diff --git a/include/maxscale/CMakeLists.txt b/include/maxscale/CMakeLists.txt
index cf37d2404..3b93a804e 100644
--- a/include/maxscale/CMakeLists.txt
+++ b/include/maxscale/CMakeLists.txt
@@ -1,5 +1,25 @@
-file(GLOB HEADERS "*.h*")
+# Install static C headers
+file(GLOB HEADERS "*.h")
 foreach(var ${HEADERS})
   get_filename_component(header ${var} NAME)
   install_header(${header} devel)
 endforeach()
+
+# Install static C++ headers
+file(GLOB HEADERS "*.hh")
+foreach(var ${HEADERS})
+  get_filename_component(header ${var} NAME)
+  install_header(${header} devel)
+endforeach()
+
+# Install generated C headers
+file(GLOB GENERATD_HEADERS "${CMAKE_BINARY_DIR}/include/maxscale/*.h")
+foreach(var ${GENERATD_HEADERS})
+  install_header(${var} devel)
+endforeach()
+
+# Install generated C++ headers
+file(GLOB GENERATD_HEADERS "${CMAKE_BINARY_DIR}/include/maxscale/*.hh")
+foreach(var ${GENERATD_HEADERS})
+  install_header(${var} devel)
+endforeach()
diff --git a/server/modules/CMakeLists.txt b/server/modules/CMakeLists.txt
index ec4364340..55e9f915a 100644
--- a/server/modules/CMakeLists.txt
+++ b/server/modules/CMakeLists.txt
@@ -3,4 +3,3 @@ add_subdirectory(protocol)
 add_subdirectory(monitor)
 add_subdirectory(filter)
 add_subdirectory(authenticator)
-add_subdirectory(include)
diff --git a/server/modules/include/CMakeLists.txt b/server/modules/include/CMakeLists.txt
deleted file mode 100644
index 9729c1462..000000000
--- a/server/modules/include/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-file(GLOB HEADERS "*.h")
-foreach(var ${HEADERS})
-  get_filename_component(header ${var} NAME)
-  install_header(${header} devel)
-endforeach()