diff --git a/MuonSpectrometer/MuonCalib/MuonCalibDbOperations/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MuonCalibDbOperations/CMakeLists.txt
index 63562f078ee7bbe1d45d9e16d84f5281abc5ec2e..dde11a41e37fef0534499e90c1fbdec8bdc13f85 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibDbOperations/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MuonCalibDbOperations/CMakeLists.txt
@@ -5,22 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonCalibDbOperations )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils
-                          MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase
-                          PRIVATE
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData
-                          MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt
-                          MuonSpectrometer/MuonCalib/MuonCalibIdentifier
-                          MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibMath
-                          MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
-                          MuonSpectrometer/MuonIdHelpers )
-
 # External dependencies:
 find_package( COOL COMPONENTS CoolKernel CoolApplication )
 find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibEvent/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MuonCalibEvent/CMakeLists.txt
index 06970288db95e1b6cb6a0152de8d883b812c00e7..464aae01befeea7e5765c3e867a90a76db315e52 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibEvent/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MuonCalibEvent/CMakeLists.txt
@@ -5,17 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonCalibEvent )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          Control/AthContainers
-                          DetectorDescription/GeoPrimitives
-                          MuonSpectrometer/MuonCalib/MuonCalibEventBase
-                          MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
-                          PRIVATE
-                          GaudiKernel
-                          MuonSpectrometer/MuonCalib/MuonCalibITools )
-
 # External dependencies:
 find_package( Eigen )
 
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibEventBase/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MuonCalibEventBase/CMakeLists.txt
index 6acb3d14002fae572e7c4c3eb4406e28bd7e1c4c..eed32e19407b72323ad0ba28918a27f21d704000 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibEventBase/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MuonCalibEventBase/CMakeLists.txt
@@ -5,14 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonCalibEventBase )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          DetectorDescription/GeoPrimitives
-                          MuonSpectrometer/MuonCalib/MuonCalibIdentifier
-                          MuonSpectrometer/MuonRDO
-                          PRIVATE
-                          MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibStl )
-
 # External dependencies:
 find_package( Eigen )
 
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraNtuple/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraNtuple/CMakeLists.txt
index 990394da5cde603f45cfca7c0b4b7671abf467ea..e33ce17f364eab173239ad4526a7ab812ca59a22 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraNtuple/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraNtuple/CMakeLists.txt
@@ -5,14 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonCalibExtraNtuple )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleReader
-                          PRIVATE
-                          MuonSpectrometer/MuonCalib/MuonCalibEventBase
-                          MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent
-                          MuonSpectrometer/MuonCalib/MuonCalibIdentifier )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/CMakeLists.txt
index c7e85bbc8a95c2c6570f93429164b5568ccb98a0..4e6838174ad0567988ac64b566346089a03dac9f 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/CMakeLists.txt
@@ -5,51 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonCalibExtraTreeAlg )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/StoreGate
-                          GaudiKernel
-                          MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPattern
-                          Tracking/TrkEvent/TrkTrack
-                          PRIVATE
-                          Calorimeter/CaloEvent
-                          Calorimeter/CaloIdentifier
-                          Control/CxxUtils
-                          Control/AthContainers
-                          Event/EventPrimitives
-                          Event/xAOD/xAODMuon
-                          Event/xAOD/xAODTracking
-                          MuonSpectrometer/MuonCalib/MuonCalibEvent
-                          MuonSpectrometer/MuonCalib/MuonCalibEventBase
-                          MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent
-                          MuonSpectrometer/MuonCalib/MuonCalibITools
-                          MuonSpectrometer/MuonCalib/MuonCalibIdentifier
-                          MuonSpectrometer/MuonCalib/MuonCalibNtuple
-                          MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibStl
-                          MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
-                          MuonSpectrometer/MuonIdHelpers
-                          MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonRIO_OnTrack
-                          MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonSegment
-                          MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools
-                          TileCalorimeter/TileEvent
-                          Tracking/TrkDetDescr/TrkDetElementBase
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkCompetingRIOsOnTrack
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkMaterialOnTrack
-                          Tracking/TrkEvent/TrkMeasurementBase
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkPrepRawData
-                          Tracking/TrkEvent/TrkPseudoMeasurementOnTrack
-                          Tracking/TrkEvent/TrkRIO_OnTrack
-                          Tracking/TrkExtrapolation/TrkExInterfaces
-                          Tracking/TrkTools/TrkToolInterfaces
-                          Trigger/TrigConfiguration/TrigConfL1Data
-                          Trigger/TrigT1/TrigT1Interfaces
-                          Trigger/TrigT1/TrigT1Result )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/CMakeLists.txt
index 557ab97aed7fbe9df2818bb823bd4140dae83470..0cb526fe8c9313145d2145296ffd17e5e785054e 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/CMakeLists.txt
@@ -5,15 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonCalibExtraTreeEvent )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          DetectorDescription/GeoPrimitives
-                          MuonSpectrometer/MuonCalib/MuonCalibEventBase
-                          MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraUtils
-                          MuonSpectrometer/MuonCalib/MuonCalibIdentifier
-                          PRIVATE
-                          MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibStl )
-
 # External dependencies:
 find_package( Eigen )
 
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraUtils/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraUtils/CMakeLists.txt
index 77dd1c8e023e682c54a5b84e88e49de64271e76e..4ea356227e70b0e66792d13003fdab5949cb5cd3 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraUtils/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraUtils/CMakeLists.txt
@@ -5,11 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonCalibExtraUtils )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          DetectorDescription/GeoPrimitives
-                          MuonSpectrometer/MuonCalib/MuonCalibIdentifier )
-
 # External dependencies:
 find_package( Eigen )
 
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/CMakeLists.txt
index 1a8bd5d5ae88309d7b94e0eb2387f3391e55e5a5..92b4c93581e9eb4be3a590301818ec9f21669e06 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/CMakeLists.txt
@@ -5,13 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonCalibIdentifier )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          DetectorDescription/Identifier
-                          PRIVATE
-                          MuonSpectrometer/MuonIdHelpers
-                          Tools/PathResolver )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibNtuple/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MuonCalibNtuple/CMakeLists.txt
index 48c5f9f452a044030f3915d230a39b33bea51e90..47dffe88d67b21824ebbb733805278adcc6bc375 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibNtuple/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MuonCalibNtuple/CMakeLists.txt
@@ -5,15 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonCalibNtuple )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibFitters
-                          MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibInterfaces
-                          MuonSpectrometer/MuonCalib/MuonCalibEventBase
-                          MuonSpectrometer/MuonRDO
-                          PRIVATE
-                          MuonSpectrometer/MuonCalib/MuonCalibIdentifier )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( ROOT COMPONENTS RIO Core Tree MathCore Hist pthread )
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibPatRec/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MuonCalibPatRec/CMakeLists.txt
index f36d1f03ad0c42d9635a0de37b041f356534fd1f..79273dbda3c93f80ada2f9bfd9f6ee63dd6b2d33 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibPatRec/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MuonCalibPatRec/CMakeLists.txt
@@ -5,28 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonCalibPatRec )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          MuonSpectrometer/MuonCalib/MuonCalibEvent
-                          MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonSegment
-                          Tracking/TrkEvent/TrkSegment
-                          PRIVATE
-                          DetectorDescription/Identifier
-                          MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc
-                          MuonSpectrometer/MuonCalib/MuonCalibEventBase
-                          MuonSpectrometer/MuonCalib/MuonCalibITools
-                          MuonSpectrometer/MuonCalib/MuonCalibNtuple
-                          MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
-                          MuonSpectrometer/MuonIdHelpers
-                          MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPattern
-                          MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonRIO_OnTrack
-                          MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecToolInterfaces
-                          Tracking/TrkEvent/TrkCompetingRIOsOnTrack
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkParameters )
-
 # Component(s) in the package:
 atlas_add_library( MuonCalibPatRecLib
                    src/*.cxx
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleReader/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleReader/CMakeLists.txt
index d415d54192c8fb0e74579b02df53cdd5a7fe546c..934b5bb05146eadba3524f090b153999cd38081b 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleReader/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleReader/CMakeLists.txt
@@ -5,12 +5,6 @@
 # Declare the package name:
 atlas_subdir( CalibNtupleReader )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          MuonSpectrometer/MuonCalib/MuonCalibEventBase
-                          PRIVATE
-                          DetectorDescription/GeoPrimitives )
-
 # External dependencies:
 find_package( Eigen )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleUtils/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleUtils/CMakeLists.txt
index 862720f60c94326bd98d5dedea7bdecdb41e7e20..b67d727c372cfc6eafab1a9620c4ef07eca7a526 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleUtils/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleUtils/CMakeLists.txt
@@ -5,13 +5,6 @@
 # Declare the package name:
 atlas_subdir( CalibNtupleUtils )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          MuonSpectrometer/MuonCalib/MuonCalibEventBase
-                          PRIVATE
-                          MuonSpectrometer/MuonCalib/MuonCalibIdentifier
-                          MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibStl )
-
 # External dependencies:
 find_package( ROOT COMPONENTS MathCore MathMore Graf Hist Core Tree RIO pthread Minuit Minuit2 Matrix Physics HistPainter Rint Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
 
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MdtCalibIOSvc/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MdtCalibIOSvc/CMakeLists.txt
index aa6a0b9edda6bc04a89a9666cc75f610ff7609fa..e8361bd5867019882f87ac4e6972fcfb499d661f 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MdtCalibIOSvc/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MdtCalibIOSvc/CMakeLists.txt
@@ -5,24 +5,6 @@
 # Declare the package name:
 atlas_subdir( MdtCalibIOSvc )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils
-                          MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase
-                          PRIVATE
-                          Control/StoreGate
-                          DetectorDescription/Identifier
-                          MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData
-                          MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibInterfaces
-                          MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt
-                          MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibT0
-                          MuonSpectrometer/MuonCalib/MuonCalibIdentifier
-                          MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibMath
-                          MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
-                          MuonSpectrometer/MuonIdHelpers )
-
 # Component(s) in the package:
 atlas_add_library( MdtCalibIOSvcLib
                    src/*.cxx
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/CMakeLists.txt
index 2407feaef9d514a2e4fcceac024e3ad1a19f5063..c6310f4084a7d08e4c391127e1b54c8f52ed383a 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/CMakeLists.txt
@@ -5,24 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonCalibStandAloneBase )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData
-                          MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibFitters
-                          MuonSpectrometer/MuonCalib/MuonCalibEventBase
-                          MuonSpectrometer/MuonCalib/MuonCalibITools
-                          MuonSpectrometer/MuonCalib/MuonCalibIdentifier
-                          PRIVATE
-                          Control/StoreGate
-                          DetectorDescription/Identifier
-                          MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibInterfaces
-                          MuonSpectrometer/MuonCalib/MuonCalibTools
-                          MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibMath
-                          MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
-                          MuonSpectrometer/MuonIdHelpers )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )