diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 4860ed25ab..598fd5686c 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -17,19 +17,28 @@
 #include <stddef.h>
 #include <string.h>
 
-#include <retro_assert.h>
-#include <gfx/scaler/pixconv.h>
-#include <gfx/scaler/scaler.h>
-#ifdef HAVE_THREADS
-#include <rthreads/rthreads.h>
-#endif
-
 #include <compat/strl.h>
 #include <retro_common_api.h>
 #include <file/config_file.h>
 #include <features/features_cpu.h>
 #include <file/file_path.h>
 
+#include <retro_assert.h>
+#include <gfx/scaler/pixconv.h>
+#include <gfx/scaler/scaler.h>
+
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
+#ifdef HAVE_THREADS
+#include <rthreads/rthreads.h>
+#endif
+
+#ifdef HAVE_MENU
+#include "../menu/menu_setting.h"
+#endif
+
 #include "video_thread_wrapper.h"
 #include "../frontend/frontend_driver.h"
 #include "video_context_driver.h"
@@ -43,11 +52,6 @@
 #include "../core.h"
 #include "../command.h"
 #include "../msg_hash.h"
-
-#ifdef HAVE_MENU
-#include "../menu/menu_setting.h"
-#endif
-
 #include "../verbosity.h"
 
 #define MEASURE_FRAME_TIME_SAMPLES_COUNT (2 * 1024)
diff --git a/gfx/video_state_tracker.c b/gfx/video_state_tracker.c
index c991f69945..106ef18b99 100644
--- a/gfx/video_state_tracker.c
+++ b/gfx/video_state_tracker.c
@@ -14,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "video_state_tracker.h"
 #include <stdlib.h>
+
 #include <compat/strl.h>
 #include <retro_inline.h>
 
@@ -23,14 +23,15 @@
 #include "../config.h"
 #endif
 
-#include "../input/input_config.h"
-#include "../configuration.h"
-#include "../verbosity.h"
-
 #ifdef HAVE_PYTHON
 #include "video_state_python.h"
 #endif
 
+#include "video_state_tracker.h"
+#include "../input/input_config.h"
+#include "../configuration.h"
+#include "../verbosity.h"
+
 struct state_tracker_internal
 {
    char id[64];