diff --git a/autosave.c b/autosave.c
index e59c1bc9a5..79e3352434 100644
--- a/autosave.c
+++ b/autosave.c
@@ -14,7 +14,7 @@
  */
 
 #include "autosave.h"
-#include "rthreads/rthreads.h"
+#include <rthreads/rthreads.h>
 #include <stdlib.h>
 #include <boolean.h>
 #include <string.h>
diff --git a/cheats.c b/cheats.c
index 9a23d7eb44..fb4e79f90e 100644
--- a/cheats.c
+++ b/cheats.c
@@ -14,8 +14,6 @@
  */
 
 #include "cheats.h"
-#include "hash.h"
-#include "dynamic.h"
 #include "general.h"
 #include <compat/strl.h>
 #include <compat/posix_string.h>
@@ -24,8 +22,6 @@
 #include "config.h"
 #endif
 
-#include "conf/config_file.h"
-
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
diff --git a/dynamic.c b/dynamic.c
index 78f0131b7e..73f570c8fa 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -14,12 +14,10 @@
  */
 
 #include "dynamic.h"
-#include "general.h"
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 #include "retroarch_logger.h"
 #include "performance.h"
-#include "file.h"
 #include "file_path.h"
 #include <string.h>
 #include <ctype.h>