diff --git a/server/modules/protocol/HTTPD/httpd.cc b/server/modules/protocol/HTTPD/httpd.cc
index 1a16ee1f8..0e2b1a1bc 100644
--- a/server/modules/protocol/HTTPD/httpd.cc
+++ b/server/modules/protocol/HTTPD/httpd.cc
@@ -34,7 +34,7 @@
 
 #define MXS_MODULE_NAME "HTTPD"
 
-#include "httpd.h"
+#include "httpd.hh"
 #include <ctype.h>
 #include <maxscale/alloc.h>
 #include <maxscale/protocol.h>
diff --git a/server/modules/protocol/HTTPD/httpd.h b/server/modules/protocol/HTTPD/httpd.hh
similarity index 86%
rename from server/modules/protocol/HTTPD/httpd.h
rename to server/modules/protocol/HTTPD/httpd.hh
index 8e072064f..6a4fb1b02 100644
--- a/server/modules/protocol/HTTPD/httpd.h
+++ b/server/modules/protocol/HTTPD/httpd.hh
@@ -1,6 +1,5 @@
 #pragma once
-#ifndef _HTTPD_H
-#define _HTTPD_H
+
 /*
  * Copyright (c) 2016 MariaDB Corporation Ab
  *
@@ -14,27 +13,20 @@
  * Public License.
  */
 
-/*
- * Revision History
- *
- * Date         Who                 Description
- * 08-07-2013   Massimiliano Pinto  Added HTTPD protocol header file
- */
-
-#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>
 
@@ -68,5 +60,3 @@ typedef struct httpd_session
 } HTTPD_session;
 
 MXS_END_DECLS
-
-#endif