diff --git a/panda/src/chan/animControl.h b/panda/src/chan/animControl.h
index d52b2e4835..7b9f973cd7 100644
--- a/panda/src/chan/animControl.h
+++ b/panda/src/chan/animControl.h
@@ -24,7 +24,7 @@
 #include "typedReferenceCount.h"
 #include "namable.h"
 #include "pmutex.h"
-#include "conditionVarFull.h"
+#include "conditionVar.h"
 
 class PartBundle;
 class AnimChannelBase;
@@ -79,7 +79,7 @@ private:
   bool _pending;
   std::string _pending_done_event;
   Mutex _pending_lock;  // protects the above two.
-  ConditionVarFull _pending_cvar; // signals when _pending goes true.
+  ConditionVar _pending_cvar; // signals when _pending goes true.
 
   // This is a PT(PartGroup) instead of a PT(PartBundle), just because we
   // can't include partBundle.h for circular reasons.  But it actually keeps a
diff --git a/panda/src/event/asyncFuture.cxx b/panda/src/event/asyncFuture.cxx
index 4805650260..f9efddbad7 100644
--- a/panda/src/event/asyncFuture.cxx
+++ b/panda/src/event/asyncFuture.cxx
@@ -14,7 +14,6 @@
 #include "asyncFuture.h"
 #include "asyncTask.h"
 #include "asyncTaskManager.h"
-#include "conditionVarFull.h"
 #include "config_event.h"
 #include "pStatTimer.h"
 #include "throw_event.h"
diff --git a/panda/src/event/asyncTaskChain.h b/panda/src/event/asyncTaskChain.h
index c211b30c85..6de098b6ed 100644
--- a/panda/src/event/asyncTaskChain.h
+++ b/panda/src/event/asyncTaskChain.h
@@ -20,7 +20,7 @@
 #include "asyncTaskCollection.h"
 #include "typedReferenceCount.h"
 #include "thread.h"
-#include "conditionVarFull.h"
+#include "conditionVar.h"
 #include "pvector.h"
 #include "pdeque.h"
 #include "pStatCollector.h"
@@ -159,7 +159,7 @@ protected:
 
   AsyncTaskManager *_manager;
 
-  ConditionVarFull _cvar;  // signaled when one of the task heaps, _state, or _current_sort changes, or a task finishes.
+  ConditionVar _cvar;  // signaled when one of the task heaps, _state, or _current_sort changes, or a task finishes.
 
   enum State {
     S_initial,     // no threads yet
diff --git a/panda/src/event/asyncTaskManager.h b/panda/src/event/asyncTaskManager.h
index 69711ab6f6..0bb137deb4 100644
--- a/panda/src/event/asyncTaskManager.h
+++ b/panda/src/event/asyncTaskManager.h
@@ -23,7 +23,7 @@
 #include "thread.h"
 #include "pmutex.h"
 #include "mutexHolder.h"
-#include "conditionVarFull.h"
+#include "conditionVar.h"
 #include "pvector.h"
 #include "pdeque.h"
 #include "pStatCollector.h"
@@ -130,7 +130,7 @@ protected:
   TasksByName _tasks_by_name;
   PT(ClockObject) _clock;
 
-  ConditionVarFull _frame_cvar;  // Signalled when the clock ticks.
+  ConditionVar _frame_cvar;  // Signalled when the clock ticks.
 
   static AsyncTaskManager* _global_ptr;
 
diff --git a/panda/src/gobj/texture.h b/panda/src/gobj/texture.h
index 7cb5f305fb..4bde90c973 100644
--- a/panda/src/gobj/texture.h
+++ b/panda/src/gobj/texture.h
@@ -29,7 +29,7 @@
 #include "pStatCollector.h"
 #include "pmutex.h"
 #include "mutexHolder.h"
-#include "conditionVarFull.h"
+#include "conditionVar.h"
 #include "loaderOptions.h"
 #include "string_utils.h"
 #include "cycleData.h"
@@ -1034,7 +1034,7 @@ protected:
   Mutex _lock;
 
   // Used to implement unlocked_reload_ram_image().
-  ConditionVarFull _cvar;  // condition: _reloading is true.
+  ConditionVar _cvar;  // condition: _reloading is true.
   bool _reloading;
 
   // A Texture keeps a list (actually, a map) of all the
diff --git a/panda/src/gobj/vertexDataPage.h b/panda/src/gobj/vertexDataPage.h
index bceca6adea..4aafeebac1 100644
--- a/panda/src/gobj/vertexDataPage.h
+++ b/panda/src/gobj/vertexDataPage.h
@@ -21,7 +21,6 @@
 #include "vertexDataSaveFile.h"
 #include "pmutex.h"
 #include "conditionVar.h"
-#include "conditionVarFull.h"
 #include "thread.h"
 #include "mutexHolder.h"
 #include "pdeque.h"
@@ -147,7 +146,7 @@ private:
 
     // Signaled when anything new is added to either of the above queues, or
     // when _shutdown is set true.  This wakes up any pending thread.
-    ConditionVarFull _pending_cvar;
+    ConditionVar _pending_cvar;
 
     PageThreads _threads;
     friend class PageThread;
diff --git a/panda/src/net/datagramQueue.h b/panda/src/net/datagramQueue.h
index 131de070cc..9dac974f5d 100644
--- a/panda/src/net/datagramQueue.h
+++ b/panda/src/net/datagramQueue.h
@@ -18,7 +18,7 @@
 
 #include "netDatagram.h"
 #include "pmutex.h"
-#include "conditionVarFull.h"
+#include "conditionVar.h"
 #include "pdeque.h"
 
 /**
@@ -41,7 +41,7 @@ public:
 
 private:
   Mutex _cvlock;
-  ConditionVarFull _cv;  // signaled when queue contents change.
+  ConditionVar _cv;  // signaled when queue contents change.
 
   typedef pdeque<NetDatagram> QueueType;
   QueueType _queue;