diff --git a/deps/SPIRV-Cross b/deps/SPIRV-Cross
index 05a97883d2..44ef367141 160000
--- a/deps/SPIRV-Cross
+++ b/deps/SPIRV-Cross
@@ -1 +1 @@
-Subproject commit 05a97883d2efa8cad6e105eaa39fc1521017238e
+Subproject commit 44ef367141f9935bc719c9cc25693a9055f61efa
diff --git a/deps/glslang/glslang b/deps/glslang/glslang
index a4a4d5e22c..5ace09a75b 160000
--- a/deps/glslang/glslang
+++ b/deps/glslang/glslang
@@ -1 +1 @@
-Subproject commit a4a4d5e22c375d37bd286106904ef819eafff29b
+Subproject commit 5ace09a75be02bd32505f1f94b1b49a6aa3498b8
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 2e48cf53dd..765251d1c0 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -55,7 +55,7 @@ typedef struct
 
 /* FIXME - Global variables, refactor */
 static char detect_content_path[PATH_MAX_LENGTH];
-static unsigned rpl_entry_selection_ptr;
+unsigned rpl_entry_selection_ptr;
 unsigned rdb_entry_start_game_selection_ptr;
 size_t hack_shader_pass = 0;
 
@@ -63,8 +63,8 @@ size_t hack_shader_pass = 0;
 /* HACK - we have to find some way to pass state inbetween
  * function pointer callback functions that don't necessarily
  * call each other. */
-static char *core_buf;
-static size_t core_len;
+char *core_buf;
+size_t core_len;
 
 /* defined in menu_cbs_deferred_push */
 static void cb_net_generic(void *task_data, void *user_data, const char *err)
diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h
index 2e3b4e812f..c2c835eb74 100644
--- a/menu/menu_cbs.h
+++ b/menu/menu_cbs.h
@@ -75,6 +75,9 @@ enum
 
 /* FIXME - Externs, refactor */
 extern size_t hack_shader_pass;
+extern char *core_buf;
+extern size_t core_len;
+extern unsigned rpl_entry_selection_ptr;
 
 /* Function callbacks */
 
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 361d2a7aed..98c1a3b2dc 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -25,6 +25,7 @@
 
 #include "menu_driver.h"
 #include "menu_navigation.h"
+#include "menu_cbs.h"
 
 #ifdef HAVE_LIBRETRODB
 #include "../database_info.h"
@@ -56,12 +57,7 @@
 #include "../frontend/drivers/platform_linux.h"
 #endif
 
-extern unsigned rpl_entry_selection_ptr;
-
 #ifdef HAVE_NETWORKING
-extern char *core_buf;
-extern size_t core_len;
-
 static void print_buf_lines(file_list_t *list, char *buf,
       const char *label, int buf_size,
       enum menu_file_type type)