diff --git a/emper/strategies/laws/LawsScheduler.hpp b/emper/strategies/laws/LawsScheduler.hpp
index 3c5b8315f2dab65bdae2f0fd77a6587720ff19bb..7382977bd11ed1b9d5862c4ab33817339fcce38b 100644
--- a/emper/strategies/laws/LawsScheduler.hpp
+++ b/emper/strategies/laws/LawsScheduler.hpp
@@ -8,7 +8,11 @@
 
 class LawsScheduler: public Scheduler {
 	template <size_t SIZE>
+#ifdef EMPER_LOCKED_WS_QUEUE
 	using WsQueue = adt::LockedQueue<Fiber*, SIZE>;
+#else
+	using WsQueue = adt::WsClQueue<Fiber*, SIZE>;
+#endif
 
 public:
 	static const int QUEUE_SIZE = 1024;
diff --git a/emper/strategies/ws/WsScheduler.hpp b/emper/strategies/ws/WsScheduler.hpp
index 3359a804ee6d15fe9a4fe801efb13cfc51b8a36b..bc004d8427aba7a7c121fb3e320c79a37d6e76b7 100644
--- a/emper/strategies/ws/WsScheduler.hpp
+++ b/emper/strategies/ws/WsScheduler.hpp
@@ -2,12 +2,11 @@
 
 #include "Scheduler.hpp"
 #include "WsClQueue.hpp"
-#include "WsClV2Queue.hpp"
 #include "LockedQueue.hpp"
 
 class WsScheduler: public Scheduler {
 	template <size_t SIZE>
-#ifdef LOCKED_WS_QUEUE
+#ifdef EMPER_LOCKED_WS_QUEUE
 	using WsQueue = adt::LockedQueue<Fiber*, SIZE>;
 #else
 	using WsQueue = adt::WsClQueue<Fiber*, SIZE>;