diff --git a/MQ/eTOF/CMakeLists.txt b/MQ/eTOF/CMakeLists.txt
index fea133da8aa810c2d2aac3174a0663330a9036e8..ccfdd8aa16a97b1ef84d6d547714a86a7594b84c 100644
--- a/MQ/eTOF/CMakeLists.txt
+++ b/MQ/eTOF/CMakeLists.txt
@@ -26,7 +26,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
     ${FAIRMQ_INCLUDE_DIR}
     ${FAIRMQ_INCLUDE_DIR}/options
 
-    ${IPC_INCLUDE_DIRECTORY}
+    ${FLES_IPC_INCLUDE_DIRECTORY}
     ${CBMROOT_SOURCE_DIR}/external/cppzmq
 )
 
@@ -77,7 +77,7 @@ set(EXE_NAME EventBuilderEtofStar2019)
 set(SRCS CbmDeviceEventBuilderEtofStar2019.cxx runEventBuilderEtofStar2019.cxx)
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
+  external::fles_ipc
   CbmFlibStar2019
   CbmFlibMcbm2018
   CbmBase
@@ -101,6 +101,7 @@ SET_SOURCE_FILES_PROPERTIES(${CBMROOT_SOURCE_DIR}/fles/star2017/unpacker/star_rh
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
   fles_ipc
+  external::fles_ipc
   CbmFlibStar2019
   CbmFlibMcbm2018
   CbmBase
diff --git a/MQ/histoServer/CMakeLists.txt b/MQ/histoServer/CMakeLists.txt
index e9f6ef1da73819610f5d9715b3550e911d9c5d7b..70ef6e3693d7bd93e9145eac1a5ed465e28dc3a7 100644
--- a/MQ/histoServer/CMakeLists.txt
+++ b/MQ/histoServer/CMakeLists.txt
@@ -67,7 +67,7 @@ set(EXE_NAME HistoServer)
 set(SRCS CbmHistoServer.cxx runCbmHistoServer.cxx)
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
+  external::fles_ipc
   Core
   RIO
   Net
diff --git a/MQ/hitbuilder/CMakeLists.txt b/MQ/hitbuilder/CMakeLists.txt
index 0f7db3120d1a50c0236675cf87a4f0056ba86adc..79387621ad2753419b1a2d79cbdd86f8e00d6f28 100644
--- a/MQ/hitbuilder/CMakeLists.txt
+++ b/MQ/hitbuilder/CMakeLists.txt
@@ -21,7 +21,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
     ${FAIRMQ_INCLUDE_DIR}/options
     ${VMC_INCLUDE_DIRS}
 
-    ${IPC_INCLUDE_DIRECTORY}
+    ${FLES_IPC_INCLUDE_DIRECTORY}
     ${CBMROOT_SOURCE_DIR}/external/cppzmq
     ${CBMROOT_SOURCE_DIR}/reco/detectors/tof
 )
diff --git a/MQ/mcbm/CMakeLists.txt b/MQ/mcbm/CMakeLists.txt
index 8e6c685d9eb8dc10dfcc0a6dd3149dd6a581ecfc..dc55f355d022811bd1adea6ec62abdf0cd33faba 100644
--- a/MQ/mcbm/CMakeLists.txt
+++ b/MQ/mcbm/CMakeLists.txt
@@ -60,7 +60,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
     ${VMC_INCLUDE_DIRS}
     ${FAIRLOGGER_INCLUDE_DIR}
 
-    ${IPC_INCLUDE_DIRECTORY}
+    ${FLES_IPC_INCLUDE_DIRECTORY}
     ${CBMROOT_SOURCE_DIR}/external/cppzmq
 )
 
@@ -116,6 +116,7 @@ set(SRCS CbmDeviceMcbmUnpack.cxx runMcbmUnpack.cxx)
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
   fles_ipc
+  external::fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
   CbmBase
@@ -134,6 +135,7 @@ set(SRCS CbmDeviceMcbmMonitorPulser.cxx runMcbmMonitorPulser.cxx)
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
   fles_ipc
+  external::fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
   CbmBase
@@ -151,7 +153,7 @@ set(SRCS CbmDeviceBuildRawEvents.cxx runBuildRawEvents.cxx)
 
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
+  external::fles_ipc
   KFParticle
   CbmFlibMcbm2018
   CbmFlibFlesTools
