From f14380243b916d791ed71ad51cd0dadd9050f59d Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Thu, 9 Aug 2018 09:13:01 +0300
Subject: [PATCH] Rename cppdefs.hh to ccdefs.hh

For obvious reasons; the c++ suffix is .cc and not .cpp
---
 examples/examplefilter.hh                                       | 2 +-
 examples/examplefiltersession.hh                                | 2 +-
 examples/roundrobinrouter.cpp                                   | 2 +-
 include/maxscale/backend.hh                                     | 2 +-
 include/maxscale/buffer.hh                                      | 2 +-
 include/maxscale/{cppdefs.hh => ccdefs.hh}                      | 2 +-
 include/maxscale/customparser.hh                                | 2 +-
 include/maxscale/event.hh                                       | 2 +-
 include/maxscale/filter.hh                                      | 2 +-
 include/maxscale/http.hh                                        | 2 +-
 include/maxscale/jansson.hh                                     | 2 +-
 include/maxscale/mariadb.hh                                     | 2 +-
 include/maxscale/messagequeue.hh                                | 2 +-
 include/maxscale/modutil.hh                                     | 2 +-
 include/maxscale/monitor.hh                                     | 2 +-
 include/maxscale/pcre2.hh                                       | 2 +-
 include/maxscale/poll_core.hh                                   | 2 +-
 include/maxscale/protocol/mariadb_client.hh                     | 2 +-
 include/maxscale/queryclassifier.hh                             | 2 +-
 include/maxscale/resultset.hh                                   | 2 +-
 include/maxscale/router.hh                                      | 2 +-
 include/maxscale/semaphore.hh                                   | 2 +-
 include/maxscale/server.hh                                      | 2 +-
 include/maxscale/session_command.hh                             | 2 +-
 include/maxscale/spinlock.hh                                    | 2 +-
 include/maxscale/utils.hh                                       | 2 +-
 include/maxscale/worker.hh                                      | 2 +-
 include/maxscale/workertask.hh                                  | 2 +-
 query_classifier/test/testreader.hh                             | 2 +-
 server/core/config_runtime.cc                                   | 2 +-
 server/core/encryption.cc                                       | 2 +-
 server/core/housekeeper.cc                                      | 2 +-
 server/core/internal/admin.hh                                   | 2 +-
 server/core/internal/event.hh                                   | 2 +-
 server/core/internal/httprequest.hh                             | 2 +-
 server/core/internal/httpresponse.hh                            | 2 +-
 server/core/internal/poll.hh                                    | 2 +-
 server/core/internal/query_classifier.hh                        | 2 +-
 server/core/internal/resource.hh                                | 2 +-
 server/core/internal/routingworker.hh                           | 2 +-
 server/core/internal/session.hh                                 | 2 +-
 server/core/internal/trxboundaryparser.hh                       | 2 +-
 server/core/service.cc                                          | 2 +-
 server/core/test/canonical_tests/canonizer.cc                   | 2 +-
 server/core/test/profile_trxboundaryparser.cc                   | 2 +-
 server/core/test/test_json.cc                                   | 2 +-
 server/core/test/test_semaphore.cc                              | 2 +-
 server/core/test/test_trxcompare.cc                             | 2 +-
 server/core/test/test_trxtracking.cc                            | 2 +-
 server/core/users.cc                                            | 2 +-
 server/modules/authenticator/PAM/PAMAuth/pam_auth.hh            | 2 +-
 .../authenticator/PAM/PAMBackendAuth/pam_backend_auth.hh        | 2 +-
 server/modules/authenticator/PAM/pam_auth_common.hh             | 2 +-
 server/modules/filter/binlogfilter/binlogfilter.hh              | 2 +-
 server/modules/filter/binlogfilter/binlogfiltersession.hh       | 2 +-
 server/modules/filter/cache/cache.hh                            | 2 +-
 server/modules/filter/cache/cache_storage_api.hh                | 2 +-
 server/modules/filter/cache/cachefilter.hh                      | 2 +-
 server/modules/filter/cache/cachefiltersession.hh               | 2 +-
 server/modules/filter/cache/cachemt.hh                          | 2 +-
 server/modules/filter/cache/cachept.hh                          | 2 +-
 server/modules/filter/cache/cachesimple.hh                      | 2 +-
 server/modules/filter/cache/cachest.hh                          | 2 +-
 server/modules/filter/cache/lrustorage.hh                       | 2 +-
 server/modules/filter/cache/lrustoragemt.hh                     | 2 +-
 server/modules/filter/cache/lrustoragest.hh                     | 2 +-
 server/modules/filter/cache/storage.hh                          | 2 +-
 .../filter/cache/storage/storage_inmemory/inmemorystorage.hh    | 2 +-
 .../filter/cache/storage/storage_inmemory/inmemorystoragemt.hh  | 2 +-
 .../filter/cache/storage/storage_inmemory/inmemorystoragest.hh  | 2 +-
 .../filter/cache/storage/storage_inmemory/storage_inmemory.cc   | 2 +-
 server/modules/filter/cache/storage/storagemodule.hh            | 2 +-
 server/modules/filter/cache/storagefactory.hh                   | 2 +-
 server/modules/filter/cache/storagereal.hh                      | 2 +-
 server/modules/filter/cache/test/tester.hh                      | 2 +-
 server/modules/filter/cache/test/testerlrustorage.hh            | 2 +-
 server/modules/filter/cache/test/testerrawstorage.hh            | 2 +-
 server/modules/filter/cache/test/testerstorage.hh               | 2 +-
 server/modules/filter/cache/test/testkeygeneration.cc           | 2 +-
 server/modules/filter/cache/test/testlrustorage.cc              | 2 +-
 server/modules/filter/cache/test/testrawstorage.cc              | 2 +-
 server/modules/filter/cache/test/teststorage.cc                 | 2 +-
 server/modules/filter/cache/test/teststorage.hh                 | 2 +-
 server/modules/filter/comment/commentfilter.hh                  | 2 +-
 server/modules/filter/comment/commentfiltersession.hh           | 2 +-
 server/modules/filter/dbfwfilter/dbfwfilter.hh                  | 2 +-
 server/modules/filter/masking/maskingfilter.hh                  | 2 +-
 server/modules/filter/masking/maskingfilterconfig.hh            | 2 +-
 server/modules/filter/masking/maskingfiltersession.hh           | 2 +-
 server/modules/filter/masking/maskingrules.hh                   | 2 +-
 server/modules/filter/masking/mysql.hh                          | 2 +-
 server/modules/filter/namedserverfilter/namedserverfilter.hh    | 2 +-
 server/modules/filter/nullfilter/nullfilter.hh                  | 2 +-
 server/modules/filter/nullfilter/nullfiltersession.hh           | 2 +-
 server/modules/filter/qlafilter/qlafilter.cc                    | 2 +-
 server/modules/filter/tee/tee.cc                                | 2 +-
 server/modules/filter/tee/tee.hh                                | 2 +-
 server/modules/filter/tee/teesession.hh                         | 2 +-
 server/modules/filter/test/filtermodule.cc                      | 2 +-
 server/modules/filter/test/maxscale/filtermodule.hh             | 2 +-
 server/modules/filter/test/maxscale/mock/backend.hh             | 2 +-
 server/modules/filter/test/maxscale/mock/client.hh              | 2 +-
 server/modules/filter/test/maxscale/mock/mock.hh                | 2 +-
 server/modules/filter/test/maxscale/mock/routersession.hh       | 2 +-
 server/modules/filter/test/maxscale/module.hh                   | 2 +-
 server/modules/filter/test/maxscale/queryclassifiermodule.hh    | 2 +-
 server/modules/filter/throttlefilter/throttlefilter.cc          | 2 +-
 server/modules/filter/throttlefilter/throttlesession.cc         | 2 +-
 server/modules/monitor/auroramon/auroramon.hh                   | 2 +-
 server/modules/monitor/galeramon/galeramon.hh                   | 2 +-
 server/modules/monitor/grmon/grmon.hh                           | 2 +-
 server/modules/monitor/mariadbmon/mariadbmon_common.hh          | 2 +-
 server/modules/monitor/mmmon/mmmon.hh                           | 2 +-
 server/modules/monitor/ndbclustermon/ndbclustermon.hh           | 2 +-
 server/modules/protocol/MySQL/mariadbclient/mysql_client.cc     | 2 +-
 server/modules/protocol/MySQL/mariadbclient/setparser.hh        | 2 +-
 server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh | 2 +-
 server/modules/protocol/MySQL/mariadbclient/sqlmodeparser.hh    | 2 +-
 server/modules/routing/hintrouter/hintrouterdefs.hh             | 2 +-
 server/modules/routing/readwritesplit/readwritesplit.hh         | 2 +-
 server/modules/routing/readwritesplit/rwbackend.hh              | 2 +-
 server/modules/routing/readwritesplit/trx.hh                    | 2 +-
 server/modules/routing/schemarouter/shard_map.hh                | 2 +-
 123 files changed, 123 insertions(+), 123 deletions(-)
 rename include/maxscale/{cppdefs.hh => ccdefs.hh} (98%)

