diff --git a/cheats.c b/cheats.c
index fb4e79f90e..62abe00e6c 100644
--- a/cheats.c
+++ b/cheats.c
@@ -15,6 +15,7 @@
 
 #include "cheats.h"
 #include "general.h"
+#include "dynamic.h"
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 
diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index 1da3877344..6bbbc1b127 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -19,6 +19,7 @@
 #include "menu_entries.h"
 #include "menu_list.h"
 #include "menu_shader.h"
+#include "../../dynamic.h"
 #include "../frontend.h"
 #include <file/file_path.h>
 
diff --git a/frontend/menu/menu_entries_cbs.c b/frontend/menu/menu_entries_cbs.c
index 8863007058..bd7d3c1d8a 100644
--- a/frontend/menu/menu_entries_cbs.c
+++ b/frontend/menu/menu_entries_cbs.c
@@ -23,6 +23,7 @@
 #include "menu_shader.h"
 #include "backend/menu_backend.h"
 
+#include "../../dynamic.h"
 #include "../../file_ext.h"
 #include "../../config.def.h"
 #include "../../performance.h"
diff --git a/general.c b/general.c
index 3c4e8cef06..b97e308568 100644
--- a/general.c
+++ b/general.c
@@ -16,6 +16,7 @@
  */
 
 #include "general.h"
+#include "dynamic.h"
 #include <file/file_path.h>
 
 void rarch_playlist_load_content(content_playlist_t *playlist,
diff --git a/general.h b/general.h
index 8350d55af0..61b6790d9d 100644
--- a/general.h
+++ b/general.h
@@ -26,7 +26,6 @@
 #include "rewind.h"
 #include "movie.h"
 #include "autosave.h"
-#include "dynamic.h"
 #include "cheats.h"
 #include "audio/dsp_filter.h"
 #include <compat/strl.h>
diff --git a/libretro_version_1.c b/libretro_version_1.c
index a1deef17ec..918be1cd58 100644
--- a/libretro_version_1.c
+++ b/libretro_version_1.c
@@ -17,6 +17,7 @@
 
 #include <boolean.h>
 #include "libretro.h"
+#include "dynamic.h"
 #include "retro.h"
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/record/ffemu.c b/record/ffemu.c
index 29b3f9bb14..a5d10910f3 100644
--- a/record/ffemu.c
+++ b/record/ffemu.c
@@ -13,8 +13,10 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ffemu.h"
 #include <string.h>
+#include "ffemu.h"
+
+#include "../dynamic.h"
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
diff --git a/retroarch.c b/retroarch.c
index c5a1baa9d1..bf7e368398 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -15,13 +15,14 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <boolean.h>
-#include "retro.h"
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
+#include <boolean.h>
+#include "retro.h"
+#include "dynamic.h"
 #include "content.h"
 #include "file_ops.h"
 #include <file/file_path.h>
diff --git a/runloop.c b/runloop.c
index 68742ab0ad..96e38c9437 100644
--- a/runloop.c
+++ b/runloop.c
@@ -16,6 +16,7 @@
  */
 
 #include <file/file_path.h>
+#include "dynamic.h"
 #include "performance.h"
 #include "retroarch_logger.h"
 #include "input/input_common.h"
diff --git a/settings_data.c b/settings_data.c
index 19caa52dae..fb19827601 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -15,6 +15,7 @@
  */
 
 #include "settings_data.h"
+#include "dynamic.h"
 #include <file/file_path.h>
 #include "input/input_common.h"
 #include "config.def.h"