@@ -176,7 +178,7 @@ set(SRCS CbmDeviceMcbmEventBuilderWin.cxx runMcbmEvtBuilderWin.cxx)
 
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
+  external::fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
   CbmBase
@@ -194,7 +196,7 @@ set(SRCS CbmDeviceMcbmEventSink.cxx runMcbmEventSink.cxx)
 
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
+  external::fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
   CbmBase
@@ -217,7 +219,7 @@ set(DEPENDENCIES
   ${FAIR_LIBS}
   ParBase
   ${BOOST_LIBS}
-  fles_ipc
+  external::fles_ipc
   CbmFlibFlesTools
   CbmBase
   CbmRecoBase
@@ -285,7 +287,7 @@ set(SRCS CbmDeviceDigiEventSink.cxx runDigiEventSink.cxx)
 
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
+  external::fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
   CbmBase
@@ -304,7 +306,7 @@ set(SRCS CbmDeviceEventSink.cxx runEventSink.cxx)
 
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
+  external::fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
   CbmBase
@@ -318,6 +320,7 @@ set(DEPENDENCIES
 )
 GENERATE_EXECUTABLE()
 
+
 # Set the correct variables for the installation
 set(VMCWORKDIR ${CMAKE_INSTALL_PREFIX}/share/cbmroot)
 
diff --git a/MQ/monitor/CMakeLists.txt b/MQ/monitor/CMakeLists.txt
index 167ed6941feae84bd7eec8d1e214147741940688..455fb491b6db8acb60c3bf5b2b599762fddd1743 100644
--- a/MQ/monitor/CMakeLists.txt
+++ b/MQ/monitor/CMakeLists.txt
@@ -31,7 +31,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
     ${FAIRMQ_INCLUDE_DIR}
     ${FAIRMQ_INCLUDE_DIR}/options
 
-    ${IPC_INCLUDE_DIRECTORY}
+    ${FLES_IPC_INCLUDE_DIRECTORY}
     ${CBMROOT_SOURCE_DIR}/external/cppzmq
 )
 
@@ -85,7 +85,7 @@ set(SRCS CbmDeviceMonitorT0.cxx runMonitorT0.cxx)
 
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
+  external::fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
   CbmBase
@@ -103,7 +103,7 @@ set(SRCS CbmDeviceMonitorTof.cxx runMonitorTof.cxx)
 
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
+  external::fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
   CbmBase
@@ -121,7 +121,7 @@ set(SRCS CbmDeviceMonitorReqT0.cxx runMonitorReqT0.cxx)
 
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
+  external::fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
   CbmBase
@@ -139,7 +139,7 @@ set(SRCS CbmDeviceMonitorReqTof.cxx runMonitorReqTof.cxx)
 
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
+  external::fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
   CbmBase
@@ -157,7 +157,7 @@ set(SRCS CbmDeviceMonitorPsd.cxx runMonitorPsd.cxx)
 
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
+  external::fles_ipc
   CbmFlibMcbm2018
   CbmFlibFlesTools
   CbmBase
diff --git a/MQ/sink/CMakeLists.txt b/MQ/sink/CMakeLists.txt
index 4f4374933d60232ef88a96342e50c71ab017115d..c0495404925aaefa1057fec61170ef983d6ef9ed 100644
--- a/MQ/sink/CMakeLists.txt
+++ b/MQ/sink/CMakeLists.txt
@@ -13,7 +13,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
     ${FAIRMQ_INCLUDE_DIR}
     ${FAIRMQ_INCLUDE_DIR}/options
 
-    ${IPC_INCLUDE_DIRECTORY}
+    ${FLES_IPC_INCLUDE_DIRECTORY}
     ${CBMROOT_SOURCE_DIR}/external/cppzmq
 )
 
@@ -65,7 +65,7 @@ set(EXE_NAME DevNullSink)
 set(SRCS CbmDevNullSink.cxx runDevNullSink.cxx)
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
+  external::fles_ipc
 )
 GENERATE_EXECUTABLE()
 
@@ -73,7 +73,7 @@ set(EXE_NAME TsaComponentSink)
 set(SRCS CbmTsaComponentSink.cxx runTsaComponentSink.cxx)
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
+  external::fles_ipc
 )
 GENERATE_EXECUTABLE()
 
