diff --git a/direct/src/directd/directd.cxx b/direct/src/directd/directd.cxx
index 57bd4c6dac..90b4a2bb19 100644
--- a/direct/src/directd/directd.cxx
+++ b/direct/src/directd/directd.cxx
@@ -171,7 +171,7 @@ DirectD::wait_for_servers(int count, int timeout_ms) {
     return true;
   }
   // The timeout is a rough estimate, we may wait slightly longer.
-  const wait_ms=200;
+  const int wait_ms=200;
   int cycles=timeout_ms/wait_ms;
   while (cycles--) {
     check_for_new_clients();
@@ -198,7 +198,8 @@ DirectD::wait_for_servers(int count, int timeout_ms) {
     }
 
     // Yield the timeslice before we poll again.
-    PR_Sleep(PR_MillisecondsToInterval(wait_ms));
+    //PR_Sleep(PR_MillisecondsToInterval(wait_ms));
+    Sleep(wait_ms);
   }
   // We've waited long enough, assume they're not going to be
   // ready in the time we want them:
diff --git a/direct/src/directd/directd.h b/direct/src/directd/directd.h
index 237a212a0e..e24e87d828 100644
--- a/direct/src/directd/directd.h
+++ b/direct/src/directd/directd.h
@@ -17,13 +17,14 @@
 ////////////////////////////////////////////////////////////////////
 
 #include <process.h>
-#include <Windows.h>
 #include "pandabase.h"
 #include "directsymbols.h"
 #include "queuedConnectionManager.h"
 #include "queuedConnectionReader.h"
 #include "connectionWriter.h"
 #include "queuedConnectionListener.h"
+#include <windows.h>
+
 
 #ifdef CPPPARSER //[
 // hack for interrogate
diff --git a/direct/src/directdServer/directdServer.cxx b/direct/src/directdServer/directdServer.cxx
index bae1832c8f..5bef669d85 100644
--- a/direct/src/directdServer/directdServer.cxx
+++ b/direct/src/directdServer/directdServer.cxx
@@ -68,7 +68,7 @@ DirectDServer::read_command(string& cmd) {
     ifstream f;
     f.open("directdCommand", ios::in | ios::binary);
     stringstream ss;
-    const buf_size=512;
+    const int buf_size=512;
     char buf[buf_size];
     f.getline(buf, buf_size);
     if (f.gcount() > 0) {
@@ -95,7 +95,8 @@ DirectDServer::run_server(int port) {
     check_for_datagrams();
 
     // Yield the timeslice before we poll again.
-    PR_Sleep(PR_MillisecondsToInterval(200));
+    //PR_Sleep(PR_MillisecondsToInterval(200));
+    Sleep(200);
   }
 }