diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CMakeLists.txt b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CMakeLists.txt
index e8228a8dfe4058c94503c5ea08e1d616f368827b..89c04c7bc83e6eca0c66d8b5793f811de4f19ded 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CMakeLists.txt
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CMakeLists.txt
@@ -5,31 +5,6 @@
 # Declare the package name:
 atlas_subdir( CscRawDataMonitoring )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaMonitoring
-                          GaudiKernel
-                          MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
-                          MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonSegment
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkSegment
-                          Tracking/TrkEvent/TrkTrack
-                          Trigger/TrigAnalysis/TrigDecisionTool
-                          PRIVATE
-                          Control/StoreGate
-                          Event/xAOD/xAODEventInfo
-                          MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools
-                          MuonSpectrometer/MuonCnv/MuonCSC_CnvTools
-                          MuonSpectrometer/MuonIdHelpers
-                          MuonSpectrometer/MuonRDO
-                          MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization
-                          MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonRIO_OnTrack
-                          MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkCompetingRIOsOnTrack
-                          Tracking/TrkEvent/TrkEventPrimitives )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
 
@@ -38,7 +13,7 @@ atlas_add_component( CscRawDataMonitoring
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaMonitoringLib GaudiKernel MuonPrepRawData MuonSegment TrkParameters TrkSegment TrkTrack TrigDecisionToolLib StoreGateLib SGtests xAODEventInfo MuonIdHelpersLib MuonRDO CscClusterizationLib MuonRIO_OnTrack MuonRecHelperToolsLib TrkSurfaces TrkCompetingRIOsOnTrack TrkEventPrimitives )
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaMonitoringLib GaudiKernel MuonPrepRawData MuonSegment TrkParameters TrkSegment TrkTrack TrigDecisionToolLib StoreGateLib SGtests xAODEventInfo MuonIdHelpersLib MuonRDO CscClusterizationLib MuonRIO_OnTrack MuonRecHelperToolsLib TrkSurfaces TrkCompetingRIOsOnTrack TrkEventPrimitives MuonCSC_CnvToolsLib )
 
 # Install files from the package:
 atlas_install_headers( CscRawDataMonitoring )
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/CMakeLists.txt b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/CMakeLists.txt
index a3157ef0f81f6b90c13b73be6d419c29afce245c..c1eb2d2b1b8dda99def8c9b5a0a52a9ef4ed6436 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/CMakeLists.txt
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/CMakeLists.txt
@@ -5,31 +5,6 @@
 # Declare the package name:
 atlas_subdir( MdtRawDataMonitoring )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaMonitoring
-                          Event/EventInfo
-                          MuonSpectrometer/MuonIdHelpers
-                          MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
-                          MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils
-                          Tracking/TrkEvent/TrkSegment
-                          PRIVATE
-                          DetectorDescription/Identifier
-                          DetectorDescription/GeoModel/GeoModelUtilities
-                          Event/xAOD/xAODEventInfo
-                          Event/xAOD/xAODTrigger
-                          GaudiKernel
-                          MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibFitters
-                          MuonSpectrometer/MuonCalib/MuonCalibIdentifier
-                          MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
-                          MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonRIO_OnTrack
-                          MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonSegment
-			  PhysicsAnalysis/MuonID/MuonSelectorTools
-                          PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
-                          Tools/LWHists
-                          Tracking/TrkEvent/TrkEventPrimitives )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Graf Core Tree MathCore Hist RIO pthread Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
 
