Many fixes and chasing down an issue with header files.
They need to be added in order; project files first
and standard library files second.