* Fix header files
* Fix sequence of header inclusion
* Update CMake files