diff --git a/MQ/eTOF/CMakeLists.txt b/MQ/eTOF/CMakeLists.txt
index ccfdd8aa16a97b1ef84d6d547714a86a7594b84c..0aba71194d08b16cc4574befb29b0da88afa1576 100644
--- a/MQ/eTOF/CMakeLists.txt
+++ b/MQ/eTOF/CMakeLists.txt
@@ -100,7 +100,6 @@ Set(NO_DICT_SRCS
 SET_SOURCE_FILES_PROPERTIES(${CBMROOT_SOURCE_DIR}/fles/star2017/unpacker/star_rhicf.c PROPERTIES COMPILE_FLAGS -Wno-pointer-sign)
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
   external::fles_ipc
   CbmFlibStar2019
   CbmFlibMcbm2018
diff --git a/MQ/histoServer/CMakeLists.txt b/MQ/histoServer/CMakeLists.txt
index 70ef6e3693d7bd93e9145eac1a5ed465e28dc3a7..8cc626787e566e388542dad1fcdad7dcc4feeef0 100644
--- a/MQ/histoServer/CMakeLists.txt
+++ b/MQ/histoServer/CMakeLists.txt
@@ -45,6 +45,7 @@ EndIf()
 
 Set(BOOST_LIBS
   ${Boost_SYSTEM_LIBRARY}
+  ${Boost_SERIALIZATION_LIBRARY}
   ${Boost_PROGRAM_OPTIONS_LIBRARY}
 )
 If(UNIX AND NOT APPLE)
diff --git a/MQ/mcbm/CMakeLists.txt b/MQ/mcbm/CMakeLists.txt
index dc55f355d022811bd1adea6ec62abdf0cd33faba..0c6680cd22874e6e2fa57562e0eabe3cd024ffb1 100644
--- a/MQ/mcbm/CMakeLists.txt
+++ b/MQ/mcbm/CMakeLists.txt
@@ -115,7 +115,6 @@ set(SRCS CbmDeviceMcbmUnpack.cxx runMcbmUnpack.cxx)
 
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
   external::fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
@@ -134,7 +133,6 @@ set(SRCS CbmDeviceMcbmMonitorPulser.cxx runMcbmMonitorPulser.cxx)
 
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
   external::fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
diff --git a/MQ/source/CMakeLists.txt b/MQ/source/CMakeLists.txt
index 0f2055463f332b30364b5fc3bab4923e81c51097..f25d984625433fc092608489d43de1d445344130 100644
--- a/MQ/source/CMakeLists.txt
+++ b/MQ/source/CMakeLists.txt
@@ -28,6 +28,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
     ${FAIRLOGGER_INCLUDE_DIR}
 
     ${FLES_IPC_INCLUDE_DIRECTORY}
+    ${FLES_LOGGING_INCLUDE_DIRECTORY}
     ${CBMROOT_SOURCE_DIR}/external/cppzmq
 )
 
@@ -53,6 +54,7 @@ Set(BOOST_LIBS
   ${Boost_SERIALIZATION_LIBRARY}
   ${Boost_PROGRAM_OPTIONS_LIBRARY}
   ${Boost_LOG_LIBRARY}
+  ${Boost_THREAD_LIBRARY}
   ${Boost_REGEX_LIBRARY}
 )
 
diff --git a/fles/mcbm2018/CMakeLists.txt b/fles/mcbm2018/CMakeLists.txt
index fa251c2284f3a6b05f602b31271a13e6a7041cbc..5ec2c19dab1e5fe77702ae79168f6a70d0a3745d 100644
--- a/fles/mcbm2018/CMakeLists.txt
+++ b/fles/mcbm2018/CMakeLists.txt
@@ -38,6 +38,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
   ${Boost_INCLUDE_DIR}
   ${ROOT_INCLUDE_DIR}
   ${FLES_IPC_INCLUDE_DIRECTORY}
+  ${FLES_LOGGING_INCLUDE_DIRECTORY}
   ${CBMROOT_SOURCE_DIR}/external/flib_dpb/flib_dpb
   ${CMAKE_SOURCE_DIR}/external/cppzmq
 )
diff --git a/reco/detectors/much/CMakeLists.txt b/reco/detectors/much/CMakeLists.txt
index 5da896630c18db6b3580b7287186203fb569a498..fbc1ebb73831259ef99e3e4674b6862bf8dc4272 100644
--- a/reco/detectors/much/CMakeLists.txt
+++ b/reco/detectors/much/CMakeLists.txt
@@ -21,7 +21,7 @@ Include_Directories( ${INCLUDE_DIRECTORIES})
 
 Set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES}
-  ${IPC_INCLUDE_DIRECTORY} # for fles for unpacker
+  ${FLES_IPC_INCLUDE_DIRECTORY}
 )
 
 Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
diff --git a/reco/mq/CMakeLists.txt b/reco/mq/CMakeLists.txt
index 1fe076d491184e784bc527d456d1486630c13a02..8334c0263ba87cb3070e3761c7716fd05a08d088 100644
--- a/reco/mq/CMakeLists.txt
+++ b/reco/mq/CMakeLists.txt
@@ -87,7 +87,7 @@ set(DEPENDENCIES
   ${DEPENDENCIES}
   ${FAIR_LIBS}
   ${BOOST_LIBS}
-  fles_ipc
+  external::fles_ipc
   CbmFlibFlesTools
   Algo
   CbmBase