diff --git a/MQ/source/CMakeLists.txt b/MQ/source/CMakeLists.txt
index 043e5495f45a9b3b4f98b7a55383658c615e18a7..0f2055463f332b30364b5fc3bab4923e81c51097 100644
--- a/MQ/source/CMakeLists.txt
+++ b/MQ/source/CMakeLists.txt
@@ -27,7 +27,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
     ${VMC_INCLUDE_DIRS}
     ${FAIRLOGGER_INCLUDE_DIR}
 
-    ${IPC_INCLUDE_DIRECTORY}
+    ${FLES_IPC_INCLUDE_DIRECTORY}
     ${CBMROOT_SOURCE_DIR}/external/cppzmq
 )
 
@@ -82,7 +82,7 @@ set(EXE_NAME TsaSampler)
 set(SRCS CbmMQTsaSampler.cxx runTsaSampler.cxx)
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
+  external::fles_ipc
   CbmMQBase
 )
 GENERATE_EXECUTABLE()
@@ -91,7 +91,7 @@ set(EXE_NAME MultiTsaSampler)
 set(SRCS CbmMQTsaMultiSampler.cxx runTsaMultiSampler.cxx)
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
+  external::fles_ipc
   CbmMQBase
   CbmFlibFlesTools
   Core
@@ -107,7 +107,7 @@ set(EXE_NAME RepReqTsSampler)
 set(SRCS CbmMQTsSamplerRepReq.cxx runTsSamplerRepReq.cxx)
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
+  external::fles_ipc
   CbmMQBase
   CbmFlibFlesTools
   Core
@@ -124,7 +124,7 @@ set(EXE_NAME TsaSamplerTof)
 set(SRCS CbmMQTsaSamplerTof.cxx runTsaSamplerTof.cxx)
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
+  external::fles_ipc
   CbmMQBase
 )
 GENERATE_EXECUTABLE()
@@ -133,7 +133,7 @@ set(EXE_NAME TsaMultiSamplerTof)
 set(SRCS CbmMQTsaMultiSamplerTof.cxx runTsaMultiSamplerTof.cxx)
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
+  external::fles_ipc
   CbmMQBase
 )
 GENERATE_EXECUTABLE()
@@ -142,7 +142,7 @@ set(EXE_NAME TsaInfo)
 set(SRCS CbmMQTsaInfo.cxx runTsaInfo.cxx)
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
+  external::fles_ipc
   CbmMQBase
 )
 GENERATE_EXECUTABLE()
@@ -171,7 +171,7 @@ set(EXE_NAME TsConsumerReqExample)
 set(SRCS CbmTsConsumerReqDevExample.cxx runTsConsumerReqExample.cxx)
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
+  external::fles_ipc
   CbmMQBase
   CbmFlibFlesTools
   Core
diff --git a/MQ/unpacker/CMakeLists.txt b/MQ/unpacker/CMakeLists.txt
index 7fbae2689a87648387229727d2105a0e24c32c41..f86bf2a21f977fb377b2e1623ea4993c52799940 100644
--- a/MQ/unpacker/CMakeLists.txt
+++ b/MQ/unpacker/CMakeLists.txt
@@ -25,7 +25,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
     ${FAIRMQ_INCLUDE_DIR}
     ${FAIRMQ_INCLUDE_DIR}/options
 
-    ${IPC_INCLUDE_DIRECTORY}
+    ${FLES_IPC_INCLUDE_DIRECTORY}
     ${CBMROOT_SOURCE_DIR}/external/cppzmq
 )
 
