Added some required code, getting ready for a bulk reformat.
Cleaned up .h files.