diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt
index f21828bd752427f2b5ed0c822f0093042d768d4e..927eced88ef44130e21546a9347a2ee42b5cbcda 100644
--- a/Examples/CMakeLists.txt
+++ b/Examples/CMakeLists.txt
@@ -5,6 +5,7 @@ find_package(podio REQUIRED)
 find_package(plcio REQUIRED)
 find_package(LCIO REQUIRED)
 find_package(EDM4HEP REQUIRED)
+find_package(K4FWCore REQUIRED)
 
 set(Examples_srcs
     src/HelloWorld/*.cpp
@@ -20,8 +21,8 @@ gaudi_install_headers(Examples)
 
 # Modules
 gaudi_add_module(Examples ${Examples_srcs}
-    INCLUDE_DIRS GaudiKernel FWCore ${plcio_INCLUDE_DIRS} ${podio_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
-    LINK_LIBRARIES GaudiKernel FWCore ${podio_LIBRARIES} ${LCIO_LIBRARIES} $ENV{PLCIO}/lib/libplcio.so 
+    INCLUDE_DIRS K4FWCore GaudiAlgLib GaudiKernel  ${plcio_INCLUDE_DIRS} ${podio_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
+    LINK_LIBRARIES K4FWCore GaudiAlgLib GaudiKernel ${podio_LIBRARIES} ${LCIO_LIBRARIES} $ENV{PLCIO}/lib/libplcio.so 
       EDM4HEP::edm4hep EDM4HEP::edm4hepDict
 )
 
diff --git a/Generator/CMakeLists.txt b/Generator/CMakeLists.txt
index 3996ab2be880fcc2a9275b8b826e209552f8b79a..41f325ec59a21f336721425edae877e76a822e5b 100644
--- a/Generator/CMakeLists.txt
+++ b/Generator/CMakeLists.txt
@@ -24,6 +24,8 @@ find_package(podio)
 find_package(EDM4HEP)
 find_package(HepMC)
 find_package(CLHEP)
+find_package(K4FWCore REQUIRED)
+
 if(ROOT_FOUND)
     message("found ROOT: ${ROOT_INCLUDE_DIRS} ${ROOT_LIBRARIES}")
 endif(ROOT_FOUND)
@@ -44,12 +46,14 @@ INCLUDE_DIRECTORIES(${GenAlgo_incs})
 
 gaudi_add_module(GenAlgo ${GenAlgo_srcs} 
   INCLUDE_DIRS 
-    FWCore
+    K4FWCore
   LINK_LIBRARIES 
     ROOT
-    FWCore 
+    K4FWCore 
+    GaudiAlgLib GaudiKernel
     HepMC
     CLHEP
+    LCIO
     EDM4HEP::edm4hep EDM4HEP::edm4hepDict
   )
 #gaudi_add_test(Reader FRAMEWORK options/read.py)
diff --git a/Reconstruction/Digitisers/CMakeLists.txt b/Reconstruction/Digitisers/CMakeLists.txt
index 53a0b9131de1df589dac332225fa26411b24333e..7c0c14eab33249b3430b14234dae01d8a7272d3d 100644
--- a/Reconstruction/Digitisers/CMakeLists.txt
+++ b/Reconstruction/Digitisers/CMakeLists.txt
@@ -5,6 +5,7 @@ find_package(GEAR REQUIRED)
 find_package(GSL REQUIRED ) 
 find_package(LCIO REQUIRED ) 
 find_package(podio REQUIRED ) 
+find_package(K4FWCore REQUIRED)
 
 gaudi_depends_on_subdirs(
     Service/GearSvc
@@ -17,6 +18,6 @@ set(Digitisers_srcs
 
 # Modules
 gaudi_add_module(Digitisers ${Digitisers_srcs}
-    INCLUDE_DIRS GaudiKernel FWCore CLHEP gear ${plcio_INCLUDE_DIRS} ${GSL_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
-    LINK_LIBRARIES GaudiKernel FWCore CLHEP $ENV{GEAR}/lib/libgearsurf.so ${GSL_LIBRARIES} $ENV{PLCIO}/lib/libplcio.so ${LCIO_LIBRARIES}
+    INCLUDE_DIRS K4FWCore GaudiKernel GaudiAlgLib CLHEP gear ${plcio_INCLUDE_DIRS} ${GSL_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS}
+    LINK_LIBRARIES K4FWCore GaudiKernel GaudiAlgLib CLHEP $ENV{GEAR}/lib/libgearsurf.so ${GSL_LIBRARIES} $ENV{PLCIO}/lib/libplcio.so ${LCIO_LIBRARIES}
 )