diff --git a/menu/drivers/menu_generic.c b/menu/drivers/menu_generic.c
index 691ad3c02a..1e8a08bcd1 100644
--- a/menu/drivers/menu_generic.c
+++ b/menu/drivers/menu_generic.c
@@ -161,9 +161,6 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action)
             {
                ret = menu_hash_get_help_enum(cbs->enum_idx,
                      menu->menu_state.msg, sizeof(menu->menu_state.msg));
-#if 0
-               RARCH_LOG("enum: %s\n", msg_hash_to_str(cbs->enum_idx));
-#endif
             }
             else
             {
@@ -172,10 +169,6 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action)
                menu_entries_get_at_offset(selection_buf, selection,
                      NULL, NULL, &type, NULL, NULL);
 
-#if 0
-               RARCH_LOG("file_type: %d\n", type);
-#endif
-
                switch (type)
                {
                   case FILE_TYPE_FONT:
diff --git a/menu/menu_input.c b/menu/menu_input.c
index 7984ecff1b..15b1d53cd1 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -31,6 +31,10 @@
 #include <features/features_cpu.h>
 #include <string/stdstring.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 #include "menu_driver.h"
 #include "menu_input.h"
 #include "menu_animation.h"
diff --git a/menu/menu_popup.c b/menu/menu_popup.c
index cdd0ca4247..431a8f547b 100644
--- a/menu/menu_popup.c
+++ b/menu/menu_popup.c
@@ -16,15 +16,21 @@
 #include <compat/strl.h>
 #include <features/features_cpu.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
+#ifdef HAVE_CHEEVOS
+#include "../cheevos.h"
+#endif
+
 #include "menu_display.h"
 #include "menu_driver.h"
 #include "menu_popup.h"
 
 #include "../retroarch.h"
 #include "../configuration.h"
-#ifdef HAVE_CHEEVOS
-#include "../cheevos.h"
-#endif
+
 #include "../input/input_autodetect.h"
 #include "../input/input_config.h"
 
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 9f97f0bd3a..ade3fda2b2 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -36,6 +36,10 @@
 
 #include <compat/strl.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 #include "../frontend/frontend_driver.h"
 
 #include "menu_setting.h"
@@ -70,11 +74,6 @@
 
 #include "../tasks/tasks_internal.h"
 
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #ifdef HAVE_CHEEVOS
 static void setting_get_string_representation_cheevos_password(void *data,
       char *s, size_t len)
diff --git a/menu/menu_shader.c b/menu/menu_shader.c
index 2b237cdb2d..11c41c3bd4 100644
--- a/menu/menu_shader.c
+++ b/menu/menu_shader.c
@@ -21,6 +21,10 @@
 #include <file/file_path.h>
 #include <string/stdstring.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 #include "menu_driver.h"
 #include "menu_shader.h"
 #include "../file_path_special.h"