@@ -77,7 +77,7 @@ set(SRCS CbmTbDaqBuffer.cxx CbmDeviceUnpackTofMcbm2018.cxx runUnpackTofMcbm2018.
 
 set(DEPENDENCIES
   ${DEPENDENCIES_ALL}
-  fles_ipc
+  external::fles_ipc
   CbmFlibMcbm2018
   CbmTofBase
   CbmBase
diff --git a/algo/CMakeLists.txt b/algo/CMakeLists.txt
index a0eb6be5633551fee8da1855602ee4477ab41a2f..15e152695d0f436c7539b7ca769282015be6e7f8 100644
--- a/algo/CMakeLists.txt
+++ b/algo/CMakeLists.txt
@@ -23,7 +23,7 @@ target_include_directories(Algo
   PUBLIC ${CMAKE_SOURCE_DIR}/core/data/tof
   PUBLIC ${CMAKE_SOURCE_DIR}/core/data/psd
   PUBLIC ${CMAKE_SOURCE_DIR}/core/data/raw
-  PUBLIC ${CMAKE_SOURCE_DIR}/external/ipc/ipc/lib/fles_ipc
+  PUBLIC ${FLES_IPC_INCLUDE_DIRECTORY}
 )
 
 target_include_directories(Algo SYSTEM
diff --git a/algo/data/CMakeLists.txt b/algo/data/CMakeLists.txt
index 80dcea0ff791678e8e64f9b92c65c4bac48bd966..90e3f7ff3b452791dcf4091a46230bd6438af76c 100644
--- a/algo/data/CMakeLists.txt
+++ b/algo/data/CMakeLists.txt
@@ -40,7 +40,7 @@ target_include_directories(OnlineData
   PUBLIC ${CMAKE_SOURCE_DIR}/core/data/psd
   PUBLIC ${CMAKE_SOURCE_DIR}/core/data/global
   PUBLIC ${CMAKE_SOURCE_DIR}/core/data/raw
-  PUBLIC ${CMAKE_SOURCE_DIR}/external/fles/flesnet/lib/fles_ipc
+  PUBLIC ${FLES_IPC_INCLUDE_DIRECTORY}
 )
 
 target_include_directories(OnlineData SYSTEM
diff --git a/algo/test/CMakeLists.txt b/algo/test/CMakeLists.txt
index 5204a056dcce198de7c4f3b1829dacb0171cd926..585175146e2217f8049168981fd66dc90d386d97 100644
--- a/algo/test/CMakeLists.txt
+++ b/algo/test/CMakeLists.txt
@@ -31,7 +31,7 @@ Set(INCLUDE_DIRECTORIES
   ${CBMDATA_DIR}/much
   ${CBMDATA_DIR}/psd
   ${CBMDATA_DIR}/trd
-  ${CMAKE_SOURCE_DIR}/external/fles/flesnet/lib/fles_ipc
+  ${FLES_IPC_INCLUDE_DIRECTORY}
   ${CMAKE_SOURCE_DIR}/algo
   ${CMAKE_SOURCE_DIR}/algo/trigger
   ${CMAKE_SOURCE_DIR}/algo/evbuild
diff --git a/core/data/CMakeLists.txt b/core/data/CMakeLists.txt
index bcd290d07a1445ac03682fab5c6c66bca79c373e..e8e45041fbc7ebbc9be889a821b797f333f98d18 100644
--- a/core/data/CMakeLists.txt
+++ b/core/data/CMakeLists.txt
@@ -14,7 +14,7 @@ set(INCLUDE_DIRECTORIES
   ${CMAKE_CURRENT_SOURCE_DIR}/rich
   ${CMAKE_CURRENT_SOURCE_DIR}/psd
   ${CMAKE_CURRENT_SOURCE_DIR}/global
-  ${CMAKE_SOURCE_DIR}/external/fles/flesnet/lib/fles_ipc
+  ${FLES_IPC_INCLUDE_DIRECTORY}
 )
 include_directories( ${INCLUDE_DIRECTORIES})
 
diff --git a/core/data/test/CMakeLists.txt b/core/data/test/CMakeLists.txt
index 826e045b52b0ed454b8a5ab1905639763fcb9ae8..87e7d2562ff326b9db32b39aaf05b25664e77e67 100644
--- a/core/data/test/CMakeLists.txt
+++ b/core/data/test/CMakeLists.txt
@@ -35,7 +35,7 @@ Set(INCLUDE_DIRECTORIES
   ${CBMDATA_DIR}/much
   ${CBMDATA_DIR}/test/sts
   ${CBMDATA_DIR}/test/global
-  ${CMAKE_SOURCE_DIR}/external/fles/flesnet/lib/fles_ipc
+  ${FLES_IPC_INCLUDE_DIRECTORY}
   ${BASE_INCLUDE_DIRECTORIES}
   ${GTEST_INCLUDE_DIR}
 )
diff --git a/core/data/test/global/CMakeLists.txt b/core/data/test/global/CMakeLists.txt
index c105658806cad09899989155cbd5c5814dc135a1..247d73ea3608948b082551b394c8c47cee289ff5 100644
--- a/core/data/test/global/CMakeLists.txt
+++ b/core/data/test/global/CMakeLists.txt
@@ -13,7 +13,7 @@ Set(INCLUDE_DIRECTORIES
   ${CBMDATA_DIR}/trd
   ${CBMDATA_DIR}/mvd
   ${CBMDATA_DIR}/test/sts
-  ${CMAKE_SOURCE_DIR}/external/fles/flesnet/lib/fles_ipc
+  ${FLES_IPC_INCLUDE_DIRECTORY}
   ${BASE_INCLUDE_DIRECTORIES}
   ${GTEST_INCLUDE_DIR}
 )
diff --git a/fles/cosy2019/CMakeLists.txt b/fles/cosy2019/CMakeLists.txt
index 1cc748ac27166ec83e65337c620dc7fd6165d183..9767a6993c42d661d925f5569cc1d53f7e077d54 100644
--- a/fles/cosy2019/CMakeLists.txt
+++ b/fles/cosy2019/CMakeLists.txt
@@ -28,7 +28,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES}
   ${Boost_INCLUDE_DIR}
   ${ROOT_INCLUDE_DIR}
-  ${IPC_INCLUDE_DIRECTORY}
+  ${FLES_IPC_INCLUDE_DIRECTORY}
 )
 
 Include_Directories(${INCLUDE_DIRECTORIES})
@@ -68,7 +68,7 @@ Set(LIBRARY_NAME CbmBeamtimeCosy2019)
 Set(DEPENDENCIES
     CbmFlibFlesTools CbmFlibMcbm2018
     CbmStsBase
-    CbmData CbmBase fles_ipc Eve Base
+    CbmData CbmBase external::fles_ipc Eve Base
 )
 
 GENERATE_LIBRARY()
diff --git a/fles/flestools/CMakeLists.txt b/fles/flestools/CMakeLists.txt
index d47694ab2252d520b13484253f31512ff52cfc0a..df1866b468ec409b686de49d849437192f2cebb1 100644
--- a/fles/flestools/CMakeLists.txt
+++ b/fles/flestools/CMakeLists.txt
@@ -9,7 +9,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES}
   ${Boost_INCLUDE_DIR}
   ${ROOT_INCLUDE_DIR}
-  ${IPC_INCLUDE_DIRECTORY}
+  ${FLES_IPC_INCLUDE_DIRECTORY}
 )
 
 Include_Directories(${INCLUDE_DIRECTORIES})
@@ -43,7 +43,7 @@ EndIf()
 #Set(LINKDEF CbmFlibMcbm2018LinkDef.h )
 Set(LIBRARY_NAME CbmFlibFlesTools)
 Set(DEPENDENCIES
-    fles_ipc Hist
+    external::fles_ipc Hist
 )
 
 GENERATE_LIBRARY()
diff --git a/fles/mcbm2018/CMakeLists.txt b/fles/mcbm2018/CMakeLists.txt
index 5a4d4e7f01bf65096d5aa4f4dc467a5f1bbcf3f5..fa251c2284f3a6b05f602b31271a13e6a7041cbc 100644
--- a/fles/mcbm2018/CMakeLists.txt
+++ b/fles/mcbm2018/CMakeLists.txt
@@ -37,7 +37,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES}
   ${Boost_INCLUDE_DIR}
   ${ROOT_INCLUDE_DIR}
