diff --git a/command.h b/command.h
index 4a3cd2eca6..d34b68b3e4 100644
--- a/command.h
+++ b/command.h
@@ -17,14 +17,15 @@
 #ifndef COMMAND_H__
 #define COMMAND_H__
 
+#include <stdint.h>
+
+#include <boolean.h>
+#include <retro_common_api.h>
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <stdint.h>
-#include <boolean.h>
-#include <retro_common_api.h>
-
 RETRO_BEGIN_DECLS
 
 typedef struct command command_t;
diff --git a/configuration.h b/configuration.h
index 4559781fbe..602e3cb25c 100644
--- a/configuration.h
+++ b/configuration.h
@@ -22,6 +22,10 @@
 #include <boolean.h>
 #include <retro_common_api.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "gfx/video_driver.h"
 #include "input/input_defines.h"