diff --git a/frontend/frontend.c b/frontend/frontend.c
index 2894ded54b..577f8409b1 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -18,6 +18,14 @@
 #include <stdint.h>
 #include <stddef.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
+#ifdef HAVE_MENU
+#include "../menu/menu_driver.h"
+#endif
+
 #include "frontend.h"
 #include "../ui/ui_companion_driver.h"
 #include "../tasks/tasks_internal.h"
@@ -27,10 +35,6 @@
 #include "../retroarch.h"
 #include "../runloop.h"
 
-#ifdef HAVE_MENU
-#include "../menu/menu_driver.h"
-#endif
-
 /**
  * main_exit:
  *
diff --git a/managers/cheat_manager.c b/managers/cheat_manager.c
index c60c860749..18dcde64be 100644
--- a/managers/cheat_manager.c
+++ b/managers/cheat_manager.c
@@ -23,13 +23,6 @@
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 
-#include "cheat_manager.h"
-#include "../configuration.h"
-#include "../runloop.h"
-#include "../dynamic.h"
-#include "../core.h"
-#include "../verbosity.h"
-
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif
@@ -38,6 +31,13 @@
 #include "../cheevos.h"
 #endif
 
+#include "cheat_manager.h"
+#include "../configuration.h"
+#include "../runloop.h"
+#include "../dynamic.h"
+#include "../core.h"
+#include "../verbosity.h"
+
 struct item_cheat
 {
    char *desc;