1 files changed, 22 insertions, 15 deletions
diff --git a/libphobos/libdruntime/rt/monitor_.d b/libphobos/libdruntime/rt/monitor_.d
index 5d6c2f8..1d4ed2e 100644
--- a/libphobos/libdruntime/rt/monitor_.d
+++ b/libphobos/libdruntime/rt/monitor_.d
@@ -8,7 +8,26 @@
  */
 module rt.monitor_;
 
-import core.atomic, core.stdc.stdlib, core.stdc.string;
+import core.atomic;
+import core.stdc.stdlib : calloc, free, realloc;
+import core.stdc.string : memmove;
+
+version (Windows)
+{
+    import core.sys.windows.winbase /+: CRITICAL_SECTION, DeleteCriticalSection,
+        EnterCriticalSection, InitializeCriticalSection, LeaveCriticalSection+/;
+}
+else version (Posix)
+{
+    import core.sys.posix.pthread : pthread_mutex_destroy, pthread_mutex_init, pthread_mutex_lock,
+        PTHREAD_MUTEX_RECURSIVE, pthread_mutex_unlock, pthread_mutexattr_destroy, pthread_mutexattr_init,
+        pthread_mutexattr_settype;
+    import core.sys.posix.sys.types : pthread_mutex_t, pthread_mutexattr_t;
+}
+else
+{
+    static assert(0, "Unsupported platform");
+}
 
 // NOTE: The dtor callback feature is only supported for monitors that are not
 //       supplied by the user.  The assumption is that any object with a user-
@@ -173,9 +192,6 @@ alias DEvent = void delegate(Object);
 
 version (Windows)
 {
-    import core.sys.windows.winbase /+: CRITICAL_SECTION, DeleteCriticalSection,
-        EnterCriticalSection, InitializeCriticalSection, LeaveCriticalSection+/;
-
     alias Mutex = CRITICAL_SECTION;
 
     alias initMutex = InitializeCriticalSection;
@@ -185,11 +201,6 @@ version (Windows)
 }
 else version (Posix)
 {
-    import core.sys.posix.pthread : pthread_mutex_destroy, pthread_mutex_init, pthread_mutex_lock,
-        PTHREAD_MUTEX_RECURSIVE, pthread_mutex_unlock, pthread_mutexattr_destroy, pthread_mutexattr_init,
-        pthread_mutexattr_settype;
-    import core.sys.posix.sys.types : pthread_mutex_t, pthread_mutexattr_t;
-
 @nogc:
     alias Mutex = pthread_mutex_t;
     __gshared pthread_mutexattr_t gattr;
@@ -214,10 +225,6 @@ else version (Posix)
         pthread_mutex_unlock(mtx) && assert(0);
     }
 }
-else
-{
-    static assert(0, "Unsupported platform");
-}
 
 struct Monitor
 {
@@ -229,6 +236,8 @@ struct Monitor
 
 private:
 
+__gshared Mutex gmtx;
+
 @property ref shared(Monitor*) monitor(return scope Object h) pure nothrow @nogc
 {
     return *cast(shared Monitor**)&h.__monitor;
@@ -244,8 +253,6 @@ void setMonitor(Object h, shared(Monitor)* m) pure @nogc
     atomicStore!(MemoryOrder.rel)(h.monitor, m);
 }
 
-__gshared Mutex gmtx;
-
 shared(Monitor)* ensureMonitor(Object h)
 {
     if (auto m = getMonitor(h))