diff --git a/polymer/eduke32/source/sw/src/_functio.h b/polymer/eduke32/source/sw/src/_functio.h
index 7dfaee607..3b83a3efa 100644
--- a/polymer/eduke32/source/sw/src/_functio.h
+++ b/polymer/eduke32/source/sw/src/_functio.h
@@ -338,6 +338,7 @@ static char *mousedigitaldefaults[] =
 };
 
 
+#if 0
 static char *gamepaddigitaldefaults[] =
 {
     "Turn_Left",
@@ -345,6 +346,7 @@ static char *gamepaddigitaldefaults[] =
     "Move_Forward",
     "Move_Backward",
 };
+#endif
 
 
 static char *joystickanalogdefaults[] =
diff --git a/polymer/eduke32/source/sw/src/config.h b/polymer/eduke32/source/sw/src/config.h
index 303384e5d..ba8826c79 100644
--- a/polymer/eduke32/source/sw/src/config.h
+++ b/polymer/eduke32/source/sw/src/config.h
@@ -31,6 +31,8 @@ extern "C" {
 #endif
 
 #include "function.h"
+#include "keyboard.h"
+#include "control.h"
 
 #define SETUPNAMEPARM "SETUPFILE"
 
diff --git a/polymer/eduke32/source/sw/src/gamedefs.h b/polymer/eduke32/source/sw/src/gamedefs.h
index 1a496ef98..c7ff21b67 100644
--- a/polymer/eduke32/source/sw/src/gamedefs.h
+++ b/polymer/eduke32/source/sw/src/gamedefs.h
@@ -60,7 +60,7 @@ extern "C" {
 
 // Number of Mouse buttons
 
-#define MAXMOUSEBUTTONS 6
+//#define MAXMOUSEBUTTONS 6
 
 // Number of JOY buttons
 
diff --git a/polymer/eduke32/source/sw/src/startwin.game.c b/polymer/eduke32/source/sw/src/startwin.game.c
index 804be8e7d..ff580fd4c 100644
--- a/polymer/eduke32/source/sw/src/startwin.game.c
+++ b/polymer/eduke32/source/sw/src/startwin.game.c
@@ -1,10 +1,9 @@
-#ifndef RENDERTYPEWIN
+#ifndef _WIN32
 #error Only for Windows
 #endif
 
-#include "types.h"
 #include "build.h"
-#include "winlayer.h"
+#include "renderlayer.h"
 
 #include "gamedefs.h"
 #include "config.h"