diff --git a/Calorimeter/CaloG4Sim/CMakeLists.txt b/Calorimeter/CaloG4Sim/CMakeLists.txt
index 1d6c8725c1e9e98c35f31db8908198a276b0e4ce..a67dfcaee804de23434b9e09439a80bea7934e45 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 e0e58635a7ff62e60aabf8d93d396441b025d0a9..4fdadae06b4abf9f7cebfc1e78a95e25d702c45e 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 974288bee1f7737981036646c7922bfd1b567248..d1a06d3dce1c3b9a37c3e1de8633fe378e2909f6 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 9852c3b21a78d2957a759ba481166d8b77af8a8c..78b27e8cf51b797462134be935fc5982212660c5 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 082c907a02f1a684de68aa912c38fa295ddd9c71..4ebd128dd22e4e65d401f6433e9cf75d8704ad57 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 912ea2f30323815b792f912e452e556e15ad7620..0dac0e4616010a328cf7f5827c16f2bccf338191 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 1f8999c3f0a037b26e184cce2fb781b68db0044d..4e70daec0f73f43435efb86e91eb3b259604fe44 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 c2654c23c6f3cf2854e2d94c1c2006659fadaf87..828c31d1135512429582695d072ccdc5148627be 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 1bd1d7f7eb4f8bc560361b990049155473cdb8d0..2813e3aa8f75b27fbbbe2b7132e34eeef7b2ba62 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 08534e662dee402478eb3c553053b1d18686b2a0..03b1e2bf4aacc2803febfb8617d6189ec217a4ff 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 ba36aeaa17ce52be6a177eace608a7ce0deedcd5..2e00b5a3f8e75de094cf75ab8b0ede948342aba3 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 8c2ae22e39291f3eb107dfa9f057f5521f5177d3..cded039785c200d3497975d0cb7da22ca878787e 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 ec920e4536635895d9f351e5761d46814c9907c0..6c082c84e29614492a522380a59eb84d384275b3 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 82616394dbf17011562414b67418e7adf92b113f..0b8cc9f1688762da0463e17b7a589884cd126ce7 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 ac94939aa710b17a4d452ca8094afc81424d117b..5f85af58081be3f9d0505f1aa070d3192e58cd6f 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 bce9b6c29ee1a3e0762608468caeee75008ea332..717abda6b56ad25ae69fa58abcaa2c3d9b5056e2 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 06a905150974bc9d1ceeecce196f8fb9cc952098..146230e6f17907b6a1c4531c9b7ab2645c3fa80a 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 77d9a10c62c88aa3e028e332d4edc85eca150dd4..bc4dd23ede56999546977c94b833538487686799 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 0d56009e2a53acb388ce329ae5a3cce74caca196..a1942408eaa5d40dfd812a98a2e240bb765e99c1 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 6cc3b8ae4ce51e0ffcf540bfcac0e81603662b21..4fe682e65cafe5ac345b723e6ba702be7ea760d8 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 d632162ff778bc5df98d57fb81ff53b027173ebf..524c9603e4592be5c30012b970e7ea96c0eb9381 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 31f351cd604682f2ce1fc1774e34d238cb4d271b..3d6b0666fe5b7bab56ce6cbb338e8f7103217f4d 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 dd64ac528e3709625d88109c67db47442f92be8b..578b9b1897fb8c1ab48e92d9449aa54886684e4a 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 4d89fe082969240448a350404b418b8dd889a038..b01fdcaebfc1dccc922bc2c65c6cdf707e4d3a2f 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 ba8c20be4d009086dc17f73c19cc63fac8e2ea97..52b7785e829b64fb037c781bc6a0f036b32005ca 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 d2da87fff935257cb6b16366a31cc992c6adc202..ce92988d7a92d78ada162077e214d50531f7bc82 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 c50234e4d8e3f706846936003d2a35eed4359a9c..9652a53f8217827df9e95341996599f298eb8af4 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 af8e055daed7eb84a0dc2cf0ccd54385d860bb70..a7f21d8b251b6e2318d0809325613d0fcc932da5 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 a1a7948c7310f1fb91d46e22cbf3b15a7a99b896..01d512dffba79c6a95c41927cfd3f6a809d8b64e 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 e57d8d5defd6a25c5eba02b9c9b47f0ae2233461..0107bea909de5a78e7ad34720e754e8897a5c7e4 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 44163416e8927a8a1de4ebb7686e235f0672d43b..57b94c241260daf6f4131875f7fb2330bc46526e 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 27d35d423bd84e57f431a5fd749f976a63fa1220..36897620e3639a3bf25a00bbc8cbb14577b97904 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 f67c472d0da9ba4a16925f71985ac3042cbf5c28..e33223b8c37d22586fbbc1b390476db8ae2f8a95 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 dc28e770d75e8715579ca73ae4166ef4145674e6..7011cb9dae29890ce638a7948c04ae5a5efd2c2f 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 3a0b865f076d76e78956197bcf90ed3a99fd5f3a..e8f309127a313b33a22ce857dd77734bb5a08897 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 174a9b4e7158aca148b4e16d1d5d5d16b98a93a9..610639715ccbeaef2b7c1aefed5dca819a9ea377 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 0e1ad60a3a9a565b71a6c4ca3afeb6c83091b1a8..a83257fe233b62a4407e15f32d118c3f43c808fb 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 7f2c059c510cbd57c9545082b52b78bb05c4103e..2d735a12d06a67ac253d5e95567b77b5be823ce9 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 8a41c26951af14add8ce239df61e3a5b2c7b15aa..080911d598b8fbc4d3e193c4e69cfc07acb25700 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 b2485364a4392c1a9a8b1f8df0653134c9b7e902..3b62b1c8dd7a3657f4b4f1176f2a99f1f39439ec 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 c0a9601efec0bf57f9fd906b653d21c8f2c323f6..b866ccfacf0b8a63ebe66b7d5ef55ad4cdcf2c6a 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 1834c926128bfb65816ade5db09874c9c42d9a47..79f825bcaf4930a6cb18f01f764d7b22f0096768 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 32c07d1a7ad519c6e67e1ac655cc05b9e506213b..27a024df161590ec488dcf43ce059842496d8190 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 28d20a9fb87ffd2add04db31de06e3fc0184faf6..c09ca87c9fcf42e2c78823ec8837c969bd507fc1 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 c71bcfef3808e9ad9f0db9cc96903c831ad91b48..cbe21dd05489386e8d1ce445a9f538be5a102112 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 fd8bc8058199181945070d5f3c02f8eec8eb58bf..fa4d1e4c4a50e5d266a93b038d9d5a840409a6a6 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 024950c9a687ad6a18578984a088ab7de9814372..591d9dd2f225f4406d8d6e41bd92ef4e50cca2d8 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 4f38c51bb8428ffd003d4ac53e0f8b5a73feeb2a..7eacc7123cdefda91966a5865e3c5fd1eec4e241 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 9f6a32300947045f80c907bd63fb854eb4c3c5e9..99dd3e5c633d311a61b49a295e0d8eb90493a75a 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 1b73c7d2fc0b943f237c37ffb010ca64462d6fa9..0daee5c839487bdebe7792e2541d425516b7e8ca 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 53940711964e037c23856e4f4fc8d1476523c3d4..2646be5219258e757ebe6ca7377f020b099f003d 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 5433b70e524aab65f813c2cea6ba549903ab0a54..f73e76f7a93cd7944bd7ea6b5b40a64e6d855b7c 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 4343bfbaf45729c1c339bdd5edb50f62a02bf491..5ad3559df9a4a6bce279091da6acb589ecbbd917 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 1849bf34dff19f5a996ac0187aad262f32f41e82..af05f69fff4f1bad1f8891e4317abfcb088746d6 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 3019802149704fb469a12e366555643d9ea40c53..784646358a1d3080c467d3734c5c5de32f687fb4 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 62efd9cbf5b21b4e64c0f99e66711ec80e69b638..54a347c54e8f1576f9f331c216af5f38e8ea9dad 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 b476d200cf949405ac05148378eb8f8bab9cf7d7..da7156e9b518a0ad70cc2cd43ea5fa08b7027c7c 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 abd1b40a832ac3cfaa89a63ec913a4be88f93f2d..1cb2188b1d58d62a3a0e2c60602ade2f0451cad0 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 3808ec5fc3d23c972d7e283dff5246756f605939..5b514aca50ded3aac5d9c551a2f7db497b1e482e 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 10a879ac0a7e5c7a17f5fe76be8124e72c0abb99..48857e92875b1bf12924fe6accb53b8d09942587 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 d223876f83dd1770ce0e44775a670ec6ba8b5dbb..5dcaf3d9559cfaf0025e298ddf88277f0dcaaa62 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 c41cbf3ded02d7704a03fe2eed7c839ee9af75b3..748425cdeb80859f2cc825812c5692a119cfee7e 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 2424cb241a29a197c377b126320ffcd4623e1e95..2898680a33478e0ab5039eaaee177fa4d4070fd9 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 67127796fd9cf58646e03e08241c3b6cff826137..4be3d4ca17b41559f0fe92772e52915046e9aef4 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 2bd933e3daaa58769ce83637bc4dcdf78452c659..e3070ff96c5e739956900a023ad0b985bd1d3441 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 3396bd068f5fd49df0d447b85f2ea1e21a612136..a33d0debf63a4b7ef10cb2ad063a1d95c51f336f 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 65e07185004cac9b9dab1a7d69fd7769dcc436c3..0d0c795306414057ef6920e8a78da67db7158f0f 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 5c6cf10fdb0e448dfe99b8ea04b79c5c3602e5c6..08250ecf2aad22a038d27c25e0e16d6bcfc012a3 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 991e913f851532177f46a9d60e9652ac558e19ee..22e41cb97d486a9349964d5b7d06c23faeb8ffef 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 88d84bad8cae560090ea99658ec29e63bdb5a18d..e9be74ed39bd9133c83095d28423b010d608a17d 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 70e02fe3c05fbf2c2771d0758ce39dff29020700..4214bf122c2c5c52edc77caf6ea8c5763be1bd56 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 e7fe2fc3a05bef7b916386b68d5684c1d0dd69f5..c94bc29472d555f1428c3ce237f2e164fe2d390c 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 75c22e7ffd34f32dd91343634da3a9a4e5de5ede..e9b973b08d093bc16514bfc2d3decfcd2d0416f2 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 f1c6527b00fd82a42ecdce24fade0129ff06e487..5c430a28c36dc567f83c7245101647c640e904d5 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 00e8e845b7431756ea82269060f7c7cb9d939a7f..9b64379cba7ff9a57d945eef28f72b87c5aa1e25 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 b0af11de8537b7e68bd0d1238ac87897a142c90c..63028887312e2b96930181027256e7e4e92494f0 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 019b5e6e23c5f2b4c1846a7782187147700cce5f..27dfefdb3c56c795c22e9db681787764f543bf89 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 fc4ca04db1814e1f5e84bba0a974c6251a8e2731..5b8165fe255b83647da958ca5b88fb0b576c350a 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 5edaa73a11bfaf2b178e81181cfdc120cb6444e5..97f8b0901d8964b7b1d44d4403fa9bfa61f8731d 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 44f850c88af490e8a631379386b53348680b390e..268ad136a41e3059b1000241757716e6af6d85ab 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 3d32cc5359aafde2f78e5027c7c4385ff8aa74fc..1d6c5e79795abb1f4c1ef484cf5778daf5fd541f 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 29a7e7802fac28baa9eed1ff4893ad0a6a0c2821..1853b41a02f7ad644467b40741891f3a9ec188eb 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 f3972dc300f65b12aa40f8145917e2069fb6f3be..15887e9773b88561b664e5c0e03122eeadbbdac2 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 a5d6ae7eb2f322e3c53c1f0b845ffe9967873638..61283b2cd776cf5eeba2877cd63272afd5c77e04 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 e03c63bf10a4c62fc04008ade90ed22a2a5c9458..b5a8e4a94c988fbd8cb2f1cf1b19e0858688b743 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 5dd3d35395b0ed4fd69b4e06c623d849db596c74..c6403f74dda61d5c1fb9afb531abdf0b1b7750de 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 0181ab4307f7a8273f31283f53dc6429fc40f95c..c011d5fcbde25c49dc376965d25b785bbaee0305 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 9d74fa16b80896967ca3eea8c7b580669eeafb33..70f6d1bfbe8bc457df2edc822182621ff787d178 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 dc81f08787e11037e6e967f95c2ec767a8fd828d..6cd3dad316e5f5681b6faf351ee71e9fcbaebbdb 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 6eacd819ee2e1d1249cb51c72ff2381c9906bc63..1eb6069e5d3cde6b14e15462a8bb71cdd473f19f 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 19ece0bf0cf803a98f581bfe9d7d834c1a13292a..cbf9e11127292880badd463b50c117ce15feb209 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 b997dc29b97ca87f33c859b032016d7e5a8bc3c6..9ffb0c6249f9369854da1b9725ab6b2c341f2a9e 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 0655fc16a86390bf028d22b6cf88b753a2be1269..5de1af4509949fc5f835c522d6f6a2ca4134a15f 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 231366c6b1a9f54c60a51f8d8efdbc850e29a834..a73f23f16bbaa2be662dbf1c2ad8166d400522fb 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 0d2a0e38e11c877e5093f40268f60772018c056f..e46508a4ee3b3808a3e4e8076da6951b0b7f3ee6 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 8d7b343610474751c473e7c1d974bd7066f09d50..22f99aacba14b34a00601e9f30166a4fea7bb404 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 8a05034d9ba60eb4737b97336eff2f7104a7dea8..4b02b05a8dcd69c71c055923de9954bbca74df98 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 e0d85b059967d9691a4ef7f6afbd9df21a6594ab..19941217bb3786086f6433f51d3ce400e8ce6ecf 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 071abf40acba993f0414438a5c515a472d8a985e..4b519f49a9dbadc13a4211f860fa457c11fd191d 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 05b2180d439d1c40737b012fa5ea9d63c4acd49f..bbf1055fda1a3b2e5b49a99e517a09bff6e6a328 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 0b9122bb837ef891039ab58094de3e46c04e4957..04edc588fe64f73ca7bc3fb7b542728ba26e9ea7 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 83274b189ef3c2287d0c208e2a78742d51f6566a..f8974a2b0b839ee879963e5ffb3c7f704f47dfd7 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 b203d83575450d872f5669686f44c3987daa1b4b..9c22c51e3dcdefe7c71164379c9605163fad4edc 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 f7210c1a06a049963a891c63436f52b5ba2404c1..77c7037ffc20083619e8ea7d79572bf320e7a33f 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 31c2a8934b776e0d4b1db885318bdcdfe5b397d8..c5d9536ec6a92fdd17334efa4d029ae00188fd82 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 6e0e8c57a54e8e659a81a212f9b52e12aac83c1f..458b240a713a751dbd611fe8359d19f24b20f88a 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 fff627d0896d83f6c35ff4b7ec55289fb5a0289a..42b11d461e1e9791fa7497e2f42b151a60c58abb 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 3d33a6332f094cfbeae33b53c49778816d69935d..257ab3a511270ca451c09b1f424dbc228ce37316 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 e79ad0932bdb4bf737cf4c19abb120929aa2092c..ba7faf34c4d7cba66c3aafe239034f2d779b8cb8 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 2827121b0b4a819d8852ec5a7efa2e408a041ac9..740c2e6e8679161413b29044125710b9df771ffc 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 ce2a5a2835719ffe9fb1afb5bd93ccc6dc8318a9..03d5a0ffa3e9b9f775e24bb0648b4e89e1b1b07b 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 c2f199469f0e97ba92aec7d3aec33dd559d6a8a5..e352da28f0073a62149e3da02298c928a0060232 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 455235174d1861973b8ecefa7bb9c3a276a22099..b7d5633cad9ae927e5ffa69fc7ee158e20b28ded 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 b772ede2a255bd608baa9f0ce9c6fbdb51541829..7aba0ab4488237d299e7bdf9430c2b04ae0ba6b1 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 b697747a09d99be99c521ee9071d6ee2a440b7d3..a1d643bae657b0978a16f32c5edca5723d356645 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 1ebce403dc6abf91e0e29b93db6eeb9330387e52..0bbbb9a78e6cc515decc691f77f1051b39e5958a 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 81c0bc06d556253f10fc67c37e8eda619177a7e9..03ae0ddc3ea17b55d3d4d51dfe53e7e3605886db 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 84c221d054328b23fc869f6b4af93d53879ff2f2..a6d6ace05449c399644d7817509bf2ba898aaf9c 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 5c26e995a99b74ae7351dcf41a97760d518ebafa..e91513bbd3a72d827a357f6a9756c37112f26be7 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 dc893512ae88317f7a9d991c0ccd9c8110570ebb..db36be9d934190408a7de966ca409b0444b7ead6 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 9935230e5ee14decbf79318cd2f3daa5ef8a1a4a..e370a90e06bcdb38ed58e5e1ea0edaf61f9d09ae 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 3ceff941462547fab912ebec76e66396ed6d324d..c495b7ef901f7310074155ac57a6b3047ce44237 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 cdcfe3a2256301c5ef2cccf6363fdc9676a9f63a..a6056b7b692cf83272c156dc25fa47b395a2bb04 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 176d0e772266e81d8e987a4b49a65168f39a67f6..4577d0bbf334760b81eb3ee0536d42b83364df57 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 c0ee2e92536910b6e2bc502239a52b00af4e3e2f..a04031e7e3c411263e3f673085cbf7cb351902b4 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 c1f91e064cc83314ff835ec3d9e8950396a7c77f..0f926291e3608f89c66f0aeb79982329ba527e3f 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 1d25f541c04a1a5860553263c22a5b83346807f1..d91a48fa0ee4ea9109c9eb5328cd7f108e47878a 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 773051757dd3cbe5c977210734e1f55f077125c0..7be73d35dfc5a5c289f42053db8a811f4199e3bb 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 )