diff --git a/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.cc b/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.cc
index d3d746c3b..18b894000 100644
--- a/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.cc
+++ b/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.cc
@@ -30,7 +30,7 @@
 #include <maxscale/authenticator.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <cdc.h>
+#include <cdc.hh>
 #include <maxscale/alloc.h>
 #include <maxscale/event.hh>
 #include <maxscale/modulecmd.hh>
diff --git a/server/modules/include/cdc.h b/server/modules/include/cdc.hh
similarity index 89%
rename from server/modules/include/cdc.h
rename to server/modules/include/cdc.hh
index 8ebe7fa79..2374ebe08 100644
--- a/server/modules/include/cdc.h
+++ b/server/modules/include/cdc.hh
@@ -1,6 +1,5 @@
 #pragma once
-#ifndef _CDC_H
-#define _CDC_H
+
 /*
  * Copyright (c) 2016 MariaDB Corporation Ab
  *
@@ -14,27 +13,20 @@
  * Public License.
  */
 
-/*
- * Revision History
- *
- * Date         Who                 Description
- * 11-01-2016   Massimiliano Pinto  First Implementation
- */
-
-#include <maxscale/cdefs.h>
+#include <maxscale/ccdefs.hh>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <maxscale/dcb.h>
-#include <maxscale/buffer.h>
-#include <maxscale/service.hh>
-#include <maxscale/session.h>
-#include <sys/ioctl.h>
-#include <errno.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
-#include <maxscale/router.h>
+#include <netinet/in.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <maxscale/dcb.h>
+#include <maxscale/buffer.hh>
+#include <maxscale/service.hh>
+#include <maxscale/session.hh>
+#include <maxscale/router.hh>
 #include <maxscale/poll.h>
 #include <maxbase/atomic.h>
 
@@ -88,5 +80,3 @@ typedef struct  cdc_protocol
 extern int gw_hex2bin(uint8_t* out, const char* in, unsigned int len);
 
 MXS_END_DECLS
-
-#endif
diff --git a/server/modules/protocol/CDC/cdc.cc b/server/modules/protocol/CDC/cdc.cc
index d656ffdb9..c1f47e13b 100644
--- a/server/modules/protocol/CDC/cdc.cc
+++ b/server/modules/protocol/CDC/cdc.cc
@@ -32,7 +32,7 @@
 
 #define MXS_MODULE_NAME "CDC"
 
-#include <cdc.h>
+#include <cdc.hh>
 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/log.h>
diff --git a/server/modules/routing/avrorouter/avrorouter.hh b/server/modules/routing/avrorouter/avrorouter.hh
index 7b3404151..6ffe026bd 100644
--- a/server/modules/routing/avrorouter/avrorouter.hh
+++ b/server/modules/routing/avrorouter/avrorouter.hh
@@ -24,7 +24,7 @@
 #include <maxscale/service.hh>
 #include <maxscale/mysql_binlog.h>
 #include <maxscale/users.h>
-#include <cdc.h>
+#include <cdc.hh>
 #include <maxavro.h>
 #include <binlog_common.h>
 #include <maxscale/protocol/mysql.h>