From 91a8e52d2f418e3f97cb069cdb52d78ea89fa483 Mon Sep 17 00:00:00 2001
From: John Chapman <jchapman@cern.ch>
Date: Fri, 1 May 2020 15:38:00 +0200
Subject: [PATCH] Remove atlas_depends_on_subdir from most Simulation
 CMakeLists.txt files

---
 Calorimeter/CaloG4Sim/CMakeLists.txt          | 10 -----
 .../InDetG4/BCM_G4_SD/CMakeLists.txt          | 11 ------
 .../InDetG4/BLM_G4_SD/CMakeLists.txt          | 14 -------
 .../InDetG4/PixelG4_SD/CMakeLists.txt         | 11 ------
 .../InDetG4/SCT_G4_SD/CMakeLists.txt          | 10 -----
 .../InDetG4/TRT_G4Utilities/CMakeLists.txt    |  7 ----
 .../InDetG4/TRT_G4_SD/CMakeLists.txt          | 14 -------
 .../TRT_PAI_Process/CMakeLists.txt            | 10 -----
 .../TRT_TR_Process/CMakeLists.txt             | 14 -------
 .../LArG4/LArG4Barrel/CMakeLists.txt          | 10 -----
 LArCalorimeter/LArG4/LArG4Code/CMakeLists.txt | 17 --------
 LArCalorimeter/LArG4/LArG4EC/CMakeLists.txt   | 15 -------
 LArCalorimeter/LArG4/LArG4FCAL/CMakeLists.txt | 12 ------
 .../LArG4/LArG4FastSimSvc/CMakeLists.txt      |  6 ---
 .../LArG4/LArG4GenShowerLib/CMakeLists.txt    | 15 -------
 LArCalorimeter/LArG4/LArG4H6SD/CMakeLists.txt | 28 -------------
 LArCalorimeter/LArG4/LArG4H8SD/CMakeLists.txt |  9 -----
 LArCalorimeter/LArG4/LArG4HEC/CMakeLists.txt  | 14 -------
 .../LArG4/LArG4MiniFCAL/CMakeLists.txt        | 12 ------
 .../LArG4/LArG4RunControl/CMakeLists.txt      |  7 ----
 LArCalorimeter/LArG4/LArG4SD/CMakeLists.txt   |  7 ----
 .../LArG4/LArG4ShowerLib/CMakeLists.txt       |  6 ---
 .../LArG4/LArG4Validation/CMakeLists.txt      | 14 -------
 .../MuonG4/MuonG4SD/CMakeLists.txt            | 10 -----
 .../Barcode/BarcodeEvent/CMakeLists.txt       |  4 --
 .../Barcode/BarcodeInterfaces/CMakeLists.txt  |  5 ---
 .../Barcode/BarcodeServices/CMakeLists.txt    |  7 ----
 Simulation/BeamEffects/CMakeLists.txt         | 14 -------
 .../FastShower/FastCaloSim/CMakeLists.txt     | 38 ------------------
 .../FastCaloSimAthenaPool/CMakeLists.txt      |  8 ----
 .../FastShower/FastCaloSimHit/CMakeLists.txt  | 17 --------
 .../FastChainPileup/CMakeLists.txt            |  6 ---
 .../FastSimulationEvent/CMakeLists.txt        |  6 ---
 .../CMakeLists.txt                            |  4 --
 Simulation/G4Atlas/G4AtlasAlg/CMakeLists.txt  | 17 --------
 .../G4Atlas/G4AtlasControl/CMakeLists.txt     |  4 --
 .../G4Atlas/G4AtlasInterfaces/CMakeLists.txt  |  4 --
 .../G4Atlas/G4AtlasServices/CMakeLists.txt    | 11 ------
 .../G4Atlas/G4AtlasTests/CMakeLists.txt       | 34 ----------------
 .../G4Atlas/G4AtlasTools/CMakeLists.txt       | 11 ------
 .../G4Extensions/Charginos/CMakeLists.txt     |  7 ----
 .../ExtraParticles/CMakeLists.txt             |  7 ----
 .../G4CosmicFilter/CMakeLists.txt             | 11 ------
 .../G4ExternalDecay/CMakeLists.txt            |  5 ---
 .../G4Extensions/G4HitFilter/CMakeLists.txt   | 15 -------
 .../G4ScoringProcess/CMakeLists.txt           |  7 ----
 .../G4Extensions/Gauginos/CMakeLists.txt      |  6 ---
 .../G4Extensions/Monopole/CMakeLists.txt      |  7 ----
 Simulation/G4Extensions/Quirks/CMakeLists.txt |  8 ----
 .../G4Extensions/RHadrons/CMakeLists.txt      |  9 -----
 .../G4Extensions/Sleptons/CMakeLists.txt      |  7 ----
 Simulation/G4Sim/G4HiveEx/CMakeLists.txt      |  7 ----
 Simulation/G4Sim/MCTruth/CMakeLists.txt       |  9 -----
 Simulation/G4Sim/MCTruthBase/CMakeLists.txt   | 17 --------
 Simulation/G4Sim/SimHelpers/CMakeLists.txt    |  5 ---
 Simulation/G4Sim/TrackRecord/CMakeLists.txt   |  7 ----
 .../G4SimCnv/G4SimAthenaPOOL/CMakeLists.txt   | 10 -----
 Simulation/G4SimCnv/G4SimTPCnv/CMakeLists.txt |  9 -----
 .../G4AncillaryEventAthenaPool/CMakeLists.txt |  8 ----
 .../G4AncillarySimEvent/CMakeLists.txt        |  6 ---
 .../G4DebuggingTools/CMakeLists.txt           | 13 -------
 .../G4FastSimulation/CMakeLists.txt           |  5 ---
 .../G4Utilities/G4PhysicsLists/CMakeLists.txt |  4 --
 .../G4ProfilingTools/CMakeLists.txt           |  8 ----
 .../G4StepLimitation/CMakeLists.txt           |  7 ----
 .../G4Utilities/G4UserActions/CMakeLists.txt  | 21 ----------
 Simulation/G4Utilities/Geo2G4/CMakeLists.txt  | 16 --------
 .../G4Utilities/GeoMaterial2G4/CMakeLists.txt |  8 ----
 .../G4Utilities/MCTruthAlgs/CMakeLists.txt    |  7 ----
 .../G4Utilities/MCTruthSimAlgs/CMakeLists.txt | 16 --------
 .../TrackWriteFastSim/CMakeLists.txt          | 10 -----
 Simulation/HitManagement/CMakeLists.txt       |  9 -----
 .../ISF_Core/ISF_Algorithms/CMakeLists.txt    | 19 ---------
 .../ISF_Core/ISF_AthenaPool/CMakeLists.txt    |  9 -----
 .../ISF/ISF_Core/ISF_Event/CMakeLists.txt     | 11 ------
 .../ISF_Core/ISF_Interfaces/CMakeLists.txt    | 14 -------
 .../ISF/ISF_Core/ISF_Services/CMakeLists.txt  | 29 --------------
 .../ISF/ISF_Core/ISF_Tools/CMakeLists.txt     | 13 -------
 .../ISF_FastCaloSimEvent/CMakeLists.txt       | 12 ------
 .../ISF_FastCaloSimInterfaces/CMakeLists.txt  |  5 ---
 .../CMakeLists.txt                            | 39 -------------------
 .../ISF_FastCaloSimSD/CMakeLists.txt          | 16 --------
 .../ISF_FastCaloSimServices/CMakeLists.txt    | 27 -------------
 .../ISF_PunchThroughTools/CMakeLists.txt      | 17 --------
 .../CMakeLists.txt                            |  7 ----
 .../ISF_FatrasDetDescrModel/CMakeLists.txt    | 19 ---------
 .../ISF_FatrasDetDescrTools/CMakeLists.txt    | 17 --------
 .../ISF_Fatras/ISF_FatrasEvent/CMakeLists.txt | 13 -------
 .../ISF_FatrasEventAthenaPool/CMakeLists.txt  | 10 -----
 .../ISF_FatrasEventTPCnv/CMakeLists.txt       | 22 -----------
 .../ISF_FatrasServices/CMakeLists.txt         | 10 -----
 .../ISF_Fatras/ISF_FatrasTools/CMakeLists.txt | 28 -------------
 .../ISF_FatrasToolsG4/CMakeLists.txt          | 17 --------
 .../ISF_FatrasToolsID/CMakeLists.txt          | 36 -----------------
 .../ISF_Geant4CommonServices/CMakeLists.txt   | 10 -----
 .../ISF_Geant4CommonTools/CMakeLists.txt      | 10 -----
 .../ISF_Geant4/ISF_Geant4Event/CMakeLists.txt | 13 -------
 .../ISF_Geant4Services/CMakeLists.txt         | 10 -----
 .../ISF_Geant4/ISF_Geant4Tools/CMakeLists.txt | 19 ---------
 .../ISF_Geant4UserActions/CMakeLists.txt      | 16 --------
 .../ISF_HepMC_Interfaces/CMakeLists.txt       |  6 ---
 .../ISF_HepMC/ISF_HepMC_Tools/CMakeLists.txt  | 13 -------
 .../ISF_ParSimInterfaces/CMakeLists.txt       |  6 ---
 .../ISF_ParSimServices/CMakeLists.txt         |  9 -----
 .../ISF_ParSimTools/CMakeLists.txt            | 16 --------
 .../ISF_SimulationSelectors/CMakeLists.txt    | 10 -----
 .../ISF_TrackingInterfaces/CMakeLists.txt     |  4 --
 .../ISF_TrackingTools/CMakeLists.txt          | 13 -------
 .../HepMC_Interfaces/CMakeLists.txt           |  5 ---
 .../Overlay/IDC_OverlayBase/CMakeLists.txt    |  5 ---
 .../RunDependentSimData/CMakeLists.txt        |  4 --
 Simulation/SimuJobTransforms/CMakeLists.txt   |  4 --
 .../Tests/DigitizationTests/CMakeLists.txt    | 13 -------
 .../CMakeLists.txt                            |  6 ---
 .../CMakeLists.txt                            | 20 ----------
 Simulation/Tools/HitAnalysis/CMakeLists.txt   | 23 -----------
 .../McEventCollectionFilter/CMakeLists.txt    | 10 -----
 Simulation/Tools/RDOAnalysis/CMakeLists.txt   | 17 --------
 Simulation/TruthJiveXML/CMakeLists.txt        | 12 ------
 .../CombinedScintillator/CMakeLists.txt       | 10 -----
 .../TileAncillary/DeadMaterial/CMakeLists.txt |  8 ----
 .../TileAncillary/LarCrate/CMakeLists.txt     |  8 ----
 .../MinBiasScintillator/CMakeLists.txt        | 11 ------
 .../TileAncillary/MuonWall/CMakeLists.txt     | 10 -----
 .../PhantomCalorimeter/CMakeLists.txt         | 10 -----
 .../TileG4/TileG4Interfaces/CMakeLists.txt    |  6 ---
 .../TileG4/TileGeoG4Calib/CMakeLists.txt      | 22 -----------
 .../TileG4/TileGeoG4SD/CMakeLists.txt         | 18 ---------
 128 files changed, 1531 deletions(-)

diff --git a/Calorimeter/CaloG4Sim/CMakeLists.txt b/Calorimeter/CaloG4Sim/CMakeLists.txt
index 1d6c8725c1e..a67dfcaee80 100644
--- a/Calorimeter/CaloG4Sim/CMakeLists.txt
+++ b/Calorimeter/CaloG4Sim/CMakeLists.txt
@@ -5,16 +5,6 @@
 # Declare the package name:
 atlas_subdir( CaloG4Sim )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          Simulation/G4Atlas/G4AtlasInterfaces
-                          Simulation/G4Atlas/G4AtlasTools
-                          PRIVATE
-                          Control/CxxUtils
-                          Simulation/G4Sim/MCTruth )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/InnerDetector/InDetG4/BCM_G4_SD/CMakeLists.txt b/InnerDetector/InDetG4/BCM_G4_SD/CMakeLists.txt
index e0e58635a7f..4fdadae06b4 100644
--- a/InnerDetector/InDetG4/BCM_G4_SD/CMakeLists.txt
+++ b/InnerDetector/InDetG4/BCM_G4_SD/CMakeLists.txt
@@ -5,17 +5,6 @@
 # Declare the package name:
 atlas_subdir( BCM_G4_SD )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          GaudiKernel
-                          InnerDetector/InDetSimEvent
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/G4Sim/MCTruth
-                          AtlasTest/TestTools
-                           )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/InnerDetector/InDetG4/BLM_G4_SD/CMakeLists.txt b/InnerDetector/InDetG4/BLM_G4_SD/CMakeLists.txt
index 974288bee1f..d1a06d3dce1 100644
--- a/InnerDetector/InDetG4/BLM_G4_SD/CMakeLists.txt
+++ b/InnerDetector/InDetG4/BLM_G4_SD/CMakeLists.txt
@@ -5,16 +5,6 @@
 # Declare the package name:
 atlas_subdir( BLM_G4_SD )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/StoreGate
-                          GaudiKernel
-                          InnerDetector/InDetSimEvent
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/G4Sim/MCTruth
-                          AtlasTest/TestTools
-                           )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
@@ -34,8 +24,6 @@ atlas_add_component( BLM_G4_SD
                      INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
                      LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} StoreGateLib SGtests GaudiKernel InDetSimEvent G4AtlasToolsLib MCTruth BLM_G4_SDLib )
 
-
-
 atlas_add_test( BLM_G4_SDToolConfig_test
                 SCRIPT test/BLM_G4_SDToolConfig_test.py
                 PROPERTIES TIMEOUT 300 )
@@ -47,8 +35,6 @@ atlas_add_test( BLMSensorSD_gtest
                 LINK_LIBRARIES TestTools BLM_G4_SDLib ${GTEST_LIBRARIES} ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} CxxUtils StoreGateLib SGtests GaudiKernel InDetSimEvent G4AtlasToolsLib MCTruth
               )
 
