diff --git a/polymer/eduke32/source/common.c b/polymer/eduke32/source/common.c
index 15e7a9616..2caf0336e 100644
--- a/polymer/eduke32/source/common.c
+++ b/polymer/eduke32/source/common.c
@@ -4,6 +4,7 @@
 
 #include "compat.h"
 #include "build.h"
+#include "baselayer.h"
 
 #include "grpscan.h"
 
diff --git a/polymer/eduke32/source/m32common.c b/polymer/eduke32/source/m32common.c
index 37f2a2908..bd0d55543 100644
--- a/polymer/eduke32/source/m32common.c
+++ b/polymer/eduke32/source/m32common.c
@@ -3,7 +3,9 @@
 #include "keys.h"
 #include "build.h"
 #include "cache1d.h"
-#include "polymer.h"
+#ifdef POLYMER
+# include "polymer.h"
+#endif
 #include "editor.h"
 #include "renderlayer.h"