-  ${IPC_INCLUDE_DIRECTORY}
+  ${FLES_IPC_INCLUDE_DIRECTORY}
   ${CBMROOT_SOURCE_DIR}/external/flib_dpb/flib_dpb
   ${CMAKE_SOURCE_DIR}/external/cppzmq
 )
@@ -136,7 +136,7 @@ Set(LIBRARY_NAME CbmFlibMcbm2018)
 Set(DEPENDENCIES
     CbmFlibFlesTools CbmStsBase CbmTofBase
     CbmRichBase CbmMuchBase CbmTrdBase CbmPsdBase
-    CbmData CbmBase fles_ipc Eve Base
+    CbmData CbmBase external::fles_ipc Eve Base
 )
 
 GENERATE_LIBRARY()
diff --git a/fles/star2019/CMakeLists.txt b/fles/star2019/CMakeLists.txt
index 43c843fe4d079a2529e8b8542ef65885b9432949..7fb4e69f8115161a12d99aae7751ffad0ad459e2 100644
--- a/fles/star2019/CMakeLists.txt
+++ b/fles/star2019/CMakeLists.txt
@@ -33,7 +33,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES}
   ${Boost_INCLUDE_DIR}
   ${ROOT_INCLUDE_DIR}
-  ${IPC_INCLUDE_DIRECTORY}
+  ${FLES_IPC_INCLUDE_DIRECTORY}
   ${CBMROOT_SOURCE_DIR}/external/flib_dpb/flib_dpb
   ${CMAKE_SOURCE_DIR}/external/cppzmq
 )