-
-
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/optionForTest.txt )
diff --git a/InnerDetector/InDetG4/PixelG4_SD/CMakeLists.txt b/InnerDetector/InDetG4/PixelG4_SD/CMakeLists.txt
index 9852c3b21a7..78b27e8cf51 100644
--- a/InnerDetector/InDetG4/PixelG4_SD/CMakeLists.txt
+++ b/InnerDetector/InDetG4/PixelG4_SD/CMakeLists.txt
@@ -5,16 +5,6 @@
 # Declare the package name:
 atlas_subdir( PixelG4_SD )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/StoreGate
-                          GaudiKernel
-                          InnerDetector/InDetSimEvent
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/G4Sim/MCTruth
-                          AtlasTest/TestTools
-                           )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
@@ -28,7 +18,6 @@ atlas_add_library( PixelG4_SDLib
                    INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
                    LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} CxxUtils StoreGateLib SGtests GaudiKernel InDetSimEvent G4AtlasToolsLib MCTruth )
 
-
 atlas_add_component( PixelG4_SD
                      src/components/*.cxx
                      INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
diff --git a/InnerDetector/InDetG4/SCT_G4_SD/CMakeLists.txt b/InnerDetector/InDetG4/SCT_G4_SD/CMakeLists.txt
index 082c907a02f..4ebd128dd22 100644
--- a/InnerDetector/InDetG4/SCT_G4_SD/CMakeLists.txt
+++ b/InnerDetector/InDetG4/SCT_G4_SD/CMakeLists.txt
@@ -5,16 +5,6 @@
 # Declare the package name:
 atlas_subdir( SCT_G4_SD )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/StoreGate
-                          GaudiKernel
-                          InnerDetector/InDetSimEvent
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/G4Sim/MCTruth
-                          AtlasTest/TestTools
-                           )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/InnerDetector/InDetG4/TRT_G4Utilities/CMakeLists.txt b/InnerDetector/InDetG4/TRT_G4Utilities/CMakeLists.txt
index 912ea2f3032..0dac0e46160 100644
--- a/InnerDetector/InDetG4/TRT_G4Utilities/CMakeLists.txt
+++ b/InnerDetector/InDetG4/TRT_G4Utilities/CMakeLists.txt
@@ -5,12 +5,6 @@
 # Declare the package name:
 atlas_subdir( TRT_G4Utilities )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          PRIVATE
-                          Tools/PathResolver )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
@@ -35,4 +29,3 @@ atlas_add_test( ut_TRT_G4UtilitiesTest
    PRIVATE_INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS}
    LINK_LIBRARIES ${Boost_LIBRARIES} TRT_G4Utilities )
 
-
diff --git a/InnerDetector/InDetG4/TRT_G4_SD/CMakeLists.txt b/InnerDetector/InDetG4/TRT_G4_SD/CMakeLists.txt
index 1f8999c3f0a..4e70daec0f7 100644
--- a/InnerDetector/InDetG4/TRT_G4_SD/CMakeLists.txt
+++ b/InnerDetector/InDetG4/TRT_G4_SD/CMakeLists.txt
@@ -5,18 +5,6 @@
 # Declare the package name:
 atlas_subdir( TRT_G4_SD )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          GaudiKernel
-                          InnerDetector/InDetG4/TRT_G4Utilities
-                          InnerDetector/InDetSimEvent
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/G4Sim/MCTruth
-                          AtlasTest/TestTools
-                           )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
@@ -35,7 +23,6 @@ atlas_add_component( TRT_G4_SD
                      INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
                      LINK_LIBRARIES ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel StoreGateLib SGtests GaudiKernel TRT_G4Utilities InDetSimEvent G4AtlasToolsLib MCTruth TRT_G4_SDLib )
 
-
 atlas_add_test( TRT_G4_SDToolConfig_test
                 SCRIPT test/TRT_G4_SDToolConfig_test.py
                 PROPERTIES TIMEOUT 300 )
@@ -47,7 +34,6 @@ atlas_add_test( TRTSensitiveDetector_gtest
                 LINK_LIBRARIES TestTools TRT_G4_SDLib ${GTEST_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel CxxUtils StoreGateLib SGtests GaudiKernel TRT_G4Utilities InDetSimEvent G4AtlasToolsLib MCTruth
               )
 
-
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/optionForTest.txt )
diff --git a/InnerDetector/InDetSimUtils/TRT_PAI_Process/CMakeLists.txt b/InnerDetector/InDetSimUtils/TRT_PAI_Process/CMakeLists.txt
index c2654c23c6f..828c31d1135 100644
--- a/InnerDetector/InDetSimUtils/TRT_PAI_Process/CMakeLists.txt
+++ b/InnerDetector/InDetSimUtils/TRT_PAI_Process/CMakeLists.txt
@@ -5,16 +5,6 @@
 # Declare the package name:
 atlas_subdir( TRT_PAI_Process )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          GaudiKernel
-                          PRIVATE
-                          Control/StoreGate
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-			  InnerDetector/InDetDetDescr/TRT_ReadoutGeometry)
-
 # External dependencies:
 find_package( CLHEP )
 
diff --git a/InnerDetector/InDetSimUtils/TRT_TR_Process/CMakeLists.txt b/InnerDetector/InDetSimUtils/TRT_TR_Process/CMakeLists.txt
index 1bd1d7f7eb4..2813e3aa8f7 100644
--- a/InnerDetector/InDetSimUtils/TRT_TR_Process/CMakeLists.txt
+++ b/InnerDetector/InDetSimUtils/TRT_TR_Process/CMakeLists.txt
@@ -5,20 +5,6 @@
 # Declare the package name:
 atlas_subdir( TRT_TR_Process )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/CxxUtils
-                          Control/StoreGate
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          DetectorDescription/IdDictDetDescr
-                          Simulation/G4Atlas/G4AtlasInterfaces
-                          Simulation/G4Utilities/GeoMaterial2G4
-                          Tools/PathResolver )
-
 # External dependencies:
 find_package( Boost )
 find_package( CLHEP )
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4Barrel/CMakeLists.txt
index 08534e662de..03b1e2bf4aa 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4Barrel/CMakeLists.txt
@@ -5,16 +5,6 @@
 # Declare the package name:
 atlas_subdir( LArG4Barrel )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Calorimeter/CaloG4Sim
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          GaudiKernel
-                          LArCalorimeter/LArG4/LArG4Code
-                          LArCalorimeter/LArGeoModel/LArHV
-                          Tools/PathResolver )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/LArCalorimeter/LArG4/LArG4Code/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4Code/CMakeLists.txt
index ba36aeaa17c..2e00b5a3f8e 100644
--- a/LArCalorimeter/LArG4/LArG4Code/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4Code/CMakeLists.txt
@@ -5,23 +5,6 @@
 # Declare the package name:
 atlas_subdir( LArG4Code )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Calorimeter/CaloG4Sim
-                          Calorimeter/CaloSimEvent
-                          DetectorDescription/AtlasDetDescr
-                          LArCalorimeter/LArGeoModel/LArGeoCode
-                          LArCalorimeter/LArSimEvent
-                          Simulation/G4Atlas/G4AtlasTools
-                          Control/StoreGate
-                          GaudiKernel
-                          PRIVATE
-                          Calorimeter/CaloIdentifier
-                          Control/AthenaKernel
-                          Control/CxxUtils
-                          AtlasTest/TestTools
-                          Simulation/G4Sim/MCTruth )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/LArCalorimeter/LArG4/LArG4EC/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4EC/CMakeLists.txt
index 8c2ae22e392..cded039785c 100644
--- a/LArCalorimeter/LArG4/LArG4EC/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4EC/CMakeLists.txt
@@ -5,21 +5,6 @@
 # Declare the package name:
 atlas_subdir( LArG4EC )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Calorimeter/CaloG4Sim
-                          DetectorDescription/GeoModel/GeoSpecialShapes
-                          LArCalorimeter/LArG4/LArG4Code
-                          LArCalorimeter/LArGeoModel/LArGeoCode
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          Database/RDBAccessSvc
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          DetectorDescription/GeoModel/GeoModelUtilities
-                          GaudiKernel
-                          LArCalorimeter/LArGeoModel/LArHV
-                          Tools/PathResolver )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )
diff --git a/LArCalorimeter/LArG4/LArG4FCAL/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4FCAL/CMakeLists.txt
index ec920e45366..6c082c84e29 100644
--- a/LArCalorimeter/LArG4/LArG4FCAL/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4FCAL/CMakeLists.txt
@@ -5,18 +5,6 @@
 # Declare the package name:
 atlas_subdir( LArG4FCAL )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Calorimeter/CaloG4Sim
-                          LArCalorimeter/LArG4/LArG4Code
-                          LArCalorimeter/LArGeoModel/LArReadoutGeometry
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          Database/RDBAccessSvc
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          GaudiKernel
-                          Tools/PathResolver )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )
diff --git a/LArCalorimeter/LArG4/LArG4FastSimSvc/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4FastSimSvc/CMakeLists.txt
index 82616394dbf..0b8cc9f1688 100644
--- a/LArCalorimeter/LArG4/LArG4FastSimSvc/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4FastSimSvc/CMakeLists.txt
@@ -5,12 +5,6 @@
 # Declare the package name:
 atlas_subdir( LArG4FastSimSvc )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel 
-                          Generators/AtlasHepMC )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/LArCalorimeter/LArG4/LArG4GenShowerLib/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4GenShowerLib/CMakeLists.txt
index ac94939aa71..5f85af58081 100644
--- a/LArCalorimeter/LArG4/LArG4GenShowerLib/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4GenShowerLib/CMakeLists.txt
@@ -5,21 +5,6 @@
 # Declare the package name:
 atlas_subdir( LArG4GenShowerLib )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/AthContainers
-                          Control/StoreGate
-                          GaudiKernel
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/G4Atlas/G4AtlasInterfaces
-                          LArCalorimeter/LArG4/LArG4Code
-                          PRIVATE
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          Generators/GeneratorObjects
-                          LArCalorimeter/LArG4/LArG4ShowerLib )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4H6SD/CMakeLists.txt
index bce9b6c29ee..717abda6b56 100644
--- a/LArCalorimeter/LArG4/LArG4H6SD/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4H6SD/CMakeLists.txt
@@ -5,34 +5,6 @@
 # Declare the package name:
 atlas_subdir( LArG4H6SD )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Calorimeter/CaloG4Sim
-                          Calorimeter/CaloSimEvent
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          Database/RDBAccessSvc
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          DetectorDescription/GeoModel/GeoModelUtilities
-                          DetectorDescription/Identifier
-                          Generators/GeneratorObjects
-                          LArCalorimeter/LArG4/LArG4Code
-                          LArCalorimeter/LArG4/LArG4RunControl
-                          LArCalorimeter/LArG4TB/LArG4TBSimEvent
-                          LArCalorimeter/LArGeoModel/LArReadoutGeometry
-                          LArCalorimeter/LArSimEvent
-                          Simulation/G4Atlas/G4AtlasInterfaces
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/G4Sim/SimHelpers
-                          Simulation/HitManagement
-                          Simulation/G4Sim/MCTruth
-                          TestBeam/TBEvent
-                          Tools/PathResolver 
-                          Generators/AtlasHepMC )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )
diff --git a/LArCalorimeter/LArG4/LArG4H8SD/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4H8SD/CMakeLists.txt
index 06a90515097..146230e6f17 100644
--- a/LArCalorimeter/LArG4/LArG4H8SD/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4H8SD/CMakeLists.txt
@@ -5,15 +5,6 @@
 # Declare the package name:
 atlas_subdir( LArG4H8SD )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Calorimeter/CaloG4Sim
-                          Calorimeter/CaloSimEvent
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          GaudiKernel
-                          LArCalorimeter/LArG4/LArG4Code )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/LArCalorimeter/LArG4/LArG4HEC/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4HEC/CMakeLists.txt
index 77d9a10c62c..bc4dd23ede5 100644
--- a/LArCalorimeter/LArG4/LArG4HEC/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4HEC/CMakeLists.txt
@@ -5,20 +5,6 @@
 # Declare the package name:
 atlas_subdir( LArG4HEC )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          LArCalorimeter/LArGeoModel/LArReadoutGeometry
-                          Control/AthenaBaseComps
-                          PRIVATE
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          Database/RDBAccessSvc
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          GaudiKernel
-                          Calorimeter/CaloG4Sim
-                          LArCalorimeter/LArG4/LArG4Code
-                          LArCalorimeter/LArGeoModel/LArHV )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )
diff --git a/LArCalorimeter/LArG4/LArG4MiniFCAL/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4MiniFCAL/CMakeLists.txt
index 0d56009e2a5..a1942408eaa 100644
--- a/LArCalorimeter/LArG4/LArG4MiniFCAL/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4MiniFCAL/CMakeLists.txt
@@ -5,18 +5,6 @@
 # Declare the package name:
 atlas_subdir( LArG4MiniFCAL )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          PRIVATE
-                          Calorimeter/CaloG4Sim
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          Database/RDBAccessSvc
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          DetectorDescription/Identifier
-                          GaudiKernel
-                          LArCalorimeter/LArG4/LArG4Code )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )
diff --git a/LArCalorimeter/LArG4/LArG4RunControl/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4RunControl/CMakeLists.txt
index 6cc3b8ae4ce..4fe682e65ca 100644
--- a/LArCalorimeter/LArG4/LArG4RunControl/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4RunControl/CMakeLists.txt
@@ -5,13 +5,6 @@
 # Declare the package name:
 atlas_subdir( LArG4RunControl )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          PRIVATE
-                          Control/StoreGate
-                          GaudiKernel )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
diff --git a/LArCalorimeter/LArG4/LArG4SD/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4SD/CMakeLists.txt
index d632162ff77..524c9603e45 100644
--- a/LArCalorimeter/LArG4/LArG4SD/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4SD/CMakeLists.txt
@@ -5,12 +5,6 @@
 # Declare the package name:
 atlas_subdir( LArG4SD )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Calorimeter/CaloG4Sim
-                          GaudiKernel
-                          LArCalorimeter/LArG4/LArG4Code )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
@@ -24,7 +18,6 @@ atlas_add_component( LArG4SD
                      INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
                      LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} CaloG4SimLib GaudiKernel LArG4Code )
 
-
 atlas_add_test( LArG4SDToolConfig_test
                 SCRIPT test/LArG4SDToolConfig_test.py
                 PROPERTIES TIMEOUT 300 )
diff --git a/LArCalorimeter/LArG4/LArG4ShowerLib/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4ShowerLib/CMakeLists.txt
index 31f351cd604..3d6b0666fe5 100644
--- a/LArCalorimeter/LArG4/LArG4ShowerLib/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4ShowerLib/CMakeLists.txt
@@ -5,12 +5,6 @@
 # Declare the package name:
 atlas_subdir( LArG4ShowerLib )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthContainers
-                          LArCalorimeter/LArG4/LArG4Code 
-                          Generators/AtlasHepMC )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/LArCalorimeter/LArG4/LArG4Validation/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4Validation/CMakeLists.txt
index dd64ac528e3..578b9b1897f 100644
--- a/LArCalorimeter/LArG4/LArG4Validation/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4Validation/CMakeLists.txt
@@ -5,20 +5,6 @@
 # Declare the package name:
 atlas_subdir( LArG4Validation )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          GaudiKernel
-                          Calorimeter/CaloDetDescr
-                          Calorimeter/CaloIdentifier
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          DetectorDescription/GeoModel/GeoAdaptors
-                          Generators/GeneratorObjects
-                          LArCalorimeter/LArSimEvent
-                          MagneticField/MagFieldInterfaces
-                          Reconstruction/egamma/egammaEvent )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( HepPDT )
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/CMakeLists.txt b/MuonSpectrometer/MuonG4/MuonG4SD/CMakeLists.txt
index 4d89fe08296..b01fdcaebfc 100644
--- a/MuonSpectrometer/MuonG4/MuonG4SD/CMakeLists.txt
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/CMakeLists.txt
@@ -5,16 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonG4SD )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/StoreGate
-                          DetectorDescription/GeoPrimitives
-                          GaudiKernel
-                          MuonSpectrometer/MuonSimEvent
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/G4Sim/MCTruth 
-                          AtlasTest/TestTools )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Eigen )
diff --git a/Simulation/Barcode/BarcodeEvent/CMakeLists.txt b/Simulation/Barcode/BarcodeEvent/CMakeLists.txt
index ba8c20be4d0..52b7785e829 100644
--- a/Simulation/Barcode/BarcodeEvent/CMakeLists.txt
+++ b/Simulation/Barcode/BarcodeEvent/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( BarcodeEvent )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel )
-
 atlas_add_library( BarcodeEventLib
                    BarcodeEvent/*.h
                    INTERFACE
diff --git a/Simulation/Barcode/BarcodeInterfaces/CMakeLists.txt b/Simulation/Barcode/BarcodeInterfaces/CMakeLists.txt
index d2da87fff93..ce92988d7a9 100644
--- a/Simulation/Barcode/BarcodeInterfaces/CMakeLists.txt
+++ b/Simulation/Barcode/BarcodeInterfaces/CMakeLists.txt
@@ -5,11 +5,6 @@
 # Declare the package name:
 atlas_subdir( BarcodeInterfaces )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          Simulation/Barcode/BarcodeEvent )
-
 atlas_add_library( BarcodeInterfacesLib
                    BarcodeInterfaces/*.h
                    INTERFACE
diff --git a/Simulation/Barcode/BarcodeServices/CMakeLists.txt b/Simulation/Barcode/BarcodeServices/CMakeLists.txt
index c50234e4d8e..9652a53f821 100644
--- a/Simulation/Barcode/BarcodeServices/CMakeLists.txt
+++ b/Simulation/Barcode/BarcodeServices/CMakeLists.txt
@@ -5,13 +5,6 @@
 # Declare the package name:
 atlas_subdir( BarcodeServices )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          Simulation/Barcode/BarcodeEvent
-                          Simulation/Barcode/BarcodeInterfaces )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Cint Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint )
 
diff --git a/Simulation/BeamEffects/CMakeLists.txt b/Simulation/BeamEffects/CMakeLists.txt
index af8e055daed..a7f21d8b251 100644
--- a/Simulation/BeamEffects/CMakeLists.txt
+++ b/Simulation/BeamEffects/CMakeLists.txt
@@ -5,20 +5,6 @@
 # Declare the package name:
 atlas_subdir( BeamEffects )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          InnerDetector/InDetConditions/BeamSpotConditionsData
-                          PRIVATE
-                          AtlasTest/TestTools
-                          Control/AthenaBaseComps
-                          Control/StoreGate
-                          Event/EventInfo
-                          Generators/AtlasHepMC
-                          Generators/GeneratorObjects
-                          InnerDetector/InDetConditions/InDetBeamSpotService
-                          Simulation/Interfaces/HepMC_Interfaces )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( GTest )
diff --git a/Simulation/FastShower/FastCaloSim/CMakeLists.txt b/Simulation/FastShower/FastCaloSim/CMakeLists.txt
index a1a7948c731..01d512dffba 100644
--- a/Simulation/FastShower/FastCaloSim/CMakeLists.txt
+++ b/Simulation/FastShower/FastCaloSim/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 ################################################################################
 # Package: FastCaloSim
 ################################################################################
@@ -6,41 +5,6 @@
 # Declare the package name:
 atlas_subdir( FastCaloSim )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Calorimeter/CaloDetDescr
-                          Calorimeter/CaloEvent
-                          Calorimeter/CaloIdentifier
-                          Calorimeter/CaloInterface
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          DetectorDescription/Identifier
-                          GaudiKernel
-                          LArCalorimeter/LArRecEvent
-                          Simulation/FastSimulation/FastSimulationEvent
-                          Simulation/FastShower/FastCaloSimAthenaPool
-                          TileCalorimeter/TileEvent
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkExtrapolation/TrkExInterfaces
-                          Generators/GeneratorObjects
-                          Simulation/FastShower/FastCaloSimAthenaPool
-                          PRIVATE
-                          Generators/AtlasHepMC
-                          Control/AthAllocators
-                          Database/AthenaPOOL/AthenaPoolUtilities
-                          DetectorDescription/AtlasDetDescr
-                          DetectorDescription/DetDescrCond/DetDescrCondTools
-                          DetectorDescription/GeoPrimitives
-                          Event/EventKernel
-                          Event/NavFourMom
-                          Generators/TruthUtils
-                          Tools/PathResolver
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkMaterialOnTrack )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Eigen )
@@ -93,13 +57,11 @@ atlas_add_component( FastCaloSim
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 
-
 atlas_add_test( FastShowerCellBuilderTool_test
   SCRIPT test/FastShowerCellBuilderTool_test.sh
   PROPERTIES TIMEOUT 600
   LOG_SELECT_PATTERN "ERROR|error|WARNING [^U]|FATAL|processing|TestAlg|xxx" )
 
-
 atlas_add_test( AddNoiseCellBuilderToolConfigTest_test
                 SCRIPT python -m FastCaloSim.AddNoiseCellBuilderToolConfig
                 LOG_SELECT_PATTERN "ComponentAccumulator|^---|^IOVDbSvc" )
diff --git a/Simulation/FastShower/FastCaloSimAthenaPool/CMakeLists.txt b/Simulation/FastShower/FastCaloSimAthenaPool/CMakeLists.txt
index e57d8d5defd..0107bea909d 100644
--- a/Simulation/FastShower/FastCaloSimAthenaPool/CMakeLists.txt
+++ b/Simulation/FastShower/FastCaloSimAthenaPool/CMakeLists.txt
@@ -5,14 +5,6 @@
 # Declare the package name:
 atlas_subdir( FastCaloSimAthenaPool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          Control/AthContainers
-                          Database/AthenaPOOL/AthenaPoolUtilities
-                          PRIVATE
-                          Database/AthenaPOOL/AthenaPoolCnvSvc )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 
diff --git a/Simulation/FastShower/FastCaloSimHit/CMakeLists.txt b/Simulation/FastShower/FastCaloSimHit/CMakeLists.txt
index 44163416e89..57b94c24126 100644
--- a/Simulation/FastShower/FastCaloSimHit/CMakeLists.txt
+++ b/Simulation/FastShower/FastCaloSimHit/CMakeLists.txt
@@ -5,23 +5,6 @@
 # Declare the package name:
 atlas_subdir( FastCaloSimHit )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Calorimeter/CaloInterface
-                          Control/AthenaBaseComps
-                          Control/StoreGate
-                          GaudiKernel
-                          LArCalorimeter/LArElecCalib
-                          LArCalorimeter/LArSimEvent
-                          TileCalorimeter/TileSimEvent
-                          PRIVATE
-                          Calorimeter/CaloEvent
-                          Calorimeter/CaloIdentifier
-                          Control/PileUpTools
-                          Event/EventInfo
-                          TileCalorimeter/TileConditions
-                          TileCalorimeter/TileEvent )
-
 # this line failed automatic conversion in cmt2cmake :
 # macro_append FastCaloSimHit_cppflags " -DFastCaloSimHit_project_release_v1=`echo $(FastCaloSimHit_project_release) | awk -F. '{printf("'"'%d'"'",$$1)}'` "
 
diff --git a/Simulation/FastSimulation/FastChainPileup/CMakeLists.txt b/Simulation/FastSimulation/FastChainPileup/CMakeLists.txt
index 27d35d423bd..36897620e36 100644
--- a/Simulation/FastSimulation/FastChainPileup/CMakeLists.txt
+++ b/Simulation/FastSimulation/FastChainPileup/CMakeLists.txt
@@ -5,12 +5,6 @@
 # Declare the package name:
 atlas_subdir( FastChainPileup )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          Generators/GeneratorModules
-                          Generators/Pythia8_i )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Lhapdf )
diff --git a/Simulation/FastSimulation/FastSimulationEvent/CMakeLists.txt b/Simulation/FastSimulation/FastSimulationEvent/CMakeLists.txt
index f67c472d0da..e33223b8c37 100644
--- a/Simulation/FastSimulation/FastSimulationEvent/CMakeLists.txt
+++ b/Simulation/FastSimulation/FastSimulationEvent/CMakeLists.txt
@@ -5,12 +5,6 @@
 # Declare the package name:
 atlas_subdir( FastSimulationEvent )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          DetectorDescription/GeoPrimitives
-                          Tracking/TrkEvent/TrkMaterialOnTrack )
-
 atlas_add_library( FastSimulationEventLib
                    src/*.cxx
                    PUBLIC_HEADERS FastSimulationEvent
diff --git a/Simulation/FastSimulation/FastSimulationJobTransforms/CMakeLists.txt b/Simulation/FastSimulation/FastSimulationJobTransforms/CMakeLists.txt
index dc28e770d75..7011cb9dae2 100644
--- a/Simulation/FastSimulation/FastSimulationJobTransforms/CMakeLists.txt
+++ b/Simulation/FastSimulation/FastSimulationJobTransforms/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( FastSimulationJobTransforms )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Tools/PyJobTransformsCore )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( share/*.db share/*.root )
diff --git a/Simulation/G4Atlas/G4AtlasAlg/CMakeLists.txt b/Simulation/G4Atlas/G4AtlasAlg/CMakeLists.txt
index 3a0b865f076..e8f309127a3 100644
--- a/Simulation/G4Atlas/G4AtlasAlg/CMakeLists.txt
+++ b/Simulation/G4Atlas/G4AtlasAlg/CMakeLists.txt
@@ -5,23 +5,6 @@
 # Declare the package name:
 atlas_subdir( G4AtlasAlg )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/SGTools
-                          Control/StoreGate
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          Event/EventInfo
-                          Generators/AtlasHepMC
-                          Generators/GeneratorObjects
-                          Simulation/G4Atlas/G4AtlasInterfaces
-                          Simulation/G4Sim/MCTruthBase
-                          Simulation/ISF/ISF_Core/ISF_Interfaces
-                          Simulation/Barcode/BarcodeInterfaces)
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/G4Atlas/G4AtlasControl/CMakeLists.txt b/Simulation/G4Atlas/G4AtlasControl/CMakeLists.txt
index 174a9b4e715..610639715cc 100644
--- a/Simulation/G4Atlas/G4AtlasControl/CMakeLists.txt
+++ b/Simulation/G4Atlas/G4AtlasControl/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( G4AtlasControl )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/G4Atlas/G4AtlasInterfaces/CMakeLists.txt b/Simulation/G4Atlas/G4AtlasInterfaces/CMakeLists.txt
index 0e1ad60a3a9..a83257fe233 100644
--- a/Simulation/G4Atlas/G4AtlasInterfaces/CMakeLists.txt
+++ b/Simulation/G4Atlas/G4AtlasInterfaces/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( G4AtlasInterfaces )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/G4Atlas/G4AtlasServices/CMakeLists.txt b/Simulation/G4Atlas/G4AtlasServices/CMakeLists.txt
index 7f2c059c510..2d735a12d06 100644
--- a/Simulation/G4Atlas/G4AtlasServices/CMakeLists.txt
+++ b/Simulation/G4Atlas/G4AtlasServices/CMakeLists.txt
@@ -5,16 +5,6 @@
 # Declare the package name:
 atlas_subdir( G4AtlasServices )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          MagneticField/MagFieldInterfaces
-                          Simulation/G4Atlas/G4AtlasInterfaces
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/G4Utilities/G4PhysicsLists )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
@@ -38,7 +28,6 @@ atlas_add_test( G4AtlasServicesConfig_test
                 SCRIPT test/G4AtlasServicesConfig_test.py
                 PROPERTIES TIMEOUT 300 )
 
-
 # Install files from the package:
 atlas_install_python_modules( python/*.py
                               POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt b/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt
index 8a41c26951a..080911d598b 100644
--- a/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt
+++ b/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt
@@ -5,40 +5,6 @@
 # Declare the package name:
 atlas_subdir( G4AtlasTests )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          PRIVATE
-                          Calorimeter/CaloDetDescr
-                          Calorimeter/CaloIdentifier
-                          Calorimeter/CaloSimEvent
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          DetectorDescription/GeoModel/GeoAdaptors
-                          DetectorDescription/GeoPrimitives
-                          DetectorDescription/Identifier
-                          Event/EventInfo
-                          ForwardDetectors/ALFA/ALFA_SimEv
-                          ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_SimEvent
-                          ForwardDetectors/ZDC/ZDC_SimEvent
-                          Generators/AtlasHepMC
-                          Generators/GeneratorObjects
-                          InnerDetector/InDetSimEvent
-                          LArCalorimeter/LArSimEvent
-                          MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
-                          MuonSpectrometer/MuonIdHelpers
-                          MuonSpectrometer/MuonSimEvent
-                          PhysicsAnalysis/TruthParticleID/McParticleEvent
-                          Simulation/G4Atlas/G4AtlasInterfaces
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/G4Sim/MCTruth
-                          Simulation/G4Sim/TrackRecord
-                          Simulation/HitManagement
-                          TileCalorimeter/TileDetDescr
-                          TileCalorimeter/TileIdentifier
-                          TileCalorimeter/TileSimEvent )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Eigen )
diff --git a/Simulation/G4Atlas/G4AtlasTools/CMakeLists.txt b/Simulation/G4Atlas/G4AtlasTools/CMakeLists.txt
index b2485364a43..3b62b1c8dd7 100644
--- a/Simulation/G4Atlas/G4AtlasTools/CMakeLists.txt
+++ b/Simulation/G4Atlas/G4AtlasTools/CMakeLists.txt
@@ -5,14 +5,6 @@
 # Declare the package name:
 atlas_subdir( G4AtlasTools )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          AtlasGeometryCommon/SubDetectorEnvelopes
-                          Control/AthenaBaseComps
-                          Simulation/G4Atlas/G4AtlasInterfaces
-                          PRIVATE
-                          GaudiKernel )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )
@@ -36,7 +28,6 @@ atlas_add_component( G4AtlasTools
                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS}
                      LINK_LIBRARIES ${Boost_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} ${TBB_LIBRARIES} AthenaBaseComps G4AtlasInterfaces GaudiKernel G4AtlasToolsLib )
 
-
 #testing just the simulation parts, no forward detectors or region
 atlas_add_test( G4GeometryToolConfig_Simtest
                 SCRIPT test/G4GeometryToolConfig_Simtest.py
@@ -53,12 +44,10 @@ atlas_add_test( G4PhysicsRegionConfig_test
                 SCRIPT test/G4PhysicsRegionConfig_test.py
                 PROPERTIES TIMEOUT 300 )
 
-
 atlas_add_test( G4FieldConfig_test
                 SCRIPT test/G4FieldConfig_test.py
                 PROPERTIES TIMEOUT 300 )
 
-
 atlas_add_test( G4AtlasToolsConfigNew_test
                 SCRIPT test/G4AtlasToolsConfigNew_test.py
                 PROPERTIES TIMEOUT 300 )
diff --git a/Simulation/G4Extensions/Charginos/CMakeLists.txt b/Simulation/G4Extensions/Charginos/CMakeLists.txt
index c0a9601efec..b866ccfacf0 100644
--- a/Simulation/G4Extensions/Charginos/CMakeLists.txt
+++ b/Simulation/G4Extensions/Charginos/CMakeLists.txt
@@ -5,13 +5,6 @@
 # Declare the package name:
 atlas_subdir( Charginos )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Simulation/G4Atlas/G4AtlasInterfaces )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/G4Extensions/ExtraParticles/CMakeLists.txt b/Simulation/G4Extensions/ExtraParticles/CMakeLists.txt
index 1834c926128..79f825bcaf4 100644
--- a/Simulation/G4Extensions/ExtraParticles/CMakeLists.txt
+++ b/Simulation/G4Extensions/ExtraParticles/CMakeLists.txt
@@ -5,13 +5,6 @@
 # Declare the package name:
 atlas_subdir( ExtraParticles )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Simulation/G4Atlas/G4AtlasInterfaces )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/G4Extensions/G4CosmicFilter/CMakeLists.txt b/Simulation/G4Extensions/G4CosmicFilter/CMakeLists.txt
index 32c07d1a7ad..27a024df161 100644
--- a/Simulation/G4Extensions/G4CosmicFilter/CMakeLists.txt
+++ b/Simulation/G4Extensions/G4CosmicFilter/CMakeLists.txt
@@ -5,17 +5,6 @@
 # Declare the package name:
 atlas_subdir( G4CosmicFilter )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/StoreGate
-                          GaudiKernel
-                          Simulation/G4Atlas/G4AtlasInterfaces
-                          Simulation/G4Atlas/G4AtlasTools
-                          PRIVATE
-                          Simulation/G4Sim/MCTruth
-                          Simulation/G4Sim/TrackRecord )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/G4Extensions/G4ExternalDecay/CMakeLists.txt b/Simulation/G4Extensions/G4ExternalDecay/CMakeLists.txt
index 28d20a9fb87..c09ca87c9fc 100644
--- a/Simulation/G4Extensions/G4ExternalDecay/CMakeLists.txt
+++ b/Simulation/G4Extensions/G4ExternalDecay/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( G4ExternalDecay )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Generators/Pythia8_i )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
@@ -33,7 +29,6 @@ if( HEPMC_FOUND )
    list( APPEND extra_libs AtlasHepMCLib )
 endif()
 
-
 # Component(s) in the package:
 atlas_add_library( G4ExternalDecay
                    src/*.cxx
diff --git a/Simulation/G4Extensions/G4HitFilter/CMakeLists.txt b/Simulation/G4Extensions/G4HitFilter/CMakeLists.txt
index c71bcfef380..cbe21dd0548 100644
--- a/Simulation/G4Extensions/G4HitFilter/CMakeLists.txt
+++ b/Simulation/G4Extensions/G4HitFilter/CMakeLists.txt
@@ -5,21 +5,6 @@
 # Declare the package name:
 atlas_subdir( G4HitFilter )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Calorimeter/CaloSimEvent
-                          Control/AthenaBaseComps
-                          Control/StoreGate
-                          ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_SimEvent
-                          InnerDetector/InDetSimEvent
-                          LArCalorimeter/LArSimEvent
-                          MuonSpectrometer/MuonSimEvent
-                          Simulation/G4Atlas/G4AtlasInterfaces
-                          Simulation/G4Atlas/G4AtlasTools
-                          TileCalorimeter/TileSimEvent )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/G4Extensions/G4ScoringProcess/CMakeLists.txt b/Simulation/G4Extensions/G4ScoringProcess/CMakeLists.txt
index fd8bc805819..fa4d1e4c4a5 100644
--- a/Simulation/G4Extensions/G4ScoringProcess/CMakeLists.txt
+++ b/Simulation/G4Extensions/G4ScoringProcess/CMakeLists.txt
@@ -5,13 +5,6 @@
 # Declare the package name:
 atlas_subdir( G4ScoringProcess )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Simulation/G4Atlas/G4AtlasInterfaces )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/G4Extensions/Gauginos/CMakeLists.txt b/Simulation/G4Extensions/Gauginos/CMakeLists.txt
index 024950c9a68..591d9dd2f22 100644
--- a/Simulation/G4Extensions/Gauginos/CMakeLists.txt
+++ b/Simulation/G4Extensions/Gauginos/CMakeLists.txt
@@ -5,12 +5,6 @@
 # Declare the package name:
 atlas_subdir( Gauginos )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          Simulation/G4Atlas/G4AtlasInterfaces )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/G4Extensions/Monopole/CMakeLists.txt b/Simulation/G4Extensions/Monopole/CMakeLists.txt
index 4f38c51bb84..7eacc7123cd 100644
--- a/Simulation/G4Extensions/Monopole/CMakeLists.txt
+++ b/Simulation/G4Extensions/Monopole/CMakeLists.txt
@@ -5,13 +5,6 @@
 # Declare the package name:
 atlas_subdir( Monopole )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Simulation/G4Atlas/G4AtlasInterfaces )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/G4Extensions/Quirks/CMakeLists.txt b/Simulation/G4Extensions/Quirks/CMakeLists.txt
index 9f6a3230094..99dd3e5c633 100644
--- a/Simulation/G4Extensions/Quirks/CMakeLists.txt
+++ b/Simulation/G4Extensions/Quirks/CMakeLists.txt
@@ -5,14 +5,6 @@
 # Declare the package name:
 atlas_subdir( Quirks )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Simulation/G4Atlas/G4AtlasInterfaces
-                          Simulation/G4Atlas/G4AtlasTools )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/G4Extensions/RHadrons/CMakeLists.txt b/Simulation/G4Extensions/RHadrons/CMakeLists.txt
index 1b73c7d2fc0..0daee5c8394 100644
--- a/Simulation/G4Extensions/RHadrons/CMakeLists.txt
+++ b/Simulation/G4Extensions/RHadrons/CMakeLists.txt
@@ -6,15 +6,6 @@
 atlas_subdir( RHadrons )
 
 if( NOT GENERATIONBASE )
-    # Declare the package's dependencies:
-    atlas_depends_on_subdirs( PUBLIC
-                              GaudiKernel
-                              PRIVATE
-                              Control/AthenaBaseComps
-                              Simulation/G4Atlas/G4AtlasInterfaces
-                              Simulation/G4Atlas/G4AtlasTools
-                              Simulation/G4Extensions/G4ExternalDecay
-                              Simulation/G4Sim/SimHelpers )
 
     # External dependencies:
     find_package( CLHEP )
diff --git a/Simulation/G4Extensions/Sleptons/CMakeLists.txt b/Simulation/G4Extensions/Sleptons/CMakeLists.txt
index 53940711964..2646be52192 100644
--- a/Simulation/G4Extensions/Sleptons/CMakeLists.txt
+++ b/Simulation/G4Extensions/Sleptons/CMakeLists.txt
@@ -5,13 +5,6 @@
 # Declare the package name:
 atlas_subdir( Sleptons )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Simulation/G4Atlas/G4AtlasInterfaces )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/G4Sim/G4HiveEx/CMakeLists.txt b/Simulation/G4Sim/G4HiveEx/CMakeLists.txt
index 5433b70e524..f73e76f7a93 100644
--- a/Simulation/G4Sim/G4HiveEx/CMakeLists.txt
+++ b/Simulation/G4Sim/G4HiveEx/CMakeLists.txt
@@ -5,13 +5,6 @@
 # Declare the package name:
 atlas_subdir( G4HiveEx )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          GaudiKernel
-                          Generators/GeneratorObjects )
-
 # External dependencies:
 find_package( Geant4 )
 find_package( CLHEP )
diff --git a/Simulation/G4Sim/MCTruth/CMakeLists.txt b/Simulation/G4Sim/MCTruth/CMakeLists.txt
index 4343bfbaf45..5ad3559df9a 100644
--- a/Simulation/G4Sim/MCTruth/CMakeLists.txt
+++ b/Simulation/G4Sim/MCTruth/CMakeLists.txt
@@ -5,15 +5,6 @@
 # Declare the package name:
 atlas_subdir( MCTruth )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          Generators/AtlasHepMC
-                          Generators/GeneratorObjects
-                          PRIVATE
-                          Simulation/ISF/ISF_Core/ISF_Event
-                          Simulation/G4Sim/SimHelpers )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/G4Sim/MCTruthBase/CMakeLists.txt b/Simulation/G4Sim/MCTruthBase/CMakeLists.txt
index 1849bf34dff..af05f69fff4 100644
--- a/Simulation/G4Sim/MCTruthBase/CMakeLists.txt
+++ b/Simulation/G4Sim/MCTruthBase/CMakeLists.txt
@@ -5,23 +5,6 @@
 # Declare the package name:
 atlas_subdir( MCTruthBase )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          GaudiKernel
-                          Simulation/G4Sim/SimHelpers
-                          Simulation/ISF/ISF_Core/ISF_Interfaces
-                          PRIVATE
-                          Generators/AtlasHepMC                          
-                          Control/AthenaBaseComps
-                          Control/StoreGate
-                          Simulation/G4Atlas/G4AtlasInterfaces
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/G4Sim/MCTruth
-                          Simulation/G4Sim/TrackRecord
-                          DetectorDescription/AtlasDetDescr
-                          Simulation/ISF/ISF_Geant4/ISF_Geant4Event )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/G4Sim/SimHelpers/CMakeLists.txt b/Simulation/G4Sim/SimHelpers/CMakeLists.txt
index 30198021497..784646358a1 100644
--- a/Simulation/G4Sim/SimHelpers/CMakeLists.txt
+++ b/Simulation/G4Sim/SimHelpers/CMakeLists.txt
@@ -5,11 +5,6 @@
 # Declare the package name:
 atlas_subdir( SimHelpers )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/StoreGate
-                          GaudiKernel )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/G4Sim/TrackRecord/CMakeLists.txt b/Simulation/G4Sim/TrackRecord/CMakeLists.txt
index 62efd9cbf5b..54a347c54e8 100644
--- a/Simulation/G4Sim/TrackRecord/CMakeLists.txt
+++ b/Simulation/G4Sim/TrackRecord/CMakeLists.txt
@@ -5,13 +5,6 @@
 # Declare the package name:
 atlas_subdir( TrackRecord )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          Simulation/HitManagement
-                          PRIVATE
-                          Database/AtlasSealCLHEP )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
diff --git a/Simulation/G4SimCnv/G4SimAthenaPOOL/CMakeLists.txt b/Simulation/G4SimCnv/G4SimAthenaPOOL/CMakeLists.txt
index b476d200cf9..da7156e9b51 100644
--- a/Simulation/G4SimCnv/G4SimAthenaPOOL/CMakeLists.txt
+++ b/Simulation/G4SimCnv/G4SimAthenaPOOL/CMakeLists.txt
@@ -5,16 +5,6 @@
 # Declare the package name:
 atlas_subdir( G4SimAthenaPOOL )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Database/AthenaPOOL/AthenaPoolUtilities
-                          Database/AtlasSealCLHEP
-                          GaudiKernel
-                          PRIVATE
-                          Database/AthenaPOOL/AthenaPoolCnvSvc
-                          Simulation/G4Sim/TrackRecord
-                          Simulation/G4SimCnv/G4SimTPCnv )
-
 # Component(s) in the package:
 atlas_add_poolcnv_library( G4SimAthenaPOOLPoolCnv
                            src/*.cxx
diff --git a/Simulation/G4SimCnv/G4SimTPCnv/CMakeLists.txt b/Simulation/G4SimCnv/G4SimTPCnv/CMakeLists.txt
index abd1b40a832..1cb2188b1d5 100644
--- a/Simulation/G4SimCnv/G4SimTPCnv/CMakeLists.txt
+++ b/Simulation/G4SimCnv/G4SimTPCnv/CMakeLists.txt
@@ -5,15 +5,6 @@
 # Declare the package name:
 atlas_subdir( G4SimTPCnv )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Database/AthenaPOOL/AthenaPoolCnvSvc
-                          Database/AthenaPOOL/AthenaPoolServices
-                          Simulation/G4Sim/TrackRecord
-                          PRIVATE
-                          AtlasTest/TestTools
-                          Control/AthenaKernel )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
diff --git a/Simulation/G4Utilities/G4Ancillary/G4AncillaryEventAthenaPool/CMakeLists.txt b/Simulation/G4Utilities/G4Ancillary/G4AncillaryEventAthenaPool/CMakeLists.txt
index 3808ec5fc3d..5b514aca50d 100644
--- a/Simulation/G4Utilities/G4Ancillary/G4AncillaryEventAthenaPool/CMakeLists.txt
+++ b/Simulation/G4Utilities/G4Ancillary/G4AncillaryEventAthenaPool/CMakeLists.txt
@@ -5,14 +5,6 @@
 # Declare the package name:
 atlas_subdir( G4AncillaryEventAthenaPool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Database/AthenaPOOL/AthenaPoolUtilities
-                          Database/AtlasSealCLHEP
-                          PRIVATE
-                          Database/AthenaPOOL/AthenaPoolCnvSvc
-                          Simulation/G4Utilities/G4Ancillary/G4AncillarySimEvent )
-
 # Component(s) in the package:
 atlas_add_poolcnv_library( G4AncillaryEventAthenaPoolPoolCnv
                            src/*.cxx
diff --git a/Simulation/G4Utilities/G4Ancillary/G4AncillarySimEvent/CMakeLists.txt b/Simulation/G4Utilities/G4Ancillary/G4AncillarySimEvent/CMakeLists.txt
index 10a879ac0a7..48857e92875 100644
--- a/Simulation/G4Utilities/G4Ancillary/G4AncillarySimEvent/CMakeLists.txt
+++ b/Simulation/G4Utilities/G4Ancillary/G4AncillarySimEvent/CMakeLists.txt
@@ -5,12 +5,6 @@
 # Declare the package name:
 atlas_subdir( G4AncillarySimEvent )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          Generators/GeneratorObjects
-                          Simulation/HitManagement )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
diff --git a/Simulation/G4Utilities/G4DebuggingTools/CMakeLists.txt b/Simulation/G4Utilities/G4DebuggingTools/CMakeLists.txt
index d223876f83d..5dcaf3d9559 100644
--- a/Simulation/G4Utilities/G4DebuggingTools/CMakeLists.txt
+++ b/Simulation/G4Utilities/G4DebuggingTools/CMakeLists.txt
@@ -5,19 +5,6 @@
 # Declare the package name:
 atlas_subdir( G4DebuggingTools )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Control/StoreGate
-                          Event/EventInfo
-                          Simulation/G4Atlas/G4AtlasInterfaces
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/G4Sim/MCTruth
-                          Simulation/G4Sim/MCTruthBase
-                          Simulation/G4Sim/SimHelpers )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/G4Utilities/G4FastSimulation/CMakeLists.txt b/Simulation/G4Utilities/G4FastSimulation/CMakeLists.txt
index c41cbf3ded0..748425cdeb8 100644
--- a/Simulation/G4Utilities/G4FastSimulation/CMakeLists.txt
+++ b/Simulation/G4Utilities/G4FastSimulation/CMakeLists.txt
@@ -5,11 +5,6 @@
 # Declare the package name:
 atlas_subdir( G4FastSimulation )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          GaudiKernel
-                          Simulation/G4Atlas/G4AtlasTools )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/G4Utilities/G4PhysicsLists/CMakeLists.txt b/Simulation/G4Utilities/G4PhysicsLists/CMakeLists.txt
index 2424cb241a2..2898680a334 100644
--- a/Simulation/G4Utilities/G4PhysicsLists/CMakeLists.txt
+++ b/Simulation/G4Utilities/G4PhysicsLists/CMakeLists.txt
@@ -6,10 +6,6 @@
 # Declare the package name:
 atlas_subdir( G4PhysicsLists )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          GaudiKernel )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/G4Utilities/G4ProfilingTools/CMakeLists.txt b/Simulation/G4Utilities/G4ProfilingTools/CMakeLists.txt
index 67127796fd9..4be3d4ca17b 100644
--- a/Simulation/G4Utilities/G4ProfilingTools/CMakeLists.txt
+++ b/Simulation/G4Utilities/G4ProfilingTools/CMakeLists.txt
@@ -5,14 +5,6 @@
 # Declare the package name:
 atlas_subdir( G4ProfilingTools )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaKernel
-                          Simulation/G4Atlas/G4AtlasTools
-			  Simulation/G4Atlas/G4AtlasInterfaces )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )
diff --git a/Simulation/G4Utilities/G4StepLimitation/CMakeLists.txt b/Simulation/G4Utilities/G4StepLimitation/CMakeLists.txt
index 2bd933e3daa..e3070ff96c5 100644
--- a/Simulation/G4Utilities/G4StepLimitation/CMakeLists.txt
+++ b/Simulation/G4Utilities/G4StepLimitation/CMakeLists.txt
@@ -5,13 +5,6 @@
 # Declare the package name:
 atlas_subdir( G4StepLimitation )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Simulation/G4Atlas/G4AtlasInterfaces )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/G4Utilities/G4UserActions/CMakeLists.txt b/Simulation/G4Utilities/G4UserActions/CMakeLists.txt
index 3396bd068f5..a33d0debf63 100644
--- a/Simulation/G4Utilities/G4UserActions/CMakeLists.txt
+++ b/Simulation/G4Utilities/G4UserActions/CMakeLists.txt
@@ -5,26 +5,6 @@
 # Declare the package name:
 atlas_subdir( G4UserActions )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          GaudiKernel
-                          Simulation/G4Atlas/G4AtlasInterfaces
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/G4Sim/TrackRecord
-                          Event/EventInfo
-                          InnerDetector/InDetSimEvent
-                          MuonSpectrometer/MuonSimEvent
-                          Simulation/G4Sim/MCTruth
-                          Simulation/G4Sim/MCTruthBase
-                          Simulation/G4Sim/SimHelpers
-                          Simulation/G4Utilities/TrackWriteFastSim
-                          Simulation/G4Utilities/G4DebuggingTools
-                          Tools/PathResolver )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
@@ -39,7 +19,6 @@ atlas_add_component( G4UserActions
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS}
                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} ${TBB_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests GaudiKernel G4AtlasInterfaces G4AtlasToolsLib EventInfo InDetSimEvent MuonSimEvent MCTruth MCTruthBaseLib SimHelpers TrackWriteFastSimLib PathResolver G4DebuggingHelperLib)
 
-
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
diff --git a/Simulation/G4Utilities/Geo2G4/CMakeLists.txt b/Simulation/G4Utilities/Geo2G4/CMakeLists.txt
index 65e07185004..0d0c7953064 100644
--- a/Simulation/G4Utilities/Geo2G4/CMakeLists.txt
+++ b/Simulation/G4Utilities/Geo2G4/CMakeLists.txt
@@ -5,22 +5,6 @@
 # Declare the package name:
 atlas_subdir( Geo2G4 )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          DetectorDescription/GeoModel/GeoSpecialShapes
-                          DetectorDescription/GeoModel/GeoModelUtilities
-			  DetectorDescription/GeoPrimitives
-                          Simulation/G4Atlas/G4AtlasInterfaces
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/G4Sim/SimHelpers
-                          Simulation/G4Utilities/GeoMaterial2G4 )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )
diff --git a/Simulation/G4Utilities/GeoMaterial2G4/CMakeLists.txt b/Simulation/G4Utilities/GeoMaterial2G4/CMakeLists.txt
index 5c6cf10fdb0..08250ecf2aa 100644
--- a/Simulation/G4Utilities/GeoMaterial2G4/CMakeLists.txt
+++ b/Simulation/G4Utilities/GeoMaterial2G4/CMakeLists.txt
@@ -5,14 +5,6 @@
 # Declare the package name:
 atlas_subdir( GeoMaterial2G4 )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          DetectorDescription/GeoModel/GeoModelUtilities )
-
 # External dependencies:
 find_package( Geant4 )
 find_package( CLHEP )
diff --git a/Simulation/G4Utilities/MCTruthAlgs/CMakeLists.txt b/Simulation/G4Utilities/MCTruthAlgs/CMakeLists.txt
index 991e913f851..22e41cb97d4 100644
--- a/Simulation/G4Utilities/MCTruthAlgs/CMakeLists.txt
+++ b/Simulation/G4Utilities/MCTruthAlgs/CMakeLists.txt
@@ -5,13 +5,6 @@
 # Declare the package name:
 atlas_subdir( MCTruthAlgs )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          PRIVATE
-                          Simulation/G4Sim/TrackRecord )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( HepPDT )
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/CMakeLists.txt b/Simulation/G4Utilities/MCTruthSimAlgs/CMakeLists.txt
index 88d84bad8ca..e9be74ed39b 100644
--- a/Simulation/G4Utilities/MCTruthSimAlgs/CMakeLists.txt
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/CMakeLists.txt
@@ -5,22 +5,6 @@
 # Declare the package name:
 atlas_subdir( MCTruthSimAlgs )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Calorimeter/CaloSimEvent
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/PileUpTools
-                          Control/StoreGate
-                          Event/EventInfo
-                          Event/xAOD/xAODJet
-                          GaudiKernel
-                          Generators/GeneratorObjects
-                          Generators/TruthUtils
-                          MuonSpectrometer/MuonSimEvent
-                          Reconstruction/RecEvent
-                          Simulation/G4Sim/TrackRecord )
-
 # Component(s) in the package:
 atlas_add_component( MCTruthSimAlgs
                      src/*.cxx
diff --git a/Simulation/G4Utilities/TrackWriteFastSim/CMakeLists.txt b/Simulation/G4Utilities/TrackWriteFastSim/CMakeLists.txt
index 70e02fe3c05..4214bf122c2 100644
--- a/Simulation/G4Utilities/TrackWriteFastSim/CMakeLists.txt
+++ b/Simulation/G4Utilities/TrackWriteFastSim/CMakeLists.txt
@@ -5,16 +5,6 @@
 # Declare the package name:
 atlas_subdir( TrackWriteFastSim )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/StoreGate
-                          Simulation/G4Sim/TrackRecord
-                          PRIVATE
-                          GaudiKernel
-                          Simulation/G4Atlas/G4AtlasInterfaces
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/G4Sim/MCTruth )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/HitManagement/CMakeLists.txt b/Simulation/HitManagement/CMakeLists.txt
index e7fe2fc3a05..c94bc29472d 100644
--- a/Simulation/HitManagement/CMakeLists.txt
+++ b/Simulation/HitManagement/CMakeLists.txt
@@ -5,15 +5,6 @@
 # Declare the package name:
 atlas_subdir( HitManagement )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthContainers
-                          Control/AthenaKernel
-                          Event/EventInfo
-                          GaudiKernel
-                          PRIVATE
-                          AtlasTest/TestTools )
-
 # Component(s) in the package:
 atlas_add_library( HitManagement
                    src/*.cxx
diff --git a/Simulation/ISF/ISF_Core/ISF_Algorithms/CMakeLists.txt b/Simulation/ISF/ISF_Core/ISF_Algorithms/CMakeLists.txt
index 75c22e7ffd3..e9b973b08d0 100644
--- a/Simulation/ISF/ISF_Core/ISF_Algorithms/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Core/ISF_Algorithms/CMakeLists.txt
@@ -6,25 +6,6 @@
 # Declare the package name:
 atlas_subdir( ISF_Algorithms )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PRIVATE
-   GaudiKernel
-   Control/AthenaBaseComps
-   Control/StoreGate
-   DetectorDescription/AtlasDetDescr
-   InnerDetector/InDetSimEvent
-   LArCalorimeter/LArSimEvent
-   TileCalorimeter/TileSimEvent
-   MuonSpectrometer/MuonSimEvent
-   Generators/AtlasHepMC
-   Generators/GeneratorObjects
-   Simulation/Interfaces/HepMC_Interfaces
-   Simulation/ISF/ISF_Core/ISF_Event
-   Simulation/ISF/ISF_Core/ISF_Interfaces
-   Tools/PmbCxxUtils
-   AtlasTest/TestTools )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
diff --git a/Simulation/ISF/ISF_Core/ISF_AthenaPool/CMakeLists.txt b/Simulation/ISF/ISF_Core/ISF_AthenaPool/CMakeLists.txt
index f1c6527b00f..5c430a28c36 100644
--- a/Simulation/ISF/ISF_Core/ISF_AthenaPool/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Core/ISF_AthenaPool/CMakeLists.txt
@@ -5,15 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_AthenaPool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Database/AthenaPOOL/AthenaPoolUtilities
-                          Database/AtlasSealCLHEP
-                          PRIVATE
-                          Database/AthenaPOOL/AthenaPoolCnvSvc
-                          GaudiKernel
-                          Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent )
-
 # Component(s) in the package:
 atlas_add_poolcnv_library( ISF_AthenaPoolPoolCnv
                            src/*.cxx
diff --git a/Simulation/ISF/ISF_Core/ISF_Event/CMakeLists.txt b/Simulation/ISF/ISF_Core/ISF_Event/CMakeLists.txt
index 00e8e845b74..9b64379cba7 100644
--- a/Simulation/ISF/ISF_Core/ISF_Event/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Core/ISF_Event/CMakeLists.txt
@@ -5,17 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_Event )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          AtlasTest/TestTools
-                          Control/AthenaBaseComps
-                          DetectorDescription/AtlasDetDescr
-                          DetectorDescription/GeoPrimitives
-                          Generators/AtlasHepMC
-                          Generators/GeneratorObjects
-                          GaudiKernel
-                          Simulation/Barcode/BarcodeEvent )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Eigen )
diff --git a/Simulation/ISF/ISF_Core/ISF_Interfaces/CMakeLists.txt b/Simulation/ISF/ISF_Core/ISF_Interfaces/CMakeLists.txt
index b0af11de853..63028887312 100644
--- a/Simulation/ISF/ISF_Core/ISF_Interfaces/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Core/ISF_Interfaces/CMakeLists.txt
@@ -5,20 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_Interfaces )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          DetectorDescription/AtlasDetDescr
-                          DetectorDescription/GeoPrimitives
-                          Generators/GeneratorObjects
-                          GaudiKernel
-                          Generators/GeneratorObjects
-                          Simulation/Barcode/BarcodeEvent
-                          Simulation/G4Sim/TrackRecord
-                          Simulation/ISF/ISF_Core/ISF_Event )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Eigen )
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/CMakeLists.txt b/Simulation/ISF/ISF_Core/ISF_Services/CMakeLists.txt
index 019b5e6e23c..27dfefdb3c5 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Core/ISF_Services/CMakeLists.txt
@@ -5,33 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_Services )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          AtlasGeometryCommon/SubDetectorEnvelopes
-                          Calorimeter/CaloIdentifier
-                          Calorimeter/CaloSimEvent
-                          Control/AthenaBaseComps
-                          Control/StoreGate
-                          DetectorDescription/AtlasDetDescr
-                          Generators/AtlasHepMC
-                          Generators/GeneratorObjects
-                          Generators/TruthUtils
-                          InnerDetector/InDetSimEvent
-                          MuonSpectrometer/MuonSimEvent
-                          Simulation/Barcode/BarcodeEvent
-                          Simulation/Barcode/BarcodeInterfaces
-                          Simulation/G4Atlas/G4AtlasInterfaces
-                          Simulation/G4Sim/MCTruth
-                          Simulation/G4Sim/SimHelpers
-                          Simulation/G4Sim/TrackRecord
-                          Simulation/ISF/ISF_Core/ISF_Event
-                          Simulation/ISF/ISF_Core/ISF_Interfaces
-                          Simulation/ISF/ISF_HepMC/ISF_HepMC_Interfaces
-                          TileCalorimeter/TileSimEvent
-                          Tools/PmbCxxUtils )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Eigen )
@@ -116,13 +89,11 @@ atlas_add_test( TruthSvc_test
                   "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/test"
                 )
 
-
 #test ISF_ServicesConfigNew
 atlas_add_test( ISF_ServicesConfigNew_test
                 SCRIPT test/ISF_ServicesConfigNew_test.py
                 PROPERTIES TIMEOUT 300 )
 
-
 # Needed for the plugin service to see the test components
 # defined in the test binary.
 set_target_properties( ISF_Services_TruthSvc_test PROPERTIES ENABLE_EXPORTS True )
diff --git a/Simulation/ISF/ISF_Core/ISF_Tools/CMakeLists.txt b/Simulation/ISF/ISF_Core/ISF_Tools/CMakeLists.txt
index fc4ca04db18..5b8165fe255 100644
--- a/Simulation/ISF/ISF_Core/ISF_Tools/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Core/ISF_Tools/CMakeLists.txt
@@ -5,19 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_Tools )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          DetectorDescription/AtlasDetDescr
-                          Simulation/Barcode/BarcodeEvent
-                          Simulation/Barcode/BarcodeInterfaces
-                          Simulation/G4Sim/TrackRecord
-                          Generators/GeneratorObjects
-                          Simulation/ISF/ISF_Core/ISF_Event
-                          Simulation/ISF/ISF_Core/ISF_Interfaces )
-
 # Component(s) in the package:
 atlas_add_component( ISF_Tools
                      src/*.cxx
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/CMakeLists.txt b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/CMakeLists.txt
index 5edaa73a11b..97f8b0901d8 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/CMakeLists.txt
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/CMakeLists.txt
@@ -6,18 +6,6 @@
 # Declare the package name:
 atlas_subdir( ISF_FastCaloSimEvent )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthContainers
-   Control/AthenaKernel
-   Control/AthenaBaseComps
-   Calorimeter/CaloGeoHelpers
-   TileCalorimeter/TileSimEvent
-   PRIVATE
-   Calorimeter/CaloDetDescr
-   GaudiKernel )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( HepPDT )
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimInterfaces/CMakeLists.txt b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimInterfaces/CMakeLists.txt
index 44f850c88af..268ad136a41 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimInterfaces/CMakeLists.txt
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimInterfaces/CMakeLists.txt
@@ -5,11 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_FastCaloSimInterfaces )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          Simulation/ISF/ISF_Core/ISF_Event )
-
 # Component(s) in the package:
 atlas_add_library( ISF_FastCaloSimInterfaces
                    PUBLIC_HEADERS ISF_FastCaloSimInterfaces
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/CMakeLists.txt b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/CMakeLists.txt
index 3d32cc5359a..1d6c5e79795 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/CMakeLists.txt
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/CMakeLists.txt
@@ -5,45 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_FastCaloSimParametrization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Calorimeter/CaloDetDescr
-                          Calorimeter/CaloGeoHelpers
-                          Calorimeter/CaloInterface
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          DetectorDescription/Identifier
-                          GaudiKernel
-                          LArCalorimeter/LArElecCalib
-                          Simulation/Barcode/BarcodeEvent
-                          Simulation/ISF/ISF_Core/ISF_Interfaces
-                          Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkExtrapolation/TrkExInterfaces
-                          PRIVATE
-                          Calorimeter/CaloEvent
-                          Calorimeter/CaloIdentifier
-                          Calorimeter/CaloTrackingGeometry
-                          Simulation/G4Sim/TrackRecord
-                          Database/AthenaPOOL/AthenaPoolUtilities
-                          DetectorDescription/GeoModel/GeoAdaptors
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          Event/EventInfo
-                          Event/NavFourMom
-                          Generators/AtlasHepMC
-                          Generators/GeneratorObjects
-                          LArCalorimeter/LArSimEvent
-                          Simulation/ISF/ISF_Core/ISF_Event
-                          Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimInterfaces
-                          TileCalorimeter/TileConditions
-                          TileCalorimeter/TileDetDescr
-                          TileCalorimeter/TileSimEvent
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkMaterialOnTrack )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/CMakeLists.txt b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/CMakeLists.txt
index 29a7e7802fa..1853b41a02f 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/CMakeLists.txt
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/CMakeLists.txt
@@ -5,22 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_FastCaloSimSD )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/StoreGate
-                          GaudiKernel
-                          Simulation/G4Atlas/G4AtlasInterfaces
-                          Simulation/G4Atlas/G4AtlasTools
-                          TileCalorimeter/TileG4/TileG4Interfaces
-                          PRIVATE
-                          Calorimeter/CaloDetDescr
-                          Calorimeter/CaloIdentifier
-                          Control/AthenaBaseComps
-                          Generators/GeneratorObjects
-                          LArCalorimeter/LArG4/LArG4Code
-                          Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent
-                          DetectorDescription/Identifier )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt
index f3972dc300f..15887e9773b 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt
@@ -5,33 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_FastCaloSimServices )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaKernel
-                          DetectorDescription/IdDictParser
-                          Control/AthenaBaseComps
-                          Simulation/Barcode/BarcodeEvent
-                          Simulation/ISF/ISF_Core/ISF_Interfaces
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkExtrapolation/TrkExInterfaces
-                          Calorimeter/CaloInterface
-                          Calorimeter/CaloEvent
-                          Calorimeter/CaloDetDescr
-                          Control/StoreGate
-                          Event/NavFourMom
-                          Generators/AtlasHepMC
-                          Generators/GeneratorObjects
-                          Simulation/FastShower/FastCaloSim
-                          Simulation/ISF/ISF_Core/ISF_Event
-                          Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent
-                          Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimInterfaces
-                          Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization
-                          Tools/PathResolver )
-
-
-
 # External dependencies:
 find_package( CLHEP )
 find_package(lwtnn)
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/CMakeLists.txt b/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/CMakeLists.txt
index a5d6ae7eb2f..61283b2cd77 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/CMakeLists.txt
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/CMakeLists.txt
@@ -5,23 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_PunchThroughTools )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          DetectorDescription/GeoPrimitives
-                          Simulation/Barcode/BarcodeEvent
-                          Simulation/Barcode/BarcodeInterfaces
-                          Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimInterfaces
-                          AtlasGeometryCommon/SubDetectorEnvelopes
-                          Control/AthContainers
-                          GaudiKernel
-                          Generators/AtlasHepMC
-                          Simulation/ISF/ISF_Core/ISF_Event
-                          Simulation/ISF/ISF_Core/ISF_Interfaces
-                          Tools/PathResolver )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Eigen )
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrInterfaces/CMakeLists.txt b/Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrInterfaces/CMakeLists.txt
index e03c63bf10a..b5a8e4a94c9 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrInterfaces/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrInterfaces/CMakeLists.txt
@@ -5,13 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_FatrasDetDescrInterfaces )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          DetectorDescription/GeoPrimitives
-                          Event/EventPrimitives
-                          GaudiKernel
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry )
-
 # External dependencies:
 find_package( Eigen )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrModel/CMakeLists.txt b/Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrModel/CMakeLists.txt
index 5dd3d35395b..c6403f74dda 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrModel/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrModel/CMakeLists.txt
@@ -5,25 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_FatrasDetDescrModel )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          DetectorDescription/GeoPrimitives
-                          DetectorDescription/Identifier
-                          Event/EventPrimitives
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-                          Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrInterfaces
-                          Tracking/TrkDetDescr/TrkDetDescrUtils
-                          Tracking/TrkDetDescr/TrkDetElementBase
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkParameters
-                          PRIVATE
-                          Control/StoreGate
-                          GaudiKernel )
-
 # External dependencies:
 find_package( Eigen )
 find_package( CLHEP )
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrTools/CMakeLists.txt b/Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrTools/CMakeLists.txt
index 0181ab4307f..c011d5fcbde 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrTools/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrTools/CMakeLists.txt
@@ -5,23 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_FatrasDetDescrTools )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          DetectorDescription/GeoPrimitives
-                          GaudiKernel
-                          Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrInterfaces
-                          Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrModel
-                          Tracking/TrkDetDescr/TrkDetDescrInterfaces
-                          Tracking/TrkDetDescr/TrkDetDescrUtils
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          PRIVATE
-                          Control/StoreGate
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkDetDescr/TrkVolumes )
-
 # External dependencies:
 find_package( Eigen )
 find_package( ROOT COMPONENTS RIO Core Tree MathCore Hist pthread )
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasEvent/CMakeLists.txt b/Simulation/ISF/ISF_Fatras/ISF_FatrasEvent/CMakeLists.txt
index 9d74fa16b80..70f6d1bfbe8 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasEvent/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasEvent/CMakeLists.txt
@@ -5,19 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_FatrasEvent )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthLinks
-                          Control/AthenaKernel
-                          Control/CxxUtils
-                          DetectorDescription/Identifier
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrModel
-                          Tracking/TrkEvent/TrkPrepRawData
-                          Tracking/TrkEvent/TrkRIO_OnTrack
-                          PRIVATE
-                          GaudiKernel )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventAthenaPool/CMakeLists.txt b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventAthenaPool/CMakeLists.txt
index dc81f08787e..6cd3dad316e 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventAthenaPool/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventAthenaPool/CMakeLists.txt
@@ -5,16 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_FatrasEventAthenaPool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Database/AthenaPOOL/AthenaPoolUtilities
-                          PRIVATE
-                          Database/AthenaPOOL/AthenaPoolCnvSvc
-                          Database/AtlasSealCLHEP
-                          GaudiKernel
-                          Simulation/ISF/ISF_Fatras/ISF_FatrasEvent
-                          Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv )
-
 # Component(s) in the package:
 atlas_add_poolcnv_library( ISF_FatrasEventAthenaPoolPoolCnv
                            src/*.cxx
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/CMakeLists.txt b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/CMakeLists.txt
index 6eacd819ee2..1eb6069e5d3 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasEventTPCnv/CMakeLists.txt
@@ -6,28 +6,6 @@
 # Declare the package name:
 atlas_subdir( ISF_FatrasEventTPCnv )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Database/AthenaPOOL/AthenaPoolCnvSvc
-   Database/AthenaPOOL/AthenaPoolUtilities
-   DetectorDescription/Identifier
-   InnerDetector/InDetEventCnv/InDetEventTPCnv
-   Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrModel
-   Simulation/ISF/ISF_Fatras/ISF_FatrasEvent
-   Tracking/TrkEventCnv/TrkEventTPCnv
-   PRIVATE
-   AtlasTest/TestTools
-   Control/AthenaKernel
-   Control/AthAllocators
-   Control/StoreGate
-   DetectorDescription/GeoPrimitives
-   DetectorDescription/IdDictParser
-   Event/EventPrimitives
-   GaudiKernel
-   InnerDetector/InDetDetDescr/InDetIdentifier
-   Tracking/TrkDetDescr/TrkGeometry )
-
 # Component(s) in the package:
 atlas_add_tpcnv_library( ISF_FatrasEventTPCnv
    ISF_FatrasEventTPCnv/*.h ISF_FatrasEventTPCnv/ISF_FatrasEvent/*.h
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/CMakeLists.txt b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/CMakeLists.txt
index 19ece0bf0cf..cbf9e111272 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/CMakeLists.txt
@@ -5,16 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_FatrasServices )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          DetectorDescription/AtlasDetDescr
-                          Simulation/ISF/ISF_Core/ISF_Event
-                          Simulation/ISF/ISF_Core/ISF_Interfaces
-                          Tracking/TrkEvent/TrkTrack )
-
 # Component(s) in the package:
 atlas_add_component( ISF_FatrasServices
                      src/*.cxx
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/CMakeLists.txt b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/CMakeLists.txt
index b997dc29b97..9ffb0c6249f 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/CMakeLists.txt
@@ -5,34 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_FatrasTools )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          DetectorDescription/AtlasDetDescr
-                          DetectorDescription/GeoPrimitives
-                          Event/EventPrimitives
-                          Simulation/Barcode/BarcodeEvent
-                          Simulation/FastSimulation/FastSimulationEvent
-                          Simulation/ISF/ISF_Core/ISF_Event
-                          Simulation/ISF/ISF_Core/ISF_Interfaces
-                          Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces
-                          Tracking/TrkDetDescr/TrkDetDescrInterfaces
-                          Tracking/TrkDetDescr/TrkDetDescrUtils
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkDetDescr/TrkVolumes
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkMaterialOnTrack
-                          Tracking/TrkEvent/TrkNeutralParameters
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkExtrapolation/TrkExInterfaces
-                          Tracking/TrkExtrapolation/TrkExUtils )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Eigen )
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/CMakeLists.txt b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/CMakeLists.txt
index 0655fc16a86..5de1af45099 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/CMakeLists.txt
@@ -5,23 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_FatrasToolsG4 )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          GaudiKernel
-                          Simulation/ISF/ISF_Core/ISF_Event
-                          Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          PRIVATE
-                          Generators/AtlasHepMC
-                          Control/StoreGate
-                          Simulation/Barcode/BarcodeEvent
-                          Simulation/G4Atlas/G4AtlasAlg
-                          Simulation/ISF/ISF_Core/ISF_Interfaces
-                          Simulation/ISF/ISF_Geant4/ISF_Geant4Tools
-                          Tracking/TrkDetDescr/TrkGeometry )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID/CMakeLists.txt b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID/CMakeLists.txt
index 231366c6b1a..a73f23f16bb 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID/CMakeLists.txt
@@ -5,42 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_FatrasToolsID )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/AthContainers
-                          Control/StoreGate
-                          DetectorDescription/AtlasDetDescr
-                          DetectorDescription/IdDictDetDescr
-                          DetectorDescription/Identifier
-			  DetectorDescription/GeoPrimitives
-                          InnerDetector/InDetConditions/InDetConditionsSummaryService
-                          InnerDetector/InDetConditions/TRT_ConditionsServices
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-			  InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          InnerDetector/InDetRecEvent/InDetRIO_OnTrack
-                          InnerDetector/InDetRecTools/SiClusterizationTool
-                          InnerDetector/InDetSimEvent
-                          Simulation/ISF/ISF_Core/ISF_Event
-                          Simulation/ISF/ISF_Core/ISF_Interfaces
-                          Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrModel
-                          Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces
-                          Tracking/TrkDetDescr/TrkDetElementBase
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkMeasurementBase
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkRIO_OnTrack
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkExtrapolation/TrkExInterfaces
-                          Tracking/TrkExtrapolation/TrkExUtils
-                          Tracking/TrkTools/TrkToolInterfaces )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4CommonServices/CMakeLists.txt b/Simulation/ISF/ISF_Geant4/ISF_Geant4CommonServices/CMakeLists.txt
index 0d2a0e38e11..e46508a4ee3 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4CommonServices/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4CommonServices/CMakeLists.txt
@@ -5,16 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_Geant4CommonServices )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          AtlasGeometryCommon/SubDetectorEnvelopes
-                          Control/AthenaBaseComps
-                          DetectorDescription/AtlasDetDescr
-                          Simulation/ISF/ISF_Core/ISF_Event
-                          Simulation/ISF/ISF_Core/ISF_Interfaces )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4CommonTools/CMakeLists.txt b/Simulation/ISF/ISF_Geant4/ISF_Geant4CommonTools/CMakeLists.txt
index 8d7b3436104..22f99aacba1 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4CommonTools/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4CommonTools/CMakeLists.txt
@@ -5,16 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_Geant4CommonTools )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Simulation/G4Sim/TrackRecord
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/ISF/ISF_Core/ISF_Event
-                          Simulation/ISF/ISF_Core/ISF_Interfaces )
-
 # Component(s) in the package:
 atlas_add_component( ISF_Geant4CommonTools
                      src/*.cxx
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/CMakeLists.txt b/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/CMakeLists.txt
index 8a05034d9ba..4b02b05a8dc 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/CMakeLists.txt
@@ -5,19 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_Geant4Event )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Simulation/ISF/ISF_Core/ISF_Event
-                          Simulation/ISF/ISF_Core/ISF_Interfaces
-                          Simulation/G4Sim/SimHelpers
-                          Simulation/Barcode/BarcodeEvent
-                          Simulation/G4Sim/MCTruth
-                          PRIVATE
-                          Generators/AtlasHepMC
-                          DetectorDescription/GeoPrimitives )
-
-
-        
 # External dependencies:
 find_package( CLHEP )
 find_package( Eigen )
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/CMakeLists.txt b/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/CMakeLists.txt
index e0d85b05996..19941217bb3 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/CMakeLists.txt
@@ -5,16 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_Geant4Services )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Control/StoreGate
-                          Simulation/G4Atlas/G4AtlasInterfaces
-                          Simulation/ISF/ISF_Core/ISF_Event
-                          Simulation/ISF/ISF_Core/ISF_Interfaces )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/CMakeLists.txt b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/CMakeLists.txt
index 071abf40acb..4b519f49a9d 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/CMakeLists.txt
@@ -5,25 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_Geant4Tools )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          GaudiKernel
-                          Simulation/G4Atlas/G4AtlasInterfaces
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Control/StoreGate
-                          DetectorDescription/AtlasDetDescr
-                          Generators/AtlasHepMC
-                          Generators/GeneratorObjects
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/G4Atlas/G4AtlasAlg
-                          Simulation/G4Sim/MCTruth
-                          Simulation/G4Sim/SimHelpers
-                          Simulation/ISF/ISF_Core/ISF_Event
-                          Simulation/ISF/ISF_Core/ISF_Interfaces
-                          Simulation/ISF/ISF_Geant4/ISF_Geant4Event )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Eigen )
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/CMakeLists.txt b/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/CMakeLists.txt
index 05b2180d439..bbf1055fda1 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4UserActions/CMakeLists.txt
@@ -5,22 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_Geant4UserActions )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          PRIVATE
-                          Control/StoreGate
-                          GaudiKernel
-                          Simulation/G4Atlas/G4AtlasInterfaces
-                          Simulation/G4Atlas/G4AtlasTools
-                          TileCalorimeter/TileG4/TileG4Interfaces
-                          Calorimeter/CaloDetDescr
-                          Calorimeter/CaloIdentifier
-                          Control/AthenaBaseComps
-                          Generators/GeneratorObjects
-                          LArCalorimeter/LArG4/LArG4Code
-                          Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent
-                          DetectorDescription/Identifier )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Interfaces/CMakeLists.txt b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Interfaces/CMakeLists.txt
index 0b9122bb837..04edc588fe6 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Interfaces/CMakeLists.txt
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Interfaces/CMakeLists.txt
@@ -5,12 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_HepMC_Interfaces )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          Generators/AtlasHepMC
-                          Simulation/ISF/ISF_Core/ISF_Event )
-
 atlas_add_library( ISF_HepMC_Interfaces
                    ISF_HepMC_Interfaces/*.h
                    INTERFACE
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/CMakeLists.txt b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/CMakeLists.txt
index 83274b189ef..f8974a2b0b8 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/CMakeLists.txt
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/CMakeLists.txt
@@ -5,19 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_HepMC_Tools )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          DetectorDescription/AtlasDetDescr
-                          Generators/TruthUtils
-                          Generators/AtlasHepMC
-                          Simulation/ISF/ISF_Core/ISF_Event
-                          Simulation/ISF/ISF_Core/ISF_Interfaces
-                          Simulation/ISF/ISF_HepMC/ISF_HepMC_Interfaces
-                          Tools/PathResolver )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 find_package( GTest )
diff --git a/Simulation/ISF/ISF_ParametricSim/ISF_ParSimInterfaces/CMakeLists.txt b/Simulation/ISF/ISF_ParametricSim/ISF_ParSimInterfaces/CMakeLists.txt
index b203d835754..9c22c51e3dc 100644
--- a/Simulation/ISF/ISF_ParametricSim/ISF_ParSimInterfaces/CMakeLists.txt
+++ b/Simulation/ISF/ISF_ParametricSim/ISF_ParSimInterfaces/CMakeLists.txt
@@ -5,12 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_ParSimInterfaces )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Event/xAOD/xAODTracking
-                          GaudiKernel
-                          Tracking/TrkEvent/TrkParameters )
-
 atlas_add_library( ISF_ParSimInterfacesLib
                    ISF_ParSimInterfaces/*.h
                    INTERFACE
diff --git a/Simulation/ISF/ISF_ParametricSim/ISF_ParSimServices/CMakeLists.txt b/Simulation/ISF/ISF_ParametricSim/ISF_ParSimServices/CMakeLists.txt
index f7210c1a06a..77c7037ffc2 100644
--- a/Simulation/ISF/ISF_ParametricSim/ISF_ParSimServices/CMakeLists.txt
+++ b/Simulation/ISF/ISF_ParametricSim/ISF_ParSimServices/CMakeLists.txt
@@ -5,15 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_ParSimServices )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          Simulation/ISF/ISF_Core/ISF_Interfaces
-                          Tracking/TrkDetDescr/TrkDetDescrInterfaces
-                          PRIVATE
-                          Simulation/ISF/ISF_Core/ISF_Event )
-
 # Component(s) in the package:
 atlas_add_component( ISF_ParSimServices
                      src/*.cxx
diff --git a/Simulation/ISF/ISF_ParametricSim/ISF_ParSimTools/CMakeLists.txt b/Simulation/ISF/ISF_ParametricSim/ISF_ParSimTools/CMakeLists.txt
index 31c2a8934b7..c5d9536ec6a 100644
--- a/Simulation/ISF/ISF_ParametricSim/ISF_ParSimTools/CMakeLists.txt
+++ b/Simulation/ISF/ISF_ParametricSim/ISF_ParSimTools/CMakeLists.txt
@@ -5,22 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_ParSimTools )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Event/xAOD/xAODTracking
-                          GaudiKernel
-                          InnerDetector/InDetConditions/InDetBeamSpotService
-                          InnerDetector/InDetConditions/BeamSpotConditionsData
-                          Simulation/ISF/ISF_Core/ISF_Interfaces
-                          Simulation/ISF/ISF_ParametricSim/ISF_ParSimInterfaces
-                          Tracking/TrkExtrapolation/TrkExInterfaces
-                          PRIVATE
-                          Simulation/ISF/ISF_Core/ISF_Event
-                          Tools/PathResolver
-                          Tracking/TrkEvent/TrkParameters )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread Matrix )
diff --git a/Simulation/ISF/ISF_SimulationSelectors/CMakeLists.txt b/Simulation/ISF/ISF_SimulationSelectors/CMakeLists.txt
index 6e0e8c57a54..458b240a713 100644
--- a/Simulation/ISF/ISF_SimulationSelectors/CMakeLists.txt
+++ b/Simulation/ISF/ISF_SimulationSelectors/CMakeLists.txt
@@ -5,16 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_SimulationSelectors )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Generators/AtlasHepMC
-                          Simulation/Barcode/BarcodeServices
-                          Simulation/ISF/ISF_Core/ISF_Event
-                          Simulation/ISF/ISF_Core/ISF_Interfaces
-                          Simulation/ISF/ISF_Tracking/ISF_TrackingInterfaces )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 
diff --git a/Simulation/ISF/ISF_Tracking/ISF_TrackingInterfaces/CMakeLists.txt b/Simulation/ISF/ISF_Tracking/ISF_TrackingInterfaces/CMakeLists.txt
index fff627d0896..42b11d461e1 100644
--- a/Simulation/ISF/ISF_Tracking/ISF_TrackingInterfaces/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Tracking/ISF_TrackingInterfaces/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_TrackingInterfaces )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel )
-
 atlas_add_library( ISF_TrackingInterfacesLib
                    ISF_TrackingInterfaces/*.h
                    INTERFACE
diff --git a/Simulation/ISF/ISF_Tracking/ISF_TrackingTools/CMakeLists.txt b/Simulation/ISF/ISF_Tracking/ISF_TrackingTools/CMakeLists.txt
index 3d33a6332f0..257ab3a5112 100644
--- a/Simulation/ISF/ISF_Tracking/ISF_TrackingTools/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Tracking/ISF_TrackingTools/CMakeLists.txt
@@ -5,19 +5,6 @@
 # Declare the package name:
 atlas_subdir( ISF_TrackingTools )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Simulation/ISF/ISF_Core/ISF_Event
-                          Simulation/ISF/ISF_Tracking/ISF_TrackingInterfaces
-                          Tracking/TrkDetDescr/TrkDetDescrInterfaces
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkExtrapolation/TrkExInterfaces )
-
 # Component(s) in the package:
 atlas_add_component( ISF_TrackingTools
                      src/*.cxx
diff --git a/Simulation/Interfaces/HepMC_Interfaces/CMakeLists.txt b/Simulation/Interfaces/HepMC_Interfaces/CMakeLists.txt
index e79ad0932bd..ba7faf34c4d 100644
--- a/Simulation/Interfaces/HepMC_Interfaces/CMakeLists.txt
+++ b/Simulation/Interfaces/HepMC_Interfaces/CMakeLists.txt
@@ -5,11 +5,6 @@
 # Declare the package name:
 atlas_subdir( HepMC_Interfaces )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Generators/AtlasHepMC
-                          GaudiKernel )
-
 atlas_add_library( HepMC_InterfacesLib
                    HepMC_Interfaces/*.h
                    INTERFACE
diff --git a/Simulation/Overlay/IDC_OverlayBase/CMakeLists.txt b/Simulation/Overlay/IDC_OverlayBase/CMakeLists.txt
index 2827121b0b4..740c2e6e867 100644
--- a/Simulation/Overlay/IDC_OverlayBase/CMakeLists.txt
+++ b/Simulation/Overlay/IDC_OverlayBase/CMakeLists.txt
@@ -5,11 +5,6 @@
 # Declare the package name:
 atlas_subdir( IDC_OverlayBase )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          DetectorDescription/Identifier )
-
 # Component(s) in the package:
 atlas_add_library( IDC_OverlayBase
                    PUBLIC_HEADERS IDC_OverlayBase
diff --git a/Simulation/RunDependentSim/RunDependentSimData/CMakeLists.txt b/Simulation/RunDependentSim/RunDependentSimData/CMakeLists.txt
index ce2a5a28357..03d5a0ffa3e 100644
--- a/Simulation/RunDependentSim/RunDependentSimData/CMakeLists.txt
+++ b/Simulation/RunDependentSim/RunDependentSimData/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( RunDependentSimData )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/MinimalRunTime )
-
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 atlas_install_scripts( share/rundmc_printdist )
diff --git a/Simulation/SimuJobTransforms/CMakeLists.txt b/Simulation/SimuJobTransforms/CMakeLists.txt
index c2f199469f0..e352da28f00 100644
--- a/Simulation/SimuJobTransforms/CMakeLists.txt
+++ b/Simulation/SimuJobTransforms/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( SimuJobTransforms )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Tools/PyJobTransforms )
-
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
diff --git a/Simulation/Tests/DigitizationTests/CMakeLists.txt b/Simulation/Tests/DigitizationTests/CMakeLists.txt
index 455235174d1..b7d5633cad9 100644
--- a/Simulation/Tests/DigitizationTests/CMakeLists.txt
+++ b/Simulation/Tests/DigitizationTests/CMakeLists.txt
@@ -5,18 +5,6 @@
 # Declare the package name:
 atlas_subdir( DigitizationTests )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaKernel
-                          Event/xAOD/xAODEventInfo
-                          Generators/GeneratorObjects
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetRawEvent/InDetRawData
-                          InnerDetector/InDetRawEvent/InDetSimData )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -29,7 +17,6 @@ atlas_add_component( DigitizationTests
                      LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps GaudiKernel AthenaKernel GeneratorObjects InDetIdentifier InDetRawData InDetSimData xAODEventInfo )
 
 # Install files from the package:
-atlas_install_headers( DigitizationTests )
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( test/DigitizationTests_TestConfiguration.xml )
diff --git a/Simulation/Tools/AtlasCLHEP_RandomGenerators/CMakeLists.txt b/Simulation/Tools/AtlasCLHEP_RandomGenerators/CMakeLists.txt
index b772ede2a25..7aba0ab4488 100644
--- a/Simulation/Tools/AtlasCLHEP_RandomGenerators/CMakeLists.txt
+++ b/Simulation/Tools/AtlasCLHEP_RandomGenerators/CMakeLists.txt
@@ -5,12 +5,6 @@
 # Declare the package name:
 atlas_subdir( AtlasCLHEP_RandomGenerators )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          GaudiKernel )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )
diff --git a/Simulation/Tools/CaloSamplingFractionAnalysis/CMakeLists.txt b/Simulation/Tools/CaloSamplingFractionAnalysis/CMakeLists.txt
index b697747a09d..a1d643bae65 100644
--- a/Simulation/Tools/CaloSamplingFractionAnalysis/CMakeLists.txt
+++ b/Simulation/Tools/CaloSamplingFractionAnalysis/CMakeLists.txt
@@ -5,26 +5,6 @@
 # Declare the package name:
 atlas_subdir( CaloSamplingFractionAnalysis )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Calorimeter/CaloDetDescr
-                          Calorimeter/CaloEvent
-                          Calorimeter/CaloIdentifier
-                          Calorimeter/CaloSimEvent
-                          Control/AthenaBaseComps
-                          DetectorDescription/GeoModel/GeoAdaptors
-                          DetectorDescription/Identifier
-                          Event/EventInfo
-                          External/AtlasHepMC/AtlasHepMC
-                          LArCalorimeter/LArElecCalib
-                          LArCalorimeter/LArG4/LArG4RunControl
-                          LArCalorimeter/LArGeoModel/LArReadoutGeometry
-                          LArCalorimeter/LArSimEvent
-                          TileCalorimeter/TileDetDescr
-                          TileCalorimeter/TileSimEvent )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( HepMC )
diff --git a/Simulation/Tools/HitAnalysis/CMakeLists.txt b/Simulation/Tools/HitAnalysis/CMakeLists.txt
index 1ebce403dc6..0bbbb9a78e6 100644
--- a/Simulation/Tools/HitAnalysis/CMakeLists.txt
+++ b/Simulation/Tools/HitAnalysis/CMakeLists.txt
@@ -5,29 +5,6 @@
 # Declare the package name:
 atlas_subdir( HitAnalysis )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Calorimeter/CaloDetDescr
-                          Calorimeter/CaloIdentifier
-                          Calorimeter/CaloSimEvent
-                          Control/AthenaBaseComps
-                          DetectorDescription/GeoModel/GeoAdaptors
-                          Event/EventInfo
-                          ForwardDetectors/AFP/AFP_SimEv
-                          ForwardDetectors/ALFA/ALFA_SimEv
-                          ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_SimEvent
-                          ForwardDetectors/ZDC/ZDC_SimEvent
-                          Generators/AtlasHepMC
-                          Generators/GeneratorObjects
-                          InnerDetector/InDetSimEvent
-                          LArCalorimeter/LArSimEvent
-                          MuonSpectrometer/MuonSimEvent
-                          Simulation/G4Sim/TrackRecord
-                          TileCalorimeter/TileDetDescr
-                          TileCalorimeter/TileSimEvent )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread Table MathMore Minuit Minuit2 Matrix Physics HistPainter Rint Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
diff --git a/Simulation/Tools/McEventCollectionFilter/CMakeLists.txt b/Simulation/Tools/McEventCollectionFilter/CMakeLists.txt
index 81c0bc06d55..03ae0ddc3ea 100644
--- a/Simulation/Tools/McEventCollectionFilter/CMakeLists.txt
+++ b/Simulation/Tools/McEventCollectionFilter/CMakeLists.txt
@@ -5,16 +5,6 @@
 # Declare the package name:
 atlas_subdir( McEventCollectionFilter )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/AthenaBaseComps
-                          DetectorDescription/GeoPrimitives
-                          GaudiKernel
-                          Generators/AtlasHepMC
-                          Generators/GeneratorObjects
-                          InnerDetector/InDetSimEvent
-                          MuonSpectrometer/MuonSimEvent )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Eigen )
diff --git a/Simulation/Tools/RDOAnalysis/CMakeLists.txt b/Simulation/Tools/RDOAnalysis/CMakeLists.txt
index 84c221d0543..a6d6ace0544 100644
--- a/Simulation/Tools/RDOAnalysis/CMakeLists.txt
+++ b/Simulation/Tools/RDOAnalysis/CMakeLists.txt
@@ -5,23 +5,6 @@
 # Declare the package name:
 atlas_subdir( RDOAnalysis )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetRawEvent/InDetRawData
-                          InnerDetector/InDetRawEvent/InDetSimData
-                          InnerDetector/InDetRawEvent/InDetBCM_RawData
-			  InnerDetector/InDetRecEvent/InDetPrepRawData
-                          LArCalorimeter/LArRawEvent
-                          MuonSpectrometer/MuonRDO
-                          MuonSpectrometer/MuonSimData
-                          TileCalorimeter/TileEvent
-			  Tracking/TrkDetDescr/TrkSurfaces
-			  Tracking/TrkEvent/TrkTruthData )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread Table MathMore Minuit Minuit2 Matrix Physics HistPainter Rint Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
 
diff --git a/Simulation/TruthJiveXML/CMakeLists.txt b/Simulation/TruthJiveXML/CMakeLists.txt
index 5c26e995a99..e91513bbd3a 100644
--- a/Simulation/TruthJiveXML/CMakeLists.txt
+++ b/Simulation/TruthJiveXML/CMakeLists.txt
@@ -5,18 +5,6 @@
 # Declare the package name:
 atlas_subdir( TruthJiveXML )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          graphics/JiveXML
-                          PRIVATE
-                          Control/StoreGate
-                          Event/EventPrimitives
-                          Generators/AtlasHepMC
-                          Generators/GeneratorObjects
-                          Simulation/G4Sim/TrackRecord )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( HepPDT )
diff --git a/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/CMakeLists.txt b/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/CMakeLists.txt
index dc893512ae8..db36be9d934 100644
--- a/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/CMakeLists.txt
+++ b/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/CMakeLists.txt
@@ -5,16 +5,6 @@
 # Declare the package name:
 atlas_subdir( CombinedScintillator )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Calorimeter/CaloIdentifier
-                          Control/StoreGate
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          GaudiKernel
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/G4Utilities/GeoMaterial2G4
-                          TileCalorimeter/TileSimEvent )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/CMakeLists.txt b/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/CMakeLists.txt
index 9935230e5ee..e370a90e06b 100644
--- a/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/CMakeLists.txt
+++ b/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/CMakeLists.txt
@@ -5,14 +5,6 @@
 # Declare the package name:
 atlas_subdir( DeadMaterial )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/StoreGate
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          GaudiKernel
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/G4Utilities/GeoMaterial2G4 )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/TileCalorimeter/TileG4/TileAncillary/LarCrate/CMakeLists.txt b/TileCalorimeter/TileG4/TileAncillary/LarCrate/CMakeLists.txt
index 3ceff941462..c495b7ef901 100644
--- a/TileCalorimeter/TileG4/TileAncillary/LarCrate/CMakeLists.txt
+++ b/TileCalorimeter/TileG4/TileAncillary/LarCrate/CMakeLists.txt
@@ -5,14 +5,6 @@
 # Declare the package name:
 atlas_subdir( LarCrate )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/StoreGate
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          GaudiKernel
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/G4Utilities/GeoMaterial2G4 )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/TileCalorimeter/TileG4/TileAncillary/MinBiasScintillator/CMakeLists.txt b/TileCalorimeter/TileG4/TileAncillary/MinBiasScintillator/CMakeLists.txt
index cdcfe3a2256..a6056b7b692 100644
--- a/TileCalorimeter/TileG4/TileAncillary/MinBiasScintillator/CMakeLists.txt
+++ b/TileCalorimeter/TileG4/TileAncillary/MinBiasScintillator/CMakeLists.txt
@@ -5,17 +5,6 @@
 # Declare the package name:
 atlas_subdir( MinBiasScintillator )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          
-                          PRIVATE
-                          Calorimeter/CaloDetDescr
-                          Calorimeter/CaloIdentifier
-                          Control/StoreGate
-                          GaudiKernel
-                          Simulation/G4Atlas/G4AtlasTools
-                          TileCalorimeter/TileSimEvent )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/TileCalorimeter/TileG4/TileAncillary/MuonWall/CMakeLists.txt b/TileCalorimeter/TileG4/TileAncillary/MuonWall/CMakeLists.txt
index 176d0e77226..4577d0bbf33 100644
--- a/TileCalorimeter/TileG4/TileAncillary/MuonWall/CMakeLists.txt
+++ b/TileCalorimeter/TileG4/TileAncillary/MuonWall/CMakeLists.txt
@@ -5,16 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonWall )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Calorimeter/CaloIdentifier
-                          Control/StoreGate
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          GaudiKernel
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/G4Utilities/GeoMaterial2G4
-                          TileCalorimeter/TileSimEvent )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/CMakeLists.txt b/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/CMakeLists.txt
index c0ee2e92536..a04031e7e3c 100644
--- a/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/CMakeLists.txt
+++ b/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/CMakeLists.txt
@@ -5,16 +5,6 @@
 # Declare the package name:
 atlas_subdir( PhantomCalorimeter )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Calorimeter/CaloIdentifier
-                          Control/StoreGate
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          GaudiKernel
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/G4Utilities/GeoMaterial2G4
-                          TileCalorimeter/TileSimEvent )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
diff --git a/TileCalorimeter/TileG4/TileG4Interfaces/CMakeLists.txt b/TileCalorimeter/TileG4/TileG4Interfaces/CMakeLists.txt
index c1f91e064cc..0f926291e36 100644
--- a/TileCalorimeter/TileG4/TileG4Interfaces/CMakeLists.txt
+++ b/TileCalorimeter/TileG4/TileG4Interfaces/CMakeLists.txt
@@ -5,12 +5,6 @@
 # Declare the package name:
 atlas_subdir( TileG4Interfaces )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          DetectorDescription/Identifier
-                           )
-
 # External dependencies:
 find_package( Geant4 )
 
diff --git a/TileCalorimeter/TileG4/TileGeoG4Calib/CMakeLists.txt b/TileCalorimeter/TileG4/TileGeoG4Calib/CMakeLists.txt
index 1d25f541c04..d91a48fa0ee 100644
--- a/TileCalorimeter/TileG4/TileGeoG4Calib/CMakeLists.txt
+++ b/TileCalorimeter/TileG4/TileGeoG4Calib/CMakeLists.txt
@@ -5,28 +5,6 @@
 # Declare the package name:
 atlas_subdir( TileGeoG4Calib )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          
-                          PRIVATE
-                          Calorimeter/CaloG4Sim
-                          Calorimeter/CaloIdentifier
-                          Calorimeter/CaloSimEvent
-                          Control/CxxUtils
-                          Control/StoreGate
-                          Database/RDBAccessSvc
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          DetectorDescription/GeoModel/GeoModelUtilities
-                          GaudiKernel
-                          Simulation/G4Atlas/G4AtlasTools
-                          Simulation/G4Sim/MCTruth
-                          TileCalorimeter/TileDetDescr
-                          TileCalorimeter/TileG4/TileGeoG4SD
-                          TileCalorimeter/TileSimEvent
-                          TileCalorimeter/TileSimUtils
-                          TileCalorimeter/TileG4/TileG4Interfaces
-                          Tools/PathResolver )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )
diff --git a/TileCalorimeter/TileG4/TileGeoG4SD/CMakeLists.txt b/TileCalorimeter/TileG4/TileGeoG4SD/CMakeLists.txt
index 773051757dd..7be73d35dfc 100644
--- a/TileCalorimeter/TileG4/TileGeoG4SD/CMakeLists.txt
+++ b/TileCalorimeter/TileG4/TileGeoG4SD/CMakeLists.txt
@@ -5,24 +5,6 @@
 # Declare the package name:
 atlas_subdir( TileGeoG4SD )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          TileCalorimeter/TileDetDescr
-                          TileCalorimeter/TileSimEvent
-                          
-                          PRIVATE
-                          Calorimeter/CaloIdentifier
-                          Control/StoreGate
-                          TileCalorimeter/TileG4/TileG4Interfaces
-                          Calorimeter/CaloDetDescr
-                          Control/CxxUtils
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          DetectorDescription/GeoModel/GeoModelUtilities
-                          GaudiKernel
-                          Simulation/G4Atlas/G4AtlasTools
-                          TileCalorimeter/TileGeoModel
-                          Tools/PathResolver )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Geant4 )
-- 
GitLab