diff --git a/polymer/eduke32/build/src/SDLMain.m b/polymer/eduke32/build/src/SDLMain.m
index 6316e724a..84d6346a8 100644
--- a/polymer/eduke32/build/src/SDLMain.m
+++ b/polymer/eduke32/build/src/SDLMain.m
@@ -10,6 +10,8 @@
 
 #if TARGET_OS_MAC
 
+#include "compat.h"
+
 #import <AppKit/AppKit.h>
 
 #include "sdl_inc.h"
@@ -76,6 +78,8 @@ static NSString *getApplicationName(void)
     SDL_Event event;
     event.type = SDL_QUIT;
     SDL_PushEvent(&event);
+
+    UNREFERENCED_PARAMETER(sender);
 }
 @end
 
@@ -206,6 +210,9 @@ static void CustomApplicationMain (int argc, char **argv)
 
     [sdlMain release];
     [pool release];
+
+    UNREFERENCED_PARAMETER(argc);
+    UNREFERENCED_PARAMETER(argv);
 }
 
 
@@ -254,6 +261,9 @@ static void CustomApplicationMain (int argc, char **argv)
     SDL_strlcpy(arg, temparg, arglen);
     gArgv[gArgc++] = arg;
     gArgv[gArgc] = NULL;
+
+    UNREFERENCED_PARAMETER(theApplication);
+
     return TRUE;
 }
 
@@ -270,6 +280,8 @@ static void CustomApplicationMain (int argc, char **argv)
     gCalledAppMainline = TRUE;
     status = SDL_main (gArgc, gArgv);
 
+    UNREFERENCED_PARAMETER(note);
+
     /* We're done, thank you for playing */
     exit(status);
 }
diff --git a/polymer/eduke32/build/src/baselayer.c b/polymer/eduke32/build/src/baselayer.c
index de13a5fdc..a68e8afe3 100644
--- a/polymer/eduke32/build/src/baselayer.c
+++ b/polymer/eduke32/build/src/baselayer.c
@@ -372,6 +372,8 @@ static int32_t osdfunc_setrendermode(const osdfuncparm_t *parm)
     case REND_POLYMER:
         renderer = "great justice (Polymer)";
         break;
+    default:
+        EDUKE32_UNREACHABLE_SECTION(break);
     }
 
     OSD_Printf("Rendering method changed to %s\n", renderer);
diff --git a/polymer/eduke32/build/src/osd.c b/polymer/eduke32/build/src/osd.c
index d23ae8937..11661c1fd 100644
--- a/polymer/eduke32/build/src/osd.c
+++ b/polymer/eduke32/build/src/osd.c
@@ -202,9 +202,12 @@ int32_t OSD_Exec(const char *szScript)
     int32_t i, len, err = 0;
     char *buf = NULL;
 
-    if ((i = kopen4load(szScript, 0)) == -1) err = 1;
-    if (!err && (len = kfilelength(i)) <= 0) err = 2; // blank file
-    if (!err && (buf = (char *)Xmalloc(len + 1)) == NULL) err = 3;
+    if ((i = kopen4load(szScript, 0)) == -1)
+        err = 1;
+    else if ((len = kfilelength(i)) <= 0)
+        err = 2; // blank file
+    else if ((buf = (char *)Xmalloc(len + 1)) == NULL)
+        err = 3;
 
     if (!err || err == 3)
         OSD_Printf("Executing \"%s\"\n", szScript);
diff --git a/polymer/eduke32/source/config.c b/polymer/eduke32/source/config.c
index 78de23dbe..33aca3b10 100644
--- a/polymer/eduke32/source/config.c
+++ b/polymer/eduke32/source/config.c
@@ -585,7 +585,7 @@ extern int32_t demorec_difftics_cvar, demorec_diffcompress_cvar, demorec_synccom
 
 int32_t CONFIG_ReadSetup(void)
 {
-    int32_t dummy, i = 0;
+    int32_t dummy;
     char commmacro[] = "CommbatMacro# ";
     char tempbuf[1024];
 
@@ -600,12 +600,14 @@ int32_t CONFIG_ReadSetup(void)
         ud.config.scripthandle = SCRIPT_Load(setupfilename);
     else if (SafeFileExists(SETUPFILENAME) && ud.config.scripthandle < 0)
     {
+        int32_t i;
         i=wm_ynbox("Import Configuration Settings", "The configuration file \"%s\" was not found. "
                    "Import configuration data from \"%s\"?",setupfilename,SETUPFILENAME);
         if (i) ud.config.scripthandle = SCRIPT_Load(SETUPFILENAME);
     }
     else if (SafeFileExists("duke3d.cfg") && ud.config.scripthandle < 0)
     {
+        int32_t i;
         i=wm_ynbox("Import Configuration Settings", "The configuration file \"%s\" was not found. "
                    "Import configuration data from \"duke3d.cfg\"?",setupfilename);
         if (i) ud.config.scripthandle = SCRIPT_Load("duke3d.cfg");
diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c
index f51aeef33..b8236f00c 100644
--- a/polymer/eduke32/source/gamedef.c
+++ b/polymer/eduke32/source/gamedef.c
@@ -2586,6 +2586,7 @@ int32_t C_AllocQuote(int32_t qnum)
     return 0;
 }
 
+#ifndef EDUKE32_TOUCH_DEVICES
 static void C_ReplaceQuoteSubstring(const size_t q, char const * const query, char const * const replacement)
 {
     size_t querylength = Bstrlen(query);
@@ -2601,6 +2602,7 @@ static void C_ReplaceQuoteSubstring(const size_t q, char const * const query, ch
             i = MAXQUOTELEN - querylength - 2;
         }
 }
+#endif
 
 void C_InitQuotes(void)
 {