diff --git a/websocketpp/common/network.hpp b/websocketpp/common/network.hpp
index 6a01f140cb..9ba8b538bc 100644
--- a/websocketpp/common/network.hpp
+++ b/websocketpp/common/network.hpp
@@ -29,7 +29,7 @@
 #define WEBSOCKETPP_COMMON_NETWORK_HPP
 
 // For ntohs and htons
-#if defined(WIN32)
+#if defined(_WIN32)
     #include <winsock2.h>
 #else
     //#include <arpa/inet.h>
diff --git a/websocketpp/common/platforms.hpp b/websocketpp/common/platforms.hpp
index 4e031aa345..1196847b5a 100644
--- a/websocketpp/common/platforms.hpp
+++ b/websocketpp/common/platforms.hpp
@@ -33,7 +33,7 @@
  * don't fit somewhere else better.
  */
 
-#if defined(WIN32) && !defined(NOMINMAX)
+#if defined(_WIN32) && !defined(NOMINMAX)
     // don't define min and max macros that conflict with std::min and std::max
     #define NOMINMAX
 #endif
diff --git a/websocketpp/common/stdint.hpp b/websocketpp/common/stdint.hpp
index 233e36f5bc..a8ca1e3c52 100644
--- a/websocketpp/common/stdint.hpp
+++ b/websocketpp/common/stdint.hpp
@@ -32,7 +32,7 @@
     #define __STDC_LIMIT_MACROS 1
 #endif
 
-#if WIN32 && (_MSC_VER < 1600)
+#if defined (_WIN32) && defined (_MSC_VER) && (_MSC_VER < 1600)
     #include <boost/cstdint.hpp>
 
     using boost::int8_t;