diff --git a/polymer/eduke32/build/include/build.h b/polymer/eduke32/build/include/build.h
index 425b9b249..d58b63745 100644
--- a/polymer/eduke32/build/include/build.h
+++ b/polymer/eduke32/build/include/build.h
@@ -560,7 +560,7 @@ typedef struct {
 } usermaphack_t;
 
 extern usermaphack_t g_loadedMapHack;
-extern int32_t compare_usermaphacks(const void *, const void *);
+extern int compare_usermaphacks(const void *, const void *);
 extern usermaphack_t *usermaphacks;
 extern int32_t num_usermaphacks;
 
diff --git a/polymer/eduke32/build/src/mhk.c b/polymer/eduke32/build/src/mhk.c
index 058ac3993..61bb0e1d4 100644
--- a/polymer/eduke32/build/src/mhk.c
+++ b/polymer/eduke32/build/src/mhk.c
@@ -6,7 +6,7 @@
 
 usermaphack_t g_loadedMapHack;  // used only for the MD4 part
 
-int32_t compare_usermaphacks(const void *a, const void *b)
+int compare_usermaphacks(const void *a, const void *b)
 {
     return Bmemcmp(((usermaphack_t const *) a)->md4, ((usermaphack_t const *) b)->md4, 16);
 }
diff --git a/polymer/eduke32/build/src/sdlayer.c b/polymer/eduke32/build/src/sdlayer.c
index d07df9a34..ad457a680 100644
--- a/polymer/eduke32/build/src/sdlayer.c
+++ b/polymer/eduke32/build/src/sdlayer.c
@@ -414,14 +414,14 @@ void eduke32_exit_return(int retval)
 #endif
 
 #ifdef _WIN32
-int32_t WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int32_t nCmdShow)
+int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nCmdShow)
 #elif defined __ANDROID__
 # ifdef __cplusplus
 extern "C" int eduke32_android_main(int argc, char const *argv[]);
 # endif
 int eduke32_android_main(int argc, char const *argv[])
 #else
