diff --git a/direct/src/plugin/p3dConditionVar.cxx b/direct/src/plugin/p3dConditionVar.cxx
index 405e2a4ea9..27717089ce 100644
--- a/direct/src/plugin/p3dConditionVar.cxx
+++ b/direct/src/plugin/p3dConditionVar.cxx
@@ -18,6 +18,7 @@
 #include <sys/time.h>
 #include <math.h>
 #endif
+#include <errno.h>
 
 ////////////////////////////////////////////////////////////////////
 //     Function: P3DConditionVar::Constructor
diff --git a/direct/src/plugin/p3dInstance.h b/direct/src/plugin/p3dInstance.h
index 5802f7b3de..3972099222 100644
--- a/direct/src/plugin/p3dInstance.h
+++ b/direct/src/plugin/p3dInstance.h
@@ -137,7 +137,7 @@ private:
   string _shared_filename;
   SubprocessWindowBuffer *_swbuffer;
   char *_reversed_buffer;
-#endif __APPLE__
+#endif  // __APPLE__
 
   P3DSplashWindow *_splash_window;
   bool _instance_window_opened;