diff --git a/database_info.c b/database_info.c
index 8c2b70aa75..e963fe497a 100644
--- a/database_info.c
+++ b/database_info.c
@@ -26,10 +26,6 @@
 #include "msg_hash.h"
 #include "verbosity.h"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #define DB_QUERY_ENTRY                          0x1c310956U
 #define DB_QUERY_ENTRY_PUBLISHER                0x125e594dU
 #define DB_QUERY_ENTRY_DEVELOPER                0xcbd89be5U
diff --git a/database_info.h b/database_info.h
index 3a961857b7..2b9bfd0197 100644
--- a/database_info.h
+++ b/database_info.h
@@ -24,6 +24,10 @@
 #include <file/archive_file.h>
 #include <retro_common_api.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "libretro-db/libretrodb.h"
 
 RETRO_BEGIN_DECLS
diff --git a/driver.c b/driver.c
index c106ef2e72..d374d75372 100644
--- a/driver.c
+++ b/driver.c
@@ -18,6 +18,10 @@
 #include <compat/posix_string.h>
 #include <string/stdstring.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "command.h"
 #include "msg_hash.h"
 
@@ -35,10 +39,6 @@
 #include "menu/menu_driver.h"
 #endif
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #define HASH_LOCATION_DRIVER           0x09189689U
 #define HASH_CAMERA_DRIVER             0xf25db959U
 #define HASH_MENU_DRIVER               0xd607fb05U
diff --git a/file_path_str.c b/file_path_str.c
index e34e52643a..5d2e272ea0 100644
--- a/file_path_str.c
+++ b/file_path_str.c
@@ -13,6 +13,10 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "file_path_special.h"
 
 const char *file_path_str(enum file_path_enum enum_idx)
diff --git a/list_special.c b/list_special.c
index 463df5f37d..cc82c618c7 100644
--- a/list_special.c
+++ b/list_special.c
@@ -20,6 +20,10 @@
 #include <lists/string_list.h>
 #include <compat/strl.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "list_special.h"
 #include "frontend/frontend_driver.h"
 #include "core_info.h"
diff --git a/patch.c b/patch.c
index 39cbcaaf6d..39794765a3 100644
--- a/patch.c
+++ b/patch.c
@@ -29,6 +29,10 @@
 #include <retro_stat.h>
 #include <string/stdstring.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "msg_hash.h"
 #include "patch.h"
 #include "runloop.h"
diff --git a/retroarch.c b/retroarch.c
index c3cc08eb7d..10639ce59b 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -15,18 +15,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-
-#include <setjmp.h>
-
-#include <boolean.h>
-#include <string/stdstring.h>
-#include <lists/string_list.h>
-
 #ifdef _WIN32
 #ifdef _XBOX
 #include <xtl.h>
@@ -36,6 +24,22 @@
 #endif
 #endif
 
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+
+#include <setjmp.h>
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <boolean.h>
+#include <string/stdstring.h>
+#include <lists/string_list.h>
+
 #include <compat/strl.h>
 #include <compat/getopt.h>
 #include <compat/posix_string.h>
diff --git a/runloop.c b/runloop.c
index 5d3dbc6f3f..3bcb032ae0 100644
--- a/runloop.c
+++ b/runloop.c
@@ -19,6 +19,10 @@
 #include <stdarg.h>
 #include <math.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <lists/dir_list.h>
 #include <file/file_path.h>
 #include <retro_inline.h>