Add extra #define guard, fix CMake.