diff --git a/occ/occlib/OccServer.cxx b/occ/occlib/OccServer.cxx
index 347ae878..48c24095 100644
--- a/occ/occlib/OccServer.cxx
+++ b/occ/occlib/OccServer.cxx
@@ -23,6 +23,9 @@
  * Intergovernmental Organization or submit itself to any jurisdiction.
  */
 
+#define BOOST_NO_CXX20_HDR_CONCEPTS // TODO: David Rohr: Fix the
+                                    // boost::lockfree::queue, must
+                                    // not use trivial constructor!!!
 
 #include "OccServer.h"
 
@@ -65,7 +68,7 @@ grpc::Status OccServer::EventStream(grpc::ServerContext* context,
                                     const occ_pb::EventStreamRequest* request,
                                     grpc::ServerWriter<occ_pb::EventStreamReply>* writer)
 {
-    boost::uuids::basic_random_generator<boost::mt19937> gen;
+    boost::uuids::basic_random_generator<std::mt19937> gen;
     std::string id = boost::uuids::to_string(gen());
 
     boost::lockfree::queue<occ_pb::DeviceEvent*> eventQueue;
@@ -100,7 +103,7 @@ grpc::Status OccServer::StateStream(grpc::ServerContext* context,
     (void) context;
     (void) request;
 
-    boost::uuids::basic_random_generator<boost::mt19937> gen;
+    boost::uuids::basic_random_generator<std::mt19937> gen;
     std::string id = boost::uuids::to_string(gen());
 
     boost::lockfree::queue<t_State> stateQueue;
diff --git a/occ/plugin/OccFMQCommon.cxx b/occ/plugin/OccFMQCommon.cxx
index ea457a95..d37ed092 100644
--- a/occ/plugin/OccFMQCommon.cxx
+++ b/occ/plugin/OccFMQCommon.cxx
@@ -28,6 +28,8 @@
 #include "util/Defer.h"
 
 #include <boost/algorithm/string.hpp>
+#include <boost/uuid/entropy_error.hpp>
+#include <boost/uuid/uuid_generators.hpp>
 #include <iomanip>
 
 std::string generateSubscriptionId(const std::string& prefix)