@@ -74,7 +74,7 @@ EndIf()
 Set(LINKDEF CbmFlibStar2019LinkDef.h )
 Set(LIBRARY_NAME CbmFlibStar2019)
 Set(DEPENDENCIES
-    CbmFlibMcbm2018 CbmData CbmBase fles_ipc Eve Base
+    CbmFlibMcbm2018 CbmData CbmBase external::fles_ipc Eve Base
 )
 
 GENERATE_LIBRARY()
diff --git a/reco/app/cbmreco_fairrun/CMakeLists.txt b/reco/app/cbmreco_fairrun/CMakeLists.txt
index 7d2068e4d5415f207dbd4f8fdae2232d279fb578..a3a95653fb02b104fafe1dd457fbd1506d9810c7 100644
--- a/reco/app/cbmreco_fairrun/CMakeLists.txt
+++ b/reco/app/cbmreco_fairrun/CMakeLists.txt
@@ -20,7 +20,7 @@ target_link_directories(cbmreco_fairrun
 )
 
 target_link_libraries(cbmreco_fairrun
-  fles_logging
+  external::fles_logging
   CbmRecoTasks
   Core
   ${Boost_LIBRARIES}
diff --git a/reco/base/CMakeLists.txt b/reco/base/CMakeLists.txt
index befd16ee0045fce999ef02ce4c83bd03e19d4b66..75e9c1cd58e53a17ec67106ad182594e2483af0f 100644
--- a/reco/base/CMakeLists.txt
+++ b/reco/base/CMakeLists.txt
@@ -47,7 +47,7 @@ ${CBMROOT_SOURCE_DIR}/core/data/sts
 
 set(SYSTEM_INCLUDE_DIRECTORIES
 ${BASE_INCLUDE_DIRECTORIES}
-${IPC_INCLUDE_DIRECTORY}
+${FLES_IPC_INCLUDE_DIRECTORY}
 )
 # ---------------------------------------------------------
 
@@ -65,7 +65,7 @@ ${Boost_LIBRARY_DIRS}
 
 # -----   Library dependences   ---------------------------
 Set(DEPENDENCIES
-fles_ipc
+external::fles_ipc
 Base
 CbmBase
 #CbmData
diff --git a/reco/detectors/psd/CMakeLists.txt b/reco/detectors/psd/CMakeLists.txt
index 630ec235fc600a105d47f78453082be6bc05db58..310acce0b2cb467d04115ff9a8d0935075f10985 100644
--- a/reco/detectors/psd/CMakeLists.txt
+++ b/reco/detectors/psd/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories(${INCLUDE_DIRECTORIES})
 
 set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES}
-  ${IPC_INCLUDE_DIRECTORY} # for fles infos for unpacker
+  ${FLES_IPC_INCLUDE_DIRECTORY} # for fles infos for unpacker
 )
 
 include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
diff --git a/reco/detectors/rich/CMakeLists.txt b/reco/detectors/rich/CMakeLists.txt
index f4839c5a9634c92a5a707af89297d576af1ae791..ff2ea0e09ed60c1ae3fe8a364d53ecc24281bc87 100644
--- a/reco/detectors/rich/CMakeLists.txt
+++ b/reco/detectors/rich/CMakeLists.txt
@@ -47,7 +47,7 @@ Include_Directories( ${INCLUDE_DIRECTORIES})
 Set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES}
   ${Boost_INCLUDE_DIR}
-  ${IPC_INCLUDE_DIRECTORY} # for fles for unpacker
+  ${FLES_IPC_INCLUDE_DIRECTORY} # for fles for unpacker
 )
 
 Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
