diff --git a/src/overlays/gamestates/ovl_file_choose/file_select.h b/src/overlays/gamestates/ovl_file_choose/file_select.h
index 69d71f71d5..9c8527a1d6 100644
--- a/src/overlays/gamestates/ovl_file_choose/file_select.h
+++ b/src/overlays/gamestates/ovl_file_choose/file_select.h
@@ -225,4 +225,26 @@ void FileSelect_DrawCharacter(GraphicsContext* gfxCtx, void* texture, s16 vtx);
 extern s16 D_808124C0[];
 #endif
 
+extern Vtx gNameEntryVtx[];
+extern Vtx gOptionsMenuHeadersVtx[];
+extern Vtx gOptionsMenuSettingsVtx[];
+extern Vtx gOptionsDividerSoundVtx[];
+extern Vtx gOptionsDividerZTargetVtx[];
+extern Vtx gOptionsDividerBrightnessVtx[];
+extern s16 gCharPageEng[];
+#if OOT_NTSC
+extern s16 gCharPageHira[];
+extern s16 gCharPageKata[];
+extern s16 gNextCharPage[];
+#endif
+#if OOT_PAL && PLATFORM_N64
+extern Vtx gOptionsMenuBrightnessVtx[];
+extern Vtx gOptionsMenuLanguageVtx[];
+extern Vtx gOptionsDividerLanguageVtx[];
+#endif
+#if OOT_PAL && PLATFORM_GC
+extern Vtx gOptionsMenuHeadersGERVtx[];
+extern Vtx gOptionsMenuSettingsGERVtx[];
+#endif
+
 #endif
diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c
index c3042a2ce9..8e300baf02 100644
--- a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c
+++ b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c
@@ -18,7 +18,6 @@
 #include "z64save.h"
 
 #include "assets/textures/title_static/title_static.h"
-#include "assets/overlays/ovl_file_choose/ovl_file_choose.h"
 
 void FileSelect_DrawCharacter(GraphicsContext* gfxCtx, void* texture, s16 vtx) {
     OPEN_DISPS(gfxCtx, "../z_file_nameset_PAL.c", 110);
diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_nameset_data.c b/src/overlays/gamestates/ovl_file_choose/z_file_nameset_data.c
index 2fc9670b89..b51fd2eceb 100644
--- a/src/overlays/gamestates/ovl_file_choose/z_file_nameset_data.c
+++ b/src/overlays/gamestates/ovl_file_choose/z_file_nameset_data.c
@@ -1 +1,83 @@
-#include "assets/overlays/ovl_file_choose/ovl_file_choose.c"
+#include "file_select.h"
+
+#include "ultra64.h"
+#include "gfx.h"
+#include "versions.h"
+
+Vtx gNameEntryVtx[] = {
+#include "assets/overlays/ovl_file_choose/gNameEntryVtx.inc.c"
+};
+
+#if OOT_NTSC
+s16 gCharPageHira[] = {
+#include "assets/overlays/ovl_file_choose/gCharPageHira.inc.c"
+};
+
+s16 gCharPageKata[] = {
+#include "assets/overlays/ovl_file_choose/gCharPageKata.inc.c"
+};
+
+s16 gCharPageEng[] = {
+#include "assets/overlays/ovl_file_choose/gCharPageEng.inc.c"
+};
+
+s16 gNextCharPage[] = {
+#include "assets/overlays/ovl_file_choose/gNextCharPage.inc.c"
+};
+#endif
+
+Vtx gOptionsMenuHeadersVtx[] = {
+#include "assets/overlays/ovl_file_choose/gOptionsMenuHeadersVtx.inc.c"
+};
+
+#if OOT_PAL && PLATFORM_GC
+Vtx gOptionsMenuHeadersGERVtx[] = {
+#include "assets/overlays/ovl_file_choose/gOptionsMenuHeadersGERVtx.inc.c"
+};
+#endif
+
+Vtx gOptionsMenuSettingsVtx[] = {
+#include "assets/overlays/ovl_file_choose/gOptionsMenuSettingsVtx.inc.c"
+};
+
+#if OOT_PAL && PLATFORM_GC
+Vtx gOptionsMenuSettingsGERVtx[] = {
+#include "assets/overlays/ovl_file_choose/gOptionsMenuSettingsGERVtx.inc.c"
+};
+#endif
+
+#if OOT_PAL && PLATFORM_N64
+Vtx gOptionsMenuBrightnessVtx[] = {
+#include "assets/overlays/ovl_file_choose/gOptionsMenuBrightnessVtx.inc.c"
+};
+
+Vtx gOptionsMenuLanguageVtx[] = {
+#include "assets/overlays/ovl_file_choose/gOptionsMenuLanguageVtx.inc.c"
+};
+
+u8 ovl_file_choose_zeros_000640[320] = { 0 };
+#endif
+
+Vtx gOptionsDividerSoundVtx[] = {
+#include "assets/overlays/ovl_file_choose/gOptionsDividerSoundVtx.inc.c"
+};
+
+Vtx gOptionsDividerZTargetVtx[] = {
+#include "assets/overlays/ovl_file_choose/gOptionsDividerZTargetVtx.inc.c"
+};
+
+Vtx gOptionsDividerBrightnessVtx[] = {
+#include "assets/overlays/ovl_file_choose/gOptionsDividerBrightnessVtx.inc.c"
+};
+
+#if OOT_PAL && PLATFORM_N64
+Vtx gOptionsDividerLanguageVtx[] = {
+#include "assets/overlays/ovl_file_choose/gOptionsDividerLanguageVtx.inc.c"
+};
+#endif
+
+#if OOT_PAL
+s16 gCharPageEng[] = {
+#include "assets/overlays/ovl_file_choose/gCharPageEng.inc.c"
+};
+#endif