diff --git a/test/sync_client_test.c b/test/sync_client_test.c
index 3ddbb36..7a5b366 100644
--- a/test/sync_client_test.c
+++ b/test/sync_client_test.c
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
 	#include <sys/time.h>
   	#include <sys/socket.h>
 	#include <unistd.h>
diff --git a/test/test1.c b/test/test1.c
index bf2c7d0..f4593ff 100644
--- a/test/test1.c
+++ b/test/test1.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
   #include <sys/time.h>
   #include <sys/socket.h>
   #include <unistd.h>
diff --git a/test/test10.c b/test/test10.c
index 53d6160..043fadd 100644
--- a/test/test10.c
+++ b/test/test10.c
@@ -40,7 +40,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
   #include <sys/time.h>
   #include <sys/socket.h>
   #include <unistd.h>
diff --git a/test/test11.c b/test/test11.c
index aa26d7f..4e884dd 100644
--- a/test/test11.c
+++ b/test/test11.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
 	#include <sys/time.h>
   #include <sys/socket.h>
 	#include <unistd.h>
diff --git a/test/test15.c b/test/test15.c
index 22b80ba..a06cca2 100644
--- a/test/test15.c
+++ b/test/test15.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
   #include <sys/time.h>
   #include <sys/socket.h>
   #include <unistd.h>
diff --git a/test/test2.c b/test/test2.c
index 0da3d85..6997360 100644
--- a/test/test2.c
+++ b/test/test2.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
 	#include <sys/time.h>
 	#include <sys/socket.h>
 	#include <unistd.h>
@@ -400,7 +400,7 @@ thread_return_type WINAPI test1_sendAndReceive(void* n)
 				"Timed out waiting for message %d\n", i);
 	}
 
-#if defined(_WINDOWS)
+#if defined(_WINDOWS) || defined(_WIN32) || defined(_WIN64)
 	return 0;
 #else
 	return NULL;
diff --git a/test/test3.c b/test/test3.c
index 2f6a060..79d26eb 100644
--- a/test/test3.c
+++ b/test/test3.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if defined(_WINDOWS)
+#if defined(_WINDOWS) || defined(_WIN32) || defined(_WIN64)
   #include <windows.h>
   #include <openssl/applink.c>
   #define MAXHOSTNAMELEN 256
diff --git a/test/test4.c b/test/test4.c
index 9c34a97..2a068f8 100644
--- a/test/test4.c
+++ b/test/test4.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
 	#include <sys/time.h>
   #include <sys/socket.h>
 	#include <unistd.h>
diff --git a/test/test45.c b/test/test45.c
index f154fa7..6134acf 100644
--- a/test/test45.c
+++ b/test/test45.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
 	#include <sys/time.h>
   #include <sys/socket.h>
 	#include <unistd.h>
diff --git a/test/test5.c b/test/test5.c
index 61deb13..e6898df 100644
--- a/test/test5.c
+++ b/test/test5.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include "Thread.h"
 
-#if defined(_WINDOWS)
+#if defined(_WINDOWS) || defined(_WIN32) || defined(_WIN64)
 #include <windows.h>
 #include <openssl/applink.c>
 #define MAXHOSTNAMELEN 256
diff --git a/test/test6.c b/test/test6.c
index b5e7a86..4798d9b 100644
--- a/test/test6.c
+++ b/test/test6.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
 	#include <sys/time.h>
 	#include <unistd.h>
   #include <signal.h>