diff --git a/examples/examplefilter.hh b/examples/examplefilter.hh
index 104b341c9..235f1bd53 100644
--- a/examples/examplefilter.hh
+++ b/examples/examplefilter.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/filter.hh>
 #include "examplefiltersession.hh"
 
diff --git a/examples/examplefiltersession.hh b/examples/examplefiltersession.hh
index 19c9ea9e6..1e63f9b6c 100644
--- a/examples/examplefiltersession.hh
+++ b/examples/examplefiltersession.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/filter.hh>
 
 class ExampleFilter;
diff --git a/examples/roundrobinrouter.cpp b/examples/roundrobinrouter.cpp
index f4cd58496..1c505cf41 100644
--- a/examples/roundrobinrouter.cpp
+++ b/examples/roundrobinrouter.cpp
@@ -32,7 +32,7 @@
 /* The log macros use this definition. */
 #define MXS_MODULE_NAME "RoundRobinRouter"
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <vector>
 #include <iostream>
diff --git a/include/maxscale/backend.hh b/include/maxscale/backend.hh
index bf1585ccc..bf93d5aa8 100644
--- a/include/maxscale/backend.hh
+++ b/include/maxscale/backend.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <list>
 #include <string>
diff --git a/include/maxscale/buffer.hh b/include/maxscale/buffer.hh
index 999d6e5e6..9524c9fa2 100644
--- a/include/maxscale/buffer.hh
+++ b/include/maxscale/buffer.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <algorithm>
 #include <iterator>
 #include <new>
diff --git a/include/maxscale/cppdefs.hh b/include/maxscale/ccdefs.hh
similarity index 98%
rename from include/maxscale/cppdefs.hh
rename to include/maxscale/ccdefs.hh
index 204490c58..7d529059f 100644
--- a/include/maxscale/cppdefs.hh
+++ b/include/maxscale/ccdefs.hh
@@ -13,7 +13,7 @@
  */
 
 /**
- * @file cppdefs.hh
+ * @file ccdefs.hh
  *
  * This file is to be included first by all C++ headers.
  */
diff --git a/include/maxscale/customparser.hh b/include/maxscale/customparser.hh
index 64e4d6bb5..f8a7a4775 100644
--- a/include/maxscale/customparser.hh
+++ b/include/maxscale/customparser.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/log_manager.h>
 #include <maxscale/modutil.h>
 #include <ctype.h>
diff --git a/include/maxscale/event.hh b/include/maxscale/event.hh
index 6fe479842..1b778e98f 100644
--- a/include/maxscale/event.hh
+++ b/include/maxscale/event.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <syslog.h>
 #include <string>
 
diff --git a/include/maxscale/filter.hh b/include/maxscale/filter.hh
index 90e200d26..98b70ec8c 100644
--- a/include/maxscale/filter.hh
+++ b/include/maxscale/filter.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/filter.h>
 
 namespace maxscale
diff --git a/include/maxscale/http.hh b/include/maxscale/http.hh
index 2c0fedcb5..fa60423d8 100644
--- a/include/maxscale/http.hh
+++ b/include/maxscale/http.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <string>
 #include <time.h>
diff --git a/include/maxscale/jansson.hh b/include/maxscale/jansson.hh
index 1929e2607..a4c7303b3 100644
--- a/include/maxscale/jansson.hh
+++ b/include/maxscale/jansson.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <memory>
 #include <sstream>
diff --git a/include/maxscale/mariadb.hh b/include/maxscale/mariadb.hh
index 38c19bb5a..32b26a9ff 100644
--- a/include/maxscale/mariadb.hh
+++ b/include/maxscale/mariadb.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <mysql.h>
 #include <map>
 #include <string>
