diff --git a/gfx/common/egl_common.c b/gfx/common/egl_common.c
index 277386ea1a..065a02484f 100644
--- a/gfx/common/egl_common.c
+++ b/gfx/common/egl_common.c
@@ -14,15 +14,19 @@
  */
 
 #include <stdlib.h>
+
 #include <retro_assert.h>
 
-#include "../../verbosity.h"
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
 
-#include "egl_common.h"
 #ifdef HAVE_OPENGL
 #include "gl_common.h"
 #endif
 
+#include "egl_common.h"
+#include "../../verbosity.h"
 #include "../../frontend/frontend_driver.h"
 
 bool g_egl_inited;
diff --git a/gfx/common/gl_common.c b/gfx/common/gl_common.c
index 3690f2d81d..1e2428770c 100644
--- a/gfx/common/gl_common.c
+++ b/gfx/common/gl_common.c
@@ -14,11 +14,11 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <gfx/math/matrix_4x4.h>
+
 #include "../drivers/gl_capabilities.h"
 #include "../video_coord_array.h"
 
-#include <gfx/math/matrix_4x4.h>
-
 void gl_ff_vertex(const struct video_coords *coords)
 {
 #ifndef NO_GL_FF_VERTEX
diff --git a/gfx/common/vulkan_common.c b/gfx/common/vulkan_common.c
index 85099fa2a9..2b88ca8cb4 100644
--- a/gfx/common/vulkan_common.c
+++ b/gfx/common/vulkan_common.c
@@ -13,6 +13,10 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <retro_assert.h>
+#include <dynamic/dylib.h>
+#include <string/stdstring.h>
+
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
 #endif
@@ -23,10 +27,6 @@
 #endif
 #endif
 
-#include <retro_assert.h>
-#include <dynamic/dylib.h>
-#include <string/stdstring.h>
-
 #include "vulkan_common.h"
 #include "../../configuration.h"
 #include "../../performance_counters.h"
diff --git a/gfx/common/win32_common.cpp b/gfx/common/win32_common.cpp
index 38116b9375..93feff3a7c 100644
--- a/gfx/common/win32_common.cpp
+++ b/gfx/common/win32_common.cpp
@@ -16,6 +16,10 @@
 #include <retro_miscellaneous.h>
 #include <string/stdstring.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
 #include "../../frontend/frontend_driver.h"
 #include "../../configuration.h"
 #include "../../general.h"
diff --git a/gfx/common/x11_common.c b/gfx/common/x11_common.c
index 3d189891ab..7f1058b785 100644
--- a/gfx/common/x11_common.c
+++ b/gfx/common/x11_common.c
@@ -23,6 +23,10 @@
 
 #include <X11/Xatom.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
 #include "x11_common.h"
 #include "../../frontend/frontend_driver.h"
 #include "../../input/common/input_x11_common.h"