diff --git a/include/boost/detail/winapi/system.hpp b/include/boost/detail/winapi/system.hpp
index 35b6682..93c8398 100644
--- a/include/boost/detail/winapi/system.hpp
+++ b/include/boost/detail/winapi/system.hpp
@@ -1,6 +1,9 @@
 //  system.hpp  --------------------------------------------------------------//
 
 //  Copyright 2010 Vicente J. Botet Escriba
+//  Copyright Steve Gates 2013.
+//  Copyright George Mileka 2013.
+//  Portions Copyright (c) Microsoft Open Technologies, Inc.
 
 //  Distributed under the Boost Software License, Version 1.0.
 //  See http://www.boost.org/LICENSE_1_0.txt
@@ -20,7 +23,11 @@ namespace detail {
 namespace winapi {
 #if defined( BOOST_USE_WINDOWS_H )
     typedef ::SYSTEM_INFO SYSTEM_INFO_;
-    extern "C" __declspec(dllimport) void __stdcall GetSystemInfo (struct system_info *);
+# if BOOST_USE_WINAPI_VERSION < BOOST_WINAPI_VERSION_WINXP
+extern "C" __declspec(dllimport) void __stdcall GetSystemInfo (struct system_info *);
+# else
+extern "C" __declspec(dllimport) void __stdcall GetNativeSystemInfo (struct system_info *);
+# endif
 #else
 extern "C" {
     typedef struct _SYSTEM_INFO {
@@ -42,8 +49,13 @@ extern "C" {
       WORD_      wProcessorRevision;
     } SYSTEM_INFO_;
 
+# if BOOST_USE_WINAPI_VERSION < BOOST_WINAPI_VERSION_WINXP
     __declspec(dllimport) void __stdcall 
         GetSystemInfo (struct system_info *);
+# else
+    __declspec(dllimport) void __stdcall 
+        GetNativeSystemInfo (struct system_info *);
+# endif
 }    
 #endif
 }
diff --git a/include/boost/detail/winapi/time.hpp b/include/boost/detail/winapi/time.hpp
index b58df63..3f49599 100644
--- a/include/boost/detail/winapi/time.hpp
+++ b/include/boost/detail/winapi/time.hpp
@@ -1,6 +1,9 @@
 //  time.hpp  --------------------------------------------------------------//
 
 //  Copyright 2010 Vicente J. Botet Escriba
+//  Copyright Steve Gates 2013.
+//  Copyright George Mileka 2013.
+//  Portions Copyright (c) Microsoft Open Technologies, Inc.
 
 //  Distributed under the Boost Software License, Version 1.0.
 //  See http://www.boost.org/LICENSE_1_0.txt
@@ -31,10 +34,15 @@ namespace winapi {
     #ifdef BOOST_HAS_GETSYSTEMTIMEASFILETIME  // Windows CE does not define GetSystemTimeAsFileTime
     using ::GetSystemTimeAsFileTime;
     #endif
+    #ifndef BOOST_WINAPI_FAMILY
     using ::FileTimeToLocalFileTime;
+    #endif
     using ::GetSystemTime;
     using ::SystemTimeToFileTime;
+    
+    #ifndef BOOST_WINAPI_FAMILY
     using ::GetTickCount;
+    #endif
     #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN6
     using ::GetTickCount64;
     #endif
@@ -70,8 +78,10 @@ extern "C" {
     __declspec(dllimport) int WINAPI
         SystemTimeToFileTime(const SYSTEMTIME_* lpSystemTime,
                 FILETIME_* lpFileTime);
+    #ifndef BOOST_WINAPI_FAMILY
     __declspec(dllimport) DWORD_ WINAPI
         GetTickCount();
+    #endif
     #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN6
     __declspec(dllimport) ULONGLONG_ WINAPI
         GetTickCount64();