diff --git a/source/common/menu/menu.h b/source/common/menu/menu.h
index fe5c4b3e3..51a1bf56c 100644
--- a/source/common/menu/menu.h
+++ b/source/common/menu/menu.h
@@ -8,11 +8,12 @@
 #include "v_font.h"
 #include "version.h"
 #include "textures.h"
+#include "zstring.h"
 
 EXTERN_CVAR(Float, snd_menuvolume)
 EXTERN_CVAR(Int, m_use_mouse);
 
-enum
+enum EMax
 {
 	MAXSKILLS = 7,
 	MAXVOLUMES = 7,
diff --git a/source/duke3d/src/duke3d.h b/source/duke3d/src/duke3d.h
index 4d6405e7f..53686b96a 100644
--- a/source/duke3d/src/duke3d.h
+++ b/source/duke3d/src/duke3d.h
@@ -34,6 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "pragmas.h"
 #include "polymost.h"
 #include "gamecvars.h"
+#include "menu/menu.h"
 
 
 #define HEAD2                   APPNAME
@@ -58,7 +59,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define MOVEFIFOSIZ         2
 
 // KEEPINSYNC lunatic/con_lang.lua
-#define MAXVOLUMES          7
 #define MAXLEVELS           64
 #define MAXGAMETYPES        16
 
diff --git a/source/duke3d/src/game.h b/source/duke3d/src/game.h
index e71d6a899..eaec48713 100644
--- a/source/duke3d/src/game.h
+++ b/source/duke3d/src/game.h
@@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "gamevars.h"
 #include "mmulti.h"
 #include "network.h"
+#include "menu/menu.h"
 
 BEGIN_DUKE_NS
 
diff --git a/source/duke3d/src/gamedef.cpp b/source/duke3d/src/gamedef.cpp
index 3893ceb09..ce83c0d40 100644
--- a/source/duke3d/src/gamedef.cpp
+++ b/source/duke3d/src/gamedef.cpp
@@ -5018,7 +5018,7 @@ repeatcase:
             }
 
 			i = strcspn(textptr, "\r\n");
-			gVolumeNames[j] = StringTable::MakeMacro(textptr, i);
+			gVolumeNames[j] = FStringTable::MakeMacro(textptr, i);
 			textptr += i;
   
             g_volumeCnt = j+1;
@@ -5119,7 +5119,7 @@ repeatcase:
             }
 
 			i = strcspn(textptr, "\r\n");
-			gSkillNames[j] = StringTable::MakeMacro(textptr, i);
+			gSkillNames[j] = FStringTable::MakeMacro(textptr, i);
 			textptr+=i;
 
             for (i=0; i<MAXSKILLS; i++)
diff --git a/source/duke3d/src/global.h b/source/duke3d/src/global.h
index 8737daff4..c5e3c3634 100644
--- a/source/duke3d/src/global.h
+++ b/source/duke3d/src/global.h
@@ -30,6 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "quotes.h"
 #include "sector.h"
 #include "sounds.h"
+#include "menu/menu.h"
 
 BEGIN_DUKE_NS
 
@@ -41,7 +42,6 @@ BEGIN_DUKE_NS
 
 #define MAXINTERPOLATIONS MAXSPRITES
 // KEEPINSYNC lunatic/con_lang.lua
-#define MAXSKILLS 7
 
 // duke3d global soup :(
 
diff --git a/source/rr/src/duke3d.h b/source/rr/src/duke3d.h
index 4b3e27367..48462e06d 100644
--- a/source/rr/src/duke3d.h
+++ b/source/rr/src/duke3d.h
@@ -36,6 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "polymost.h"
 #include "gamecvars.h"
+#include "menu/menu.h"
 
 BEGIN_RR_NS
 
@@ -60,7 +61,6 @@ BEGIN_RR_NS
 #define MOVEFIFOSIZ         256
 
 // KEEPINSYNC lunatic/con_lang.lua
-#define MAXVOLUMES          7
 #define MAXLEVELS           64
 #define MAXGAMETYPES        16
 
diff --git a/source/rr/src/gamedef.cpp b/source/rr/src/gamedef.cpp
index 2a7386230..a854e7146 100644
--- a/source/rr/src/gamedef.cpp
+++ b/source/rr/src/gamedef.cpp
@@ -1887,7 +1887,7 @@ static int32_t C_ParseCommand(int32_t loop)
             }
 
 			i = strcspn(textptr, "\r\n");
-			gVolumeNames[j] = StringTable::MakeMacro(textptr, i);
+			gVolumeNames[j] = FStringTable::MakeMacro(textptr, i);
 			textptr+=i;
             g_volumeCnt = j+1;
             continue;
@@ -1911,7 +1911,7 @@ static int32_t C_ParseCommand(int32_t loop)
             }
 
 			i = strcspn(textptr, "\r\n");
-			gSkillNames[j] = StringTable::MakeMacro(textptr, i);
+			gSkillNames[j] = FStringTable::MakeMacro(textptr, i);
 			textptr+=i;
 
             for (i=0; i<MAXSKILLS; i++)
diff --git a/source/rr/src/global.h b/source/rr/src/global.h
index 55da0a63e..d6c83ed25 100644
--- a/source/rr/src/global.h
+++ b/source/rr/src/global.h
@@ -47,7 +47,6 @@ BEGIN_RR_NS
 
 #define MAXINTERPOLATIONS MAXSPRITES
 // KEEPINSYNC lunatic/con_lang.lua
-#define MAXSKILLS 7
 
 // duke3d global soup :(