diff --git a/Documentation/Release-Notes/MaxScale-2.1.0-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.1.0-Release-Notes.md
index f3bce5ae0..d1014d0d5 100644
--- a/Documentation/Release-Notes/MaxScale-2.1.0-Release-Notes.md
+++ b/Documentation/Release-Notes/MaxScale-2.1.0-Release-Notes.md
@@ -1,4 +1,4 @@
-# MariaDB MaxScale 2.1.0 Release Notes
+# MariaDB MaxScale 2.1.0 Release Notes -- 2017-02-16
 
 Release 2.1.0 is a Beta release.
 
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/maxscale.cnf.template b/server/maxscale.cnf.template
index 20f9fd7ea..30688089b 100644
--- a/server/maxscale.cnf.template
+++ b/server/maxscale.cnf.template
@@ -1,10 +1,10 @@
 # MaxScale documentation on GitHub:
-# https://github.com/mariadb-corporation/MaxScale/blob/master/Documentation/Documentation-Contents.md
+# https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Documentation-Contents.md
 
 # Global parameters
 #
 # Complete list of configuration options:
-# https://github.com/mariadb-corporation/MaxScale/blob/master/Documentation/Getting-Started/Configuration-Guide.md
+# https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Getting-Started/Configuration-Guide.md
 
 [maxscale]
 threads=1
@@ -25,7 +25,7 @@ protocol=MySQLBackend
 #
 # This will keep MaxScale aware of the state of the servers.
 # MySQL Monitor documentation:
-# https://github.com/mariadb-corporation/MaxScale/blob/master/Documentation/Monitors/MySQL-Monitor.md
+# https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Monitors/MySQL-Monitor.md
 
 [MySQL Monitor]
 type=monitor
@@ -42,7 +42,7 @@ monitor_interval=10000
 #
 
 # ReadConnRoute documentation:
-# https://github.com/mariadb-corporation/MaxScale/blob/master/Documentation/Routers/ReadConnRoute.md
+# https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Routers/ReadConnRoute.md
 
 [Read-Only Service]
 type=service
@@ -53,7 +53,7 @@ passwd=mypwd
 router_options=slave
 
 # ReadWriteSplit documentation:
-# https://github.com/mariadb-corporation/MaxScale/blob/master/Documentation/Routers/ReadWriteSplit.md
+# https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Routers/ReadWriteSplit.md
 
 [Read-Write Service]
 type=service
@@ -65,7 +65,7 @@ max_slave_connections=100%
 
 # This service enables the use of the MaxAdmin interface
 # MaxScale administration guide:
-# https://github.com/mariadb-corporation/MaxScale/blob/master/Documentation/Reference/MaxAdmin.md
+# https://github.com/mariadb-corporation/MaxScale/blob/2.1/Documentation/Reference/MaxAdmin.md
 
 [MaxAdmin Service]
 type=service
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/filter/luafilter/luafilter.c b/server/modules/filter/luafilter/luafilter.c
index e54508ac2..0b65179d3 100644
--- a/server/modules/filter/luafilter/luafilter.c
+++ b/server/modules/filter/luafilter/luafilter.c
@@ -64,7 +64,7 @@ static void setUpstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession,  MXS
 static int32_t routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue);
 static int32_t clientReply(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue);
 static void diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb);
-static uint64_t getCapabilities(void);
+static uint64_t getCapabilities(MXS_FILTER *instance);
 
 /**
  * The module entry point routine. It is this routine that
@@ -668,7 +668,7 @@ static void diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *
  *
  * @return The capabilities of the filter.
  */
-static uint64_t getCapabilities(void)
+static uint64_t getCapabilities(MXS_FILTER *instance)
 {
     return RCAP_TYPE_CONTIGUOUS_INPUT;
 }
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()