diff --git a/dynamic.c b/dynamic.c
index c43a9218db..d00ea50160 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -116,6 +116,10 @@ static bool ignore_environment_cb   = false;
 static bool core_set_shared_context = false;
 static bool *load_no_content_hook   = NULL;
 
+struct retro_subsystem_info subsystem_data[SUBSYSTEM_MAX_SUBSYSTEMS];
+struct retro_subsystem_rom_info subsystem_data_roms[SUBSYSTEM_MAX_SUBSYSTEMS][SUBSYSTEM_MAX_SUBSYSTEM_ROMS];
+unsigned subsystem_current_count;
+
 const struct retro_subsystem_info *libretro_find_subsystem_info(
       const struct retro_subsystem_info *info, unsigned num_info,
       const char *ident)
diff --git a/managers/cheat_manager.c b/managers/cheat_manager.c
index a4d5434cec..40c8f3d191 100644
--- a/managers/cheat_manager.c
+++ b/managers/cheat_manager.c
@@ -52,6 +52,8 @@
 #include "../input/input_driver.h"
 #include "../configuration.h"
 
+cheat_manager_t cheat_manager_state;
+
 unsigned cheat_manager_get_buf_size(void)
 {
    return cheat_manager_state.buf_size;