diff --git a/Source/DiabloUI/diabloui.cpp b/Source/DiabloUI/diabloui.cpp
index d20ca8f9c..1900e9518 100644
--- a/Source/DiabloUI/diabloui.cpp
+++ b/Source/DiabloUI/diabloui.cpp
@@ -64,7 +64,7 @@ std::size_t SelectedItem = 0;
 
 namespace {
 
-DWORD fadeTc;
+uint32_t fadeTc;
 int fadeValue = 0;
 
 struct ScrollBarState {
diff --git a/Source/DiabloUI/mainmenu.cpp b/Source/DiabloUI/mainmenu.cpp
index 0f4b77560..f2abd68d0 100644
--- a/Source/DiabloUI/mainmenu.cpp
+++ b/Source/DiabloUI/mainmenu.cpp
@@ -7,7 +7,7 @@
 namespace devilution {
 namespace {
 int mainmenu_attract_time_out; //seconds
-DWORD dwAttractTicks;
+uint32_t dwAttractTicks;
 
 std::vector<std::unique_ptr<UiItemBase>> vecMainMenuDialog;
 std::vector<std::unique_ptr<UiListItem>> vecMenuItems;
diff --git a/Source/DiabloUI/ui_item.h b/Source/DiabloUI/ui_item.h
index 68d12cac5..0a7ba6cad 100644
--- a/Source/DiabloUI/ui_item.h
+++ b/Source/DiabloUI/ui_item.h
@@ -340,7 +340,7 @@ public:
 	int indexAt(Sint16 y) const
 	{
 		ASSERT(y >= m_rect.y);
-		const int index = (y - m_rect.y) / m_height;
+		const size_t index = (y - m_rect.y) / m_height;
 		ASSERT(index < m_vecItems.size());
 		return index;
 	}
diff --git a/Source/codec.cpp b/Source/codec.cpp
index 75d66f035..e51eb3b72 100644
--- a/Source/codec.cpp
+++ b/Source/codec.cpp
@@ -7,7 +7,6 @@
 #include <cstdint>
 
 #include "appfat.h"
-#include "miniwin/miniwin.h"
 #include "sha.h"
 #include "utils/stdcompat/cstddef.hpp"
 
diff --git a/Source/control.cpp b/Source/control.cpp
index 0a727e02d..70abbe6d3 100644
--- a/Source/control.cpp
+++ b/Source/control.cpp
@@ -1950,7 +1950,7 @@ bool control_talk_last_key(int vkey)
 	if (!talkflag)
 		return false;
 
-	if ((DWORD)vkey < DVL_VK_SPACE)
+	if (vkey >= 0 && vkey < DVL_VK_SPACE)
 		return false;
 
 	std::size_t result = strlen(sgszTalkMsg);
diff --git a/Source/controls/game_controls.cpp b/Source/controls/game_controls.cpp
index 5bb2d2c45..6ab008beb 100644
--- a/Source/controls/game_controls.cpp
+++ b/Source/controls/game_controls.cpp
@@ -21,7 +21,7 @@ bool select_modifier_active = false;
 
 namespace {
 
-DWORD TranslateControllerButtonToKey(ControllerButton controllerButton)
+uint32_t TranslateControllerButtonToKey(ControllerButton controllerButton)
 {
 	switch (controllerButton) {
 	case ControllerButton_BUTTON_A: // Bottom button
diff --git a/Source/controls/keymapper.cpp b/Source/controls/keymapper.cpp
index 00a783673..c218f9349 100644
--- a/Source/controls/keymapper.cpp
+++ b/Source/controls/keymapper.cpp
@@ -10,8 +10,7 @@
 #include "utils/sdl2_to_1_2_backports.h"
 #endif
 
-#include "../control.h"
-#include "../miniwin/miniwin.h"
+#include "control.h"
 #include "utils/log.hpp"
 
 namespace devilution {
diff --git a/Source/controls/plrctrls.cpp b/Source/controls/plrctrls.cpp
index 8290d65a9..5050a4e98 100644
--- a/Source/controls/plrctrls.cpp
+++ b/Source/controls/plrctrls.cpp
@@ -1188,7 +1188,7 @@ struct RightStickAccumulator {
 		lastTc = SDL_GetTicks();
 	}
 
-	DWORD lastTc;
+	uint32_t lastTc;
 	float hiresDX;
 	float hiresDY;
 };
diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index 57d14602f..408ac8424 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -73,7 +73,7 @@
 namespace devilution {
 
 SDL_Window *ghMainWnd;
-DWORD glSeedTbl[NUMLEVELS];
+uint32_t glSeedTbl[NUMLEVELS];
 dungeon_type gnLevelTypeTbl[NUMLEVELS];
 Point MousePosition;
 bool gbRunGame;
@@ -418,7 +418,7 @@ void RightMouseDown()
 	}
 }
 
-void DiabloHotkeyMsg(DWORD dwMsg)
+void DiabloHotkeyMsg(uint32_t dwMsg)
 {
 	if (!gbIsMultiplayer) {
 		return;
diff --git a/Source/diablo.h b/Source/diablo.h
index f14a2d94c..695974b0f 100644
--- a/Source/diablo.h
+++ b/Source/diablo.h
@@ -54,7 +54,7 @@ enum class MouseActionType : int {
 };
 
 extern SDL_Window *ghMainWnd;
-extern DWORD glSeedTbl[NUMLEVELS];
+extern uint32_t glSeedTbl[NUMLEVELS];
 extern dungeon_type gnLevelTypeTbl[NUMLEVELS];
 extern Point MousePosition;
 extern bool gbRunGame;
diff --git a/Source/dvlnet/abstract_net.h b/Source/dvlnet/abstract_net.h
index ecdc85200..df8e233e3 100644
--- a/Source/dvlnet/abstract_net.h
+++ b/Source/dvlnet/abstract_net.h
@@ -24,26 +24,17 @@ class abstract_net {
 public:
 	virtual int create(std::string addrstr, std::string passwd) = 0;
 	virtual int join(std::string addrstr, std::string passwd) = 0;
-	virtual bool SNetReceiveMessage(int *sender, void **data,
-	    uint32_t *size)
-	    = 0;
-	virtual bool SNetSendMessage(int dest, void *data,
-	    unsigned int size)
-	    = 0;
-	virtual bool SNetReceiveTurns(char **data, unsigned int *size,
-	    DWORD *status)
-	    = 0;
+	virtual bool SNetReceiveMessage(int *sender, void **data, uint32_t *size) = 0;
+	virtual bool SNetSendMessage(int dest, void *data, unsigned int size) = 0;
+	virtual bool SNetReceiveTurns(char **data, size_t *size, uint32_t *status) = 0;
 	virtual bool SNetSendTurn(char *data, unsigned int size) = 0;
 	virtual void SNetGetProviderCaps(struct _SNETCAPS *caps) = 0;
-	virtual bool SNetRegisterEventHandler(event_type evtype,
-	    SEVTHANDLER func)
-	    = 0;
-	virtual bool SNetUnregisterEventHandler(event_type evtype)
-	    = 0;
+	virtual bool SNetRegisterEventHandler(event_type evtype, SEVTHANDLER func) = 0;
+	virtual bool SNetUnregisterEventHandler(event_type evtype) = 0;
 	virtual bool SNetLeaveGame(int type) = 0;
-	virtual bool SNetDropPlayer(int playerid, DWORD flags) = 0;
-	virtual bool SNetGetOwnerTurnsWaiting(DWORD *turns) = 0;
-	virtual bool SNetGetTurnsInTransit(DWORD *turns) = 0;
+	virtual bool SNetDropPlayer(int playerid, uint32_t flags) = 0;
+	virtual bool SNetGetOwnerTurnsWaiting(uint32_t *turns) = 0;
+	virtual bool SNetGetTurnsInTransit(uint32_t *turns) = 0;
 	virtual void setup_gameinfo(buffer_t info) = 0;
 	virtual ~abstract_net() = default;
 
diff --git a/Source/dvlnet/base.cpp b/Source/dvlnet/base.cpp
index 4f098f314..06e234810 100644
--- a/Source/dvlnet/base.cpp
+++ b/Source/dvlnet/base.cpp
@@ -140,7 +140,7 @@ bool base::SNetSendMessage(int playerId, void *data, unsigned int size)
 	return true;
 }
 
-bool base::SNetReceiveTurns(char **data, unsigned int *size, DWORD *status)
+bool base::SNetReceiveTurns(char **data, size_t *size, uint32_t *status)
 {
 	poll();
 	bool allTurnsArrived = true;
@@ -229,7 +229,7 @@ bool base::SNetLeaveGame(int type)
 	return true;
 }
 
-bool base::SNetDropPlayer(int playerid, DWORD flags)
+bool base::SNetDropPlayer(int playerid, uint32_t flags)
 {
 	auto pkt = pktfty->make_packet<PT_DISCONNECT>(plr_self,
 	    PLR_BROADCAST,
@@ -250,13 +250,13 @@ plr_t base::GetOwner()
 	return PLR_BROADCAST; // should be unreachable
 }
 
-bool base::SNetGetOwnerTurnsWaiting(DWORD *turns)
+bool base::SNetGetOwnerTurnsWaiting(uint32_t *turns)
 {
 	*turns = turn_queue[GetOwner()].size();
 	return true;
 }
 
-bool base::SNetGetTurnsInTransit(DWORD *turns)
+bool base::SNetGetTurnsInTransit(uint32_t *turns)
 {
 	*turns = turn_queue[plr_self].size();
 	return true;
diff --git a/Source/dvlnet/base.h b/Source/dvlnet/base.h
index 3882fd389..8b82a0773 100644
--- a/Source/dvlnet/base.h
+++ b/Source/dvlnet/base.h
@@ -19,17 +19,16 @@ public:
 
 	virtual bool SNetReceiveMessage(int *sender, void **data, uint32_t *size);
 	virtual bool SNetSendMessage(int playerId, void *data, unsigned int size);
-	virtual bool SNetReceiveTurns(char **data, unsigned int *size,
-	    DWORD *status);
+	virtual bool SNetReceiveTurns(char **data, size_t *size, uint32_t *status);
 	virtual bool SNetSendTurn(char *data, unsigned int size);
 	virtual void SNetGetProviderCaps(struct _SNETCAPS *caps);
 	virtual bool SNetRegisterEventHandler(event_type evtype,
 	    SEVTHANDLER func);
 	virtual bool SNetUnregisterEventHandler(event_type evtype);
 	virtual bool SNetLeaveGame(int type);
-	virtual bool SNetDropPlayer(int playerid, DWORD flags);
-	virtual bool SNetGetOwnerTurnsWaiting(DWORD *turns);
-	virtual bool SNetGetTurnsInTransit(DWORD *turns);
+	virtual bool SNetDropPlayer(int playerid, uint32_t flags);
+	virtual bool SNetGetOwnerTurnsWaiting(uint32_t *turns);
+	virtual bool SNetGetTurnsInTransit(uint32_t *turns);
 
 	virtual void poll() = 0;
 	virtual void send(packet &pkt) = 0;
diff --git a/Source/dvlnet/cdwrap.h b/Source/dvlnet/cdwrap.h
index 46404cc19..338f9ae34 100644
--- a/Source/dvlnet/cdwrap.h
+++ b/Source/dvlnet/cdwrap.h
@@ -24,19 +24,17 @@ public:
 	virtual int create(std::string addrstr, std::string passwd);
 	virtual int join(std::string addrstr, std::string passwd);
 	virtual bool SNetReceiveMessage(int *sender, void **data, uint32_t *size);
-	virtual bool SNetSendMessage(int dest, void *data,
-	    unsigned int size);
-	virtual bool SNetReceiveTurns(char **data, unsigned int *size,
-	    DWORD *status);
+	virtual bool SNetSendMessage(int dest, void *data, unsigned int size);
+	virtual bool SNetReceiveTurns(char **data, size_t *size, uint32_t *status);
 	virtual bool SNetSendTurn(char *data, unsigned int size);
 	virtual void SNetGetProviderCaps(struct _SNETCAPS *caps);
 	virtual bool SNetRegisterEventHandler(event_type evtype,
 	    SEVTHANDLER func);
 	virtual bool SNetUnregisterEventHandler(event_type evtype);
 	virtual bool SNetLeaveGame(int type);
-	virtual bool SNetDropPlayer(int playerid, DWORD flags);
-	virtual bool SNetGetOwnerTurnsWaiting(DWORD *turns);
-	virtual bool SNetGetTurnsInTransit(DWORD *turns);
+	virtual bool SNetDropPlayer(int playerid, uint32_t flags);
+	virtual bool SNetGetOwnerTurnsWaiting(uint32_t *turns);
+	virtual bool SNetGetTurnsInTransit(uint32_t *turns);
 	virtual void setup_gameinfo(buffer_t info);
 	virtual std::string make_default_gamename();
 
@@ -96,7 +94,7 @@ bool cdwrap<T>::SNetSendMessage(int playerID, void *data, unsigned int size)
 }
 
 template <class T>
-bool cdwrap<T>::SNetReceiveTurns(char **data, unsigned int *size, DWORD *status)
+bool cdwrap<T>::SNetReceiveTurns(char **data, size_t *size, uint32_t *status)
 {
 	return dvlnet_wrap->SNetReceiveTurns(data, size, status);
 }
@@ -140,19 +138,19 @@ bool cdwrap<T>::SNetLeaveGame(int type)
 }
 
 template <class T>
-bool cdwrap<T>::SNetDropPlayer(int playerid, DWORD flags)
+bool cdwrap<T>::SNetDropPlayer(int playerid, uint32_t flags)
 {
 	return dvlnet_wrap->SNetDropPlayer(playerid, flags);
 }
 
 template <class T>
-bool cdwrap<T>::SNetGetOwnerTurnsWaiting(DWORD *turns)
+bool cdwrap<T>::SNetGetOwnerTurnsWaiting(uint32_t *turns)
 {
 	return dvlnet_wrap->SNetGetOwnerTurnsWaiting(turns);
 }
 
 template <class T>
-bool cdwrap<T>::SNetGetTurnsInTransit(DWORD *turns)
+bool cdwrap<T>::SNetGetTurnsInTransit(uint32_t *turns)
 {
 	return dvlnet_wrap->SNetGetTurnsInTransit(turns);
 }
diff --git a/Source/dvlnet/loopback.cpp b/Source/dvlnet/loopback.cpp
index d5d811a3a..7adfe0f2c 100644
--- a/Source/dvlnet/loopback.cpp
+++ b/Source/dvlnet/loopback.cpp
@@ -37,7 +37,7 @@ bool loopback::SNetSendMessage(int dest, void *data, unsigned int size)
 	return true;
 }
 
-bool loopback::SNetReceiveTurns(char **data, unsigned int *size, DWORD * /*status*/)
+bool loopback::SNetReceiveTurns(char **data, size_t *size, uint32_t * /*status*/)
 {
 	for (auto i = 0; i < MAX_PLRS; ++i) {
 		size[i] = 0;
@@ -85,7 +85,7 @@ bool loopback::SNetLeaveGame(int /*type*/)
 	return true;
 }
 
-bool loopback::SNetDropPlayer(int /*playerid*/, DWORD /*flags*/)
+bool loopback::SNetDropPlayer(int /*playerid*/, uint32_t /*flags*/)
 {
 	return true;
 }
@@ -94,13 +94,13 @@ void loopback::setup_gameinfo(buffer_t info)
 {
 }
 
-bool loopback::SNetGetOwnerTurnsWaiting(DWORD *turns)
+bool loopback::SNetGetOwnerTurnsWaiting(uint32_t *turns)
 {
 	*turns = 0;
 	return true;
 }
 
-bool loopback::SNetGetTurnsInTransit(DWORD *turns)
+bool loopback::SNetGetTurnsInTransit(uint32_t *turns)
 {
 	*turns = 0;
 	return true;
diff --git a/Source/dvlnet/loopback.h b/Source/dvlnet/loopback.h
index 8bbdca68e..7999954e1 100644
--- a/Source/dvlnet/loopback.h
+++ b/Source/dvlnet/loopback.h
@@ -24,17 +24,15 @@ public:
 	virtual int join(std::string addrstr, std::string passwd);
 	virtual bool SNetReceiveMessage(int *sender, void **data, uint32_t *size);
 	virtual bool SNetSendMessage(int dest, void *data, unsigned int size);
-	virtual bool SNetReceiveTurns(char **data, unsigned int *size,
-	    DWORD *status);
+	virtual bool SNetReceiveTurns(char **data, size_t *size, uint32_t *status);
 	virtual bool SNetSendTurn(char *data, unsigned int size);
 	virtual void SNetGetProviderCaps(struct _SNETCAPS *caps);
-	virtual bool SNetRegisterEventHandler(event_type evtype,
-	    SEVTHANDLER func);
+	virtual bool SNetRegisterEventHandler(event_type evtype, SEVTHANDLER func);
 	virtual bool SNetUnregisterEventHandler(event_type evtype);
 	virtual bool SNetLeaveGame(int type);
-	virtual bool SNetDropPlayer(int playerid, DWORD flags);
-	virtual bool SNetGetOwnerTurnsWaiting(DWORD *turns);
-	virtual bool SNetGetTurnsInTransit(DWORD *turns);
+	virtual bool SNetDropPlayer(int playerid, uint32_t flags);
+	virtual bool SNetGetOwnerTurnsWaiting(uint32_t *turns);
+	virtual bool SNetGetTurnsInTransit(uint32_t *turns);
 	virtual void setup_gameinfo(buffer_t info);
 	virtual std::string make_default_gamename();
 };
diff --git a/Source/dx.cpp b/Source/dx.cpp
index 285e29727..3b49dc7d5 100644
--- a/Source/dx.cpp
+++ b/Source/dx.cpp
@@ -351,9 +351,9 @@ void RenderPresent()
 #endif
 }
 
-void PaletteGetEntries(DWORD dwNumEntries, SDL_Color *lpEntries)
+void PaletteGetEntries(int dwNumEntries, SDL_Color *lpEntries)
 {
-	for (DWORD i = 0; i < dwNumEntries; i++) {
+	for (int i = 0; i < dwNumEntries; i++) {
 		lpEntries[i] = system_palette[i];
 	}
 }
diff --git a/Source/dx.h b/Source/dx.h
index 4f39cd174..be3e8bc20 100644
--- a/Source/dx.h
+++ b/Source/dx.h
@@ -23,6 +23,6 @@ void InitPalette();
 void BltFast(SDL_Rect *srcRect, SDL_Rect *dstRect);
 void Blit(SDL_Surface *src, SDL_Rect *srcRect, SDL_Rect *dstRect);
 void RenderPresent();
-void PaletteGetEntries(DWORD dwNumEntries, SDL_Color *lpEntries);
+void PaletteGetEntries(int dwNumEntries, SDL_Color *lpEntries);
 
 } // namespace devilution
diff --git a/Source/error.cpp b/Source/error.cpp
index 57b67dfac..8cea3b61f 100644
--- a/Source/error.cpp
+++ b/Source/error.cpp
@@ -13,7 +13,7 @@
 
 namespace devilution {
 
-DWORD msgdelay;
+uint32_t msgdelay;
 diablo_message msgflag;
 
 namespace {
diff --git a/Source/error.h b/Source/error.h
index a9d989880..c0384fa75 100644
--- a/Source/error.h
+++ b/Source/error.h
@@ -69,7 +69,7 @@ enum diablo_message : uint8_t {
 	EMSG_SHRINE_MURPHYS,
 };
 
-extern DWORD msgdelay;
+extern uint32_t msgdelay;
 extern diablo_message msgflag;
 
 void InitDiabloMsg(diablo_message e);
diff --git a/Source/gmenu.cpp b/Source/gmenu.cpp
index dbcf9728b..a504ffcff 100644
--- a/Source/gmenu.cpp
+++ b/Source/gmenu.cpp
@@ -224,7 +224,7 @@ void gmenu_draw(const Surface &out)
 		if (gmenu_current_option != nullptr)
 			gmenu_current_option();
 		if (gbIsHellfire) {
-			const DWORD ticks = SDL_GetTicks();
+			const uint32_t ticks = SDL_GetTicks();
 			if ((int)(ticks - LogoAnim_tick) > 25) {
 				LogoAnim_frame++;
 				if (LogoAnim_frame > 16)
diff --git a/Source/inv.cpp b/Source/inv.cpp
index a3000cb1f..18a455813 100644
--- a/Source/inv.cpp
+++ b/Source/inv.cpp
@@ -706,8 +706,8 @@ void CheckInvCut(int pnum, Point cursorPosition, bool automaticMove)
 
 	bool done = false;
 
-	int r = 0;
-	for (; (DWORD)r < NUM_XY_SLOTS; r++) {
+	uint32_t r = 0;
+	for (; r < NUM_XY_SLOTS; r++) {
 		int xo = RIGHT_PANEL;
 		int yo = 0;
 		if (r >= SLOTXY_BELT_FIRST) {
@@ -1834,7 +1834,7 @@ int InvPutItem(PlayerStruct &player, Point position)
 	return ii;
 }
 
-int SyncPutItem(PlayerStruct &player, Point position, int idx, uint16_t icreateinfo, int iseed, int id, int dur, int mdur, int ch, int mch, int ivalue, DWORD ibuff, int toHit, int maxDam, int minStr, int minMag, int minDex, int ac)
+int SyncPutItem(PlayerStruct &player, Point position, int idx, uint16_t icreateinfo, int iseed, int id, int dur, int mdur, int ch, int mch, int ivalue, uint32_t ibuff, int toHit, int maxDam, int minStr, int minMag, int minDex, int ac)
 {
 	if (!PutItem(player, position))
 		return -1;
@@ -1878,8 +1878,8 @@ int SyncPutItem(PlayerStruct &player, Point position, int idx, uint16_t icreatei
 
 char CheckInvHLight()
 {
-	int r = 0;
-	for (; (DWORD)r < NUM_XY_SLOTS; r++) {
+	uint32_t r = 0;
+	for (; r < NUM_XY_SLOTS; r++) {
 		int xo = RIGHT_PANEL;
 		int yo = 0;
 		if (r >= SLOTXY_BELT_FIRST) {
@@ -1895,7 +1895,7 @@ char CheckInvHLight()
 		}
 	}
 
-	if ((DWORD)r >= NUM_XY_SLOTS)
+	if (r >= NUM_XY_SLOTS)
 		return -1;
 
 	int8_t rv = -1;
diff --git a/Source/inv.h b/Source/inv.h
index 854d244c0..0d5d8cbf1 100644
--- a/Source/inv.h
+++ b/Source/inv.h
@@ -111,7 +111,7 @@ void SyncGetItem(Point position, int idx, uint16_t ci, int iseed);
 bool CanPut(Point position);
 bool TryInvPut();
 int InvPutItem(PlayerStruct &player, Point position);
-int SyncPutItem(PlayerStruct &player, Point position, int idx, uint16_t icreateinfo, int iseed, int Id, int dur, int mdur, int ch, int mch, int ivalue, DWORD ibuff, int toHit, int maxDam, int minStr, int minMag, int minDex, int ac);
+int SyncPutItem(PlayerStruct &player, Point position, int idx, uint16_t icreateinfo, int iseed, int Id, int dur, int mdur, int ch, int mch, int ivalue, uint32_t ibuff, int toHit, int maxDam, int minStr, int minMag, int minDex, int ac);
 char CheckInvHLight();
 void RemoveScroll(PlayerStruct &player);
 bool UseScroll();
diff --git a/Source/items.cpp b/Source/items.cpp
index 3632efc60..f31d7aa43 100644
--- a/Source/items.cpp
+++ b/Source/items.cpp
@@ -2921,6 +2921,8 @@ void CalcPlrItemVals(int playerId, bool loadgfx)
 	case ITYPE_STAFF:
 		animWeaponId = PlayerWeaponGraphic::Staff;
 		break;
+    default:
+		break;
 	}
 
 	PlayerArmorGraphic animArmorId = PlayerArmorGraphic::Light;
diff --git a/Source/mpqapi.cpp b/Source/mpqapi.cpp
index 7a7b12e60..63767bda1 100644
--- a/Source/mpqapi.cpp
+++ b/Source/mpqapi.cpp
@@ -336,7 +336,7 @@ _BLOCKENTRY *NewBlock(int *blockIndex)
 {
 	_BLOCKENTRY *blockEntry = cur_archive.sgpBlockTbl;
 
-	for (DWORD i = 0; i < INDEX_ENTRIES; i++, blockEntry++) {
+	for (int i = 0; i < INDEX_ENTRIES; i++, blockEntry++) {
 		if (blockEntry->offset != 0)
 			continue;
 		if (blockEntry->sizealloc != 0)
diff --git a/Source/nthread.cpp b/Source/nthread.cpp
index f4b1b0b9c..9b1e90cdc 100644
--- a/Source/nthread.cpp
+++ b/Source/nthread.cpp
@@ -13,11 +13,11 @@
 namespace devilution {
 
 BYTE sgbNetUpdateRate;
-DWORD gdwMsgLenTbl[MAX_PLRS];
+size_t gdwMsgLenTbl[MAX_PLRS];
 static CCritSect sgMemCrit;
 DWORD gdwDeltaBytesSec;
 bool nthread_should_run;
-DWORD gdwTurnsInTransit;
+uint32_t gdwTurnsInTransit;
 uintptr_t glpMsgTbl[MAX_PLRS];
 SDL_threadID glpNThreadId;
 char sgbSyncCountdown;
@@ -25,8 +25,8 @@ uint32_t turn_upper_bit;
 bool sgbTicsOutOfSync;
 char sgbPacketCountdown;
 bool sgbThreadIsRunning;
-DWORD gdwLargestMsgSize;
-DWORD gdwNormalMsgSize;
+uint32_t gdwLargestMsgSize;
+uint32_t gdwNormalMsgSize;
 int last_tick;
 float gfProgressToNextGameTick = 0.0;
 
@@ -88,7 +88,7 @@ bool nthread_recv_turns(bool *pfSendAsync)
 		last_tick += gnTickDelay;
 		return true;
 	}
-	if (!SNetReceiveTurns(0, MAX_PLRS, (char **)glpMsgTbl, (unsigned int *)gdwMsgLenTbl, &player_state[0])) {
+	if (!SNetReceiveTurns(MAX_PLRS, (char **)glpMsgTbl, gdwMsgLenTbl, &player_state[0])) {
 		if (SErrGetLastError() != STORM_ERROR_NO_MESSAGES_WAITING)
 			nthread_terminate_game("SNetReceiveTurns");
 		sgbTicsOutOfSync = false;
@@ -139,10 +139,6 @@ void nthread_set_turn_upper_bit()
 
 void nthread_start(bool setTurnUpperBit)
 {
-	const char *err;
-	DWORD largestMsgSize;
-	_SNETCAPS caps;
-
 	last_tick = SDL_GetTicks();
 	sgbPacketCountdown = 1;
 	sgbSyncCountdown = 1;
@@ -151,6 +147,7 @@ void nthread_start(bool setTurnUpperBit)
 		nthread_set_turn_upper_bit();
 	else
 		turn_upper_bit = 0;
+	_SNETCAPS caps;
 	caps.size = 36;
 	SNetGetProviderCaps(&caps);
 	gdwTurnsInTransit = caps.defaultturnsintransit;
@@ -160,7 +157,7 @@ void nthread_start(bool setTurnUpperBit)
 		sgbNetUpdateRate = 20 / caps.defaultturnssec;
 	else
 		sgbNetUpdateRate = 1;
-	largestMsgSize = 512;
+	uint32_t largestMsgSize = 512;
 	if (caps.maxmessagesize < 0x200)
 		largestMsgSize = caps.maxmessagesize;
 	gdwDeltaBytesSec = caps.bytessec / 4;
@@ -183,7 +180,7 @@ void nthread_start(bool setTurnUpperBit)
 		nthread_should_run = true;
 		sghThread = CreateThread(NthreadHandler, &glpNThreadId);
 		if (sghThread == nullptr) {
-			err = SDL_GetError();
+			const char *err = SDL_GetError();
 			app_fatal("nthread2:\n%s", err);
 		}
 	}
diff --git a/Source/nthread.h b/Source/nthread.h
index 7e5434c78..29a15bb22 100644
--- a/Source/nthread.h
+++ b/Source/nthread.h
@@ -5,22 +5,20 @@
  */
 #pragma once
 
-#include "miniwin/miniwin.h"
 #include "player.h"
 
 namespace devilution {
 
 extern BYTE sgbNetUpdateRate;
-extern DWORD gdwMsgLenTbl[MAX_PLRS];
-extern DWORD gdwDeltaBytesSec;
-extern DWORD gdwTurnsInTransit;
+extern size_t gdwMsgLenTbl[MAX_PLRS];
+extern uint32_t gdwTurnsInTransit;
 extern uintptr_t glpMsgTbl[MAX_PLRS];
-extern DWORD gdwLargestMsgSize;
-extern DWORD gdwNormalMsgSize;
+extern uint32_t gdwLargestMsgSize;
+extern uint32_t gdwNormalMsgSize;
 extern float gfProgressToNextGameTick; // the progress as a fraction (0.0f to 1.0f) in time to the next game tick
 
 void nthread_terminate_game(const char *pszFcn);
-DWORD nthread_send_and_recv_turn(DWORD curTurn, int turnDelta);
+uint32_t nthread_send_and_recv_turn(uint32_t curTurn, int turnDelta);
 bool nthread_recv_turns(bool *pfSendAsync = nullptr);
 void nthread_set_turn_upper_bit();
 void nthread_start(bool setTurnUpperBit);
diff --git a/Source/path.cpp b/Source/path.cpp
index da62aff1d..7fa3ba0de 100644
--- a/Source/path.cpp
+++ b/Source/path.cpp
@@ -85,7 +85,7 @@ constexpr size_t MAXPATHNODES = 300;
 /** Notes visisted by the path finding algorithm. */
 PATHNODE path_nodes[MAXPATHNODES];
 /** the number of in-use nodes in path_nodes */
-int gdwCurNodes;
+uint32_t gdwCurNodes;
 /**
  * @brief zero one of the preallocated nodes and return a pointer to it, or NULL if none are available
  */
diff --git a/Source/storm/storm.h b/Source/storm/storm.h
index b354a87b6..a9b4eaeab 100644
--- a/Source/storm/storm.h
+++ b/Source/storm/storm.h
@@ -173,7 +173,7 @@ bool SNetJoinGame(char *gameName, char *gamePassword, int *playerid);
 bool SNetLeaveGame(int type);
 
 bool SNetReceiveMessage(int *senderplayerid, void **data, uint32_t *databytes);
-bool SNetReceiveTurns(int a1, int arraysize, char **arraydata, unsigned int *arraydatabytes, DWORD *arrayplayerstatus);
+bool SNetReceiveTurns(int arraysize, char **arraydata, size_t *arraydatabytes, uint32_t *arrayplayerstatus);
 
 typedef void (*SEVTHANDLER)(struct _SNETEVENT *);
 
diff --git a/Source/storm/storm_net.cpp b/Source/storm/storm_net.cpp
index 173f61adf..02ff146b6 100644
--- a/Source/storm/storm_net.cpp
+++ b/Source/storm/storm_net.cpp
@@ -42,14 +42,11 @@ bool SNetSendMessage(int playerID, void *data, unsigned int databytes)
 	return dvlnet_inst->SNetSendMessage(playerID, data, databytes);
 }
 
-bool SNetReceiveTurns(int a1, int arraysize, char **arraydata, unsigned int *arraydatabytes,
-    DWORD *arrayplayerstatus)
+bool SNetReceiveTurns(int arraysize, char **arraydata, size_t *arraydatabytes, uint32_t *arrayplayerstatus)
 {
 #ifndef NONET
 	std::lock_guard<SdlMutex> lg(storm_net_mutex);
 #endif
-	if (a1 != 0)
-		UNIMPLEMENTED();
 	if (arraysize != MAX_PLRS)
 		UNIMPLEMENTED();
 	if (!dvlnet_inst->SNetReceiveTurns(arraydata, arraydatabytes, arrayplayerstatus)) {
diff --git a/Source/storm/storm_svid.h b/Source/storm/storm_svid.h
index bab9d457f..54d82e89c 100644
--- a/Source/storm/storm_svid.h
+++ b/Source/storm/storm_svid.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "miniwin/miniwin.h"
-
 namespace devilution {
 
 bool SVidPlayBegin(const char *filename, int flags);