diff --git a/external/source/meterpreter/source/extensions/stdapi/server/fs/dir.c b/external/source/meterpreter/source/extensions/stdapi/server/fs/dir.c
index 1d64717e4a..1c8a88cc6e 100644
--- a/external/source/meterpreter/source/extensions/stdapi/server/fs/dir.c
+++ b/external/source/meterpreter/source/extensions/stdapi/server/fs/dir.c
@@ -1,7 +1,7 @@
 #include "../precomp.h"
 #include <sys/stat.h>
 
-#ifndef __WIN32__
+#ifndef _WIN32
  #include <dirent.h>
 #endif
 
@@ -30,7 +30,7 @@ DWORD request_fs_ls(Remote *remote, Packet *packet)
 		result = ERROR_INVALID_PARAMETER;
 	else
 	{
-#ifdef __WIN32__
+#ifdef _WIN32
 		WIN32_FIND_DATA data;
 		HANDLE ctx = NULL;
 #else
@@ -40,7 +40,7 @@ DWORD request_fs_ls(Remote *remote, Packet *packet)
 		BOOLEAN freeDirectory = FALSE;
 		LPSTR tempDirectory = (LPSTR)directory;
 
-#ifdef __WIN32__
+#ifdef _WIN32
 		// If there is not wildcard mask on the directory, create a version of the
 		// directory with a mask appended
 		if (!strrchr(directory, '*'))
@@ -154,7 +154,7 @@ DWORD request_fs_ls(Remote *remote, Packet *packet)
 				packet_add_tlv_raw(response, TLV_TYPE_STAT_BUF, &buf,
 						sizeof(buf));
 
-#ifdef __WIN32__
+#ifdef _WIN32
 		} while (FindNextFile(ctx, &data));
 #else
 	        } while (data = readdir(ctx));
@@ -165,7 +165,7 @@ DWORD request_fs_ls(Remote *remote, Packet *packet)
 		if (freeDirectory)
 			free(tempDirectory);
 		if (ctx)
-#ifdef __WIN32__
+#ifdef _WIN32
 			FindClose(ctx);
 #else
 			closedir(ctx);
@@ -209,7 +209,7 @@ again:
 
 		memset(directory, 0, directorySize);
 
-#ifdef __WIN32__
+#ifdef _WIN32
 		if (!(realSize = GetCurrentDirectory(directorySize, directory)))
 #else
 		if (!(realSize = getcwd(directory, directorySize)))
@@ -261,7 +261,7 @@ DWORD request_fs_chdir(Remote *remote, Packet *packet)
 
 	if (!directory)
 		result = ERROR_INVALID_PARAMETER;
-#ifdef __WIN32__
+#ifdef _WIN32
 	else if (!SetCurrentDirectory(directory))
 #else
 	else if (!chdir(directory))
@@ -292,7 +292,7 @@ DWORD request_fs_mkdir(Remote *remote, Packet *packet)
 
 	if (!directory)
 		result = ERROR_INVALID_PARAMETER;
-#ifdef __WIN32__
+#ifdef _WIN32
 	else if (!CreateDirectory(directory, NULL))
 #else
 	else if (!mkdir(directory, 777))
@@ -323,7 +323,7 @@ DWORD request_fs_delete_dir(Remote *remote, Packet *packet)
 
 	if (!directory)
 		result = ERROR_INVALID_PARAMETER;
-#ifdef __WIN32__
+#ifdef _WIN32
 	else if (!RemoveDirectory(directory))
 #else
 	else if (!rmdir(directory))
