Changes in address path for header files, CMakeLists.txt