diff --git a/polymer/eduke32/source/config.c b/polymer/eduke32/source/config.c
index 7d7b36d33..9568a770e 100644
--- a/polymer/eduke32/source/config.c
+++ b/polymer/eduke32/source/config.c
@@ -30,6 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "baselayer.h"
 #include "duke3d.h"
+#include "game.h"
 #include "scriplib.h"
 #include "osd.h"
 #include "osdcmds.h"
@@ -611,7 +612,6 @@ int32_t CONFIG_ReadSetup(void)
 {
     int32_t dummy, i = 0;
     char commmacro[] = "CommbatMacro# ";
-    extern int32_t g_forceWeaponChoice;
     char tempbuf[1024];
 
     CONTROL_ClearAssignments();
@@ -681,11 +681,8 @@ int32_t CONFIG_ReadSetup(void)
         }
 // #endif
 
-        {
-            extern char defaultduke3dgrp[BMAX_PATH];
-            if (!Bstrcmp(defaultduke3dgrp,"duke3d.grp"))
-                SCRIPT_GetString(ud.config.scripthandle, "Setup","SelectedGRP",&g_grpNamePtr[0]);
-        }
+        if (!Bstrcmp(defaultduke3dgrp,"duke3d.grp"))
+            SCRIPT_GetString(ud.config.scripthandle, "Setup","SelectedGRP",&g_grpNamePtr[0]);
 
         if (!NAM)
         {
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index b0c6a583c..e5cc1ca08 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -9326,7 +9326,6 @@ static void G_DisplayLogo(void)
 static void G_Cleanup(void)
 {
     int32_t i;
-    extern char *bitptr;
 
     for (i=(MAXLEVELS*(MAXVOLUMES+1))-1; i>=0; i--) // +1 volume for "intro", "briefing" music
     {
@@ -9733,7 +9732,6 @@ static int32_t G_EndOfLevel(void)
             ud.eog = 0;
             if ((!g_netServer && ud.multimode < 2))
             {
-                extern int32_t probey;
                 if (!VOLUMEALL)
                     G_DoOrderScreen();
                 g_player[myconnectindex].ps->gm = MODE_MENU;
diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c
index a06a10ef4..bffaae7d4 100644
--- a/polymer/eduke32/source/menus.c
+++ b/polymer/eduke32/source/menus.c
@@ -21,6 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //-------------------------------------------------------------------------
 
 #include "duke3d.h"
+#include "net.h"
+#include "player.h"
 #include "mouse.h"
 #include "osd.h"
 #include "osdcmds.h"
@@ -579,7 +581,6 @@ static void Menus_LoadSave_DisplayCommon1(void)
 
 void M_DisplayMenus(void)
 {
-    extern int32_t g_netSync;
     CACHE1D_FIND_REC *dir;
     int32_t c,x,i;
     int32_t l,m;
@@ -4246,7 +4247,6 @@ cheat_for_port_credits:
             ud.config.JoystickAnalogueAxes[thispage*2+(x==7)] = l;
             CONTROL_MapAnalogAxis(thispage*2+(x==7),l,controldevice_joystick);
             {
-                extern int32_t mouseyaxismode;	// player.c
                 mouseyaxismode = -1;
             }
             break;
diff --git a/polymer/eduke32/source/osdcmds.c b/polymer/eduke32/source/osdcmds.c
index f4ee34732..1d355e10c 100644
--- a/polymer/eduke32/source/osdcmds.c
+++ b/polymer/eduke32/source/osdcmds.c
@@ -24,6 +24,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "osdcmds.h"
 #include "baselayer.h"
 #include "duke3d.h"
+#include "game.h"
+#include "net.h"
 #include "premap.h"
 #include "menus.h"
 #include "osd.h"
@@ -699,7 +701,6 @@ static int32_t osdcmd_give(const osdfuncparm_t *parm)
 void onvideomodechange(int32_t newmode)
 {
     uint8_t palid;
-    extern int32_t g_crosshairSum;
 
     if (newmode)
     {
@@ -1132,7 +1133,6 @@ static int32_t osdcmd_inittimer(const osdfuncparm_t *parm)
 
 static int32_t osdcmd_disconnect(const osdfuncparm_t *parm)
 {
-    extern int32_t g_netDisconnect;
     UNREFERENCED_PARAMETER(parm);
     g_netDisconnect = 1;
     return OSDCMD_OK;
@@ -1150,8 +1150,6 @@ static int32_t osdcmd_connect(const osdfuncparm_t *parm)
 
 static int32_t osdcmd_password(const osdfuncparm_t *parm)
 {
-    extern char g_netPassword[32];
-
     if (parm->numparms < 1)
     {
         Bmemset(g_netPassword, 0, sizeof(g_netPassword));
diff --git a/polymer/eduke32/source/premap.c b/polymer/eduke32/source/premap.c
index 5f444d79e..54bb54dd2 100644
--- a/polymer/eduke32/source/premap.c
+++ b/polymer/eduke32/source/premap.c
@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //-------------------------------------------------------------------------
 
 #include "duke3d.h"
+#include "game.h"
 #include "osd.h"
 #include "gamedef.h"
 #include "premap.h"
@@ -1104,7 +1105,6 @@ static inline void prelevel(char g)
 {
     int32_t i, nexti, j, startwall, endwall;
     int32_t switchpicnum;
-    extern char ror_protectedsectors[MAXSECTORS];
 
     uint8_t tagbitmap[65536>>3];
     Bmemset(tagbitmap, 0, sizeof(tagbitmap));
@@ -2149,4 +2149,3 @@ void G_FreeMapState(int32_t mapnum)
     Bfree(MapInfo[mapnum].savedstate);
     MapInfo[mapnum].savedstate = NULL;
 }
-