diff --git a/reco/detectors/sts/CMakeLists.txt b/reco/detectors/sts/CMakeLists.txt
index 78c904eb80ac1a738a800e89eda9a6ac064884a2..8386c5ad4437c085fc03a4111f2320ce3df687a9 100644
--- a/reco/detectors/sts/CMakeLists.txt
+++ b/reco/detectors/sts/CMakeLists.txt
@@ -66,7 +66,7 @@ ${CBMDETECTORBASE_DIR}/sts
 
 set(SYSTEM_INCLUDE_DIRECTORIES
 ${BASE_INCLUDE_DIRECTORIES}
-${IPC_INCLUDE_DIRECTORY} # for fles infos for unpacker
+${FLES_IPC_INCLUDE_DIRECTORY} # for fles infos for unpacker
 )
 # ----  End of include directories ------------------------
 
diff --git a/reco/detectors/tof/CMakeLists.txt b/reco/detectors/tof/CMakeLists.txt
index 0d5d628b841abdff748f44355e3e4a92377332b5..05bdfb4894fba5f7d68394bea61ea1252895eaec 100644
--- a/reco/detectors/tof/CMakeLists.txt
+++ b/reco/detectors/tof/CMakeLists.txt
@@ -25,7 +25,7 @@ include_directories(${INCLUDE_DIRECTORIES})
 
 set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES}
-  ${IPC_INCLUDE_DIRECTORY} # for fles infos for unpacker
+  ${FLES_IPC_INCLUDE_DIRECTORY} # for fles infos for unpacker
 )
 
 include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
diff --git a/reco/detectors/trd/CMakeLists.txt b/reco/detectors/trd/CMakeLists.txt
index e389e6b63d7de2e3339ced11055ecbdf758a110f..cd60a09779e8a2c54861b458ab9b2dad82e4a7e2 100644
--- a/reco/detectors/trd/CMakeLists.txt
+++ b/reco/detectors/trd/CMakeLists.txt
@@ -32,7 +32,7 @@ Include_Directories( ${INCLUDE_DIRECTORIES})
 Set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES} 
   ${Boost_INCLUDE_DIR}
-  ${IPC_INCLUDE_DIRECTORY} # for fles infos for unpacker
+  ${FLES_IPC_INCLUDE_DIRECTORY} # for fles infos for unpacker
 )
 
 Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
diff --git a/reco/steer/CMakeLists.txt b/reco/steer/CMakeLists.txt
index ed7eea304b13e510129ddeec9ee2323850793045..3f19544f9faa6fd737f22ab3cecb5ad42ad34fa9 100644
--- a/reco/steer/CMakeLists.txt
+++ b/reco/steer/CMakeLists.txt
@@ -60,7 +60,7 @@ ${CBMROOT_SOURCE_DIR}/algo/evbuild
 
 set(SYSTEM_INCLUDE_DIRECTORIES
 ${BASE_INCLUDE_DIRECTORIES}
-${IPC_INCLUDE_DIRECTORY}
+${FLES_IPC_INCLUDE_DIRECTORY}
 )
 # ---------------------------------------------------------
 
@@ -79,7 +79,7 @@ ${Boost_LIBRARY_DIRS}
 
 # -----   Library dependences   ---------------------------
 Set(DEPENDENCIES
-fles_ipc
+external::fles_ipc
 Base
 CbmBase
 CbmPsdBase
diff --git a/reco/tasks/CMakeLists.txt b/reco/tasks/CMakeLists.txt
index e98d6b0599cd7946f14f78bc9ba6d257d75135de..9b517ee4dca205ed584cb66f3a954061881dbcff 100644
--- a/reco/tasks/CMakeLists.txt
+++ b/reco/tasks/CMakeLists.txt
@@ -44,7 +44,7 @@ ${CBMROOT_SOURCE_DIR}/algo/detectors/sts
 
 set(SYSTEM_INCLUDE_DIRECTORIES
 ${BASE_INCLUDE_DIRECTORIES}
-${IPC_INCLUDE_DIRECTORY}
+${FLES_IPC_INCLUDE_DIRECTORY}
 )
 # ---------------------------------------------------------
 
@@ -62,7 +62,7 @@ ${Boost_LIBRARY_DIRS}
 
 # -----   Library dependences   ---------------------------
 Set(DEPENDENCIES
-fles_ipc
+external::fles_ipc
 Base
 CbmBase
 CbmData