Fix ifndef, fix CMakeLists