diff --git a/query_classifier/query_classifier.h b/query_classifier/query_classifier.h
index db2011642..3600bce5a 100644
--- a/query_classifier/query_classifier.h
+++ b/query_classifier/query_classifier.h
@@ -18,6 +18,7 @@ Copyright MariaDB Corporation Ab
 */
 
 /** getpid */
+#include <my_config.h>
 #include <unistd.h>
 #include <mysql.h>
 #include <skygw_utils.h>
diff --git a/query_classifier/test/canonical_tests/canonizer.c b/query_classifier/test/canonical_tests/canonizer.c
index 7e33fe4a1..bffe9c1b9 100644
--- a/query_classifier/test/canonical_tests/canonizer.c
+++ b/query_classifier/test/canonical_tests/canonizer.c
@@ -1,3 +1,4 @@
+#include <my_config.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/query_classifier/test/classify.c b/query_classifier/test/classify.c
index 8eafbdc5c..96a001771 100644
--- a/query_classifier/test/classify.c
+++ b/query_classifier/test/classify.c
@@ -1,3 +1,4 @@
+#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 ead016000..61bc6157d 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -41,6 +41,7 @@
  *
  * @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 2749850fe..34783bc52 100644
--- a/server/core/gateway.c
+++ b/server/core/gateway.c
@@ -40,6 +40,7 @@
  * @endverbatim
  */
 #define _XOPEN_SOURCE 700
+#include <my_config.h>
 #include <ftw.h>
 #include <string.h>
 #include <strings.h>
diff --git a/server/core/poll.c b/server/core/poll.c
index e1a3f80ec..bfb1e65c6 100644
--- a/server/core/poll.c
+++ b/server/core/poll.c
@@ -15,6 +15,7 @@
  *
  * Copyright MariaDB Corporation Ab 2013-2014
  */
+#include <my_config.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/server/modules/routing/debugcmd.c b/server/modules/routing/debugcmd.c
index 8f51d531a..65384bfc6 100644
--- a/server/modules/routing/debugcmd.c
+++ b/server/modules/routing/debugcmd.c
@@ -44,6 +44,7 @@
  *
  * @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 8d5f51727..505c7c5d1 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -15,6 +15,7 @@
  *
  * Copyright MariaDB Corporation Ab 2013-2014
  */
+#include <my_config.h>
 #include <stdio.h>
 #include <strings.h>
 #include <string.h>