Fixed include issues and CMake errors on default.