Add header guard. Add .h files to CMakeLists.txt