diff --git a/server/modules/filter/cache/cache.cc b/server/modules/filter/cache/cache.cc
index beecd112e..31eef18dd 100644
--- a/server/modules/filter/cache/cache.cc
+++ b/server/modules/filter/cache/cache.cc
@@ -12,12 +12,12 @@
  */
 
 #define MXS_MODULE_NAME "cache"
-#include "cache.h"
+#include "cache.hh"
 #include <new>
 #include <maxscale/alloc.h>
 #include <maxscale/gwdirs.h>
-#include "storagefactory.h"
-#include "storage.h"
+#include "storagefactory.hh"
+#include "storage.hh"
 
 Cache::Cache(const std::string&  name,
              const CACHE_CONFIG* pConfig,
diff --git a/server/modules/filter/cache/cache.h b/server/modules/filter/cache/cache.hh
similarity index 100%
rename from server/modules/filter/cache/cache.h
rename to server/modules/filter/cache/cache.hh
diff --git a/server/modules/filter/cache/cachefilter.cc b/server/modules/filter/cache/cachefilter.cc
index a9d1b6384..a40e78523 100644
--- a/server/modules/filter/cache/cachefilter.cc
+++ b/server/modules/filter/cache/cachefilter.cc
@@ -17,8 +17,8 @@
 #include <maxscale/gwdirs.h>
 #include <maxscale/modulecmd.h>
 #include <maxscale/cpp.hh>
-#include "cachemt.h"
-#include "cachept.h"
+#include "cachemt.hh"
+#include "cachept.hh"
 
 using std::auto_ptr;
 using std::string;
diff --git a/server/modules/filter/cache/cachefiltersession.cc b/server/modules/filter/cache/cachefiltersession.cc
index e8dd53229..193a34944 100644
--- a/server/modules/filter/cache/cachefiltersession.cc
+++ b/server/modules/filter/cache/cachefiltersession.cc
@@ -17,7 +17,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/mysql_utils.h>
-#include "storage.h"
+#include "storage.hh"
 
 CacheFilterSession::CacheFilterSession(SESSION* pSession, Cache* pCache, char* zDefaultDb)
     : maxscale::FilterSession(pSession)
diff --git a/server/modules/filter/cache/cachefiltersession.hh b/server/modules/filter/cache/cachefiltersession.hh
index 3c874a1f2..fff444c0c 100644
--- a/server/modules/filter/cache/cachefiltersession.hh
+++ b/server/modules/filter/cache/cachefiltersession.hh
@@ -15,7 +15,7 @@
 #include <maxscale/cdefs.h>
 #include <maxscale/buffer.h>
 #include <maxscale/filter.hh>
-#include "cache.h"
+#include "cache.hh"
 #include "cachefilter.h"
 #include "cache_storage_api.h"
 
diff --git a/server/modules/filter/cache/cachemt.cc b/server/modules/filter/cache/cachemt.cc
index 23651356d..3979aacc0 100644
--- a/server/modules/filter/cache/cachemt.cc
+++ b/server/modules/filter/cache/cachemt.cc
@@ -12,9 +12,9 @@
  */
 
 #define MXS_MODULE_NAME "cache"
-#include "cachemt.h"
-#include "storage.h"
-#include "storagefactory.h"
+#include "cachemt.hh"
+#include "storage.hh"
+#include "storagefactory.hh"
 
 using maxscale::SpinLockGuard;
 using std::tr1::shared_ptr;
diff --git a/server/modules/filter/cache/cachemt.h b/server/modules/filter/cache/cachemt.hh
similarity index 98%
rename from server/modules/filter/cache/cachemt.h
rename to server/modules/filter/cache/cachemt.hh
index 70ab558a0..6d31246b7 100644
--- a/server/modules/filter/cache/cachemt.h
+++ b/server/modules/filter/cache/cachemt.hh
@@ -14,7 +14,7 @@
 
 #include <maxscale/cdefs.h>
 #include <maxscale/spinlock.hh>
-#include "cachesimple.h"
+#include "cachesimple.hh"
 
 class CacheMT : public CacheSimple
 {
diff --git a/server/modules/filter/cache/cachept.cc b/server/modules/filter/cache/cachept.cc
index c812be273..aa37a8a7b 100644
--- a/server/modules/filter/cache/cachept.cc
+++ b/server/modules/filter/cache/cachept.cc
@@ -12,12 +12,12 @@
  */
 
 #define MXS_MODULE_NAME "cache"
-#include "cachept.h"
+#include "cachept.hh"
 #include <maxscale/atomic.h>
 #include <maxscale/platform.h>
 #include <maxscale/cpp.hh>
-#include "cachest.h"
-#include "storagefactory.h"
+#include "cachest.hh"
+#include "storagefactory.hh"
 
 using std::tr1::shared_ptr;
 using std::string;
diff --git a/server/modules/filter/cache/cachept.h b/server/modules/filter/cache/cachept.hh
similarity index 98%
rename from server/modules/filter/cache/cachept.h
rename to server/modules/filter/cache/cachept.hh
index a92907c5a..24a6feeac 100644
--- a/server/modules/filter/cache/cachept.h
+++ b/server/modules/filter/cache/cachept.hh
@@ -15,7 +15,7 @@
 #include <maxscale/cdefs.h>
 #include <tr1/memory>
 #include <vector>
-#include "cache.h"
+#include "cache.hh"
 
 class CachePT : public Cache
 {
diff --git a/server/modules/filter/cache/cachesimple.cc b/server/modules/filter/cache/cachesimple.cc
index f56810086..683185485 100644
--- a/server/modules/filter/cache/cachesimple.cc
+++ b/server/modules/filter/cache/cachesimple.cc
@@ -12,9 +12,9 @@
  */
 
 #define MXS_MODULE_NAME "cache"
-#include "cachesimple.h"
-#include "storage.h"
-#include "storagefactory.h"
+#include "cachesimple.hh"
+#include "storage.hh"
+#include "storagefactory.hh"
 
 CacheSimple::CacheSimple(const std::string&  name,
                          const CACHE_CONFIG* pConfig,
diff --git a/server/modules/filter/cache/cachesimple.h b/server/modules/filter/cache/cachesimple.hh
similarity index 98%
rename from server/modules/filter/cache/cachesimple.h
rename to server/modules/filter/cache/cachesimple.hh
index 700ed516a..24ecf9386 100644
--- a/server/modules/filter/cache/cachesimple.h
+++ b/server/modules/filter/cache/cachesimple.hh
@@ -15,7 +15,7 @@
 #include <maxscale/cdefs.h>
 #include <tr1/unordered_map>
 #include <maxscale/hashtable.h>
-#include "cache.h"
+#include "cache.hh"
 #include "cache_storage_api.hh"
 
 class Storage;
diff --git a/server/modules/filter/cache/cachest.cc b/server/modules/filter/cache/cachest.cc
index 9bc4d3e4b..d810a55ae 100644
--- a/server/modules/filter/cache/cachest.cc
+++ b/server/modules/filter/cache/cachest.cc
@@ -12,10 +12,10 @@
  */
 
 #define MXS_MODULE_NAME "cache"
-#include "cachest.h"
+#include "cachest.hh"
 #include <maxscale/cpp.hh>
-#include "storage.h"
-#include "storagefactory.h"
+#include "storage.hh"
+#include "storagefactory.hh"
 
 using std::tr1::shared_ptr;
 
diff --git a/server/modules/filter/cache/cachest.h b/server/modules/filter/cache/cachest.hh
similarity index 98%
rename from server/modules/filter/cache/cachest.h
rename to server/modules/filter/cache/cachest.hh
index 2509ce362..3e0c19a89 100644
--- a/server/modules/filter/cache/cachest.h
+++ b/server/modules/filter/cache/cachest.hh
@@ -13,7 +13,7 @@
  */
 
 #include <maxscale/cdefs.h>
-#include "cachesimple.h"
+#include "cachesimple.hh"
 
 class CacheST : public CacheSimple
 {
diff --git a/server/modules/filter/cache/lrustorage.cc b/server/modules/filter/cache/lrustorage.cc
index 465e92deb..77eb1e07d 100644
--- a/server/modules/filter/cache/lrustorage.cc
+++ b/server/modules/filter/cache/lrustorage.cc
@@ -12,7 +12,7 @@
  */
 
 #define MXS_MODULE_NAME "cache"
-#include "lrustorage.h"
+#include "lrustorage.hh"
 
 LRUStorage::LRUStorage(Storage* pstorage, size_t max_count, size_t max_size)
     : pstorage_(pstorage)
diff --git a/server/modules/filter/cache/lrustorage.h b/server/modules/filter/cache/lrustorage.hh
similarity index 99%
rename from server/modules/filter/cache/lrustorage.h
rename to server/modules/filter/cache/lrustorage.hh
index 67e93722d..a1e19fb9d 100644
--- a/server/modules/filter/cache/lrustorage.h
+++ b/server/modules/filter/cache/lrustorage.hh
@@ -16,7 +16,7 @@
 #include <tr1/unordered_map>
 #include "cachefilter.h"
 #include "cache_storage_api.hh"
-#include "storage.h"
+#include "storage.hh"
 
 class LRUStorage : public Storage
 {
diff --git a/server/modules/filter/cache/lrustoragemt.cc b/server/modules/filter/cache/lrustoragemt.cc
index c1233de1d..b373c45cc 100644
--- a/server/modules/filter/cache/lrustoragemt.cc
+++ b/server/modules/filter/cache/lrustoragemt.cc
@@ -12,7 +12,7 @@
  */
 
 #define MXS_MODULE_NAME "cache"
-#include "lrustoragemt.h"
+#include "lrustoragemt.hh"
 
 using maxscale::SpinLockGuard;
 
diff --git a/server/modules/filter/cache/lrustoragemt.h b/server/modules/filter/cache/lrustoragemt.hh
similarity index 98%
rename from server/modules/filter/cache/lrustoragemt.h
rename to server/modules/filter/cache/lrustoragemt.hh
index 0ec16d255..cc21345b5 100644
--- a/server/modules/filter/cache/lrustoragemt.h
+++ b/server/modules/filter/cache/lrustoragemt.hh
@@ -14,7 +14,7 @@
 
 #include <maxscale/cdefs.h>
 #include <maxscale/spinlock.hh>
-#include "lrustorage.h"
+#include "lrustorage.hh"
 
 class LRUStorageMT : public LRUStorage
 {
diff --git a/server/modules/filter/cache/lrustoragest.cc b/server/modules/filter/cache/lrustoragest.cc
index 164676e72..f5c11c54b 100644
--- a/server/modules/filter/cache/lrustoragest.cc
+++ b/server/modules/filter/cache/lrustoragest.cc
@@ -12,7 +12,7 @@
  */
 
 #define MXS_MODULE_NAME "cache"
-#include "lrustoragest.h"
+#include "lrustoragest.hh"
 #include <maxscale/cpp.hh>
 
 LRUStorageST::LRUStorageST(Storage* pstorage, size_t max_count, size_t max_size)
diff --git a/server/modules/filter/cache/lrustoragest.h b/server/modules/filter/cache/lrustoragest.hh
similarity index 97%
rename from server/modules/filter/cache/lrustoragest.h
rename to server/modules/filter/cache/lrustoragest.hh
index 20646400b..2e250d9f5 100644
--- a/server/modules/filter/cache/lrustoragest.h
+++ b/server/modules/filter/cache/lrustoragest.hh
@@ -13,7 +13,7 @@
  */
 
 #include <maxscale/cdefs.h>
-#include "lrustorage.h"
+#include "lrustorage.hh"
 
 class LRUStorageST : public LRUStorage
 {
diff --git a/server/modules/filter/cache/storage.cc b/server/modules/filter/cache/storage.cc
index ff446c3d8..f05fbd1e7 100644
--- a/server/modules/filter/cache/storage.cc
+++ b/server/modules/filter/cache/storage.cc
@@ -12,7 +12,7 @@
  */
 
 #define MXS_MODULE_NAME "cache"
-#include "storage.h"
+#include "storage.hh"
 
 
 Storage::Storage()
diff --git a/server/modules/filter/cache/storage.h b/server/modules/filter/cache/storage.hh
similarity index 100%
rename from server/modules/filter/cache/storage.h
rename to server/modules/filter/cache/storage.hh
diff --git a/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.cc b/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.cc
index ad69c9d9a..b984990ce 100644
--- a/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.cc
+++ b/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.cc
@@ -12,7 +12,7 @@
  */
 
 #define MXS_MODULE_NAME "storage_inmemory"
-#include "inmemorystorage.h"
+#include "inmemorystorage.hh"
 #include <openssl/sha.h>
 #include <algorithm>
 #include <set>
diff --git a/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.h b/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.hh
similarity index 98%
rename from server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.h
rename to server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.hh
index 1eb29a160..d3823cd23 100644
--- a/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.h
+++ b/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.hh
@@ -17,7 +17,6 @@
 #include <string>
 #include <vector>
 #include <tr1/unordered_map>
-#include "../../cachefilter.h"
 #include "../../cache_storage_api.hh"
 
 class InMemoryStorage
diff --git a/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragemt.cc b/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragemt.cc
index 26eb05c90..c4df42fa5 100644
--- a/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragemt.cc
+++ b/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragemt.cc
@@ -12,7 +12,7 @@
  */
 
 #define MXS_MODULE_NAME "storage_inmemory"
-#include "inmemorystoragemt.h"
+#include "inmemorystoragemt.hh"
 
 using maxscale::SpinLockGuard;
 
diff --git a/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragemt.h b/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragemt.hh
similarity index 97%
rename from server/modules/filter/cache/storage/storage_inmemory/inmemorystoragemt.h
rename to server/modules/filter/cache/storage/storage_inmemory/inmemorystoragemt.hh
index 5917ef325..32cdbe7b2 100644
--- a/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragemt.h
+++ b/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragemt.hh
@@ -14,7 +14,7 @@
 
 #include <maxscale/cdefs.h>
 #include <maxscale/spinlock.hh>
-#include "inmemorystorage.h"
+#include "inmemorystorage.hh"
 
 class InMemoryStorageMT : public InMemoryStorage
 {
diff --git a/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragest.cc b/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragest.cc
index 590abe7ce..791e8ee64 100644
--- a/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragest.cc
+++ b/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragest.cc
@@ -12,7 +12,7 @@
  */
 
 #define MXS_MODULE_NAME "storage_inmemory"
-#include "inmemorystoragest.h"
+#include "inmemorystoragest.hh"
 
 InMemoryStorageST::InMemoryStorageST(const std::string& name, uint32_t ttl)
     : InMemoryStorage(name, ttl)
diff --git a/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragest.h b/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragest.hh
similarity index 97%
rename from server/modules/filter/cache/storage/storage_inmemory/inmemorystoragest.h
rename to server/modules/filter/cache/storage/storage_inmemory/inmemorystoragest.hh
index d9bbbcb19..fd0fe13aa 100644
--- a/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragest.h
+++ b/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragest.hh
@@ -13,7 +13,7 @@
  */
 
 #include <maxscale/cdefs.h>
-#include "inmemorystorage.h"
+#include "inmemorystorage.hh"
 
 class InMemoryStorageST : public InMemoryStorage
 {
diff --git a/server/modules/filter/cache/storage/storage_inmemory/storage_inmemory.cc b/server/modules/filter/cache/storage/storage_inmemory/storage_inmemory.cc
index ad75b2e52..ac5f5b0eb 100644
--- a/server/modules/filter/cache/storage/storage_inmemory/storage_inmemory.cc
+++ b/server/modules/filter/cache/storage/storage_inmemory/storage_inmemory.cc
@@ -14,8 +14,8 @@
 #define MXS_MODULE_NAME "storage_inmemory"
 #include <inttypes.h>
 #include "../../cache_storage_api.h"
-#include "inmemorystoragest.h"
-#include "inmemorystoragemt.h"
+#include "inmemorystoragest.hh"
+#include "inmemorystoragemt.hh"
 
 namespace
 {
diff --git a/server/modules/filter/cache/storage/storage_rocksdb/rocksdbinternals.cc b/server/modules/filter/cache/storage/storage_rocksdb/rocksdbinternals.cc
index 6687a96f7..d130e12b0 100644
--- a/server/modules/filter/cache/storage/storage_rocksdb/rocksdbinternals.cc
+++ b/server/modules/filter/cache/storage/storage_rocksdb/rocksdbinternals.cc
@@ -12,7 +12,7 @@
  */
 
 #define MXS_MODULE_NAME "storage_rocksdb"
-#include "rocksdbinternals.h"
+#include "rocksdbinternals.hh"
 #include <rocksdb/env.h>
 #include <util/coding.h>
 
diff --git a/server/modules/filter/cache/storage/storage_rocksdb/rocksdbinternals.h b/server/modules/filter/cache/storage/storage_rocksdb/rocksdbinternals.hh
similarity index 91%
rename from server/modules/filter/cache/storage/storage_rocksdb/rocksdbinternals.h
rename to server/modules/filter/cache/storage/storage_rocksdb/rocksdbinternals.hh
index f82920732..d9fe4f5d1 100644
--- a/server/modules/filter/cache/storage/storage_rocksdb/rocksdbinternals.h
+++ b/server/modules/filter/cache/storage/storage_rocksdb/rocksdbinternals.hh
@@ -1,6 +1,4 @@
 #pragma once
-#ifndef _ROCKSDBINTERNALS_H
-#define _ROCKSDBINTERNALS_H
 /*
  * Copyright (c) 2016 MariaDB Corporation Ab
  *
@@ -15,7 +13,6 @@
  */
 
 #include <maxscale/cdefs.h>
-#include "storage_rocksdb.h"
 #include <rocksdb/env.h>
 #include <rocksdb/version.h>
 #include <rocksdb/slice.h>
@@ -38,5 +35,3 @@ static const uint32_t TS_LENGTH = sizeof(int32_t);
 bool IsStale(const rocksdb::Slice& slice, int32_t ttl, rocksdb::Env* pEnv);
 
 }
-
-#endif
diff --git a/server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.cc b/server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.cc
index 8f4b14af8..7972c4ce4 100644
--- a/server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.cc
+++ b/server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.cc
@@ -12,7 +12,7 @@
  */
 
 #define MXS_MODULE_NAME "storage_rocksdb"
-#include "rocksdbstorage.h"
+#include "rocksdbstorage.hh"
 #include <openssl/sha.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -25,7 +25,7 @@
 #include <maxscale/gwdirs.h>
 #include <maxscale/modutil.h>
 #include <maxscale/query_classifier.h>
-#include "rocksdbinternals.h"
+#include "rocksdbinternals.hh"
 
 using std::for_each;
 using std::set;
diff --git a/server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.h b/server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.hh
similarity index 95%
rename from server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.h
rename to server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.hh
index 2391a6246..eec3bd762 100644
--- a/server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.h
+++ b/server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.hh
@@ -1,6 +1,4 @@
 #pragma once
-#ifndef _ROCKSDBSTORAGE_H
-#define _ROCKSDBSTORAGE_H
 /*
  * Copyright (c) 2016 MariaDB Corporation Ab
  *
@@ -15,7 +13,6 @@
  */
 
 #include <maxscale/cdefs.h>
-#include "storage_rocksdb.h"
 #include <memory>
 #include <string>
 #include <rocksdb/utilities/db_ttl.h>
@@ -62,5 +59,3 @@ private:
 
     static rocksdb::WriteOptions        s_writeOptions;
 };
-
-#endif
diff --git a/server/modules/filter/cache/storage/storage_rocksdb/storage_rocksdb.cc b/server/modules/filter/cache/storage/storage_rocksdb/storage_rocksdb.cc
index b47145f54..1ae132221 100644
--- a/server/modules/filter/cache/storage/storage_rocksdb/storage_rocksdb.cc
+++ b/server/modules/filter/cache/storage/storage_rocksdb/storage_rocksdb.cc
@@ -12,10 +12,9 @@
  */
 
 #define MXS_MODULE_NAME "storage_rocksdb"
-#include "storage_rocksdb.h"
 #include <inttypes.h>
 #include "../../cache_storage_api.h"
-#include "rocksdbstorage.h"
+#include "rocksdbstorage.hh"
 
 namespace
 {
diff --git a/server/modules/filter/cache/storage/storage_rocksdb/storage_rocksdb.h b/server/modules/filter/cache/storage/storage_rocksdb/storage_rocksdb.h
deleted file mode 100644
index 7ab92c51b..000000000
--- a/server/modules/filter/cache/storage/storage_rocksdb/storage_rocksdb.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-#ifndef _STORAGE_ROCKSDB_H
-#define _STORAGE_ROCKSDB_H
-/*
- * Copyright (c) 2016 MariaDB Corporation Ab
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file and at www.mariadb.com/bsl.
- *
- * Change Date: 2019-07-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2 or later of the General
- * Public License.
- */
-
-#define MXS_MODULE_NAME "storage_rocksdb"
-#include <maxscale/cdefs.h>
-#include <maxscale/log_manager.h>
-
-#endif
diff --git a/server/modules/filter/cache/storagefactory.cc b/server/modules/filter/cache/storagefactory.cc
index eeb994547..e5a2d560c 100644
--- a/server/modules/filter/cache/storagefactory.cc
+++ b/server/modules/filter/cache/storagefactory.cc
@@ -12,7 +12,7 @@
  */
 
 #define MXS_MODULE_NAME "cache"
-#include "storagefactory.h"
+#include "storagefactory.hh"
 #include <dlfcn.h>
 #include <sys/param.h>
 #include <new>
@@ -20,9 +20,9 @@
 #include <maxscale/gwdirs.h>
 #include <maxscale/log_manager.h>
 #include "cachefilter.h"
-#include "lrustoragest.h"
-#include "lrustoragemt.h"
-#include "storagereal.h"
+#include "lrustoragest.hh"
+#include "lrustoragemt.hh"
+#include "storagereal.hh"
 
 
 namespace
diff --git a/server/modules/filter/cache/storagefactory.h b/server/modules/filter/cache/storagefactory.hh
similarity index 92%
rename from server/modules/filter/cache/storagefactory.h
rename to server/modules/filter/cache/storagefactory.hh
index 24f0e7871..61326a4a2 100644
--- a/server/modules/filter/cache/storagefactory.h
+++ b/server/modules/filter/cache/storagefactory.hh
@@ -1,6 +1,4 @@
 #pragma once
-#ifndef _MAXSCALE_FILTER_CACHE_STORAGEFACTORY_H
-#define _MAXSCALE_FILTER_CACHE_STORAGEFACTORY_H
 /*
  * Copyright (c) 2016 MariaDB Corporation Ab
  *
@@ -44,5 +42,3 @@ private:
     CACHE_STORAGE_API* m_pApi;         /*< API of storage. */
     uint32_t           m_capabilities; /*< Capabilities of storage. */
 };
-
-#endif
diff --git a/server/modules/filter/cache/storagereal.cc b/server/modules/filter/cache/storagereal.cc
index 06309e5e6..d68798f3a 100644
--- a/server/modules/filter/cache/storagereal.cc
+++ b/server/modules/filter/cache/storagereal.cc
@@ -12,7 +12,7 @@
  */
 
 #define MXS_MODULE_NAME "cache"
-#include "storagereal.h"
+#include "storagereal.hh"
 
 
 StorageReal::StorageReal(CACHE_STORAGE_API* pApi, CACHE_STORAGE* pStorage)
diff --git a/server/modules/filter/cache/storagereal.h b/server/modules/filter/cache/storagereal.hh
similarity index 98%
rename from server/modules/filter/cache/storagereal.h
rename to server/modules/filter/cache/storagereal.hh
index 11e8e2013..f7322a501 100644
--- a/server/modules/filter/cache/storagereal.h
+++ b/server/modules/filter/cache/storagereal.hh
@@ -13,7 +13,7 @@
  */
 
 #include <maxscale/cdefs.h>
-#include "storage.h"
+#include "storage.hh"
 
 class StorageReal : public Storage
 {