Move some headers to *.m-files.

Move some headers to *.m-files.