diff --git a/server/modules/monitor/mariadbmon/mariadbmon.cc b/server/modules/monitor/mariadbmon/mariadbmon.cc
index a0597f153..6ba45add6 100644
--- a/server/modules/monitor/mariadbmon/mariadbmon.cc
+++ b/server/modules/monitor/mariadbmon/mariadbmon.cc
@@ -17,7 +17,7 @@
 
 #define MXS_MODULE_NAME "mariadbmon"
 
-#include "mariadbmon.h"
+#include "mariadbmon.hh"
 #include <inttypes.h>
 #include <limits>
 #include <string>
diff --git a/server/modules/monitor/mariadbmon/mariadbmon.h b/server/modules/monitor/mariadbmon/mariadbmon.hh
similarity index 95%
rename from server/modules/monitor/mariadbmon/mariadbmon.h
rename to server/modules/monitor/mariadbmon/mariadbmon.hh
index 59f71e9a4..5c82192e6 100644
--- a/server/modules/monitor/mariadbmon/mariadbmon.h
+++ b/server/modules/monitor/mariadbmon/mariadbmon.hh
@@ -15,31 +15,28 @@
  */
 
 /**
- * @file mysqlmon.h - The MySQL monitor
+ * @file mysqlmon.hh - The MySQL monitor
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/cppdefs.hh>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <maxscale/monitor.h>
-#include <maxscale/spinlock.h>
-#include <maxscale/thread.h>
 #include <mysql.h>
 #include <mysqld_error.h>
-#include <maxscale/log_manager.h>
-#include <maxscale/secrets.h>
-#include <maxscale/dcb.h>
-#include <maxscale/modinfo.h>
+
 #include <maxscale/config.h>
+#include <maxscale/dcb.h>
 #include <maxscale/hashtable.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/modinfo.h>
+#include <maxscale/monitor.h>
+#include <maxscale/spinlock.h>
+#include <maxscale/secrets.h>
+#include <maxscale/thread.h>
 
-MXS_BEGIN_DECLS
-
-/**
- * The handle for an instance of a MySQL Monitor module
- */
-typedef struct
+// MySQL Monitor module instance
+struct MYSQL_MONITOR
 {
     THREAD thread;                 /**< Monitor thread */
     int shutdown;                  /**< Flag to shutdown the monitor thread */
@@ -79,8 +76,6 @@ typedef struct
     MXS_MONITORED_SERVER** excluded_servers; /**< Servers banned for master promotion during auto-failover. */
 
     MXS_MONITOR* monitor;
-} MYSQL_MONITOR;
-
-MXS_END_DECLS
+};
 
 #endif