diff --git a/playlist.c b/playlist.c
index 4228d9f281..6a819accdc 100644
--- a/playlist.c
+++ b/playlist.c
@@ -17,8 +17,7 @@
 
 #include "playlist.h"
 #include <compat/posix_string.h>
-#include "boolean.h"
-#include "file.h"
+#include <boolean.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/retroarch.c b/retroarch.c
index d1adde74af..0ca55d6c66 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -22,12 +22,9 @@
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
-#include "driver.h"
-#include "file.h"
 #include "file_path.h"
 #include "dir_list.h"
 #include "general.h"
-#include "dynamic.h"
 #include <compat/strl.h>
 #include "screenshot.h"
 #include "performance.h"
@@ -35,7 +32,6 @@
 #include <compat/getopt.h>
 #include <compat/posix_string.h>
 #include "input/keyboard_line.h"
-#include "input/input_common.h"
 #include "git_version.h"
 #include "intl/intl.h"
 
diff --git a/settings.c b/settings.c
index 09bcaf55e2..a64aea0311 100644
--- a/settings.c
+++ b/settings.c
@@ -13,16 +13,13 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "general.h"
 #include "conf/config_file.h"
 #include "conf/config_file_macros.h"
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 #include "config.def.h"
-#include "file.h"
 #include "file_path.h"
 #include "input/input_common.h"
-#include "frontend/frontend.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"