diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59438e168..b51562e7d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -190,6 +190,7 @@ endif()
 add_subdirectory(plugins)
 add_subdirectory(query_classifier)
 add_subdirectory(server)
+add_subdirectory(include/maxscale)
 if(NOT WITHOUT_MAXADMIN)
   add_subdirectory(client)
 endif()
diff --git a/server/include/maxscale/CMakeLists.txt b/include/maxscale/CMakeLists.txt
similarity index 81%
rename from server/include/maxscale/CMakeLists.txt
rename to include/maxscale/CMakeLists.txt
index 9729c1462..cf37d2404 100644
--- a/server/include/maxscale/CMakeLists.txt
+++ b/include/maxscale/CMakeLists.txt
@@ -1,4 +1,4 @@
-file(GLOB HEADERS "*.h")
+file(GLOB HEADERS "*.h*")
 foreach(var ${HEADERS})
   get_filename_component(header ${var} NAME)
   install_header(${header} devel)
diff --git a/server/include/CMakeLists.txt b/include/maxscale/protocol/CMakeLists.txt
similarity index 68%
rename from server/include/CMakeLists.txt
rename to include/maxscale/protocol/CMakeLists.txt
index 468e419af..cf37d2404 100644
--- a/server/include/CMakeLists.txt
+++ b/include/maxscale/protocol/CMakeLists.txt
@@ -1,7 +1,5 @@
-file(GLOB HEADERS "*.h")
+file(GLOB HEADERS "*.h*")
 foreach(var ${HEADERS})
   get_filename_component(header ${var} NAME)
   install_header(${header} devel)
 endforeach()
-
-add_subdirectory(maxscale)
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index df0edd60a..69361c9d6 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -4,4 +4,3 @@ include_directories(${MARIADB_CONNECTOR_INCLUDE_DIR})
 add_subdirectory(core)
 add_subdirectory(modules)
 add_subdirectory(inih)
-add_subdirectory(include)