-int32_t main(int32_t argc, char *argv[])
+int main(int argc, char *argv[])
 #endif
 {
 #ifdef __ANDROID__
diff --git a/polymer/eduke32/build/src/wiibits.c b/polymer/eduke32/build/src/wiibits.c
index 2e1c637ba..e03767ba7 100644
--- a/polymer/eduke32/build/src/wiibits.c
+++ b/polymer/eduke32/build/src/wiibits.c
@@ -63,7 +63,7 @@ static void print_centered(const int32_t width, const char *part1, const char *p
 
 void wii_open(void)
 {
-    vec2_t ConsoleExtent;
+    struct { int x, y; } ConsoleExtent;
 
     L2Enhance();
     CON_EnableGecko(1, 1);
diff --git a/polymer/eduke32/build/src/winlayer.c b/polymer/eduke32/build/src/winlayer.c
index 5a9bb526a..153631559 100644
--- a/polymer/eduke32/build/src/winlayer.c
+++ b/polymer/eduke32/build/src/winlayer.c
@@ -296,7 +296,7 @@ static void divcommon(int32_t *ap, int32_t *bp)
 //
 // WinMain() -- main Windows entry point
 //
-int32_t WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int32_t nCmdShow)
+int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nCmdShow)
 {
     int32_t r;
 #ifdef USE_OPENGL
diff --git a/polymer/eduke32/source/jaudiolib/src/driver_nosound.h b/polymer/eduke32/source/jaudiolib/src/driver_nosound.h
index 6dc933f0d..302f2c2d5 100644
--- a/polymer/eduke32/source/jaudiolib/src/driver_nosound.h
+++ b/polymer/eduke32/source/jaudiolib/src/driver_nosound.h
@@ -19,12 +19,12 @@
  */
 
 
-int NoSoundDrv_GetError(void);
-const char *NoSoundDrv_ErrorString( int ErrorNumber );
-int NoSoundDrv_PCM_Init(int *mixrate, int *numchannels, void * initdata);
+int32_t NoSoundDrv_GetError(void);
+const char *NoSoundDrv_ErrorString( int32_t ErrorNumber );
+int32_t NoSoundDrv_PCM_Init(int32_t *mixrate, int32_t *numchannels, void * initdata);
 void NoSoundDrv_PCM_Shutdown(void);
-int NoSoundDrv_PCM_BeginPlayback(char *BufferStart, int BufferSize,
-              int NumDivisions, void ( *CallBackFunc )( void ) );
+int32_t NoSoundDrv_PCM_BeginPlayback(char *BufferStart, int32_t BufferSize,
+              int32_t NumDivisions, void ( *CallBackFunc )( void ) );
 void NoSoundDrv_PCM_StopPlayback(void);
 void NoSoundDrv_PCM_Lock(void);
 void NoSoundDrv_PCM_Unlock(void);
diff --git a/polymer/eduke32/source/jaudiolib/src/driver_sdl.c b/polymer/eduke32/source/jaudiolib/src/driver_sdl.c
index 2d492fff7..f8e0e3a82 100644
--- a/polymer/eduke32/source/jaudiolib/src/driver_sdl.c
+++ b/polymer/eduke32/source/jaudiolib/src/driver_sdl.c
@@ -60,7 +60,7 @@ static uint8_t *DummyBuffer = NULL;
 static int32_t InterruptsDisabled = 0;
 static SDL_mutex *EffectFence;
 
-static void fillData(int32_t chan, void *ptr, int32_t remaining, void *udata)
+static void fillData(int chan, void *ptr, int remaining, void *udata)
 {
 	int32_t len;
 	char *sptr;
@@ -172,7 +172,9 @@ int32_t SDLDrv_PCM_Init(int32_t *mixrate, int32_t *numchannels, void * initdata)
     }
 
 
-    if (Mix_QuerySpec(mixrate, &fmt, numchannels))
+    int intmixrate = *mixrate;
+    int intnumchannels = *numchannels;
+    if (Mix_QuerySpec(&intmixrate, &fmt, &intnumchannels))
     {
         if (fmt == AUDIO_U8 || fmt == AUDIO_S8)
         {
@@ -180,6 +182,8 @@ int32_t SDLDrv_PCM_Init(int32_t *mixrate, int32_t *numchannels, void * initdata)
             return SDLErr_Error;
         }
     }
+    *mixrate = intmixrate;
+    *numchannels = intnumchannels;
 
     //Mix_SetPostMix(fillData, NULL);
 
diff --git a/polymer/eduke32/source/jaudiolib/src/vorbis.c b/polymer/eduke32/source/jaudiolib/src/vorbis.c
index fb60ad0d1..6c5bfb240 100644
--- a/polymer/eduke32/source/jaudiolib/src/vorbis.c
+++ b/polymer/eduke32/source/jaudiolib/src/vorbis.c
@@ -172,7 +172,7 @@ static size_t read_vorbis(void *ptr, size_t size, size_t nmemb, void *datasource
 }
 
 
-static int32_t seek_vorbis(void *datasource, ogg_int64_t offset, int32_t whence)
+static int seek_vorbis(void *datasource, ogg_int64_t offset, int whence)
 {
     vorbis_data *vorb = (vorbis_data *)datasource;
 
@@ -191,7 +191,7 @@ static int32_t seek_vorbis(void *datasource, ogg_int64_t offset, int32_t whence)
     return vorb->pos;
 }
 
-static int32_t close_vorbis(void *datasource)
+static int close_vorbis(void *datasource)
 {
     UNREFERENCED_PARAMETER(datasource);
     return 0;
@@ -229,7 +229,7 @@ Controls playback of OggVorbis data
 
 static playbackstatus MV_GetNextVorbisBlock(VoiceNode *voice)
 {
-    int32_t bitstream;
+    int bitstream;
 
     voice->Playing = TRUE;