diff --git a/server/core/dcb.cc b/server/core/dcb.cc
index 29ad3f68d..768b5e1a0 100644
--- a/server/core/dcb.cc
+++ b/server/core/dcb.cc
@@ -20,7 +20,7 @@
  * the state data and pointers to other components that relate to the
  * use of a file descriptor.
  */
-#include "internal/dcb.h"
+#include "internal/dcb.hh"
 
 #include <arpa/inet.h>
 #include <errno.h>
diff --git a/server/core/gateway.cc b/server/core/gateway.cc
index 2df4f4a86..73a102bec 100644
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@@ -66,7 +66,7 @@
 
 #include "internal/admin.hh"
 #include "internal/config.hh"
-#include "internal/maxscale.h"
+#include "internal/maxscale.hh"
 #include "internal/modules.hh"
 #include "internal/monitor.hh"
 #include "internal/poll.hh"
diff --git a/server/core/internal/dcb.h b/server/core/internal/dcb.hh
similarity index 100%
rename from server/core/internal/dcb.h
rename to server/core/internal/dcb.hh
diff --git a/server/core/internal/maxscale.h b/server/core/internal/maxscale.hh
similarity index 92%
rename from server/core/internal/maxscale.h
rename to server/core/internal/maxscale.hh
index 0e3bc56d5..4886168bc 100644
--- a/server/core/internal/maxscale.h
+++ b/server/core/internal/maxscale.hh
@@ -13,7 +13,7 @@
 #pragma once
 
 /**
- * @file core/maxscale/maxscale.h - The private maxscale general definitions
+ * @file core/maxscale/maxscale.hh - The private maxscale general definitions
  */
 
 #include <maxscale/maxscale.h>
diff --git a/server/core/misc.cc b/server/core/misc.cc
index 2098ad95c..71be05061 100644
--- a/server/core/misc.cc
+++ b/server/core/misc.cc
@@ -17,7 +17,7 @@
 
 #include <maxscale/routingworker.hh>
 
-#include "internal/maxscale.h"
+#include "internal/maxscale.hh"
 #include "internal/service.hh"
 
 static time_t started;
diff --git a/server/core/routingworker.cc b/server/core/routingworker.cc
index 7876d531c..edef95151 100644
--- a/server/core/routingworker.cc
+++ b/server/core/routingworker.cc
@@ -34,7 +34,7 @@
 #include <maxscale/utils.hh>
 #include <maxscale/statistics.hh>
 
-#include "internal/dcb.h"
+#include "internal/dcb.hh"
 #include "internal/modules.hh"
 #include "internal/poll.hh"
 #include "internal/service.hh"
diff --git a/server/core/service.cc b/server/core/service.cc
index 94a328213..7102b63f7 100644
--- a/server/core/service.cc
+++ b/server/core/service.cc
@@ -61,7 +61,7 @@
 #include "internal/filter.hh"
 #include "internal/modules.hh"
 #include "internal/service.hh"
-#include "internal/maxscale.h"
+#include "internal/maxscale.hh"
 
 /** This define is needed in CentOS 6 systems */
 #if !defined (UINT64_MAX)
diff --git a/server/core/session.cc b/server/core/session.cc
index c4bff9bf8..ad2438813 100644
--- a/server/core/session.cc
+++ b/server/core/session.cc
@@ -41,7 +41,7 @@
 #include <maxscale/utils.h>
 #include <maxscale/protocol/mysql.h>
 
-#include "internal/dcb.h"
+#include "internal/dcb.hh"
 #include "internal/filter.hh"
 #include "internal/session.hh"
 #include "internal/service.hh"
diff --git a/server/modules/routing/debugcli/debugcmd.cc b/server/modules/routing/debugcli/debugcmd.cc
index 2c1877b11..cd37c1063 100644
--- a/server/modules/routing/debugcli/debugcmd.cc
+++ b/server/modules/routing/debugcli/debugcmd.cc
@@ -58,7 +58,7 @@
 
 #include "../../../core/internal/config.hh"
 #include "../../../core/internal/config_runtime.hh"
-#include "../../../core/internal/maxscale.h"
+#include "../../../core/internal/maxscale.hh"
 #include "../../../core/internal/modules.hh"
 #include "../../../core/internal/monitor.hh"
 #include "../../../core/internal/poll.hh"
diff --git a/server/modules/routing/maxinfo/maxinfo_exec.cc b/server/modules/routing/maxinfo/maxinfo_exec.cc
index f908ddbaf..fb11ba679 100644
--- a/server/modules/routing/maxinfo/maxinfo_exec.cc
+++ b/server/modules/routing/maxinfo/maxinfo_exec.cc
@@ -45,7 +45,7 @@
 #include <maxscale/service.hh>
 #include <maxscale/version.h>
 
-#include "../../../core/internal/maxscale.h"
+#include "../../../core/internal/maxscale.hh"
 #include "../../../core/internal/modules.hh"
 #include "../../../core/internal/monitor.hh"
 #include "../../../core/internal/poll.hh"