@@ -38,7 +13,7 @@ atlas_add_component( MdtRawDataMonitoring
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaMonitoringLib EventInfo MuonIdHelpersLib MuonPrepRawData MuonDQAUtilsLib TrkSegment Identifier xAODEventInfo xAODTrigger GaudiKernel MdtCalibFitters MuonCalibIdentifier MuonReadoutGeometry MuonRIO_OnTrack MuonSegment AnalysisTriggerEvent LWHists TrkEventPrimitives GeoModelUtilities )
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaMonitoringLib EventInfo MuonIdHelpersLib MuonPrepRawData MuonDQAUtilsLib TrkSegment Identifier xAODEventInfo xAODTrigger GaudiKernel MdtCalibFitters MuonCalibIdentifier MuonReadoutGeometry MuonRIO_OnTrack MuonSegment AnalysisTriggerEvent LWHists TrkEventPrimitives GeoModelUtilities MuonAnalysisInterfacesLib )
 
 # Install files from the package:
 atlas_install_headers( MdtRawDataMonitoring )
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/CMakeLists.txt b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/CMakeLists.txt
index 7027a39ea495e82fa54a3c87a1e23de9b510bbb3..b6dd10ca17cedea07a84f17ba799f90f36cd6fdd 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/CMakeLists.txt
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/CMakeLists.txt
@@ -5,42 +5,6 @@
 # Declare the package name:
 atlas_subdir( RpcRawDataMonitoring )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaMonitoring
-                          Control/StoreGate
-                          Event/xAOD/xAODEventInfo
-                          Event/xAOD/xAODMuon
-                          Event/xAOD/xAODTracking
-                          Event/xAOD/xAODTrigger
-                          GaudiKernel
-                          MuonSpectrometer/MuonCablings/MuonRPC_Cabling
-                          MuonSpectrometer/MuonCablings/RPCcablingInterface
-                          MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
-                          MuonSpectrometer/MuonGeoModel
-                          MuonSpectrometer/MuonRDO
-                          MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonTrigCoinData
-                          MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils
-                          Reconstruction/MuonIdentification/muonEvent
-                          Trigger/TrigAnalysis/TrigDecisionTool
-                          Trigger/TrigT1/TrigT1Interfaces
-                          PRIVATE
-                          DetectorDescription/GeoPrimitives
-                          Event/EventPrimitives
-                          MuonSpectrometer/MuonDigitContainer
-                          MuonSpectrometer/MuonIdHelpers
-                          MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools
-                          MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonRIO_OnTrack
-                          MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
-                          Tracking/TrkEvent/TrkEventPrimitives
-                          Tracking/TrkEvent/TrkMeasurementBase
-                          Tracking/TrkEvent/TrkMultiComponentStateOnSurface
-                          Tracking/TrkEvent/TrkTrack
-                          Trigger/TrigConfiguration/TrigConfL1Data
-                          Trigger/TrigT1/TrigT1Result
-                          PhysicsAnalysis/Interfaces/MuonAnalysisInterfaces )
-
 # External dependencies:
 find_package( Eigen )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
@@ -50,7 +14,7 @@ atlas_add_component( RpcRawDataMonitoring
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaMonitoringLib StoreGateLib SGtests xAODEventInfo xAODMuon xAODTrigger xAODTracking GaudiKernel RPCcablingInterfaceLib MuonReadoutGeometry MuonGeoModelLib MuonRDO MuonRIO_OnTrack MuonRPC_CablingLib MuonTrigCoinData MuonDQAUtilsLib muonEvent TrigDecisionToolLib TrigT1Interfaces GeoPrimitives EventPrimitives MuonDigitContainer MuonIdHelpersLib MuonPrepRawData TrkEventPrimitives TrkMeasurementBase TrkMultiComponentStateOnSurface TrkTrack TrigConfL1Data TrigT1Result )
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaMonitoringLib StoreGateLib SGtests xAODEventInfo xAODMuon xAODTrigger xAODTracking GaudiKernel RPCcablingInterfaceLib MuonReadoutGeometry MuonGeoModelLib MuonRDO MuonRIO_OnTrack MuonRPC_CablingLib MuonTrigCoinData MuonDQAUtilsLib muonEvent TrigDecisionToolLib TrigT1Interfaces GeoPrimitives EventPrimitives MuonDigitContainer MuonIdHelpersLib MuonPrepRawData TrkEventPrimitives TrkMeasurementBase TrkMultiComponentStateOnSurface TrkTrack TrigConfL1Data TrigT1Result MuonAnalysisInterfacesLib )
 
 # Install files from the package:
 atlas_install_headers( RpcRawDataMonitoring )