diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index 411dadae57..2ae8083e21 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -27,6 +27,7 @@
 #include "../command_event.h"
 #include "../configuration.h"
 #include "../general.h"
+#include "../performance.h"
 #include "../verbosity.h"
 #include "../string_list_special.h"
 
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 3a99920452..322dd3ada0 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -39,7 +39,11 @@
 #include "../input/input_config.h"
 #include "../dir_list_special.h"
 #include "../string_list_special.h"
+#include "../performance.h"
+
+#ifdef HAVE_CHEEVOS
 #include "../cheevos.h"
+#endif
 
 #ifdef __linux__
 #include "../frontend/drivers/platform_linux.h"
diff --git a/runloop.h b/runloop.h
index 8b1108f6e5..18faa01553 100644
--- a/runloop.h
+++ b/runloop.h
@@ -21,7 +21,6 @@
 #include "core_options.h"
 #include "dynamic.h"
 #include "system.h"
-#include "performance.h"
 
 #ifdef __cplusplus
 extern "C" {