diff --git a/algo/CMakeLists.txt b/algo/CMakeLists.txt
index 74081542161f20a0fbbeecdb3095882895160416..a3f98e7075ca28c7c28ef8bc6c4b87121063795f 100644
--- a/algo/CMakeLists.txt
+++ b/algo/CMakeLists.txt
@@ -28,5 +28,7 @@ target_include_directories(Algo SYSTEM
   PUBLIC ${Boost_INCLUDE_DIR}
 )
 
+target_link_libraries(Algo OnlineData)
+
 target_compile_definitions(Algo PUBLIC NO_ROOT)
 
diff --git a/algo/data/CMakeLists.txt b/algo/data/CMakeLists.txt
index ddff59ad68a2c0922dd66e4a4a15141c187ca264..484a89cd54f84c836ef9ea28490dbe4ee78246ed 100644
--- a/algo/data/CMakeLists.txt
+++ b/algo/data/CMakeLists.txt
@@ -3,6 +3,9 @@
 # The extension is already found.  Any number of sources could be listed here.
 
 set(SRCS
+  ${CMAKE_SOURCE_DIR}/core/data/CbmDefs.cxx
+  ${CMAKE_SOURCE_DIR}/core/data/CbmAddress.cxx
+
   ${CMAKE_SOURCE_DIR}/core/data/sts/CbmStsDigi.cxx
   ${CMAKE_SOURCE_DIR}/core/data/sts/CbmStsAddress.cxx
 
@@ -15,10 +18,13 @@ set(SRCS
 
   ${CMAKE_SOURCE_DIR}/core/data/tof/CbmTofDigi.cxx
   ${CMAKE_SOURCE_DIR}/core/data/tof/CbmTofAddress.cxx
+  ${CMAKE_SOURCE_DIR}/core/data/tof/CbmTofDetectorId.cxx
+  ${CMAKE_SOURCE_DIR}/core/data/tof/CbmTofDetectorId_v12b.cxx
+
 
   ${CMAKE_SOURCE_DIR}/core/data/psd/CbmPsdDigi.cxx
   ${CMAKE_SOURCE_DIR}/core/data/psd/CbmPsdAddress.cxx
- )
+)
 
 add_library(OnlineData SHARED ${SRCS})
 
diff --git a/core/data/much/CbmMuchAddress.cxx b/core/data/much/CbmMuchAddress.cxx
index 9e654bf6db5dea4eb7ab113e6cb444da5e1edcf5..bb9a2ff7109c349607a6cbefd9ce916dad96cb49 100644
--- a/core/data/much/CbmMuchAddress.cxx
+++ b/core/data/much/CbmMuchAddress.cxx
@@ -121,4 +121,6 @@ uint32_t CbmMuchAddress::SetElementId(uint32_t address, int32_t level, int32_t n
 }
 // -------------------------------------------------------------------------
 
+#ifndef NO_ROOT
 ClassImp(CbmMuchAddress)
+#endif
diff --git a/core/data/much/CbmMuchAddress.h b/core/data/much/CbmMuchAddress.h
index a370dd47f896211cfff1382a5860c032ee0eec76..eca37ad8d4edb08a9ccd9e4eca16f4be8dc6c182 100644
--- a/core/data/much/CbmMuchAddress.h
+++ b/core/data/much/CbmMuchAddress.h
@@ -7,7 +7,9 @@
 
 #include "CbmAddress.h"  // for CbmAddress
 
+#ifndef NO_ROOT
 #include <Rtypes.h>  // for ClassDef
+#endif
 
 #include <cstdint>
 
@@ -137,7 +139,9 @@ private:
   static const int32_t fgkMask[kMuchNofLevels];
 
 
+#ifndef NO_ROOT
   ClassDef(CbmMuchAddress, 1);
+#endif
 };