Include file fixes

No functional changes.

Move data from headers to source files, remove redundant includes and add whitespace to improve readability.