Cleaned up header files

Added better handling support for compiler/os