2 files changed, 3 insertions, 3 deletions
diff --git a/include/libcamera/base/semaphore.h b/include/libcamera/base/semaphore.h
index ae87d319..ec05fad3 100644
--- a/include/libcamera/base/semaphore.h
+++ b/include/libcamera/base/semaphore.h
@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include <condition_variable>
-
 #include <libcamera/base/private.h>
 #include <libcamera/base/thread.h>
 
@@ -26,7 +24,7 @@ public:
 
 private:
 	Mutex mutex_;
-	std::condition_variable cv_;
+	ConditionVariable cv_;
 	unsigned int available_;
 };
 
diff --git a/include/libcamera/base/thread.h b/include/libcamera/base/thread.h
index 32ebc80a..1ebf8363 100644
--- a/include/libcamera/base/thread.h
+++ b/include/libcamera/base/thread.h
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <condition_variable>
 #include <memory>
 #include <mutex>
 #include <sys/types.h>
@@ -26,6 +27,7 @@ class Object;
 class ThreadData;
 class ThreadMain;
 
+using ConditionVariable = std::condition_variable;
 using Mutex = std::mutex;
 using MutexLocker = std::unique_lock<std::mutex>;