diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDD/CMakeLists.txt b/MuonSpectrometer/MuonDetDescr/MuonAGDD/CMakeLists.txt
index 9a138202eabb737c485cc4a20d7143d9df2c916a..b9e16f36fe5108eb0dc2a8b029c4d22c17c01580 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDD/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDD/CMakeLists.txt
@@ -17,22 +17,6 @@ if( NOT SIMULATIONBASE )
    set( extra_lib AmdcAthLib )
 endif()
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          DetectorDescription/AGDD/AGDDControl
-                          GaudiKernel
-                          PRIVATE
-                          Control/StoreGate
-                          Database/RDBAccessSvc
-                          DetectorDescription/AGDD/AGDD2GeoSvc
-                          DetectorDescription/AGDD/AGDDKernel
-                          DetectorDescription/AGDD/AGDDModel
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          MuonSpectrometer/MuonDetDescr/MuonAGDDBase
-                          MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
-			  MuonSpectrometer/MuonDetDescr/MuonDetDescrUtils
-                          ${extra_dep} )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDDBase/CMakeLists.txt b/MuonSpectrometer/MuonDetDescr/MuonAGDDBase/CMakeLists.txt
index 661b0b42ab8b009c2cba63cccf69482cdcf3be09..55b26eed56dc27dacac43aa2b92c08a0a13d7236 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDDBase/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDDBase/CMakeLists.txt
@@ -5,18 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonAGDDBase )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          DetectorDescription/AGDD/AGDDControl
-                          DetectorDescription/AGDD/AGDDKernel
-                          GaudiKernel
-                          MuonSpectrometer/MuonDetDescr/MuonAGDDDescription
-                          PRIVATE
-                          Control/StoreGate
-                          DetectorDescription/AGDD/AGDDModel
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          MuonSpectrometer/MuonGeoModel )
-
 find_package( GeoModelCore )
 
 # Component(s) in the package:
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/CMakeLists.txt b/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/CMakeLists.txt
index 3fe96c40d108e7096cdc227711eb89c4494dddf5..8f79a003cde49ecc42602cc154ba2a2892e8a9f4 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/CMakeLists.txt
@@ -5,12 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonAGDDDescription )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          DetectorDescription/AGDD/AGDDKernel
-                          DetectorDescription/AGDD/AGDDModel
-                        )
-
 # Component(s) in the package:
 atlas_add_library( MuonAGDDDescription
                    src/*.cxx
diff --git a/MuonSpectrometer/MuonDetDescr/MuonDetDescrUtils/CMakeLists.txt b/MuonSpectrometer/MuonDetDescr/MuonDetDescrUtils/CMakeLists.txt
index 95f1d167bdbbe6132c78169741e1c780899dfab5..75e119af3c4dc3451d84d930dafb3e087e73f289 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonDetDescrUtils/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDetDescr/MuonDetDescrUtils/CMakeLists.txt
@@ -5,13 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonDetDescrUtils )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          MuonSpectrometer/MuonStationIndex
-			  PRIVATE
-			  DetectorDescription/AGDD/AGDDKernel
-			  MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry )
-
 # External dependencies:
 find_package( ROOT COMPONENTS RIO Tree Core MathCore Hist pthread )
 
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/CMakeLists.txt b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/CMakeLists.txt
index faa73eb878112be069714cf6e1d1faabc8684ddf..5c2800c25719e7a6433edf4482c3d98c156f979a 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/CMakeLists.txt
@@ -6,33 +6,11 @@
 atlas_subdir( MuonReadoutGeometry )
 
 # Extra dependencies, based on the environment (no MuonCondSvc needed in AthSimulation):
-set( extra_deps )
 set( extra_libs )
 if( NOT SIMULATIONBASE )
-  set( extra_deps MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc )
   set( extra_libs MuonCondSvcLib )
 endif()
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/CxxUtils
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          DetectorDescription/GeoPrimitives
-                          DetectorDescription/Identifier
-                          GaudiKernel
-                          MuonSpectrometer/MuonAlignment/MuonAlignmentData
-                          MuonSpectrometer/MuonIdHelpers
-                          Tracking/TrkDetDescr/TrkDetElementBase
-                          Tracking/TrkDetDescr/TrkDistortedSurfaces
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          ${extra_deps}
-                          PRIVATE
-                          Control/StoreGate
-                          DetectorDescription/AGDD/AGDDModel
-                          DetectorDescription/GeoModel/GeoModelUtilities
-                          MuonSpectrometer/MuonDetDescr/MuonAGDDDescription )
-
 # External dependencies:
 find_package( GeoModelCore )
 
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/CMakeLists.txt b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/CMakeLists.txt
index a5c7fb8fbb291e86484e82406a54bc17ce23bf13..9c9ed2d891f586ded5f719c6779a32ae55247fed 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/CMakeLists.txt
@@ -5,24 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonRegionSelector )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/StoreGate
-                          DetectorDescription/GeoPrimitives
-                          DetectorDescription/RegSelLUT
-                          GaudiKernel
-                          MuonSpectrometer/MuonConditions/MuonCondCabling/RPC_CondCabling
-                          MuonSpectrometer/MuonCablings/RPCcablingInterface
-                          PRIVATE
-                          DetectorDescription/Identifier
-                          DetectorDescription/IRegionSelector
-                          MuonSpectrometer/MuonCablings/MuonCablingData
-                          MuonSpectrometer/MuonCablings/CSCcabling
-                          MuonSpectrometer/MuonCablings/MuonTGC_Cabling
-                          MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
-                          MuonSpectrometer/MuonDetDescr/MuonAGDDDescription )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Eigen )
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/CMakeLists.txt b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/CMakeLists.txt
index 07eb85495d28e8700f2834e58fc35c2863eaff8f..5c99a74ba13fd33b9d631cff77a31c58d9f23bd0 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/CMakeLists.txt
@@ -5,25 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonTrackingGeometry )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          AtlasGeometryCommon/SubDetectorEnvelopes
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          Tracking/TrkDetDescr/TrkDetDescrGeoModelCnv
-                          Tracking/TrkDetDescr/TrkDetDescrInterfaces
-                          Tracking/TrkDetDescr/TrkDetDescrUtils
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkDetDescr/TrkVolumes
-                          PRIVATE
-                          Control/StoreGate
-                          DetectorDescription/GeoPrimitives
-                          DetectorDescription/GeoModel/GeoModelUtilities
-                          MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
-                          MuonSpectrometer/MuonIdHelpers
-                          Tracking/TrkDetDescr/TrkGeometrySurfaces
-                          Tracking/TrkDetDescr/TrkSurfaces )
-
 # External dependencies:
 find_package( Eigen )
 find_package( GeoModelCore )