diff --git a/include/maxscale/messagequeue.hh b/include/maxscale/messagequeue.hh
index b56d191df..b9e65eb7c 100644
--- a/include/maxscale/messagequeue.hh
+++ b/include/maxscale/messagequeue.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/poll_core.hh>
 
 namespace maxscale
diff --git a/include/maxscale/modutil.hh b/include/maxscale/modutil.hh
index 4b4ba05c6..58b79f1b9 100644
--- a/include/maxscale/modutil.hh
+++ b/include/maxscale/modutil.hh
@@ -16,7 +16,7 @@
  * @file modutil.hh C++ additions/alternatives for modutil.h functions
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/modutil.h>
 
 #include <string>
diff --git a/include/maxscale/monitor.hh b/include/maxscale/monitor.hh
index 4afa15933..64d75c53e 100644
--- a/include/maxscale/monitor.hh
+++ b/include/maxscale/monitor.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/monitor.h>
 #include <maxscale/semaphore.hh>
 #include <maxscale/thread.h>
diff --git a/include/maxscale/pcre2.hh b/include/maxscale/pcre2.hh
index 56e0f2b9b..3bf4ffb8f 100644
--- a/include/maxscale/pcre2.hh
+++ b/include/maxscale/pcre2.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/pcre2.h>
 #include <maxscale/utils.hh>
 
diff --git a/include/maxscale/poll_core.hh b/include/maxscale/poll_core.hh
index 60a642ffc..b54c72905 100644
--- a/include/maxscale/poll_core.hh
+++ b/include/maxscale/poll_core.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/poll_core.h>
 
 namespace maxscale
diff --git a/include/maxscale/protocol/mariadb_client.hh b/include/maxscale/protocol/mariadb_client.hh
index c28e5a09c..ec4fd555d 100644
--- a/include/maxscale/protocol/mariadb_client.hh
+++ b/include/maxscale/protocol/mariadb_client.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <deque>
 
diff --git a/include/maxscale/queryclassifier.hh b/include/maxscale/queryclassifier.hh
index a1d62a1df..a95a73da3 100644
--- a/include/maxscale/queryclassifier.hh
+++ b/include/maxscale/queryclassifier.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <string>
 #include <memory>
 #include <unordered_map>
diff --git a/include/maxscale/resultset.hh b/include/maxscale/resultset.hh
index 2a9ea847f..0aa3f4022 100644
--- a/include/maxscale/resultset.hh
+++ b/include/maxscale/resultset.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <initializer_list>
 #include <memory>
diff --git a/include/maxscale/router.hh b/include/maxscale/router.hh
index e2ff948de..c7156089b 100644
--- a/include/maxscale/router.hh
+++ b/include/maxscale/router.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/router.h>
 
 namespace maxscale
diff --git a/include/maxscale/semaphore.hh b/include/maxscale/semaphore.hh
index 565093180..1d4478c97 100644
--- a/include/maxscale/semaphore.hh
+++ b/include/maxscale/semaphore.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <errno.h>
 #include <maxscale/semaphore.h>
 #include <maxscale/debug.h>
diff --git a/include/maxscale/server.hh b/include/maxscale/server.hh
index 7d9bf9f69..8e7deb1da 100644
--- a/include/maxscale/server.hh
+++ b/include/maxscale/server.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <string>
 #include <maxscale/server.h>
diff --git a/include/maxscale/session_command.hh b/include/maxscale/session_command.hh
index 7ec2e74ad..4dee0f4d9 100644
--- a/include/maxscale/session_command.hh
+++ b/include/maxscale/session_command.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <memory>
 #include <list>
diff --git a/include/maxscale/spinlock.hh b/include/maxscale/spinlock.hh
index e457faf56..1950e58e1 100644
--- a/include/maxscale/spinlock.hh
+++ b/include/maxscale/spinlock.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/spinlock.h>
 
 namespace maxscale
diff --git a/include/maxscale/utils.hh b/include/maxscale/utils.hh
index bb1ee613b..b77581694 100644
--- a/include/maxscale/utils.hh
+++ b/include/maxscale/utils.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <stdio.h>
 #include <openssl/sha.h>
diff --git a/include/maxscale/worker.hh b/include/maxscale/worker.hh
index dace5ffa3..9f343d1ba 100644
--- a/include/maxscale/worker.hh
+++ b/include/maxscale/worker.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <functional>
 #include <map>
