diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index 2158f27efd..1e20bb1e6b 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -18,6 +18,8 @@
 
 #include <string/string_list.h>
 
+#include "audio_monitor.h"
+#include "audio_driver.h"
 #include "audio_utils.h"
 #include "audio_thread_wrapper.h"
 #include "../general.h"
diff --git a/frontend/frontend.c b/frontend/frontend.c
index f5cd38a581..036459e54a 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -17,6 +17,7 @@
 
 #include <file/file_path.h>
 
+#include "frontend.h"
 #include "../system.h"
 #include "../driver.h"
 #include "../general.h"
diff --git a/frontend/frontend.h b/frontend/frontend.h
index 8a830d2c63..ce97054a87 100644
--- a/frontend/frontend.h
+++ b/frontend/frontend.h
@@ -21,6 +21,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <boolean.h>
+#include "frontend_driver.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/input/input_remapping.c b/input/input_remapping.c
index c262a8fb6c..58c2a74cd1 100644
--- a/input/input_remapping.c
+++ b/input/input_remapping.c
@@ -13,6 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "input_remapping.h"
 #include <file/config_file.h>
 #include <file/file_path.h>
 
diff --git a/libretro-common/file/dir_list.c b/libretro-common/file/dir_list.c
index 0e50fe34c4..51d7efd9f4 100644
--- a/libretro-common/file/dir_list.c
+++ b/libretro-common/file/dir_list.c
@@ -22,6 +22,7 @@
 
 #include <stdlib.h>
 
+#include <file/dir_list.h>
 #include <file/file_path.h>
 #include <string/string_list.h>
 
diff --git a/libretro-common/file/retro_dirent.c b/libretro-common/file/retro_dirent.c
index b2b5d77b64..aea6bcd60a 100644
--- a/libretro-common/file/retro_dirent.c
+++ b/libretro-common/file/retro_dirent.c
@@ -1,3 +1,5 @@
+#include <retro_dirent.h>
+
 #include <stdlib.h>
 
 #if defined(_WIN32)
diff --git a/menu/cbs/menu_cbs_cancel.c b/menu/cbs/menu_cbs_cancel.c
index ae62b20947..d935cc4e65 100644
--- a/menu/cbs/menu_cbs_cancel.c
+++ b/menu/cbs/menu_cbs_cancel.c
@@ -15,6 +15,7 @@
 
 #include <file/file_path.h>
 #include "../menu.h"
+#include "../menu_cbs.h"
 
 static int action_cancel_pop_default(const char *path,
       const char *label, unsigned type, size_t idx)
diff --git a/menu/cbs/menu_cbs_refresh.c b/menu/cbs/menu_cbs_refresh.c
index 22e7659e72..ff6c96c494 100644
--- a/menu/cbs/menu_cbs_refresh.c
+++ b/menu/cbs/menu_cbs_refresh.c
@@ -14,6 +14,7 @@
  */
 
 #include "../menu.h"
+#include "../menu_cbs.h"
 #include "../menu_hash.h"
 
 static int action_refresh_default(file_list_t *list, file_list_t *menu_list)
diff --git a/tasks/task_database.c b/tasks/task_database.c
index 41acf7a3e2..3612776373 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -13,6 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "tasks.h"
 #include <compat/strcasestr.h>
 #include <compat/strl.h>
 
diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c
index 9f2618b33e..d451a1de88 100644
--- a/tasks/task_overlay.c
+++ b/tasks/task_overlay.c
@@ -18,6 +18,7 @@
 #include <rthreads/rthreads.h>
 #endif
 
+#include "tasks.h"
 #include "../input/input_overlay.h"
 
 #ifdef HAVE_THREADS