diff --git a/Reconstruction/Tracking/CMakeLists.txt b/Reconstruction/Tracking/CMakeLists.txt
index cec2aee147c15600099fbdaf038d800841b0adc0..3335b022e55e3dc1b442575d37c998c798ec33e9 100644
--- a/Reconstruction/Tracking/CMakeLists.txt
+++ b/Reconstruction/Tracking/CMakeLists.txt
@@ -4,6 +4,8 @@ find_package(GEAR REQUIRED)
 find_package(GSL REQUIRED ) 
 find_package(LCIO REQUIRED ) 
 find_package(EDM4HEP REQUIRED ) 
+find_package(DD4hep COMPONENTS DDCore DDRec REQUIRED)
+
 
 gaudi_depends_on_subdirs(
     Service/GearSvc
@@ -17,6 +19,9 @@ set(Tracking_srcs
 
 # Modules
 gaudi_add_module(Tracking ${Tracking_srcs}
-    INCLUDE_DIRS GaudiKernel FWCore CLHEP gear ${GSL_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
-    LINK_LIBRARIES GaudiKernel FWCore CLHEP ${GEAR_LIBRARIES} ${GSL_LIBRARIES} ${LCIO_LIBRARIES} TrackSystemSvcLib
+    INCLUDE_DIRS GaudiKernel gear ${GSL_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
+    LINK_LIBRARIES GaudiAlgLib GaudiKernel ${GEAR_LIBRARIES} ${GSL_LIBRARIES} ${LCIO_LIBRARIES} TrackSystemSvcLib
+      -Wl,--no-as-needed
+     EDM4HEP::edm4hep EDM4HEP::edm4hepDict
+     -Wl,--as-needed
 )