diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index 4ef6fc8bc9..10dcbc5b38 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -33,6 +33,7 @@
 
 #include "audio_driver.h"
 #include "audio_thread_wrapper.h"
+#include "../gfx/video_driver.h"
 #include "../record/record_driver.h"
 #include "../frontend/frontend_driver.h"
 
diff --git a/audio/drivers/jack.c b/audio/drivers/jack.c
index 3bfa0c608f..1f509bd942 100644
--- a/audio/drivers/jack.c
+++ b/audio/drivers/jack.c
@@ -13,6 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/configuration.h b/configuration.h
index bbeb56f767..a6e1d94ec4 100644
--- a/configuration.h
+++ b/configuration.h
@@ -23,12 +23,12 @@
 
 #include <boolean.h>
 #include <retro_common_api.h>
+#include <retro_miscellaneous.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include "gfx/video_driver.h"
 #include "input/input_defines.h"
 
 enum override_type
diff --git a/dirs.c b/dirs.c
index bd3221d5a5..c830af1f20 100644
--- a/dirs.c
+++ b/dirs.c
@@ -26,6 +26,7 @@
 #include "configuration.h"
 #include "command.h"
 #include "defaults.h"
+#include "gfx/video_driver.h"
 #include "list_special.h"
 #include "file_path_special.h"
 #include "msg_hash.h"
diff --git a/input/input_remote.c b/input/input_remote.c
index 875c7fadab..05dbcfb7fe 100644
--- a/input/input_remote.c
+++ b/input/input_remote.c
@@ -29,6 +29,7 @@
 #include <compat/posix_string.h>
 #include <file/file_path.h>
 #include <retro_miscellaneous.h>
+#include <libretro.h>
 #include <net/net_compat.h>
 #include <net/net_socket.h>
 
diff --git a/intl/msg_hash_chs.c b/intl/msg_hash_chs.c
index 89607373a6..aebc8657ec 100644
--- a/intl/msg_hash_chs.c
+++ b/intl/msg_hash_chs.c
@@ -13,6 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
diff --git a/intl/msg_hash_de.c b/intl/msg_hash_de.c
index efb1a8366a..8adadab268 100644
--- a/intl/msg_hash_de.c
+++ b/intl/msg_hash_de.c
@@ -14,6 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
diff --git a/intl/msg_hash_es.c b/intl/msg_hash_es.c
index 9bb64c2609..056f3bf24b 100644
--- a/intl/msg_hash_es.c
+++ b/intl/msg_hash_es.c
@@ -12,6 +12,8 @@
  *  You should have received a copy of the GNU General Public License along with RetroArch.
  *  If not, see <http://www.gnu.org/licenses/>.
  */
+
+#include <stdio.h>
 #include <stdint.h>
 #include <string.h>
 
diff --git a/intl/msg_hash_it.c b/intl/msg_hash_it.c
index 79fb438f02..e7928cae74 100644
--- a/intl/msg_hash_it.c
+++ b/intl/msg_hash_it.c
@@ -12,6 +12,8 @@
  *  You should have received a copy of the GNU General Public License along with RetroArch.
  *  If not, see <http://www.gnu.org/licenses/>.
  */
+
+#include <stdio.h>
 #include <stdint.h>
 #include <string.h>
 
diff --git a/intl/msg_hash_ja.c b/intl/msg_hash_ja.c
index 58afba031e..0f281b4969 100644
--- a/intl/msg_hash_ja.c
+++ b/intl/msg_hash_ja.c
@@ -14,6 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
diff --git a/intl/msg_hash_ko.c b/intl/msg_hash_ko.c
index 73b5ed6e17..26c6093ee8 100644
--- a/intl/msg_hash_ko.c
+++ b/intl/msg_hash_ko.c
@@ -14,6 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
diff --git a/intl/msg_hash_pt_br.c b/intl/msg_hash_pt_br.c
index 38034858aa..46f0f4dc5d 100644
--- a/intl/msg_hash_pt_br.c
+++ b/intl/msg_hash_pt_br.c
@@ -13,7 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../msg_hash.h"
+#include <stdio.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -21,6 +21,7 @@
 #include <compat/strl.h>
 #include <string/stdstring.h>
 
+#include "../msg_hash.h"
 #include "../../configuration.h"
 
 int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len)
diff --git a/intl/msg_hash_pt_pt.c b/intl/msg_hash_pt_pt.c
index 7606203f8c..376209c4c3 100644
--- a/intl/msg_hash_pt_pt.c
+++ b/intl/msg_hash_pt_pt.c
@@ -13,7 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../msg_hash.h"
+#include <stdio.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -21,6 +21,7 @@
 #include <compat/strl.h>
 #include <string/stdstring.h>
 
+#include "../msg_hash.h"
 #include "../../configuration.h"
 
 int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len)
diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c
index 0e0586a845..f95feccd73 100644
--- a/intl/msg_hash_us.c
+++ b/intl/msg_hash_us.c
@@ -14,6 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c
index bdb77b2679..1115fb4672 100644
--- a/intl/msg_hash_vn.c
+++ b/intl/msg_hash_vn.c
@@ -14,6 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
diff --git a/msg_hash.c b/msg_hash.c
index 9137362c9f..f8a3c4db50 100644
--- a/msg_hash.c
+++ b/msg_hash.c
@@ -14,10 +14,12 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdio.h>
 #include <string.h>
 
 #include <rhash.h>
 #include <string/stdstring.h>
+#include <libretro.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/record/record_driver.c b/record/record_driver.c
index 232d44c918..5adb9842db 100644
--- a/record/record_driver.c
+++ b/record/record_driver.c
@@ -29,6 +29,7 @@
 #include "../command.h"
 #include "../configuration.h"
 #include "../driver.h"
+#include "../gfx/video_driver.h"
 #include "../retroarch.h"
 #include "../runloop.h"
 #include "../verbosity.h"
diff --git a/tasks/task_autodetect.c b/tasks/task_autodetect.c
index 36c48445d3..68f62cc480 100644
--- a/tasks/task_autodetect.c
+++ b/tasks/task_autodetect.c
@@ -21,6 +21,7 @@
 #include <compat/strl.h>
 #include <lists/dir_list.h>
 #include <file/file_path.h>
+#include <file/config_file.h>
 #include <string/stdstring.h>
 
 #include "../input/input_config.h"
diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c
index e6ae77425f..c6bb96271f 100644
--- a/tasks/task_overlay.c
+++ b/tasks/task_overlay.c
@@ -27,6 +27,7 @@
 #include "tasks_internal.h"
 
 #include "../file_path_special.h"
+#include "../gfx/video_driver.h"
 #include "../input/input_config.h"
 #include "../input/input_overlay.h"
 #include "../configuration.h"