diff --git a/include/boost/detail/win/synchronization.hpp b/include/boost/detail/win/synchronization.hpp
index 5a6ab0b..391e0ef 100644
--- a/include/boost/detail/win/synchronization.hpp
+++ b/include/boost/detail/win/synchronization.hpp
@@ -47,11 +47,14 @@ namespace win32
     using ::WaitForSingleObject;
     using ::QueueUserAPC;
 
-    static const DWORD_ infinite       = INFINITE;
-    static const DWORD_ wait_abandoned = WAIT_ABANDONED;
-    static const DWORD_ wait_object_0  = WAIT_OBJECT_0;
-    static const DWORD_ wait_timeout   = WAIT_TIMEOUT;
-    static const DWORD_ wait_failed    = WAIT_FAILED;
+    enum
+    {
+        infinite       = INFINITE,
+        wait_abandoned = WAIT_ABANDONED,
+        wait_object_0  = WAIT_OBJECT_0,
+        wait_timeout   = WAIT_TIMEOUT,
+        wait_failed    = WAIT_FAILED
+    };
 
 #else
 extern "C" {
@@ -123,11 +126,14 @@ extern "C" {
     using ::SetEvent;
     using ::ResetEvent;
 
-    static const DWORD_ infinite       = (DWORD_)0xFFFFFFFF;
-    static const DWORD_ wait_abandoned = 0x00000080L;
-    static const DWORD_ wait_object_0  = 0x00000000L;
-    static const DWORD_ wait_timeout   = 0x00000102L;
-    static const DWORD_ wait_failed    = (DWORD_)0xFFFFFFFF;
+    enum
+    {
+        infinite       = (DWORD_)0xFFFFFFFF,
+        wait_abandoned = 0x00000080L,
+        wait_object_0  = 0x00000000L,
+        wait_timeout   = 0x00000102L,
+        wait_failed    = (DWORD_)0xFFFFFFFF
+    };
 
 # endif
 }
diff --git a/include/boost/detail/win/time.hpp b/include/boost/detail/win/time.hpp
index 7f636ed..b0adfa7 100644
--- a/include/boost/detail/win/time.hpp
+++ b/include/boost/detail/win/time.hpp
@@ -23,7 +23,7 @@ namespace win32 {
     typedef SYSTEMTIME SYSTEMTIME_;
     typedef SYSTEMTIME* PSYSTEMTIME_;
 
-    #ifndef UNDER_CE  // Windows CE does not define GetSystemTimeAsFileTime
+    #ifdef BOOST_HAS_GETSYSTEMTIMEASFILETIME  // Windows CE does not define GetSystemTimeAsFileTime
     using ::GetSystemTimeAsFileTime;
     #endif
     using ::FileTimeToLocalFileTime;
@@ -49,22 +49,32 @@ extern "C" {
       WORD_ wMilliseconds;
     } SYSTEMTIME_, *PSYSTEMTIME_;
 
-    #ifndef UNDER_CE  // Windows CE does not define GetSystemTimeAsFileTime
+    #ifdef BOOST_HAS_GETSYSTEMTIMEASFILETIME  // Windows CE does not define GetSystemTimeAsFileTime
     __declspec(dllimport) void WINAPI
         GetSystemTimeAsFileTime(FILETIME_* lpFileTime);
     #endif
     __declspec(dllimport) int WINAPI
-        FileTimeToLocalFileTime(const FILETIME_* lpFileTime, 
+        FileTimeToLocalFileTime(const FILETIME_* lpFileTime,
                 FILETIME_* lpLocalFileTime);
     __declspec(dllimport) void WINAPI
         GetSystemTime(SYSTEMTIME_* lpSystemTime);
     __declspec(dllimport) int WINAPI
-        SystemTimeToFileTime(const SYSTEMTIME_* lpSystemTime, 
+        SystemTimeToFileTime(const SYSTEMTIME_* lpSystemTime,
                 FILETIME_* lpFileTime);
-    __declspec(dllimport) unsigned long __stdcall 
+    __declspec(dllimport) DWORD_ WINAPI
         GetTickCount();
 }
 #endif
+
+#ifndef BOOST_HAS_GETSYSTEMTIMEASFILETIME
+inline void WINAPI GetSystemTimeAsFileTime(FILETIME_* lpFileTime)
+{
+    SYSTEMTIME_ st;
+    GetSystemTime(&st);
+    SystemTimeToFileTime(&st, lpFileTime);
+}
+#endif
+
 }
 }
 }