Don't add extra #define guard, fix CMake