@@ -523,7 +523,7 @@ int recreateReconnect(void)
 		MyLog(LOGA_ALWAYS, "Recreating client");
 
 		MQTTAsync_destroy(&client); /* destroy the client object so that we force persistence to be read on recreate */
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
 		/*heap_info* mqtt_mem = 0;
 		mqtt_mem = Heap_get_info();
 		MyLog(LOGA_INFO, "MQTT mem current %ld, max %ld",mqtt_mem->current_size,mqtt_mem->max_size);
diff --git a/test/test8.c b/test/test8.c
index 2e6d881..bd5da80 100644
--- a/test/test8.c
+++ b/test/test8.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
 	#include <sys/time.h>
 	#include <sys/socket.h>
 	#include <unistd.h>
diff --git a/test/test9.c b/test/test9.c
index 59bbcef..1aba1a9 100644
--- a/test/test9.c
+++ b/test/test9.c
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include "Thread.h"
 
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
 	#include <sys/time.h>
   #include <sys/socket.h>
 	#include <unistd.h>
diff --git a/test/test95.c b/test/test95.c
index 4663340..e040db0 100644
--- a/test/test95.c
+++ b/test/test95.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include "Thread.h"
 
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
 	#include <sys/time.h>
   #include <sys/socket.h>
 	#include <unistd.h>
diff --git a/test/test_connect_destroy.c b/test/test_connect_destroy.c
index d185082..5a7ac20 100644
--- a/test/test_connect_destroy.c
+++ b/test/test_connect_destroy.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
 	#include <sys/time.h>
 	#include <sys/socket.h>
 	#include <unistd.h>
diff --git a/test/test_issue373.c b/test/test_issue373.c
index 14cadc0..26003a6 100644
--- a/test/test_issue373.c
+++ b/test/test_issue373.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include "Thread.h"
 
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <unistd.h>
@@ -314,7 +314,7 @@ int test_373(struct Options options)
 			MyLog(LOGA_INFO, "Connected %d connectCnt %d\n",connected,connectCnt);
 			MyLog(LOGA_INFO, "PublishCnt %d, FailedCnt %d, Pending %d maxPending %d",
 			      goodPublishCnt,failedPublishCnt,pendingMessageCnt,pendingMessageCntMax);
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
 			mqtt_mem = Heap_get_info();
 			MyLog(LOGA_INFO, "MQTT mem current %ld, max %ld",mqtt_mem->current_size,mqtt_mem->max_size);
 #endif
@@ -349,7 +349,7 @@ int test_373(struct Options options)
 	MySleep(5000);
 	MyLog(LOGA_INFO, "PublishCnt %d, FailedCnt %d, Pending %d maxPending %d",
 	      goodPublishCnt,failedPublishCnt,pendingMessageCnt,pendingMessageCntMax);
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
 	mqtt_mem = Heap_get_info();
 	MyLog(LOGA_INFO, "MQTT mem current %ld, max %ld",mqtt_mem->current_size,mqtt_mem->max_size);
 #endif
@@ -357,13 +357,13 @@ int test_373(struct Options options)
 	connected = 0;
 	MyLog(LOGA_INFO, "PublishCnt %d, FailedCnt %d, Pending %d maxPending %d",
 	      goodPublishCnt,failedPublishCnt,pendingMessageCnt,pendingMessageCntMax);
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
 	mqtt_mem = Heap_get_info();
 	MyLog(LOGA_INFO, "MQTT mem current %ld, max %ld",mqtt_mem->current_size,mqtt_mem->max_size);
 #endif
 exit:
 	MQTTAsync_destroy(&mqttasyncContext);
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
 	mqtt_mem = Heap_get_info();
 	MyLog(LOGA_INFO, "MQTT mem current %ld, max %ld",mqtt_mem->current_size,mqtt_mem->max_size);
 	if (mqtt_mem->current_size > 0) failures++; /* consider any not freed memory as failure */
diff --git a/test/test_mqtt4async.c b/test/test_mqtt4async.c
index 4e78039..37b37b4 100644
--- a/test/test_mqtt4async.c
+++ b/test/test_mqtt4async.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
 	#include <sys/time.h>
   	#include <sys/socket.h>
 	#include <unistd.h>
diff --git a/test/test_mqtt4sync.c b/test/test_mqtt4sync.c
index 9305af1..9c95ffc 100644
--- a/test/test_mqtt4sync.c
+++ b/test/test_mqtt4sync.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
 	#include <sys/time.h>
   	#include <sys/socket.h>
 	#include <unistd.h>
diff --git a/test/test_persistence.c b/test/test_persistence.c
index f8d82f6..bb4e468 100644
--- a/test/test_persistence.c
+++ b/test/test_persistence.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include "Thread.h"
 
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
 	#include <sys/time.h>
   #include <sys/socket.h>
 	#include <unistd.h>
diff --git a/test/test_sync_session_present.c b/test/test_sync_session_present.c
index 0e7201a..451eae3 100644
--- a/test/test_sync_session_present.c
+++ b/test/test_sync_session_present.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
   #include <sys/time.h>
   #include <sys/socket.h>
   #include <unistd.h>
diff --git a/test/thread.c b/test/thread.c
index 4918f8a..efa5236 100644
--- a/test/thread.c
+++ b/test/thread.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if !defined(_WINDOWS)
+#if !defined(_WINDOWS) && !defined(_WIN32) && !defined(_WIN64)
 	#include <sys/time.h>
   #include <sys/socket.h>
 	#include <unistd.h>