diff --git a/source/build/src/xxhash.c b/source/build/src/xxhash.c
index e9ff2d424..a6b25036f 100644
--- a/source/build/src/xxhash.c
+++ b/source/build/src/xxhash.c
@@ -396,7 +396,7 @@ FORCE_INLINE XXH_errorcode XXH32_update_endian (XXH32_state_t* state, const void
 
     if (state->memsize) {   /* some data left from previous update */
         XXH_memcpy((BYTE*)(state->mem32) + state->memsize, input, 16-state->memsize);
-        {   const U32* p32 = state->mem32;
+        {   const unsigned* p32 = state->mem32;
             state->v1 = XXH32_round(state->v1, XXH_readLE32(p32, endian)); p32++;
             state->v2 = XXH32_round(state->v2, XXH_readLE32(p32, endian)); p32++;
             state->v3 = XXH32_round(state->v3, XXH_readLE32(p32, endian)); p32++;
diff --git a/source/duke3d/src/gamedef.cpp b/source/duke3d/src/gamedef.cpp
index 38987579f..eb266ace0 100644
--- a/source/duke3d/src/gamedef.cpp
+++ b/source/duke3d/src/gamedef.cpp
@@ -3082,7 +3082,7 @@ DO_DEFSTATE:
             C_GetNextValue(LABEL_DEFINE);
 
             char const * const arrayName = label+(g_labelCnt<<6);
-            int arrayFlags = 0;
+            int32_t arrayFlags = 0;
 
             while (C_GetKeyword() == -1)
                 C_BitOrNextValue(&arrayFlags);
diff --git a/source/duke3d/src/global.cpp b/source/duke3d/src/global.cpp
index 2a4bbefcf..4ce29f53c 100644
--- a/source/duke3d/src/global.cpp
+++ b/source/duke3d/src/global.cpp
@@ -55,26 +55,26 @@ int32_t g_gametypeFlags[MAXGAMETYPES] =
     2+/*4+*/8+16+16384+65536+131072
 };
 
-int g_actorRespawnTime   = 768;
-int g_bouncemineRadius   = 2500;
-int g_deleteQueueSize    = 64;
-int g_itemRespawnTime    = 768;
-int g_lastSaveSlot       = -1;
+int32_t g_actorRespawnTime   = 768;
+int32_t g_bouncemineRadius   = 2500;
+int32_t g_deleteQueueSize    = 64;
+int32_t g_itemRespawnTime    = 768;
+int32_t g_lastSaveSlot       = -1;
 int32_t g_requestedSaveSlot = -1;
 
-int g_morterRadius       = 2500;
-int g_numFreezeBounces   = 3;
-int g_gametypeCnt       = 5;
-int g_volumeCnt         = 3;
-int g_pipebombRadius     = 2500;
-int g_playerFriction     = 0xCFD0;
-int g_rpgRadius          = 1780;
-int g_scriptSize         = 1048576;
-int g_seenineRadius      = 2048;
-int g_shrinkerRadius     = 650;
-int g_spriteGravity      = 176;
-int g_timerTicsPerSecond = TICRATE;
-int g_tripbombRadius     = 3880;
+int32_t g_morterRadius       = 2500;
+int32_t g_numFreezeBounces   = 3;
+int32_t g_gametypeCnt       = 5;
+int32_t g_volumeCnt         = 3;
+int32_t g_pipebombRadius     = 2500;
+int32_t g_playerFriction     = 0xCFD0;
+int32_t g_rpgRadius          = 1780;
+int32_t g_scriptSize         = 1048576;
+int32_t g_seenineRadius      = 2048;
+int32_t g_shrinkerRadius     = 650;
+int32_t g_spriteGravity      = 176;
+int32_t g_timerTicsPerSecond = TICRATE;
+int32_t g_tripbombRadius     = 3880;
 
 int16_t g_blimpSpawnItems[15] =
 {