diff --git a/ForwardDetectors/AFP/AFP_Digitization/CMakeLists.txt b/ForwardDetectors/AFP/AFP_Digitization/CMakeLists.txt
index c9581326d8d2af0ffa5cdca395ea8af45e6c151b..16ed77de57cbe110c597a812b1132fc16aaa265d 100644
--- a/ForwardDetectors/AFP/AFP_Digitization/CMakeLists.txt
+++ b/ForwardDetectors/AFP/AFP_Digitization/CMakeLists.txt
@@ -5,19 +5,6 @@
 # Declare the package name:
 atlas_subdir( AFP_Digitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/PileUpTools
-                          Event/xAOD/xAODEventInfo
-                          ForwardDetectors/AFP/AFP_DigiEv
-                          ForwardDetectors/AFP/AFP_SimEv
-                          GaudiKernel
-                          Simulation/HitManagement
-                          PRIVATE
-                          DetectorDescription/Identifier )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -30,7 +17,6 @@ atlas_add_component( AFP_Digitization
                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel PileUpToolsLib xAODEventInfo AFP_DigiEv AFP_SimEv GaudiKernel HitManagement Identifier )
 
 # Install files from the package:
-atlas_install_headers( AFP_Digitization )
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 
diff --git a/ForwardDetectors/ALFA/ALFA_Digitization/CMakeLists.txt b/ForwardDetectors/ALFA/ALFA_Digitization/CMakeLists.txt
index 9fa388cfcef6fd5806f2a4884e8785bab5d769a0..ed3cec90a0a797c023f2515856c88b942e3df5eb 100644
--- a/ForwardDetectors/ALFA/ALFA_Digitization/CMakeLists.txt
+++ b/ForwardDetectors/ALFA/ALFA_Digitization/CMakeLists.txt
@@ -5,21 +5,6 @@
 # Declare the package name:
 atlas_subdir( ALFA_Digitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/PileUpTools
-                          ForwardDetectors/ALFA/ALFA_RawEv
-                          ForwardDetectors/ALFA/ALFA_SimEv
-                          GaudiKernel
-                          Simulation/HitManagement
-                          PRIVATE
-                          DetectorDescription/Identifier
-                          Generators/GeneratorObjects
-                          Generators/AtlasHepMC
-                          Tools/PathResolver )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -28,11 +13,10 @@ find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 atlas_add_component( ALFA_Digitization
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} 
+                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthenaKernel PileUpToolsLib ALFA_RawEv ALFA_SimEv GaudiKernel HitManagement Identifier GeneratorObjects PathResolver )
 
 # Install files from the package:
-atlas_install_headers( ALFA_Digitization )
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( xtalk/*.txt )
diff --git a/ForwardDetectors/LUCID/LUCID_Digitization/CMakeLists.txt b/ForwardDetectors/LUCID/LUCID_Digitization/CMakeLists.txt
index a07b0aa70bd042adb61e0d8e9f27e357f042cdc3..3d8f653c3123af1d342bb0a3d2b0954a0d834b23 100644
--- a/ForwardDetectors/LUCID/LUCID_Digitization/CMakeLists.txt
+++ b/ForwardDetectors/LUCID/LUCID_Digitization/CMakeLists.txt
@@ -5,18 +5,6 @@
 # Declare the package name:
 atlas_subdir( LUCID_Digitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/PileUpTools
-                          Event/xAOD/xAODEventInfo
-                          ForwardDetectors/LUCID/LUCID_RawEvent
-                          ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_SimEvent
-                          GaudiKernel
-                          Generators/GeneratorObjects
-                          Simulation/HitManagement )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
diff --git a/ForwardDetectors/ZDC/ZDC_SimuDigitization/CMakeLists.txt b/ForwardDetectors/ZDC/ZDC_SimuDigitization/CMakeLists.txt
index 4f35e4c85db70931ea17c3afd6d42fc54f417e42..4f89a3473fa55c81c541ceb8c7ef6d80693437b1 100644
--- a/ForwardDetectors/ZDC/ZDC_SimuDigitization/CMakeLists.txt
+++ b/ForwardDetectors/ZDC/ZDC_SimuDigitization/CMakeLists.txt
@@ -5,18 +5,6 @@
 # Declare the package name:
 atlas_subdir( ZDC_SimuDigitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/PileUpTools
-                          ForwardDetectors/ZDC/ZDC_SimEvent
-                          ForwardDetectors/ZDC/ZdcEvent
-                          GaudiKernel
-                          Simulation/HitManagement
-                          PRIVATE
-                          DetectorDescription/Identifier )
-
 # External dependencies:
 find_package( CLHEP )
 
@@ -28,7 +16,6 @@ atlas_add_component( ZDC_SimuDigitization
                      LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel PileUpToolsLib ZDC_SimEvent ZdcEvent GaudiKernel HitManagement Identifier )
 
 # Install files from the package:
-atlas_install_headers( ZDC_SimuDigitization )
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )