Update module names to not use C preprocessor and to be at top of headers.
10 files changed