diff --git a/direct/src/plugin/p3dConditionVar.cxx b/direct/src/plugin/p3dConditionVar.cxx
index ccfe7d9b64..3b4b28f03c 100644
--- a/direct/src/plugin/p3dConditionVar.cxx
+++ b/direct/src/plugin/p3dConditionVar.cxx
@@ -14,6 +14,11 @@
 
 #include "p3dConditionVar.h"
 
+#ifndef _WIN32
+#include <sys/time.h>
+#include <math.h>
+#endif
+
 ////////////////////////////////////////////////////////////////////
 //     Function: P3DConditionVar::Constructor
 //       Access: Public
diff --git a/direct/src/plugin/p3d_plugin.cxx b/direct/src/plugin/p3d_plugin.cxx
index 2b371ddd16..f8b9bb79bf 100644
--- a/direct/src/plugin/p3d_plugin.cxx
+++ b/direct/src/plugin/p3d_plugin.cxx
@@ -30,7 +30,7 @@
 bool initialized_lock = false;
 LOCK _api_lock;
 
-ofstream log;
+ofstream logfile;
 string plugin_output_filename;
 ostream *nout_stream;
 
@@ -54,9 +54,9 @@ P3D_initialize(int api_version, const char *output_filename) {
   }
   nout_stream = &cerr;
   if (!plugin_output_filename.empty()) {
-    log.open(plugin_output_filename.c_str(), ios::out | ios::trunc);
-    if (log) {
-      nout_stream = &log;
+    logfile.open(plugin_output_filename.c_str(), ios::out | ios::trunc);
+    if (logfile) {
+      nout_stream = &logfile;
     }
   }
 
diff --git a/direct/src/plugin/p3d_plugin_common.h b/direct/src/plugin/p3d_plugin_common.h
index d9e049bc3d..8468082f30 100644
--- a/direct/src/plugin/p3d_plugin_common.h
+++ b/direct/src/plugin/p3d_plugin_common.h
@@ -34,7 +34,6 @@
 using namespace std;
 
 // Appears in p3d_plugin.cxx.
-extern ofstream log;
 extern string plugin_output_filename;
 extern ostream *nout_stream;
 #define nout (*nout_stream)