diff --git a/common/main/newdemo.h b/common/main/newdemo.h
index 9c79dbb28..abe64e499 100644
--- a/common/main/newdemo.h
+++ b/common/main/newdemo.h
@@ -94,7 +94,7 @@ extern void newdemo_record_hud_message(const char *s);
 extern void newdemo_record_palette_effect(short r, short g, short b);
 extern void newdemo_record_player_energy(int);
 extern void newdemo_record_player_shields(int);
-extern void newdemo_record_player_flags(uint);
+extern void newdemo_record_player_flags(unsigned);
 extern void newdemo_record_player_weapon(int, int);
 void newdemo_record_effect_blowup(segnum_t, int, const vms_vector &);
 extern void newdemo_record_homing_distance(fix);
diff --git a/d2x-rebirth/utilities/hogcreate.c b/d2x-rebirth/utilities/hogcreate.c
index ad8a3c46b..b07147afd 100644
--- a/d2x-rebirth/utilities/hogcreate.c
+++ b/d2x-rebirth/utilities/hogcreate.c
@@ -22,7 +22,7 @@
 #include <fcntl.h>
 #include <dirent.h>
 
-#define SWAPINT(x)   (((x)<<24) | (((uint)(x)) >> 24) | (((x) &0x0000ff00) << 8) | (((x) & 0x00ff0000) >> 8))
+#define SWAPINT(x)   (((x)<<24) | (((unsigned)(x)) >> 24) | (((x) &0x0000ff00) << 8) | (((x) & 0x00ff0000) >> 8))
 
 int
 main(int argc, char *argv[])
diff --git a/d2x-rebirth/utilities/hogextract.c b/d2x-rebirth/utilities/hogextract.c
index 7ef6ca455..dab2d6308 100644
--- a/d2x-rebirth/utilities/hogextract.c
+++ b/d2x-rebirth/utilities/hogextract.c
@@ -21,7 +21,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#define SWAPINT(x)   (((x)<<24) | (((uint)(x)) >> 24) | (((x) &0x0000ff00) << 8) | (((x) & 0x00ff0000) >> 8))
+#define SWAPINT(x)   (((x)<<24) | (((unsigned)(x)) >> 24) | (((x) &0x0000ff00) << 8) | (((x) & 0x00ff0000) >> 8))
 
 int
 main(int argc, char *argv[])
diff --git a/d2x-rebirth/utilities/mvlcreate.c b/d2x-rebirth/utilities/mvlcreate.c
index 71a504cd7..548e84176 100644
--- a/d2x-rebirth/utilities/mvlcreate.c
+++ b/d2x-rebirth/utilities/mvlcreate.c
@@ -24,7 +24,7 @@
 
 #define MAX_FILES 256
 
-#define SWAPINT(x)   (((x)<<24) | (((uint)(x)) >> 24) | (((x) &0x0000ff00) << 8) | (((x) & 0x00ff0000) >> 8))
+#define SWAPINT(x)   (((x)<<24) | (((unsigned)(x)) >> 24) | (((x) &0x0000ff00) << 8) | (((x) & 0x00ff0000) >> 8))
 
 int
 main(int argc, char *argv[])
diff --git a/similar/main/state.cpp b/similar/main/state.cpp
index ebe49dee8..fc465e8fd 100644
--- a/similar/main/state.cpp
+++ b/similar/main/state.cpp
@@ -914,7 +914,7 @@ int state_save_all_sub(const char *filename, const char *desc)
 // Save Coop state_game_id and this Player's callsign. Oh the redundancy... we have this one later on but Coop games want to read this before loading a state so for easy access save this here, too
 	if (Game_mode & GM_MULTI_COOP)
 	{
-		PHYSFS_write(fp, &state_game_id, sizeof(uint), 1);
+		PHYSFS_write(fp, &state_game_id, sizeof(unsigned), 1);
 		PHYSFS_write(fp, &get_local_player().callsign, sizeof(char)*CALLSIGN_LEN+1, 1);
 	}
 
@@ -1137,7 +1137,7 @@ int state_save_all_sub(const char *filename, const char *desc)
 	else
 		PHYSFS_write(fp, &Automap_visited[0], sizeof(ubyte), MAX_SEGMENTS_ORIGINAL);
 
-	PHYSFS_write(fp, &state_game_id, sizeof(uint), 1);
+	PHYSFS_write(fp, &state_game_id, sizeof(unsigned), 1);
 	{
 		const int i = 0;
 	PHYSFS_write(fp, &cheats.rapidfire, sizeof(int), 1);