CMake file fixed to include message headers