diff --git a/external/source/meterpreter/source/extensions/stdapi/server/fs/fs_util.c b/external/source/meterpreter/source/extensions/stdapi/server/fs/fs_util.c
index dfbbfbfb1a..4098e55ed0 100644
--- a/external/source/meterpreter/source/extensions/stdapi/server/fs/fs_util.c
+++ b/external/source/meterpreter/source/extensions/stdapi/server/fs/fs_util.c
@@ -5,7 +5,7 @@
  */
 LPSTR fs_expand_path(LPCSTR regular)
 {
-#ifdef __WIN32__
+#ifdef _WIN32
 	DWORD expandedFilePathSize = 32768;
 	LPSTR expandedFilePath = NULL;
 
diff --git a/external/source/meterpreter/source/extensions/stdapi/server/net/net.h b/external/source/meterpreter/source/extensions/stdapi/server/net/net.h
index 245a0fffc3..e1dd2c1408 100644
--- a/external/source/meterpreter/source/extensions/stdapi/server/net/net.h
+++ b/external/source/meterpreter/source/extensions/stdapi/server/net/net.h
@@ -8,7 +8,7 @@ typedef struct _SocketContext
 {
 	Remote   *remote;
 	Channel  *channel;
-#ifdef __WIN32__
+#ifdef _WIN32
 	WSAEVENT notify;
 #else
 	int notify;
diff --git a/external/source/meterpreter/source/extensions/stdapi/server/precomp.h b/external/source/meterpreter/source/extensions/stdapi/server/precomp.h
index 22ff529a35..26685608f3 100644
--- a/external/source/meterpreter/source/extensions/stdapi/server/precomp.h
+++ b/external/source/meterpreter/source/extensions/stdapi/server/precomp.h
@@ -1,7 +1,7 @@
 #ifndef METERPRETER_SOURCE_EXTENSION_STDAPI_SERVER_PRECOMP_H
 #define METERPRETER_SOURCE_EXTENSION_STDAPI_SERVER_PRECOMP_H
 
-#ifdef __WIN32__
+#ifdef _WIN32
 // sf: Compatability fix for a broken sdk? We get errors in Iphlpapi.h using the latest Windows SDK if we dont do this.
 #define  _WIN32_WINNT _WIN32_WINNT_WIN2K
 
@@ -21,7 +21,7 @@
 #include "net/net.h"
 #include "ui/ui.h"
 
-#ifdef __WIN32__
+#ifdef _WIN32
  #include "../../../ReflectiveDLLInjection/DelayLoadMetSrv.h"
  #include "../../../ReflectiveDLLInjection/GetProcAddressR.h"
  #include "../../../ReflectiveDLLInjection/ReflectiveLoader.h"
diff --git a/external/source/meterpreter/source/extensions/stdapi/server/stdapi.c b/external/source/meterpreter/source/extensions/stdapi/server/stdapi.c
index 3a25ae21a3..bb4db58ca6 100644
--- a/external/source/meterpreter/source/extensions/stdapi/server/stdapi.c
+++ b/external/source/meterpreter/source/extensions/stdapi/server/stdapi.c
@@ -7,7 +7,7 @@
 // include the Reflectiveloader() function, we end up linking back to the metsrv.dll's Init function
 // but this doesnt matter as we wont ever call DLL_METASPLOIT_ATTACH as that is only used by the 
 // second stage reflective dll inject payload and not the metsrv itself when it loads extensions.
-#ifdef __WIN32__
+#ifdef _WIN32
  #include "../../../ReflectiveDLLInjection/ReflectiveLoader.c"
 #endif
 // NOTE: _CRT_SECURE_NO_WARNINGS has been added to Configuration->C/C++->Preprocessor->Preprocessor
@@ -322,14 +322,14 @@ Command customCommands[] =
 /*
  * Initialize the server extension
  */
-#ifdef __WIN32__
+#ifdef _WIN32
 DWORD __declspec(dllexport) InitServerExtension(Remote *remote)
 #else
 DWORD InitServerExtension(Remote *remote)
 #endif
 {
 	DWORD index;
-#ifdef __WIN32__
+#ifdef _WIN32
 	hMetSrv = remote->hMetSrv;
 #endif
 	for (index = 0;