diff --git a/menu/drivers_display/menu_display_d3d.cpp b/menu/drivers_display/menu_display_d3d.cpp
index efdd1b6e01..41ec0957c7 100644
--- a/menu/drivers_display/menu_display_d3d.cpp
+++ b/menu/drivers_display/menu_display_d3d.cpp
@@ -17,15 +17,18 @@
 
 #include <gfx/math/matrix_4x4.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
+#include "../menu_display.h"
+
 #include "../../config.def.h"
 #include "../../retroarch.h"
 #include "../../gfx/font_driver.h"
 #include "../../gfx/video_context_driver.h"
 #include "../../gfx/drivers/d3d.h"
 #include "../../gfx/common/d3d_common.h"
-
-#include "../menu_display.h"
-
 #include "../../gfx/include/d3d9/d3dx9math.h"
 
 #define BYTE_CLAMP(i) (int) ((((i) > 255) ? 255 : (((i) < 0) ? 0 : (i))))
diff --git a/menu/drivers_display/menu_display_gl.c b/menu/drivers_display/menu_display_gl.c
index cffc28704c..f03a0fafe2 100644
--- a/menu/drivers_display/menu_display_gl.c
+++ b/menu/drivers_display/menu_display_gl.c
@@ -15,6 +15,10 @@
 
 #include <retro_miscellaneous.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
 #include "../../config.def.h"
 #include "../../retroarch.h"
 #include "../../gfx/font_driver.h"
diff --git a/menu/drivers_display/menu_display_vita2d.c b/menu/drivers_display/menu_display_vita2d.c
index fa046619f0..66cb4ed1da 100644
--- a/menu/drivers_display/menu_display_vita2d.c
+++ b/menu/drivers_display/menu_display_vita2d.c
@@ -13,17 +13,22 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <vita2d.h>
+
 #include <retro_miscellaneous.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
+#include "../menu_display.h"
+
 #include "../../config.def.h"
 #include "../../retroarch.h"
 #include "../../gfx/font_driver.h"
 #include "../../gfx/video_context_driver.h"
 #include "../../gfx/video_shader_driver.h"
 #include "../../gfx/common/vita2d_common.h"
-#include <vita2d.h>
-
-#include "../menu_display.h"
 
 static const float vita2d_vertexes[] = {
    0, 0,
diff --git a/menu/drivers_display/menu_display_vulkan.c b/menu/drivers_display/menu_display_vulkan.c
index 04dfc8e5c4..de6fd49bb6 100644
--- a/menu/drivers_display/menu_display_vulkan.c
+++ b/menu/drivers_display/menu_display_vulkan.c
@@ -16,14 +16,18 @@
 
 #include <retro_miscellaneous.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
+#include "../menu_display.h"
+
 #include "../../config.def.h"
 #include "../../gfx/font_driver.h"
 #include "../../gfx/video_context_driver.h"
 #include "../../gfx/common/vulkan_common.h"
 #include "../../gfx/video_shader_driver.h"
 
-#include "../menu_display.h"
-
 /* Will do Y-flip later, but try to make it similar to GL. */
 static const float vk_vertexes[] = {
    0, 0,