Mad the include files idempotent using a consistent macro naming
scheme.

49 files changed