diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index f2d4a80c7..995a836e2 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -536,7 +536,7 @@ void __fastcall diablo_reload_process(HMODULE hModule)
 				CloseHandle(hMap);
 				ExitProcess(0);
 			}
-			if (InterlockedIncrement((long *)v4)) {
+			if (InterlockedIncrement((LPLONG)v4)) {
 				v6 = GetForegroundWindow();
 				do {
 					hWnd = v6;
diff --git a/Source/drlg_l1.cpp b/Source/drlg_l1.cpp
index 0dd9ac557..995b76570 100644
--- a/Source/drlg_l1.cpp
+++ b/Source/drlg_l1.cpp
@@ -212,7 +212,7 @@ void __fastcall LoadL1Dungeon(char *sFileName, int vx, int vy)
 void __cdecl DRLG_L1Floor()
 {
 	int i, j;
-	long rv;
+	LONG rv;
 
 	for (j = 0; j < DMAXY; j++) {
 		for (i = 0; i < DMAXX; i++) {
@@ -502,7 +502,7 @@ void __cdecl DRLG_FreeL1SP()
 void __fastcall DRLG_L5(int entry)
 {
 	int i, j;
-	long minarea;
+	LONG minarea;
 	BOOL doneflag;
 
 	switch (currlevel) {
diff --git a/Source/mpqapi.cpp b/Source/mpqapi.cpp
index 520e6abdf..a79be494a 100644
--- a/Source/mpqapi.cpp
+++ b/Source/mpqapi.cpp
@@ -66,7 +66,7 @@ BOOLEAN __fastcall mpqapi_reg_load_modification_time(char *dst, int size)
 	v2 = size;
 	v3 = dst;
 	memset(dst, 0, size);
-	if (!SRegLoadData("Diablo", "Video Player ", 0, (unsigned char *)v3, v2, (unsigned long *)&nbytes_read) || nbytes_read != v2)
+	if (!SRegLoadData("Diablo", "Video Player ", 0, (unsigned char *)v3, v2, (LPDWORD)&nbytes_read) || nbytes_read != v2)
 		return 0;
 	if (v2 >= 8) {
 		v6 = v2 >> 3;
diff --git a/Source/multi.cpp b/Source/multi.cpp
index 1b6ef1ad9..af8f5d601 100644
--- a/Source/multi.cpp
+++ b/Source/multi.cpp
@@ -938,7 +938,7 @@ int __fastcall multi_upgrade(int *a1)
 	int status; // [esp+4h] [ebp-4h]
 
 	v1 = a1;
-	SNetPerformUpgrade((unsigned long *)&status);
+	SNetPerformUpgrade((LPDWORD)&status);
 	result = 1;
 	if (status && status != 1) {
 		if (status == 2) {
diff --git a/Source/nthread.cpp b/Source/nthread.cpp
index 0295bf2cb..1502a8c32 100644
--- a/Source/nthread.cpp
+++ b/Source/nthread.cpp
@@ -124,7 +124,7 @@ int __fastcall nthread_recv_turns(int *pfSendAsync)
 	sgbPacketCountdown = byte_679704;
 	if (!hasCountedDown)
 		goto LABEL_11;
-	if (SNetReceiveTurns(0, 4, (char **)glpMsgTbl, (unsigned int *)gdwMsgLenTbl, (unsigned long *)player_state)) {
+	if (SNetReceiveTurns(0, 4, (char **)glpMsgTbl, (unsigned int *)gdwMsgLenTbl, (LPDWORD)player_state)) {
 		if (!byte_679758) {
 			byte_679758 = 1;
 			last_tick = GetTickCount();