diff --git a/query_classifier/test/classify.c b/query_classifier/test/classify.c
index 846700490..300924d7c 100644
--- a/query_classifier/test/classify.c
+++ b/query_classifier/test/classify.c
@@ -11,7 +11,6 @@
  * Public License.
  */
 
-#include <my_config.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/server/core/config.c b/server/core/config.c
index 321a7ccdc..03a725c31 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -44,7 +44,6 @@
  *
  * @endverbatim
  */
-#include <my_config.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/server/core/gateway.c b/server/core/gateway.c
index 0177d2321..a77be3491 100644
--- a/server/core/gateway.c
+++ b/server/core/gateway.c
@@ -36,7 +36,6 @@
  */
 #define _XOPEN_SOURCE 700
 #define OPENSSL_THREAD_DEFINES
-#include <my_config.h>
 
 #include <openssl/opensslconf.h>
 #if defined(OPENSSL_THREADS)
diff --git a/server/core/test/testfeedback.c b/server/core/test/testfeedback.c
index 1ccaddc58..cb7396644 100644
--- a/server/core/test/testfeedback.c
+++ b/server/core/test/testfeedback.c
@@ -31,7 +31,6 @@
 #undef NDEBUG
 #endif
 #define FAILTEST(s) printf("TEST FAILED: " s "\n");return 1;
-#include <my_config.h>
 #include <mysql.h>
 #include <stdio.h>
 #include <notification.h>
diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.c b/server/modules/filter/dbfwfilter/dbfwfilter.c
index a5ef051a5..ab825c285 100644
--- a/server/modules/filter/dbfwfilter/dbfwfilter.c
+++ b/server/modules/filter/dbfwfilter/dbfwfilter.c
@@ -60,7 +60,6 @@
  *@endcode
  */
 
-#include <my_config.h>
 #include <stdio.h>
 #include <filter.h>
 #include <string.h>
diff --git a/server/modules/filter/mqfilter.c b/server/modules/filter/mqfilter.c
index 97a8b230e..b60ca0e8a 100644
--- a/server/modules/filter/mqfilter.c
+++ b/server/modules/filter/mqfilter.c
@@ -56,7 +56,6 @@
  *@endverbatim
  * See the individual struct documentations for logging trigger parameters
  */
-#include <my_config.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <filter.h>
diff --git a/server/modules/filter/test/harness_util.c b/server/modules/filter/test/harness_util.c
index c23e8c192..077704a5c 100644
--- a/server/modules/filter/test/harness_util.c
+++ b/server/modules/filter/test/harness_util.c
@@ -1,4 +1,3 @@
-#include <my_config.h>
 #include <mysql.h>
 #include <harness.h>
 
diff --git a/server/modules/routing/debugcmd.c b/server/modules/routing/debugcmd.c
index 8e0be70f1..4225e3569 100644
--- a/server/modules/routing/debugcmd.c
+++ b/server/modules/routing/debugcmd.c
@@ -45,7 +45,6 @@
  *
  * @endverbatim
  */
-#include <my_config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index 339ba6b39..ca0b75e1a 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -10,7 +10,6 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-#include <my_config.h>
 #include <stdio.h>
 #include <strings.h>
 #include <string.h>
diff --git a/server/modules/routing/schemarouter/schemarouter.c b/server/modules/routing/schemarouter/schemarouter.c
index 4126958f7..0921c356d 100644
--- a/server/modules/routing/schemarouter/schemarouter.c
+++ b/server/modules/routing/schemarouter/schemarouter.c
@@ -10,7 +10,6 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-#include <my_config.h>
 #include <stdio.h>
 #include <strings.h>
 #include <string.h>
diff --git a/server/modules/routing/schemarouter/shardrouter.c b/server/modules/routing/schemarouter/shardrouter.c
index 7bc54d6fe..c02b00f28 100644
--- a/server/modules/routing/schemarouter/shardrouter.c
+++ b/server/modules/routing/schemarouter/shardrouter.c
@@ -11,7 +11,6 @@
  * Public License.
  */
 
-#include <my_config.h>
 #include <stdio.h>
 #include <strings.h>
 #include <string.h>
diff --git a/server/modules/routing/schemarouter/test/testschemarouter.c b/server/modules/routing/schemarouter/test/testschemarouter.c
index 0e0abd8d8..1d0a7346c 100644
--- a/server/modules/routing/schemarouter/test/testschemarouter.c
+++ b/server/modules/routing/schemarouter/test/testschemarouter.c
@@ -1,4 +1,3 @@
-#include <my_config.h>
 #include <mysql.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/server/modules/routing/schemarouter/test/testschemarouter2.c b/server/modules/routing/schemarouter/test/testschemarouter2.c
index edd7d074a..94ca41380 100644
--- a/server/modules/routing/schemarouter/test/testschemarouter2.c
+++ b/server/modules/routing/schemarouter/test/testschemarouter2.c
@@ -1,4 +1,3 @@
-#include <my_config.h>
 #include <mysql.h>
 #include <stdio.h>
 #include <stdlib.h>