diff --git a/include/boost/asio/detail/config.hpp b/include/boost/asio/detail/config.hpp
index 453f04d7..0483e2de 100644
--- a/include/boost/asio/detail/config.hpp
+++ b/include/boost/asio/detail/config.hpp
@@ -456,9 +456,9 @@
 #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
 # if defined(__cplusplus_winrt)
 #  include <winapifamily.h>
-#  if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP)
+#  if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
 #   define BOOST_ASIO_WINDOWS_RUNTIME 1
-#  endif // WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP)
+#  endif // WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
 # endif // defined(__cplusplus_winrt)
 #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME)
 
diff --git a/include/boost/asio/detail/socket_types.hpp b/include/boost/asio/detail/socket_types.hpp
index 29e4739a..594985a0 100644
--- a/include/boost/asio/detail/socket_types.hpp
+++ b/include/boost/asio/detail/socket_types.hpp
@@ -93,6 +93,7 @@ const int max_addr_v4_str_len = 256;
 const int max_addr_v6_str_len = 256;
 typedef unsigned __int32 u_long_type;
 typedef unsigned __int16 u_short_type;
+#undef s_addr
 struct in4_addr_type { u_long_type s_addr; };
 struct in4_mreq_type { in4_addr_type imr_multiaddr, imr_interface; };
 struct in6_addr_type { unsigned char s6_addr[16]; };