diff --git a/Source/logging.cpp b/Source/logging.cpp
index 203ad3d96..693b0599d 100644
--- a/Source/logging.cpp
+++ b/Source/logging.cpp
@@ -12,7 +12,7 @@ DWORD nNumberOfBytesToWrite; // idb
 /* data */
 
 int log_not_created = 1;              // weak
-HANDLE log_file = (HANDLE)0xFFFFFFFF; // idb
+HANDLE log_file = INVALID_HANDLE_VALUE;
 
 void __cdecl log_flush(BOOL force_close)
 {
@@ -72,11 +72,11 @@ HANDLE log_create()
 		    file_info.dwProductVersionLS >> 16,
 		    _LOWORD(file_info.dwProductVersionLS));
 	}
-	v1 = (HANDLE)-1;
+	v1 = INVALID_HANDLE_VALUE;
 	for (pcbBuffer = log_not_created == 0; (signed int)pcbBuffer < 2; ++pcbBuffer) {
 		v2 = CreateFile(FileName, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
 		v1 = v2;
-		if (v2 != (HANDLE)-1) {
+		if (v2 != INVALID_HANDLE_VALUE) {
 			if (GetFileSize(v2, 0) > 0x10000)
 				SetEndOfFile(v1);
 			break;
diff --git a/Source/mpqapi.cpp b/Source/mpqapi.cpp
index 041153479..bae95a377 100644
--- a/Source/mpqapi.cpp
+++ b/Source/mpqapi.cpp
@@ -12,7 +12,7 @@ BOOLEAN save_archive_open; // weak
 
 /* data */
 
-HANDLE sghArchive = (HANDLE)0xFFFFFFFF; // idb
+HANDLE sghArchive = INVALID_HANDLE_VALUE;
 
 BOOL mpqapi_set_hidden(const char *pszArchive, BOOL hidden)
 {
@@ -43,7 +43,7 @@ void mpqapi_store_creation_time(const char *pszArchive, int dwChar)
 	if (gbMaxPlayers != 1) {
 		mpqapi_reg_load_modification_time(dst, 160);
 		v4 = FindFirstFile(v3, &FindFileData);
-		if (v4 != (HANDLE)-1) {
+		if (v4 != INVALID_HANDLE_VALUE) {
 			FindClose(v4);
 			v5 = 16 * v2;
 			*(_DWORD *)&dst[v5] = FindFileData.ftCreationTime.dwLowDateTime;
@@ -99,7 +99,7 @@ void mpqapi_xor_buf(char *pbData)
 
 void mpqapi_store_default_time(DWORD dwChar)
 {
-/*
+	/*
 	DWORD idx;
 	char dst[160];
 
@@ -504,9 +504,9 @@ BOOL mpqapi_open_archive(const char *pszArchive, BOOL hidden, int dwChar) // Ope
 	v6 = (unsigned char)gbMaxPlayers > 1u ? FILE_FLAG_WRITE_THROUGH : 0;
 	save_archive_open = 0;
 	sghArchive = CreateFile(v3, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, v6, NULL);
-	if (sghArchive == (HANDLE)-1) {
+	if (sghArchive == INVALID_HANDLE_VALUE) {
 		sghArchive = CreateFile(lpFileName, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, v6 | (v4 != 0 ? FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN : 0), NULL);
-		if (sghArchive == (HANDLE)-1)
+		if (sghArchive == INVALID_HANDLE_VALUE)
 			return 0;
 		save_archive_open = 1;
 		save_archive_modified = 1;
@@ -623,7 +623,7 @@ void mpqapi_store_modified_time(const char *pszArchive, int dwChar)
 	if (gbMaxPlayers != 1) {
 		mpqapi_reg_load_modification_time(dst, 160);
 		v4 = FindFirstFile(v3, &FindFileData);
-		if (v4 != (HANDLE)-1) {
+		if (v4 != INVALID_HANDLE_VALUE) {
 			FindClose(v4);
 			v5 = 16 * v2;
 			*(_DWORD *)&dst[v5 + 8] = FindFileData.ftLastWriteTime.dwLowDateTime;
@@ -636,7 +636,7 @@ void mpqapi_store_modified_time(const char *pszArchive, int dwChar)
 
 void mpqapi_flush_and_close(const char *pszArchive, BOOL bFree, int dwChar)
 {
-	if (sghArchive != (HANDLE)-1) {
+	if (sghArchive != INVALID_HANDLE_VALUE) {
 		if (save_archive_modified) {
 			if (mpqapi_can_seek()) {
 				if (mpqapi_write_header()) {
diff --git a/Source/nthread.cpp b/Source/nthread.cpp
index 7b0be74f2..abd6029fc 100644
--- a/Source/nthread.cpp
+++ b/Source/nthread.cpp
@@ -178,7 +178,7 @@ void nthread_start(BOOL set_turn_upper_bit)
 #endif
 		nthread_should_run = 1;
 		sghThread = (HANDLE)_beginthreadex(NULL, 0, nthread_handler, NULL, 0, &glpNThreadId);
-		if (sghThread == (HANDLE)-1) {
+		if (sghThread == INVALID_HANDLE_VALUE) {
 			err2 = TraceLastError();
 			app_fatal("nthread2:\n%s", err2);
 		}
@@ -237,7 +237,7 @@ void nthread_cleanup()
 	gdwTurnsInTransit = 0;
 	gdwNormalMsgSize = 0;
 	gdwLargestMsgSize = 0;
-	if (sghThread != (HANDLE)-1 && glpNThreadId != GetCurrentThreadId()) {
+	if (sghThread != INVALID_HANDLE_VALUE && glpNThreadId != GetCurrentThreadId()) {
 #ifdef __cplusplus
 		if (!sgbThreadIsRunning)
 			sgMemCrit.Leave();
@@ -246,13 +246,13 @@ void nthread_cleanup()
 			app_fatal("nthread3:\n(%s)", TraceLastError());
 		}
 		CloseHandle(sghThread);
-		sghThread = (HANDLE)-1;
+		sghThread = INVALID_HANDLE_VALUE;
 	}
 }
 
 void nthread_ignore_mutex(BOOL bStart)
 {
-	if (sghThread != (HANDLE)-1) {
+	if (sghThread != INVALID_HANDLE_VALUE) {
 #ifdef __cplusplus
 		if (bStart)
 			sgMemCrit.Leave();