diff --git a/polymer/eduke32/source/demo.c b/polymer/eduke32/source/demo.c
index d2eb9839f..4d54252dc 100644
--- a/polymer/eduke32/source/demo.c
+++ b/polymer/eduke32/source/demo.c
@@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "duke3d.h"
 #include "demo.h"
+#include "menus.h"
 
 char firstdemofile[80] = { '\0' };
 
diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c
index 73a00e3b3..2ea17ad27 100644
--- a/polymer/eduke32/source/menus.c
+++ b/polymer/eduke32/source/menus.c
@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "gameexec.h"
 #include "savegame.h"
 #include "premap.h"
+#include "demo.h"
 #include <sys/stat.h>
 
 extern char inputloc;
diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c
index 47bf60190..f6ef8cf56 100644
--- a/polymer/eduke32/source/player.c
+++ b/polymer/eduke32/source/player.c
@@ -22,9 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "duke3d.h"
 #include "osd.h"
-#include "gamedef.h"
 #include "player.h"
-#include "gameexec.h"
+#include "demo.h"
 #include "enet/enet.h"
 
 int32_t g_currentweapon;
diff --git a/polymer/eduke32/source/premap.c b/polymer/eduke32/source/premap.c
index ab07a3f3d..c6dbb4041 100644
--- a/polymer/eduke32/source/premap.c
+++ b/polymer/eduke32/source/premap.c
@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "gameexec.h"
 #include "anim.h"
 #include "menus.h"
+#include "demo.h"
 
 #ifdef RENDERTYPEWIN
 #define WIN32_LEAN_AND_MEAN