diff --git a/include/maxscale/workertask.hh b/include/maxscale/workertask.hh
index 537590fdb..a68961ada 100644
--- a/include/maxscale/workertask.hh
+++ b/include/maxscale/workertask.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 namespace maxscale
 {
diff --git a/query_classifier/test/testreader.hh b/query_classifier/test/testreader.hh
index ce1d88f99..4b5bf1b33 100644
--- a/query_classifier/test/testreader.hh
+++ b/query_classifier/test/testreader.hh
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <istream>
 
 namespace maxscale
diff --git a/server/core/config_runtime.cc b/server/core/config_runtime.cc
index 3b9cf45c1..bb87ac23f 100644
--- a/server/core/config_runtime.cc
+++ b/server/core/config_runtime.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include "internal/config_runtime.h"
 
diff --git a/server/core/encryption.cc b/server/core/encryption.cc
index 3bd8bcebb..e50b96c49 100644
--- a/server/core/encryption.cc
+++ b/server/core/encryption.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <maxscale/alloc.h>
 #include <maxscale/encryption.h>
diff --git a/server/core/housekeeper.cc b/server/core/housekeeper.cc
index 760999b9e..ba3dd0bfc 100644
--- a/server/core/housekeeper.cc
+++ b/server/core/housekeeper.cc
@@ -10,7 +10,7 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/server/core/internal/admin.hh b/server/core/internal/admin.hh
index 85b33335c..e27bc8312 100644
--- a/server/core/internal/admin.hh
+++ b/server/core/internal/admin.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <string>
 #include <microhttpd.h>
diff --git a/server/core/internal/event.hh b/server/core/internal/event.hh
index a38fa9e0a..8df5812d4 100644
--- a/server/core/internal/event.hh
+++ b/server/core/internal/event.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/event.hh>
 
 namespace maxscale
diff --git a/server/core/internal/httprequest.hh b/server/core/internal/httprequest.hh
index feea2d840..8f70bc9ae 100644
--- a/server/core/internal/httprequest.hh
+++ b/server/core/internal/httprequest.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <deque>
 #include <map>
diff --git a/server/core/internal/httpresponse.hh b/server/core/internal/httpresponse.hh
index 58e81b13b..cecf4083d 100644
--- a/server/core/internal/httpresponse.hh
+++ b/server/core/internal/httpresponse.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <map>
 #include <string>
diff --git a/server/core/internal/poll.hh b/server/core/internal/poll.hh
index aa2c316f1..b2ef7f5c2 100644
--- a/server/core/internal/poll.hh
+++ b/server/core/internal/poll.hh
@@ -16,7 +16,7 @@
  * The private poll header
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/poll.h>
 #include <maxscale/resultset.hh>
 
diff --git a/server/core/internal/query_classifier.hh b/server/core/internal/query_classifier.hh
index 129b4d059..3201997da 100644
--- a/server/core/internal/query_classifier.hh
+++ b/server/core/internal/query_classifier.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/query_classifier.h>
 #include <maxscale/jansson.hh>
 
diff --git a/server/core/internal/resource.hh b/server/core/internal/resource.hh
index c97008c7d..6fa76376f 100644
--- a/server/core/internal/resource.hh
+++ b/server/core/internal/resource.hh
@@ -14,7 +14,7 @@
 
 /** @file REST API resources */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <string>
 #include <deque>
diff --git a/server/core/internal/routingworker.hh b/server/core/internal/routingworker.hh
index 36e376b39..029dc2722 100644
--- a/server/core/internal/routingworker.hh
+++ b/server/core/internal/routingworker.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <unordered_map>
 
diff --git a/server/core/internal/session.hh b/server/core/internal/session.hh
index aae55b43d..534a3d396 100644
--- a/server/core/internal/session.hh
+++ b/server/core/internal/session.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <deque>
 #include <string>
diff --git a/server/core/internal/trxboundaryparser.hh b/server/core/internal/trxboundaryparser.hh
index b8b0f64ba..f2bb7f60f 100644
--- a/server/core/internal/trxboundaryparser.hh
+++ b/server/core/internal/trxboundaryparser.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <ctype.h>
 #include <maxscale/customparser.hh>
 #include <maxscale/query_classifier.h>
diff --git a/server/core/service.cc b/server/core/service.cc
index 1032ece96..e50e9ba72 100644
--- a/server/core/service.cc
+++ b/server/core/service.cc
@@ -15,7 +15,7 @@
  * @file service.c  - A representation of a service within MaxScale
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/server/core/test/canonical_tests/canonizer.cc b/server/core/test/canonical_tests/canonizer.cc
index df7659ee8..76471a5a2 100644
--- a/server/core/test/canonical_tests/canonizer.cc
+++ b/server/core/test/canonical_tests/canonizer.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/server/core/test/profile_trxboundaryparser.cc b/server/core/test/profile_trxboundaryparser.cc
index 3d6aac21f..357583796 100644
--- a/server/core/test/profile_trxboundaryparser.cc
+++ b/server/core/test/profile_trxboundaryparser.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <iomanip>
 #include <iostream>
 #include <maxscale/paths.h>
diff --git a/server/core/test/test_json.cc b/server/core/test/test_json.cc
index 57a150065..9a032a856 100644
--- a/server/core/test/test_json.cc
+++ b/server/core/test/test_json.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <string>
 
diff --git a/server/core/test/test_semaphore.cc b/server/core/test/test_semaphore.cc
index cdadf1d06..3d215f6b3 100644
--- a/server/core/test/test_semaphore.cc
+++ b/server/core/test/test_semaphore.cc
@@ -18,7 +18,7 @@
 #undef NDEBUG
 #endif
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <time.h>
 #include <iostream>
 #include <pthread.h>
diff --git a/server/core/test/test_trxcompare.cc b/server/core/test/test_trxcompare.cc
index 46e62da99..c677b001f 100644
--- a/server/core/test/test_trxcompare.cc
+++ b/server/core/test/test_trxcompare.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <unistd.h>
 #include <fstream>
 #include <iostream>
diff --git a/server/core/test/test_trxtracking.cc b/server/core/test/test_trxtracking.cc
index 47e229086..c330944e3 100644
--- a/server/core/test/test_trxtracking.cc
+++ b/server/core/test/test_trxtracking.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <algorithm>
 #include <iostream>
 #include <maxscale/modutil.h>
diff --git a/server/core/users.cc b/server/core/users.cc
index 692ccaffe..ac269cb73 100644
--- a/server/core/users.cc
+++ b/server/core/users.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <new>
 #include <unordered_map>
diff --git a/server/modules/authenticator/PAM/PAMAuth/pam_auth.hh b/server/modules/authenticator/PAM/PAMAuth/pam_auth.hh
index 32dd6ead5..cf9c02f54 100644
--- a/server/modules/authenticator/PAM/PAMAuth/pam_auth.hh
+++ b/server/modules/authenticator/PAM/PAMAuth/pam_auth.hh
@@ -17,7 +17,7 @@
  */
 #define MXS_MODULE_NAME "PAMAuth"
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <string>
 #include <maxscale/alloc.h>
diff --git a/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.hh b/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.hh
index 5eb9c1809..ea1fb823f 100644
--- a/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.hh
+++ b/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.hh
@@ -17,7 +17,7 @@
  */
 #define MXS_MODULE_NAME "PAMBackendAuth"
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <maxscale/buffer.h>
 #include <maxscale/dcb.h>
diff --git a/server/modules/authenticator/PAM/pam_auth_common.hh b/server/modules/authenticator/PAM/pam_auth_common.hh
index 7c7d12508..1c24a051d 100644
--- a/server/modules/authenticator/PAM/pam_auth_common.hh
+++ b/server/modules/authenticator/PAM/pam_auth_common.hh
@@ -16,7 +16,7 @@
 /**
  * Common declarations for both PAMAuth and PAMBackendAuth
  */
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <string>
 
 extern const std::string DIALOG;
diff --git a/server/modules/filter/binlogfilter/binlogfilter.hh b/server/modules/filter/binlogfilter/binlogfilter.hh
index a9e63e0ec..0c792b865 100644
--- a/server/modules/filter/binlogfilter/binlogfilter.hh
+++ b/server/modules/filter/binlogfilter/binlogfilter.hh
@@ -13,7 +13,7 @@
  */
 
 #include <string>
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/filter.hh>
 #include "binlogfiltersession.hh"
 
diff --git a/server/modules/filter/binlogfilter/binlogfiltersession.hh b/server/modules/filter/binlogfilter/binlogfiltersession.hh
index df8c84a7b..9d2931008 100644
--- a/server/modules/filter/binlogfilter/binlogfiltersession.hh
+++ b/server/modules/filter/binlogfilter/binlogfiltersession.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/filter.hh>
 #include "binlogfilter.hh"
 
diff --git a/server/modules/filter/cache/cache.hh b/server/modules/filter/cache/cache.hh
index d6300b4be..2768fa498 100644
--- a/server/modules/filter/cache/cache.hh
+++ b/server/modules/filter/cache/cache.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <functional>
 #include <memory>
 #include <string>
diff --git a/server/modules/filter/cache/cache_storage_api.hh b/server/modules/filter/cache/cache_storage_api.hh
index c6a95eee0..cc86666fe 100644
--- a/server/modules/filter/cache/cache_storage_api.hh
+++ b/server/modules/filter/cache/cache_storage_api.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <functional>
 #include <string>
 #include <functional>
diff --git a/server/modules/filter/cache/cachefilter.hh b/server/modules/filter/cache/cachefilter.hh
index a66c5ddf2..77904e0f7 100644
--- a/server/modules/filter/cache/cachefilter.hh
+++ b/server/modules/filter/cache/cachefilter.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/filter.hh>
 #include "cachefilter.h"
 #include "cachefiltersession.hh"
diff --git a/server/modules/filter/cache/cachefiltersession.hh b/server/modules/filter/cache/cachefiltersession.hh
index 15ccdd305..8dde9b3a9 100644
--- a/server/modules/filter/cache/cachefiltersession.hh
+++ b/server/modules/filter/cache/cachefiltersession.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/buffer.h>
 #include <maxscale/filter.hh>
 #include "cache.hh"
diff --git a/server/modules/filter/cache/cachemt.hh b/server/modules/filter/cache/cachemt.hh
index 2f514db78..f198e98e1 100644
--- a/server/modules/filter/cache/cachemt.hh
+++ b/server/modules/filter/cache/cachemt.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/spinlock.hh>
 #include "cachesimple.hh"
 
diff --git a/server/modules/filter/cache/cachept.hh b/server/modules/filter/cache/cachept.hh
index b0bb8b48c..c82498f7c 100644
--- a/server/modules/filter/cache/cachept.hh
+++ b/server/modules/filter/cache/cachept.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <memory>
 #include <vector>
 #include "cache.hh"
diff --git a/server/modules/filter/cache/cachesimple.hh b/server/modules/filter/cache/cachesimple.hh
index dda13235d..90572964f 100644
--- a/server/modules/filter/cache/cachesimple.hh
+++ b/server/modules/filter/cache/cachesimple.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <unordered_map>
 #include "cache.hh"
 #include "cache_storage_api.hh"
diff --git a/server/modules/filter/cache/cachest.hh b/server/modules/filter/cache/cachest.hh
index edd3ce2b5..4676b5eec 100644
--- a/server/modules/filter/cache/cachest.hh
+++ b/server/modules/filter/cache/cachest.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include "cachesimple.hh"
 
 class CacheST : public CacheSimple
diff --git a/server/modules/filter/cache/lrustorage.hh b/server/modules/filter/cache/lrustorage.hh
index d4734dc77..9943efe99 100644
--- a/server/modules/filter/cache/lrustorage.hh
+++ b/server/modules/filter/cache/lrustorage.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <unordered_map>
 #include "cachefilter.h"
 #include "cache_storage_api.hh"
diff --git a/server/modules/filter/cache/lrustoragemt.hh b/server/modules/filter/cache/lrustoragemt.hh
index 80285fa1d..294e03db6 100644
--- a/server/modules/filter/cache/lrustoragemt.hh
+++ b/server/modules/filter/cache/lrustoragemt.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/spinlock.hh>
 #include "lrustorage.hh"
 
diff --git a/server/modules/filter/cache/lrustoragest.hh b/server/modules/filter/cache/lrustoragest.hh
index ffbc17cd6..103e105c9 100644
--- a/server/modules/filter/cache/lrustoragest.hh
+++ b/server/modules/filter/cache/lrustoragest.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include "lrustorage.hh"
 
 class LRUStorageST : public LRUStorage
diff --git a/server/modules/filter/cache/storage.hh b/server/modules/filter/cache/storage.hh
index 867591b27..a7be4efa9 100644
--- a/server/modules/filter/cache/storage.hh
+++ b/server/modules/filter/cache/storage.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include "cache_storage_api.h"
 
 class Storage
diff --git a/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.hh b/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.hh
index 907b28940..f043f55bc 100644
--- a/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.hh
+++ b/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragemt.hh b/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragemt.hh
index ba4f0b288..460ef7ebe 100644
--- a/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragemt.hh
+++ b/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragemt.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/spinlock.hh>
 #include "inmemorystorage.hh"
 
diff --git a/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragest.hh b/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragest.hh
index 22adda3c1..7ba950d04 100644
--- a/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragest.hh
+++ b/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragest.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #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 4ce57b3fc..6ed8fe87c 100644
--- a/server/modules/filter/cache/storage/storage_inmemory/storage_inmemory.cc
+++ b/server/modules/filter/cache/storage/storage_inmemory/storage_inmemory.cc
@@ -12,7 +12,7 @@
  */
 
 #define MXS_MODULE_NAME "storage_inmemory"
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include "../../cache_storage_api.h"
 #include "../storagemodule.hh"
 #include "inmemorystoragest.hh"
diff --git a/server/modules/filter/cache/storage/storagemodule.hh b/server/modules/filter/cache/storage/storagemodule.hh
index 02bf28f9f..6e8bd09a0 100644
--- a/server/modules/filter/cache/storage/storagemodule.hh
+++ b/server/modules/filter/cache/storage/storagemodule.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 template<class StorageType>
 class StorageModule
diff --git a/server/modules/filter/cache/storagefactory.hh b/server/modules/filter/cache/storagefactory.hh
index aa25e7c47..40eeacf97 100644
--- a/server/modules/filter/cache/storagefactory.hh
+++ b/server/modules/filter/cache/storagefactory.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include "cache_storage_api.h"
 
 class Storage;
diff --git a/server/modules/filter/cache/storagereal.hh b/server/modules/filter/cache/storagereal.hh
index c405ad02b..e6e7094a8 100644
--- a/server/modules/filter/cache/storagereal.hh
+++ b/server/modules/filter/cache/storagereal.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include "storage.hh"
 
 class StorageReal : public Storage
diff --git a/server/modules/filter/cache/test/tester.hh b/server/modules/filter/cache/test/tester.hh
index cf0b2e01f..2a1831fb4 100644
--- a/server/modules/filter/cache/test/tester.hh
+++ b/server/modules/filter/cache/test/tester.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/buffer.h>
 #include <ostream>
 #include <string>
diff --git a/server/modules/filter/cache/test/testerlrustorage.hh b/server/modules/filter/cache/test/testerlrustorage.hh
index 98d28539a..28966daf1 100644
--- a/server/modules/filter/cache/test/testerlrustorage.hh
+++ b/server/modules/filter/cache/test/testerlrustorage.hh
@@ -13,7 +13,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include "testerstorage.hh"
 
 
diff --git a/server/modules/filter/cache/test/testerrawstorage.hh b/server/modules/filter/cache/test/testerrawstorage.hh
index 3adf9c5c3..fe2194a3f 100644
--- a/server/modules/filter/cache/test/testerrawstorage.hh
+++ b/server/modules/filter/cache/test/testerrawstorage.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include "testerstorage.hh"
 
 
diff --git a/server/modules/filter/cache/test/testerstorage.hh b/server/modules/filter/cache/test/testerstorage.hh
index a3398779a..51d0e6683 100644
--- a/server/modules/filter/cache/test/testerstorage.hh
+++ b/server/modules/filter/cache/test/testerstorage.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include "tester.hh"
 
 class Storage;
diff --git a/server/modules/filter/cache/test/testkeygeneration.cc b/server/modules/filter/cache/test/testkeygeneration.cc
index 875e4540d..e21540434 100644
--- a/server/modules/filter/cache/test/testkeygeneration.cc
+++ b/server/modules/filter/cache/test/testkeygeneration.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <iostream>
 #include <fstream>
 #include <unordered_map>
diff --git a/server/modules/filter/cache/test/testlrustorage.cc b/server/modules/filter/cache/test/testlrustorage.cc
index 8635434e0..971119c8a 100644
--- a/server/modules/filter/cache/test/testlrustorage.cc
+++ b/server/modules/filter/cache/test/testlrustorage.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <iostream>
 #include <maxscale/alloc.h>
 #include <maxscale/paths.h>
diff --git a/server/modules/filter/cache/test/testrawstorage.cc b/server/modules/filter/cache/test/testrawstorage.cc
index fccff8fb5..413a492fd 100644
--- a/server/modules/filter/cache/test/testrawstorage.cc
+++ b/server/modules/filter/cache/test/testrawstorage.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <iostream>
 #include <maxscale/alloc.h>
 #include <maxscale/paths.h>
diff --git a/server/modules/filter/cache/test/teststorage.cc b/server/modules/filter/cache/test/teststorage.cc
index 9f11233e0..8312f3902 100644
--- a/server/modules/filter/cache/test/teststorage.cc
+++ b/server/modules/filter/cache/test/teststorage.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <stdlib.h>
 #include <iostream>
diff --git a/server/modules/filter/cache/test/teststorage.hh b/server/modules/filter/cache/test/teststorage.hh
index d835216a7..105d5dd88 100644
--- a/server/modules/filter/cache/test/teststorage.hh
+++ b/server/modules/filter/cache/test/teststorage.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 class StorageFactory;
 
diff --git a/server/modules/filter/comment/commentfilter.hh b/server/modules/filter/comment/commentfilter.hh
index c673fe49e..673207a47 100644
--- a/server/modules/filter/comment/commentfilter.hh
+++ b/server/modules/filter/comment/commentfilter.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/filter.hh>
 #include "commentfiltersession.hh"
 #include <string>
diff --git a/server/modules/filter/comment/commentfiltersession.hh b/server/modules/filter/comment/commentfiltersession.hh
index 57a1332a4..3f53ada40 100644
--- a/server/modules/filter/comment/commentfiltersession.hh
+++ b/server/modules/filter/comment/commentfiltersession.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/filter.hh>
 #include <string>
 
diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.hh b/server/modules/filter/dbfwfilter/dbfwfilter.hh
index f7806dcbe..893dfa25f 100644
--- a/server/modules/filter/dbfwfilter/dbfwfilter.hh
+++ b/server/modules/filter/dbfwfilter/dbfwfilter.hh
@@ -13,7 +13,7 @@
  */
 
 #define MXS_MODULE_NAME "dbfwfilter"
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <time.h>
 #include <string>
diff --git a/server/modules/filter/masking/maskingfilter.hh b/server/modules/filter/masking/maskingfilter.hh
index fe598bfc6..1fcf62c8f 100644
--- a/server/modules/filter/masking/maskingfilter.hh
+++ b/server/modules/filter/masking/maskingfilter.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <memory>
 #include <memory>
 #include <maxscale/filter.hh>
diff --git a/server/modules/filter/masking/maskingfilterconfig.hh b/server/modules/filter/masking/maskingfilterconfig.hh
index a6988a89d..476b120b0 100644
--- a/server/modules/filter/masking/maskingfilterconfig.hh
+++ b/server/modules/filter/masking/maskingfilterconfig.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/config.h>
 #include <maxscale/modinfo.h>
 #include <string>
diff --git a/server/modules/filter/masking/maskingfiltersession.hh b/server/modules/filter/masking/maskingfiltersession.hh
index 7231be42b..6182be7b4 100644
--- a/server/modules/filter/masking/maskingfiltersession.hh
+++ b/server/modules/filter/masking/maskingfiltersession.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <memory>
 #include <memory>
 #include <maxscale/buffer.hh>
diff --git a/server/modules/filter/masking/maskingrules.hh b/server/modules/filter/masking/maskingrules.hh
index 43d273e17..ed88e86d6 100644
--- a/server/modules/filter/masking/maskingrules.hh
+++ b/server/modules/filter/masking/maskingrules.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <string>
 #include <memory>
diff --git a/server/modules/filter/masking/mysql.hh b/server/modules/filter/masking/mysql.hh
index 94a657ddb..d5212d0a2 100644
--- a/server/modules/filter/masking/mysql.hh
+++ b/server/modules/filter/masking/mysql.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <ostream>
 #include <sstream>
 #include <string>
diff --git a/server/modules/filter/namedserverfilter/namedserverfilter.hh b/server/modules/filter/namedserverfilter/namedserverfilter.hh
index a82c56b4e..91e2020c4 100644
--- a/server/modules/filter/namedserverfilter/namedserverfilter.hh
+++ b/server/modules/filter/namedserverfilter/namedserverfilter.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <string>
 #include <vector>
diff --git a/server/modules/filter/nullfilter/nullfilter.hh b/server/modules/filter/nullfilter/nullfilter.hh
index 72235eab7..2c27b5911 100644
--- a/server/modules/filter/nullfilter/nullfilter.hh
+++ b/server/modules/filter/nullfilter/nullfilter.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/filter.hh>
 #include "nullfiltersession.hh"
 
diff --git a/server/modules/filter/nullfilter/nullfiltersession.hh b/server/modules/filter/nullfilter/nullfiltersession.hh
index 7e1dd4744..815fb0985 100644
--- a/server/modules/filter/nullfilter/nullfiltersession.hh
+++ b/server/modules/filter/nullfilter/nullfiltersession.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/filter.hh>
 
 class NullFilter;
diff --git a/server/modules/filter/qlafilter/qlafilter.cc b/server/modules/filter/qlafilter/qlafilter.cc
index e59c3a0d6..fe928c2ff 100644
--- a/server/modules/filter/qlafilter/qlafilter.cc
+++ b/server/modules/filter/qlafilter/qlafilter.cc
@@ -23,7 +23,7 @@
 
 #define MXS_MODULE_NAME "qlafilter"
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <cmath>
 #include <errno.h>
diff --git a/server/modules/filter/tee/tee.cc b/server/modules/filter/tee/tee.cc
index 0b9494473..4d2e1c5b0 100644
--- a/server/modules/filter/tee/tee.cc
+++ b/server/modules/filter/tee/tee.cc
@@ -17,7 +17,7 @@
 
 #define MXS_MODULE_NAME "tee"
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
diff --git a/server/modules/filter/tee/tee.hh b/server/modules/filter/tee/tee.hh
index cb3058216..c34e3dba5 100644
--- a/server/modules/filter/tee/tee.hh
+++ b/server/modules/filter/tee/tee.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <string>
 #include <regex.h>
diff --git a/server/modules/filter/tee/teesession.hh b/server/modules/filter/tee/teesession.hh
index 1d60a8bd0..7be2ffd04 100644
--- a/server/modules/filter/tee/teesession.hh
+++ b/server/modules/filter/tee/teesession.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <maxscale/filter.hh>
 #include <maxscale/protocol/mariadb_client.hh>
diff --git a/server/modules/filter/test/filtermodule.cc b/server/modules/filter/test/filtermodule.cc
index 1a1a12cda..ec005a77b 100644
--- a/server/modules/filter/test/filtermodule.cc
+++ b/server/modules/filter/test/filtermodule.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include "maxscale/filtermodule.hh"
 #include "../../../core/internal/modules.h"
 
diff --git a/server/modules/filter/test/maxscale/filtermodule.hh b/server/modules/filter/test/maxscale/filtermodule.hh
index f1dd2e048..9399fc78b 100644
--- a/server/modules/filter/test/maxscale/filtermodule.hh
+++ b/server/modules/filter/test/maxscale/filtermodule.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <memory>
 #include <maxscale/filter.hh>
 #include "module.hh"
diff --git a/server/modules/filter/test/maxscale/mock/backend.hh b/server/modules/filter/test/maxscale/mock/backend.hh
index d77439479..d79002869 100644
--- a/server/modules/filter/test/maxscale/mock/backend.hh
+++ b/server/modules/filter/test/maxscale/mock/backend.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <map>
 #include <maxscale/resultset.hh>
 #include "routersession.hh"
diff --git a/server/modules/filter/test/maxscale/mock/client.hh b/server/modules/filter/test/maxscale/mock/client.hh
index 5f8209c7c..5c97bfff8 100644
--- a/server/modules/filter/test/maxscale/mock/client.hh
+++ b/server/modules/filter/test/maxscale/mock/client.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <memory>
 #include <string>
 #include <maxscale/filter.h>
diff --git a/server/modules/filter/test/maxscale/mock/mock.hh b/server/modules/filter/test/maxscale/mock/mock.hh
index 0c34bbf46..5d3460228 100644
--- a/server/modules/filter/test/maxscale/mock/mock.hh
+++ b/server/modules/filter/test/maxscale/mock/mock.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <string>
 #include <string.h>
 #include <maxscale/buffer.h>
diff --git a/server/modules/filter/test/maxscale/mock/routersession.hh b/server/modules/filter/test/maxscale/mock/routersession.hh
index 1ddc49b56..6dc003696 100644
--- a/server/modules/filter/test/maxscale/mock/routersession.hh
+++ b/server/modules/filter/test/maxscale/mock/routersession.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <memory>
 #include <deque>
 #include <maxscale/router.hh>
diff --git a/server/modules/filter/test/maxscale/module.hh b/server/modules/filter/test/maxscale/module.hh
index 71746ff30..4362ca7eb 100644
--- a/server/modules/filter/test/maxscale/module.hh
+++ b/server/modules/filter/test/maxscale/module.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <memory>
 #include <deque>
 #include <maxscale/config.h>
diff --git a/server/modules/filter/test/maxscale/queryclassifiermodule.hh b/server/modules/filter/test/maxscale/queryclassifiermodule.hh
index c4d5cb75b..42aed282f 100644
--- a/server/modules/filter/test/maxscale/queryclassifiermodule.hh
+++ b/server/modules/filter/test/maxscale/queryclassifiermodule.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <memory>
 #include <maxscale/query_classifier.h>
 #include "module.hh"
diff --git a/server/modules/filter/throttlefilter/throttlefilter.cc b/server/modules/filter/throttlefilter/throttlefilter.cc
index 0a7551572..1b2e4fa85 100644
--- a/server/modules/filter/throttlefilter/throttlefilter.cc
+++ b/server/modules/filter/throttlefilter/throttlefilter.cc
@@ -6,7 +6,7 @@
 
 #define MXS_MODULE_NAME "throttlefilter"
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/utils.h>
 #include <maxscale/json_api.h>
 #include <maxscale/jansson.hh>
diff --git a/server/modules/filter/throttlefilter/throttlesession.cc b/server/modules/filter/throttlefilter/throttlesession.cc
index 0cd88ca6f..1ea34e50d 100644
--- a/server/modules/filter/throttlefilter/throttlesession.cc
+++ b/server/modules/filter/throttlefilter/throttlesession.cc
@@ -13,7 +13,7 @@
 
 #define MXS_MODULE_NAME "throttlefilter"
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/modutil.h>
 #include <maxscale/query_classifier.h>
 
diff --git a/server/modules/monitor/auroramon/auroramon.hh b/server/modules/monitor/auroramon/auroramon.hh
index 6759a2f88..13d2f3d87 100644
--- a/server/modules/monitor/auroramon/auroramon.hh
+++ b/server/modules/monitor/auroramon/auroramon.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/monitor.hh>
 
 /**
diff --git a/server/modules/monitor/galeramon/galeramon.hh b/server/modules/monitor/galeramon/galeramon.hh
index 5f55c4cca..4a815d193 100644
--- a/server/modules/monitor/galeramon/galeramon.hh
+++ b/server/modules/monitor/galeramon/galeramon.hh
@@ -16,7 +16,7 @@
  * @file galeramon.hh - The Galera cluster monitor
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <unordered_map>
 
diff --git a/server/modules/monitor/grmon/grmon.hh b/server/modules/monitor/grmon/grmon.hh
index dcc5d768f..3bf4d24e7 100644
--- a/server/modules/monitor/grmon/grmon.hh
+++ b/server/modules/monitor/grmon/grmon.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/monitor.hh>
 
 /**
diff --git a/server/modules/monitor/mariadbmon/mariadbmon_common.hh b/server/modules/monitor/mariadbmon/mariadbmon_common.hh
index a9254f8f5..5aa6e2caa 100644
--- a/server/modules/monitor/mariadbmon/mariadbmon_common.hh
+++ b/server/modules/monitor/mariadbmon/mariadbmon_common.hh
@@ -19,7 +19,7 @@
 
 #define MXS_MODULE_NAME "mariadbmon"
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <string>
 #include <maxscale/json_api.h>
diff --git a/server/modules/monitor/mmmon/mmmon.hh b/server/modules/monitor/mmmon/mmmon.hh
index 13f2626d7..cb5307e94 100644
--- a/server/modules/monitor/mmmon/mmmon.hh
+++ b/server/modules/monitor/mmmon/mmmon.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/monitor.hh>
 #include <maxscale/thread.h>
 
diff --git a/server/modules/monitor/ndbclustermon/ndbclustermon.hh b/server/modules/monitor/ndbclustermon/ndbclustermon.hh
index e409d1191..b84cfa125 100644
--- a/server/modules/monitor/ndbclustermon/ndbclustermon.hh
+++ b/server/modules/monitor/ndbclustermon/ndbclustermon.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/monitor.hh>
 #include <maxscale/thread.h>
 
diff --git a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
index 1a7bbfb72..8b6bd1958 100644
--- a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
+++ b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
@@ -14,7 +14,7 @@
 
 #define MXS_MODULE_NAME "mariadbclient"
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <inttypes.h>
 #include <limits.h>
diff --git a/server/modules/protocol/MySQL/mariadbclient/setparser.hh b/server/modules/protocol/MySQL/mariadbclient/setparser.hh
index f4ee33473..cec894d31 100644
--- a/server/modules/protocol/MySQL/mariadbclient/setparser.hh
+++ b/server/modules/protocol/MySQL/mariadbclient/setparser.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <vector>
 #include <maxscale/customparser.hh>
 #include <maxscale/protocol/mysql.h>
diff --git a/server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh b/server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh
index 4ae428e17..d93110bd6 100644
--- a/server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh
+++ b/server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/customparser.hh>
 #include <maxscale/protocol/mysql.h>
 
diff --git a/server/modules/protocol/MySQL/mariadbclient/sqlmodeparser.hh b/server/modules/protocol/MySQL/mariadbclient/sqlmodeparser.hh
index 21a7074d7..7fbfdf3cc 100644
--- a/server/modules/protocol/MySQL/mariadbclient/sqlmodeparser.hh
+++ b/server/modules/protocol/MySQL/mariadbclient/sqlmodeparser.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 #include <maxscale/customparser.hh>
 #include <maxscale/protocol/mysql.h>
 
diff --git a/server/modules/routing/hintrouter/hintrouterdefs.hh b/server/modules/routing/hintrouter/hintrouterdefs.hh
index 07d2e0429..cb84b4666 100644
--- a/server/modules/routing/hintrouter/hintrouterdefs.hh
+++ b/server/modules/routing/hintrouter/hintrouterdefs.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <maxscale/dcb.h>
 #include <maxscale/log_manager.h>
diff --git a/server/modules/routing/readwritesplit/readwritesplit.hh b/server/modules/routing/readwritesplit/readwritesplit.hh
index 1e16d3a13..b2ce432fa 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.hh
+++ b/server/modules/routing/readwritesplit/readwritesplit.hh
@@ -18,7 +18,7 @@
 
 #define MXS_MODULE_NAME "readwritesplit"
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <unordered_set>
 #include <unordered_map>
diff --git a/server/modules/routing/readwritesplit/rwbackend.hh b/server/modules/routing/readwritesplit/rwbackend.hh
index 785322e69..01ff57d91 100644
--- a/server/modules/routing/readwritesplit/rwbackend.hh
+++ b/server/modules/routing/readwritesplit/rwbackend.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <map>
 #include <memory>
diff --git a/server/modules/routing/readwritesplit/trx.hh b/server/modules/routing/readwritesplit/trx.hh
index 8cea12100..67925c6dd 100644
--- a/server/modules/routing/readwritesplit/trx.hh
+++ b/server/modules/routing/readwritesplit/trx.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <list>
 
diff --git a/server/modules/routing/schemarouter/shard_map.hh b/server/modules/routing/schemarouter/shard_map.hh
index d0bdab4d3..f343baa33 100644
--- a/server/modules/routing/schemarouter/shard_map.hh
+++ b/server/modules/routing/schemarouter/shard_map.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cppdefs.hh>
+#include <maxscale/ccdefs.hh>
 
 #include <unordered_map>
 #include <string>