diff --git a/command_event.c b/command_event.c
index 6ed16cbe08..2b215f1f88 100644
--- a/command_event.c
+++ b/command_event.c
@@ -16,6 +16,7 @@
 #include <ctype.h>
 
 #include <compat/strl.h>
+#include <file/dir_list.h>
 #include <string/stdstring.h>
 
 #include "command_event.h"
diff --git a/core_info.c b/core_info.c
index 236a368d9a..455b16fd35 100644
--- a/core_info.c
+++ b/core_info.c
@@ -16,6 +16,7 @@
  */
 
 #include <file/file_path.h>
+#include <file/dir_list.h>
 #include <file/file_archive.h>
 
 #include <string/stdstring.h>
diff --git a/database_info.h b/database_info.h
index 44206dc66a..612c1c6dec 100644
--- a/database_info.h
+++ b/database_info.h
@@ -21,7 +21,6 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include <boolean.h>
 #include <file/file_archive.h>
 
 #include "libretro-db/libretrodb.h"
diff --git a/dir_list_special.c b/dir_list_special.c
index 62ad124403..12ef289b40 100644
--- a/dir_list_special.c
+++ b/dir_list_special.c
@@ -14,6 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <file/dir_list.h>
+
 #include "dir_list_special.h"
 #include "frontend/frontend_driver.h"
 #include "general.h"
diff --git a/dir_list_special.h b/dir_list_special.h
index 3941cb7a5e..6e28b983c2 100644
--- a/dir_list_special.h
+++ b/dir_list_special.h
@@ -20,7 +20,6 @@
 #include <stdint.h>
 
 #include <file/file_path.h>
-#include <file/dir_list.h>
 
 #include <string/string_list.h>
 
diff --git a/file_ops.h b/file_ops.h
index 7e15001044..11de683a01 100644
--- a/file_ops.h
+++ b/file_ops.h
@@ -21,8 +21,6 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include <boolean.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/runloop.c b/runloop.c
index 2dbc19024e..0562c833c6 100644
--- a/runloop.c
+++ b/runloop.c
@@ -19,6 +19,7 @@
 #include <stdarg.h>
 #include <math.h>
 
+#include <file/dir_list.h>
 #include <file/file_path.h>
 #include <retro_inline.h>
 #include <retro_assert.h>
diff --git a/tasks/task_database.c b/tasks/task_database.c
index e7b6044da1..7be4bc252d 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -17,6 +17,7 @@
 #include <compat/strl.h>
 #include <retro_endianness.h>
 #include <string/stdstring.h>
+#include <file/dir_list.h>
 
 #include <queues/message_queue.h>