diff --git a/MQ/CMakeLists.txt b/MQ/CMakeLists.txt
index b19ebfa4404d7c3119df50c3e0a36abe4d7739d0..4bb3fa32b884dfd666f4d9b1011818ad85727991 100644
--- a/MQ/CMakeLists.txt
+++ b/MQ/CMakeLists.txt
@@ -31,9 +31,5 @@ add_subdirectory(mcbm)
 #add_subdirectory(sts)
 #add_subdirectory(test)
 
-# The following subdirectories contain files which do not compile with
-# FairRoot v18
-# Don't compile it for the time being
-# TODO: Fix the compilation problems
-  add_subdirectory(parmq)
-  add_subdirectory(hitbuilder)
+add_subdirectory(parmq)
+add_subdirectory(hitbuilder)
diff --git a/MQ/eTOF/CMakeLists.txt b/MQ/eTOF/CMakeLists.txt
index 22cde1948d4cb17972f539f7fb874ae7017999b4..fea133da8aa810c2d2aac3174a0663330a9036e8 100644
--- a/MQ/eTOF/CMakeLists.txt
+++ b/MQ/eTOF/CMakeLists.txt
@@ -66,12 +66,17 @@ If(FAIRLOGGER_FOUND)
      )
 EndIf()
 
-set(EXE_NAME EventBuilderEtofStar2019)
-set(SRCS CbmDeviceEventBuilderEtofStar2019.cxx runEventBuilderEtofStar2019.cxx)
-set(DEPENDENCIES
+# Dependencies common to all executables
+set(DEPENDENCIES_ALL
   ${DEPENDENCIES}
   ${FAIR_LIBS}
   ${BOOST_LIBS}
+)
+
+set(EXE_NAME EventBuilderEtofStar2019)
+set(SRCS CbmDeviceEventBuilderEtofStar2019.cxx runEventBuilderEtofStar2019.cxx)
+set(DEPENDENCIES
+  ${DEPENDENCIES_ALL}
   fles_ipc
   CbmFlibStar2019
   CbmFlibMcbm2018
@@ -94,9 +99,7 @@ Set(NO_DICT_SRCS
 # Mask warning from file provided by STAR
 SET_SOURCE_FILES_PROPERTIES(${CBMROOT_SOURCE_DIR}/fles/star2017/unpacker/star_rhicf.c PROPERTIES COMPILE_FLAGS -Wno-pointer-sign)
 set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   fles_ipc
   CbmFlibStar2019
   CbmFlibMcbm2018
diff --git a/MQ/histoServer/CMakeLists.txt b/MQ/histoServer/CMakeLists.txt
index 761cda1a8ad5f7382bb93281760d0c648b27bf98..e9f6ef1da73819610f5d9715b3550e911d9c5d7b 100644
--- a/MQ/histoServer/CMakeLists.txt
+++ b/MQ/histoServer/CMakeLists.txt
@@ -51,6 +51,7 @@ If(UNIX AND NOT APPLE)
   List(APPEND BOOST_LIBS pthread)
 EndIf()
 
+# Dependencies common to all executables
 set(DEPENDENCIES_ALL
   ${DEPENDENCIES}
   ${FAIR_LIBS}
@@ -66,7 +67,6 @@ set(EXE_NAME HistoServer)
 set(SRCS CbmHistoServer.cxx runCbmHistoServer.cxx)
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  ${FAIR_LIBS}
   fles_ipc
   Core
   RIO
@@ -80,7 +80,6 @@ set(EXE_NAME MqHistoServer)
 set(SRCS CbmMqHistoServer.cxx runCbmMqHistoServer.cxx)
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  ${FAIR_LIBS}
   CbmFlibFlesTools
   Core
   RIO
diff --git a/MQ/hitbuilder/CMakeLists.txt b/MQ/hitbuilder/CMakeLists.txt
index 44fcefaedf242a5f1713a62cd582888ae247e4b1..0f7db3120d1a50c0236675cf87a4f0056ba86adc 100644
--- a/MQ/hitbuilder/CMakeLists.txt
+++ b/MQ/hitbuilder/CMakeLists.txt
@@ -66,13 +66,17 @@ If(FAIRLOGGER_FOUND)
      )
 EndIf()
 
-set(EXE_NAME HitBuilderTof)
-set(SRCS CbmDeviceHitBuilderTof.cxx runHitBuilderTof.cxx)
-set(DEPENDENCIES
+# Dependencies common to all executables
+set(DEPENDENCIES_ALL
   ${DEPENDENCIES}
-#     FairMQ
   ${FAIR_LIBS}
   ${BOOST_LIBS}
+)
+
+set(EXE_NAME HitBuilderTof)
+set(SRCS CbmDeviceHitBuilderTof.cxx runHitBuilderTof.cxx)
+set(DEPENDENCIES
+  ${DEPENDENCIES_ALL}
 #    fles_ipc
   CbmBase
   CbmData
diff --git a/MQ/mcbm/CMakeLists.txt b/MQ/mcbm/CMakeLists.txt
index ab4843e0c08cf9fc83cff3ec2bd088242738c732..b0919fbee222d7c35ca5b6f000c8a12830844fbb 100644
--- a/MQ/mcbm/CMakeLists.txt
+++ b/MQ/mcbm/CMakeLists.txt
@@ -100,13 +100,18 @@ If(FAIRLOGGER_FOUND)
      )
 EndIf()
 
+# Dependencies common to all executables
+set(DEPENDENCIES_ALL
+  ${DEPENDENCIES}
+  ${FAIR_LIBS}
+  ${BOOST_LIBS}
+)
+
 set(EXE_NAME McbmUnpack)
 set(SRCS CbmDeviceMcbmUnpack.cxx runMcbmUnpack.cxx)
 
 set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
@@ -124,9 +129,7 @@ set(EXE_NAME McbmMonitorPulser)
 set(SRCS CbmDeviceMcbmMonitorPulser.cxx runMcbmMonitorPulser.cxx)
 
 set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
@@ -144,9 +147,7 @@ set(EXE_NAME BuildRawEvents)
 set(SRCS CbmDeviceBuildRawEvents.cxx runBuildRawEvents.cxx)
 
 set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   fles_ipc
   KFParticle
   CbmFlibMcbm2018
@@ -171,9 +172,7 @@ set(EXE_NAME McbmEventBuilderWin)
 set(SRCS CbmDeviceMcbmEventBuilderWin.cxx runMcbmEvtBuilderWin.cxx)
 
 set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
@@ -191,9 +190,7 @@ set(EXE_NAME McbmEventSink)
 set(SRCS CbmDeviceMcbmEventSink.cxx runMcbmEventSink.cxx)
 
 set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
@@ -240,9 +237,7 @@ set(EXE_NAME BuildDigiEvents)
 set(SRCS CbmDeviceBuildDigiEvents.cxx runBuildDigiEvents.cxx)
 
 set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   CbmFlibFlesTools
   CbmEventBuilder
   KF
@@ -263,9 +258,7 @@ set(EXE_NAME EventBuilder)
 set(SRCS CbmDeviceEventBuilder.cxx runEventBuilder.cxx)
 
 set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   Algo
   CbmFlibFlesTools
   CbmEventBuilder
@@ -287,9 +280,7 @@ set(EXE_NAME DigiEventSink)
 set(SRCS CbmDeviceDigiEventSink.cxx runDigiEventSink.cxx)
 
 set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
@@ -308,9 +299,7 @@ set(EXE_NAME EventSink)
 set(SRCS CbmDeviceEventSink.cxx runEventSink.cxx)
 
 set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
diff --git a/MQ/monitor/CMakeLists.txt b/MQ/monitor/CMakeLists.txt
index 43c45b98a2574d3f47c17abf7d5e84c539144651..167ed6941feae84bd7eec8d1e214147741940688 100644
--- a/MQ/monitor/CMakeLists.txt
+++ b/MQ/monitor/CMakeLists.txt
@@ -73,15 +73,18 @@ If(FAIRLOGGER_FOUND)
      )
 EndIf()
 
-set(BASE_DEPENDENCIES ${DEPENDENCIES})
+# Dependencies common to all executables
+set(DEPENDENCIES_ALL
+  ${DEPENDENCIES}
+  ${FAIR_LIBS}
+  ${BOOST_LIBS}
+)
 
 set(EXE_NAME T0MonitorMcbm2018)
 set(SRCS CbmDeviceMonitorT0.cxx runMonitorT0.cxx)
 
 set(DEPENDENCIES
-  ${BASE_DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
@@ -99,9 +102,7 @@ set(EXE_NAME TofMonitorMcbm2018)
 set(SRCS CbmDeviceMonitorTof.cxx runMonitorTof.cxx)
 
 set(DEPENDENCIES
-  ${BASE_DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
@@ -119,9 +120,7 @@ set(EXE_NAME T0MonitorReqMcbm)
 set(SRCS CbmDeviceMonitorReqT0.cxx runMonitorReqT0.cxx)
 
 set(DEPENDENCIES
-  ${BASE_DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
@@ -139,9 +138,7 @@ set(EXE_NAME TofMonitorReqMcbm)
 set(SRCS CbmDeviceMonitorReqTof.cxx runMonitorReqTof.cxx)
 
 set(DEPENDENCIES
-  ${BASE_DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
@@ -159,9 +156,7 @@ set(EXE_NAME PsdMonitorMcbm2018)
 set(SRCS CbmDeviceMonitorPsd.cxx runMonitorPsd.cxx)
 
 set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
diff --git a/MQ/parmq/CMakeLists.txt b/MQ/parmq/CMakeLists.txt
index 299ca939e28c22b6c5703e8114c8beea3b2f3633..c2eceec7ecc47fbc9aae966e789c59ad65c8ea1f 100644
--- a/MQ/parmq/CMakeLists.txt
+++ b/MQ/parmq/CMakeLists.txt
@@ -57,6 +57,13 @@ If(FAIRLOGGER_FOUND)
      )
 EndIf()
 
+# Dependencies common to all executables
+set(DEPENDENCIES_ALL
+  ${DEPENDENCIES}
+  ${FAIR_LIBS}
+  ${BOOST_LIBS}
+)
+
 Set(EXE_NAME parmq-server)
 Set(SRCS
   ParameterMQServer.cxx
@@ -65,9 +72,7 @@ Set(SRCS
 )
 
 Set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   Core
   Net
   Geom
diff --git a/MQ/sink/CMakeLists.txt b/MQ/sink/CMakeLists.txt
index 731189d3543bf42167379cc674324ddd30177470..4f4374933d60232ef88a96342e50c71ab017115d 100644
--- a/MQ/sink/CMakeLists.txt
+++ b/MQ/sink/CMakeLists.txt
@@ -54,12 +54,17 @@ If(FAIRLOGGER_FOUND)
      )
 EndIf()
 
-set(EXE_NAME DevNullSink)
-set(SRCS CbmDevNullSink.cxx runDevNullSink.cxx)
-set(DEPENDENCIES
+# Dependencies common to all executables
+set(DEPENDENCIES_ALL
   ${DEPENDENCIES}
   ${FAIR_LIBS}
   ${BOOST_LIBS}
+)
+
+set(EXE_NAME DevNullSink)
+set(SRCS CbmDevNullSink.cxx runDevNullSink.cxx)
+set(DEPENDENCIES
+  ${DEPENDENCIES_ALL}
   fles_ipc
 )
 GENERATE_EXECUTABLE()
@@ -67,9 +72,7 @@ GENERATE_EXECUTABLE()
 set(EXE_NAME TsaComponentSink)
 set(SRCS CbmTsaComponentSink.cxx runTsaComponentSink.cxx)
 set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   fles_ipc
 )
 GENERATE_EXECUTABLE()
diff --git a/MQ/source/CMakeLists.txt b/MQ/source/CMakeLists.txt
index 3b618ce19dcbc39b8b58703b25bf78e52f7d60e6..043e5495f45a9b3b4f98b7a55383658c615e18a7 100644
--- a/MQ/source/CMakeLists.txt
+++ b/MQ/source/CMakeLists.txt
@@ -71,12 +71,17 @@ If(FAIRLOGGER_FOUND)
      )
 EndIf()
 
-set(EXE_NAME TsaSampler)
-set(SRCS CbmMQTsaSampler.cxx runTsaSampler.cxx)
-set(DEPENDENCIES
+# Dependencies common to all executables
+set(DEPENDENCIES_ALL
   ${DEPENDENCIES}
   ${FAIR_LIBS}
   ${BOOST_LIBS}
+)
+
+set(EXE_NAME TsaSampler)
+set(SRCS CbmMQTsaSampler.cxx runTsaSampler.cxx)
+set(DEPENDENCIES
+  ${DEPENDENCIES_ALL}
   fles_ipc
   CbmMQBase
 )
@@ -85,9 +90,7 @@ GENERATE_EXECUTABLE()
 set(EXE_NAME MultiTsaSampler)
 set(SRCS CbmMQTsaMultiSampler.cxx runTsaMultiSampler.cxx)
 set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   fles_ipc
   CbmMQBase
   CbmFlibFlesTools
@@ -103,9 +106,7 @@ GENERATE_EXECUTABLE()
 set(EXE_NAME RepReqTsSampler)
 set(SRCS CbmMQTsSamplerRepReq.cxx runTsSamplerRepReq.cxx)
 set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   fles_ipc
   CbmMQBase
   CbmFlibFlesTools
@@ -122,9 +123,7 @@ GENERATE_EXECUTABLE()
 set(EXE_NAME TsaSamplerTof)
 set(SRCS CbmMQTsaSamplerTof.cxx runTsaSamplerTof.cxx)
 set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   fles_ipc
   CbmMQBase
 )
@@ -133,9 +132,7 @@ GENERATE_EXECUTABLE()
 set(EXE_NAME TsaMultiSamplerTof)
 set(SRCS CbmMQTsaMultiSamplerTof.cxx runTsaMultiSamplerTof.cxx)
 set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   fles_ipc
   CbmMQBase
 )
@@ -144,9 +141,7 @@ GENERATE_EXECUTABLE()
 set(EXE_NAME TsaInfo)
 set(SRCS CbmMQTsaInfo.cxx runTsaInfo.cxx)
 set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   fles_ipc
   CbmMQBase
 )
@@ -155,9 +150,7 @@ GENERATE_EXECUTABLE()
 set(EXE_NAME StsDigiSource)
 set(SRCS CbmStsDigiSource.cxx runStsDigiSource.cxx)
 set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   CbmBase
   Core
   CbmMQBase
@@ -167,9 +160,7 @@ GENERATE_EXECUTABLE()
 set(EXE_NAME MCPointSource)
 set(SRCS CbmMCPointSource.cxx runMCPointSource.cxx)
 set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   CbmBase
   Core
   CbmMQBase
@@ -179,9 +170,7 @@ GENERATE_EXECUTABLE()
 set(EXE_NAME TsConsumerReqExample)
 set(SRCS CbmTsConsumerReqDevExample.cxx runTsConsumerReqExample.cxx)
 set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   fles_ipc
   CbmMQBase
   CbmFlibFlesTools
diff --git a/MQ/sts/CMakeLists.txt b/MQ/sts/CMakeLists.txt
index 4ef2cb396c7254f4d72b652fb2a119e2c672e029..d1cb3e16dddf1976a191d2e9d348283d8aba86b9 100644
--- a/MQ/sts/CMakeLists.txt
+++ b/MQ/sts/CMakeLists.txt
@@ -53,13 +53,18 @@ If(FAIRLOGGER_FOUND)
      )
 EndIf()
 
+# Dependencies common to all executables
+set(DEPENDENCIES_ALL
+  ${DEPENDENCIES}
+  ${FAIR_LIBS}
+  ${BOOST_LIBS}
+)
+
 set(EXE_NAME StsLocalReco)
 set(SRCS CbmDeviceStsLocalReco.cxx runStsLocalReco.cxx)
 
 set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   CbmField
   CbmSts
   Core
diff --git a/MQ/unpacker/CMakeLists.txt b/MQ/unpacker/CMakeLists.txt
index 0602122e1819afb8a1169f421860df1967898697..7fbae2689a87648387229727d2105a0e24c32c41 100644
--- a/MQ/unpacker/CMakeLists.txt
+++ b/MQ/unpacker/CMakeLists.txt
@@ -65,13 +65,18 @@ If(FAIRLOGGER_FOUND)
      )
 EndIf()
 
+# Dependencies common to all executables
+set(DEPENDENCIES_ALL
+  ${DEPENDENCIES}
+  ${FAIR_LIBS}
+  ${BOOST_LIBS}
+)
+
 set(EXE_NAME UnpackTofMcbm2018)
 set(SRCS CbmTbDaqBuffer.cxx CbmDeviceUnpackTofMcbm2018.cxx runUnpackTofMcbm2018.cxx)
 
 set(DEPENDENCIES
-  ${DEPENDENCIES}
-  ${FAIR_LIBS}
-  ${BOOST_LIBS}
+  ${DEPENDENCIES_ALL}
   fles_ipc
   CbmFlibMcbm2018
   CbmTofBase