diff --git a/gfx/common/x11_common.c b/gfx/common/x11_common.c
index 458c4d06a2..caf145bae7 100644
--- a/gfx/common/x11_common.c
+++ b/gfx/common/x11_common.c
@@ -17,6 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
+
 #include <sys/types.h>
 #include <sys/wait.h>
 
diff --git a/gfx/drivers_wm/win32_shader_dlg.c b/gfx/drivers_wm/win32_shader_dlg.c
index e6c9d8d18e..d78fa3afca 100644
--- a/gfx/drivers_wm/win32_shader_dlg.c
+++ b/gfx/drivers_wm/win32_shader_dlg.c
@@ -25,6 +25,14 @@
 #define _WIN32_IE 0x0300
 #endif
 
+#include <string.h>
+
+#include <windows.h>
+#include <commdlg.h>
+#include <commctrl.h>
+
+#include <retro_inline.h>
+
 #include "../../driver.h"
 #include "../../runloop.h"
 #include "../video_context_driver.h"
@@ -32,11 +40,6 @@
 #include "../video_monitor.h"
 #include "../common/win32_common.h"
 #include "win32_shader_dlg.h"
-#include <windows.h>
-#include <commdlg.h>
-#include <commctrl.h>
-#include <string.h>
-#include <retro_inline.h>
 
 #define IDI_ICON 1