Misc changes to project headers and includes