diff --git a/InnerDetector/InDetDigitization/BCM_Digitization/CMakeLists.txt b/InnerDetector/InDetDigitization/BCM_Digitization/CMakeLists.txt
index 84c3f07a4a8372ae818ff7359aae58987e5a7d03..3506e5494d9ec51541391315b3b8ef89f6ca3fc9 100644
--- a/InnerDetector/InDetDigitization/BCM_Digitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/BCM_Digitization/CMakeLists.txt
@@ -5,19 +5,6 @@
 # Declare the package name:
 atlas_subdir( BCM_Digitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/PileUpTools
-                          Event/xAOD/xAODEventInfo
-                          Generators/GeneratorObjects
-                          InnerDetector/InDetRawEvent/InDetBCM_RawData
-                          InnerDetector/InDetRawEvent/InDetSimData
-                          InnerDetector/InDetSimEvent )
-
 # External dependencies:
 find_package( CLHEP )
 
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/CMakeLists.txt b/InnerDetector/InDetDigitization/FastSiDigitization/CMakeLists.txt
index e4696ac3e3aed0c0b08ec735974f4fc1cdbe1afc..fc94caaf60d712d59e9f7ebf3e48a7843423288d 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/CMakeLists.txt
@@ -5,42 +5,6 @@
 # Declare the package name:
 atlas_subdir( FastSiDigitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/PileUpTools
-                          Event/EventPrimitives
-                          Event/xAOD/xAODEventInfo
-                          GaudiKernel
-                          InnerDetector/InDetConditions/InDetConditionsSummaryService
-                          InnerDetector/InDetConditions/InDetCondTools
-                          InnerDetector/InDetConditions/PixelConditionsTools
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-			  InnerDetector/InDetDetDescr/PixelReadoutGeometry
-			  InnerDetector/InDetDetDescr/SCT_ReadoutGeometry
-                          InnerDetector/InDetRawEvent/InDetSimData
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          InnerDetector/InDetRecTools/SiClusterizationTool
-                          InnerDetector/InDetSimEvent
-                          Simulation/HitManagement
-                          Simulation/ISF/ISF_Fatras/ISF_FatrasDetDescrModel
-                          Simulation/ISF/ISF_Fatras/ISF_FatrasEvent
-                          Tracking/TrkEvent/TrkTruthData
-                          PRIVATE
-                          Control/StoreGate
-                          DetectorDescription/Identifier
-                          Generators/GeneratorObjects
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          Tracking/TrkDetDescr/TrkDetDescrInterfaces
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkExtrapolation/TrkExUtils
-                          Tracking/TrkDigitization/TrkDigEvent
-                          Tracking/TrkDigitization/TrkDigInterfaces
-                          DetectorDescription/GeoPrimitives 
-                          Generators/AtlasHepMC )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
diff --git a/InnerDetector/InDetDigitization/FastTRT_Digitization/CMakeLists.txt b/InnerDetector/InDetDigitization/FastTRT_Digitization/CMakeLists.txt
index 887f1cce9d83a8e9803bb42e8e967776454a1ebe..4f77d3996e9ec1b833411846816e8b83e6323ce4 100644
--- a/InnerDetector/InDetDigitization/FastTRT_Digitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/FastTRT_Digitization/CMakeLists.txt
@@ -5,34 +5,6 @@
 # Declare the package name:
 atlas_subdir( FastTRT_Digitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/PileUpTools
-                          Control/StoreGate
-                          DetectorDescription/Identifier
-                          Event/EventInfo
-                          Event/xAOD/xAODEventInfo
-                          GaudiKernel
-                          InnerDetector/InDetConditions/TRT_ConditionsServices
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          InnerDetector/InDetRecTools/TRT_DriftFunctionTool # FIXME this package only builds a component library!
-                          InnerDetector/InDetSimEvent
-                          Simulation/HitManagement
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkTruthData
-                          Tracking/TrkTools/TrkToolInterfaces
-                          Event/EventContainers
-                          PRIVATE
-                          DetectorDescription/GeoPrimitives
-                          Generators/GeneratorObjects
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-                          InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
-                          InnerDetector/InDetRawEvent/InDetSimData
-                          Tracking/TrkDetDescr/TrkDetElementBase )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Eigen )
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/CMakeLists.txt b/InnerDetector/InDetDigitization/PixelDigitization/CMakeLists.txt
index f4aec89fd5b52bb50c4010cd6ccfc51aec94155d..847cb812353bb7130514460ae9ba526cec4d60f7 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/PixelDigitization/CMakeLists.txt
@@ -5,34 +5,6 @@
 # Declare the package name:
 atlas_subdir( PixelDigitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/CxxUtils
-                          Control/PileUpTools
-                          Control/StoreGate
-                          DetectorDescription/Identifier
-                          Generators/GeneratorObjects
-                          Generators/AtlasHepMC
-                          InnerDetector/InDetConditions/InDetConditionsSummaryService
-                          InnerDetector/InDetConditions/InDetCondTools
-                          InnerDetector/InDetConditions/PixelConditionsTools
-                          InnerDetector/InDetConditions/PixelConditionsData
-                          InnerDetector/InDetConditions/SiPropertiesTool
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-			  InnerDetector/InDetDetDescr/PixelReadoutGeometry
-                          InnerDetector/InDetDetDescr/PixelCabling
-                          InnerDetector/InDetDigitization/SiDigitization
-                          InnerDetector/InDetRawEvent/InDetRawData
-                          InnerDetector/InDetRawEvent/InDetSimData
-                          InnerDetector/InDetSimEvent
-                          Simulation/HitManagement
-                          Tools/PathResolver )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread Matrix TreePlayer )
@@ -41,7 +13,7 @@ find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread Matrix TreePla
 atlas_add_component( PixelDigitization
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} 
+                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps GaudiKernel CommissionEvent AthenaKernel PileUpToolsLib StoreGateLib SGtests Identifier GeneratorObjects PixelConditionsData SiPropertiesToolLib InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry SiDigitization InDetRawData InDetSimData InDetSimEvent HitManagement PathResolver PixelCablingLib InDetConditionsSummaryService )
 
 # Install files from the package:
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/CMakeLists.txt b/InnerDetector/InDetDigitization/SCT_Digitization/CMakeLists.txt
index 99da0ad9e2ee583895491a8ed68148ab17bea59d..027e24319b1e714c5da9385f4ea195a23b435577 100644
--- a/InnerDetector/InDetDigitization/SCT_Digitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/SCT_Digitization/CMakeLists.txt
@@ -5,32 +5,6 @@
 # Declare the package name:
 atlas_subdir( SCT_Digitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Commission/CommissionEvent
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/PileUpTools
-                          DetectorDescription/Identifier
-                          Event/xAOD/xAODEventInfo
-                          GaudiKernel
-                          InnerDetector/InDetConditions/InDetCondTools
-                          InnerDetector/InDetDigitization/SiDigitization
-                          InnerDetector/InDetRawEvent/InDetRawData
-                          InnerDetector/InDetSimEvent
-                          Simulation/HitManagement
-                          PRIVATE
-                          Control/StoreGate
-                          Generators/GeneratorObjects
-                          InnerDetector/InDetConditions/InDetConditionsSummaryService
-                          InnerDetector/InDetConditions/SCT_ConditionsTools
-                          InnerDetector/InDetConditions/SiPropertiesTool
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-			  InnerDetector/InDetDetDescr/SCT_ReadoutGeometry
-                          InnerDetector/InDetDetDescr/SCT_ModuleDistortions
-                          InnerDetector/InDetRawEvent/InDetSimData )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -48,7 +22,6 @@ atlas_add_test( SCT_DigitizationMT_test
                 ENVIRONMENT THREADS=10 )
 
 # Install files from the package:
-atlas_install_headers( SCT_Digitization )
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 
diff --git a/InnerDetector/InDetDigitization/SiDigitization/CMakeLists.txt b/InnerDetector/InDetDigitization/SiDigitization/CMakeLists.txt
index 6161672e9259cdbc15ecb1fc74e0fb775afeb4c5..7ab61b59d4bfa653db2804432b7de887c8dc82c2 100644
--- a/InnerDetector/InDetDigitization/SiDigitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/SiDigitization/CMakeLists.txt
@@ -5,15 +5,6 @@
 # Declare the package name:
 atlas_subdir( SiDigitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          Control/AthAllocators
-                          DetectorDescription/Identifier
-                          GaudiKernel
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-                          InnerDetector/InDetSimEvent )
-
 # Component(s) in the package:
 atlas_add_library( SiDigitization
                    src/SiChargedDiode.cxx
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/CMakeLists.txt b/InnerDetector/InDetDigitization/TRT_Digitization/CMakeLists.txt
index f199a3bcb639619d73eff36c8a5cc17e3c533d3c..9beff4d82596697a76f6df328ee852875e7ba5e3 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/CMakeLists.txt
@@ -5,35 +5,6 @@
 # Declare the package name:
 atlas_subdir( TRT_Digitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-			  Control/StoreGate
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/CxxUtils
-                          Control/PileUpTools
-                          Database/AthenaPOOL/AthenaPoolUtilities
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          DetectorDescription/GeoModel/GeoModelUtilities
-                          DetectorDescription/GeoPrimitives
-                          DetectorDescription/Identifier
-                          Event/xAOD/xAODEventInfo
-                          Generators/GeneratorObjects
-                          InnerDetector/InDetConditions/TRT_ConditionsData
-                          InnerDetector/InDetConditions/TRT_ConditionsServices
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-			  InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
-                          InnerDetector/InDetRawEvent/InDetRawData
-                          InnerDetector/InDetRawEvent/InDetSimData
-                          InnerDetector/InDetSimEvent
-                          InnerDetector/InDetSimUtils/TRT_PAI_Process
-                          Simulation/HitManagement
-                          MagneticField/MagFieldElements
-                          MagneticField/MagFieldConditions )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Eigen )
diff --git a/InnerDetector/InDetRawAlgs/InDetOverlay/CMakeLists.txt b/InnerDetector/InDetRawAlgs/InDetOverlay/CMakeLists.txt
index 4b222431f35887dd485890e5c7c249776e9462f4..ca37b502fa8e2364c39bb826bda9b85110537a8d 100644
--- a/InnerDetector/InDetRawAlgs/InDetOverlay/CMakeLists.txt
+++ b/InnerDetector/InDetRawAlgs/InDetOverlay/CMakeLists.txt
@@ -38,7 +38,6 @@ atlas_add_component( InDetOverlay
                      LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps IDC_OverlayBase GaudiKernel InDetRawData StoreGateLib SGtests GeneratorObjects InDetBCM_RawData InDetIdentifier InDetSimData TrkTrack TRT_ConditionsServicesLib TRT_ElectronPidToolsLib)
 
 # Install files from the package:
-atlas_install_headers( InDetOverlay )
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/StoreGateTestCommon.txt )
 
diff --git a/LArCalorimeter/LArDigitization/CMakeLists.txt b/LArCalorimeter/LArDigitization/CMakeLists.txt
index 8bc6e121421a5f2a7f163dea372bd155ba2ffd67..e31f694723d547dbcda0e531203f3858abbc4d9c 100644
--- a/LArCalorimeter/LArDigitization/CMakeLists.txt
+++ b/LArCalorimeter/LArDigitization/CMakeLists.txt
@@ -5,30 +5,6 @@
 # Declare the package name:
 atlas_subdir( LArDigitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Calorimeter/CaloDetDescr
-                          Calorimeter/CaloIdentifier
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/PileUpTools
-                          Control/StoreGate
-                          DetectorDescription/Identifier
-                          Event/xAOD/xAODEventInfo
-                          GaudiKernel
-                          LArCalorimeter/LArCabling
-                          LArCalorimeter/LArElecCalib
-                          LArCalorimeter/LArIdentifier
-                          LArCalorimeter/LArRawEvent
-                          LArCalorimeter/LArSimEvent
-                          LArCalorimeter/LArRecConditions
-			  LArCalorimeter/LArRawConditions
-                          Event/EventInfoUtils
-                          PRIVATE
-                          Generators/GeneratorObjects 
-                          Generators/AtlasHepMC )
-
-
 # External dependencies:
 find_package( CLHEP )
 
@@ -36,7 +12,7 @@ find_package( CLHEP )
 atlas_add_library( LArDigitizationLib
                    src/*.cxx
                    PUBLIC_HEADERS LArDigitization
-                   PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} 
+                   PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
                    PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
                    LINK_LIBRARIES CaloIdentifier AthenaBaseComps
                    AthenaKernel Identifier xAODEventInfo GaudiKernel
@@ -47,10 +23,9 @@ atlas_add_library( LArDigitizationLib
 
 atlas_add_component( LArDigitization
                      src/components/*.cxx
-                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} 
+                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
                      LINK_LIBRARIES LArDigitizationLib )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
-
diff --git a/MuonSpectrometer/MuonDigitization/CSC_Digitization/CMakeLists.txt b/MuonSpectrometer/MuonDigitization/CSC_Digitization/CMakeLists.txt
index 3137dbe4939d60f6d46ff6668b17ce6bdac3b870..98adc9bc6136c043106c6b937b7152f3e27e55d2 100755
--- a/MuonSpectrometer/MuonDigitization/CSC_Digitization/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDigitization/CSC_Digitization/CMakeLists.txt
@@ -5,24 +5,6 @@
 # Declare the package name:
 atlas_subdir( CSC_Digitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/PileUpTools
-                          GaudiKernel
-                          MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools
-                          MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
-                          MuonSpectrometer/MuonDigitContainer
-                          MuonSpectrometer/MuonIdHelpers
-                          MuonSpectrometer/MuonSimData
-                          MuonSpectrometer/MuonSimEvent
-                          Simulation/HitManagement
-                          PRIVATE
-                          Control/StoreGate
-                          Generators/GeneratorObjects 
-                          Generators/AtlasHepMC )
-
 # External dependencies:
 find_package( CLHEP )
 
@@ -30,11 +12,10 @@ find_package( CLHEP )
 atlas_add_component( CSC_Digitization
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} 
+                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
                      LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthenaKernel PileUpToolsLib GaudiKernel MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonSimData MuonSimEvent HitManagement StoreGateLib SGtests GeneratorObjects CscCalibToolsLib )
 
 # Install files from the package:
-atlas_install_headers( CSC_Digitization )
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/CMakeLists.txt b/MuonSpectrometer/MuonDigitization/MDT_Digitization/CMakeLists.txt
index e6b9c3ab0d1e2b16ea6c6b1faab07cda02832895..6b112cd48225b34a1abacd5c4b37b0d1a1624082 100755
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/CMakeLists.txt
@@ -5,33 +5,6 @@
 # Declare the package name:
 atlas_subdir( MDT_Digitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/PileUpTools
-                          Control/StoreGate
-                          DetectorDescription/Identifier
-                          Event/xAOD/xAODEventInfo
-                          GaudiKernel
-                          Generators/GeneratorObjects
-                          Generators/AtlasHepMC
-                          MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData
-                          MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc
-                          MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface
-                          MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData
-                          MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
-                          MuonSpectrometer/MuonDigitContainer
-                          MuonSpectrometer/MuonDigitization/MDT_Response
-                          MuonSpectrometer/MuonIdHelpers
-                          MuonSpectrometer/MuonSimData
-                          MuonSpectrometer/MuonSimEvent
-                          Simulation/HitManagement
-                          Tools/PathResolver
-                          Tracking/TrkDetDescr/TrkDetDescrUtils
-                          PRIVATE
-                          Event/EventPrimitives )
-
 # External dependencies:
 find_package( CLHEP )
 
@@ -39,11 +12,10 @@ find_package( CLHEP )
 atlas_add_component( MDT_Digitization
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} 
+                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
                      LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthenaKernel PileUpToolsLib StoreGateLib SGtests Identifier xAODEventInfo GaudiKernel GeneratorObjects MdtCalibData MdtCalibSvcLib MuonCondInterface MuonCondData MuonReadoutGeometry MuonDigitContainer MDT_Response MuonIdHelpersLib MuonSimData MuonSimEvent HitManagement PathResolver TrkDetDescrUtils EventPrimitives )
 
 # Install files from the package:
-atlas_install_headers( MDT_Digitization )
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( share/*.rt )
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/CMakeLists.txt b/MuonSpectrometer/MuonDigitization/MM_Digitization/CMakeLists.txt
index 02f3c6374f2afd66ef34b5ee67b26a9e708d852a..f6f1b3116f9ae177d597d98fd3afa56f88ad06fd 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/CMakeLists.txt
@@ -5,35 +5,6 @@
 # Declare the package name:
 atlas_subdir( MM_Digitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/PileUpTools
-                          DetectorDescription/GeoPrimitives
-                          DetectorDescription/Identifier
-                          GaudiKernel
-                          MagneticField/MagFieldElements
-                          MagneticField/MagFieldConditions
-                          MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
-                          MuonSpectrometer/MuonDigitization/MuonDigToolInterfaces
-                          MuonSpectrometer/MuonSimEvent
-                          Simulation/HitManagement
-                          PRIVATE
-                          Control/StoreGate
-                          Generators/GeneratorObjects
-                          Generators/AtlasHepMC
-                          MuonSpectrometer/MuonDetDescr/MuonAGDDDescription
-                          MuonSpectrometer/MuonDigitContainer
-                          MuonSpectrometer/MuonIdHelpers
-                          MuonSpectrometer/MuonSimData
-                          MuonSpectrometer/MuonCalib/NSWCalib/NSWCalibTools
-                          Simulation/Tools/AtlasCLHEP_RandomGenerators
-                          Tools/PathResolver
-                          Tracking/TrkDetDescr/TrkDetDescrUtils
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkEventPrimitives )
-
 # External dependencies:
 find_package( AIDA )
 find_package( CLHEP )
@@ -49,15 +20,14 @@ atlas_add_library( MM_DigitizationLib
                    src/*.cxx
                    PUBLIC_HEADERS MM_Digitization
                    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-                   PRIVATE_INCLUDE_DIRS ${AIDA_INCLUDE_DIRS} 
+                   PRIVATE_INCLUDE_DIRS ${AIDA_INCLUDE_DIRS}
                    DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel GeoPrimitives Identifier GaudiKernel MagFieldInterfaces MuonSimEvent HitManagement PileUpToolsLib StoreGateLib SGtests MuonIdHelpersLib NSWCalibToolsLib MagFieldElements MagFieldConditions MuonReadoutGeometry
-                   PRIVATE_LINK_LIBRARIES AtlasHepMCLib GeneratorObjects MuonAGDDDescription MuonDigitContainer MuonSimData AtlasCLHEP_RandomGenerators PathResolver TrkDetDescrUtils TrkSurfaces TrkEventPrimitives )
+                   LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel GeoPrimitives Identifier GaudiKernel MagFieldInterfaces MuonSimEvent HitManagement PileUpToolsLib StoreGateLib SGtests MuonIdHelpersLib NSWCalibToolsLib MagFieldElements MagFieldConditions MuonReadoutGeometry MuonSimData MuonDigitContainer MuonDigToolInterfacesLib
+                   PRIVATE_LINK_LIBRARIES AtlasHepMCLib GeneratorObjects MuonAGDDDescription AtlasCLHEP_RandomGenerators PathResolver TrkDetDescrUtils TrkSurfaces TrkEventPrimitives )
 
 atlas_add_component( MM_Digitization
                      src/components/*.cxx
-                     INCLUDE_DIRS ${AIDA_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}  ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel PileUpToolsLib GeoPrimitives Identifier GaudiKernel MagFieldInterfaces MuonSimEvent HitManagement StoreGateLib SGtests GeneratorObjects MuonAGDDDescription MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonSimData AtlasCLHEP_RandomGenerators PathResolver TrkDetDescrUtils TrkSurfaces TrkEventPrimitives MM_DigitizationLib NSWCalibToolsLib MagFieldElements MagFieldConditions )
+                     LINK_LIBRARIES MM_DigitizationLib )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
diff --git a/MuonSpectrometer/MuonDigitization/MuonFastDigitization/CMakeLists.txt b/MuonSpectrometer/MuonDigitization/MuonFastDigitization/CMakeLists.txt
index a9a3122f31fb90ea7f3a24eada4942061facc77e..e47dcb40ddc5194ff135152fda0b803b5ee0efc9 100644
--- a/MuonSpectrometer/MuonDigitization/MuonFastDigitization/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDigitization/MuonFastDigitization/CMakeLists.txt
@@ -5,24 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonFastDigitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          DetectorDescription/Identifier
-                          GaudiKernel
-                          MuonSpectrometer/MuonDetDescr/MuonAGDDDescription
-                          MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
-                          MuonSpectrometer/MuonIdHelpers
-                          MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
-                          MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecToolInterfaces
-                          MuonSpectrometer/MuonSimData
-                          MuonSpectrometer/MuonSimEvent
-                          Tools/PathResolver
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkEventPrimitives )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
diff --git a/MuonSpectrometer/MuonDigitization/RPC_Digitization/CMakeLists.txt b/MuonSpectrometer/MuonDigitization/RPC_Digitization/CMakeLists.txt
index 00c0703a6341069e0fbc0169ce948adc50a9bccb..3e1aacaaf7f7984568df03fdb32ebc69c1d37f31 100755
--- a/MuonSpectrometer/MuonDigitization/RPC_Digitization/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDigitization/RPC_Digitization/CMakeLists.txt
@@ -5,31 +5,6 @@
 # Declare the package name:
 atlas_subdir( RPC_Digitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/PileUpTools
-                          Event/xAOD/xAODEventInfo
-                          GaudiKernel
-                          MuonSpectrometer/MuonSimData
-                          MuonSpectrometer/MuonSimEvent
-                          Simulation/HitManagement
-                          PRIVATE
-                          Control/AthenaKernel
-                          Database/RDBAccessSvc
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          DetectorDescription/GeometryDBSvc
-                          Event/EventInfo
-                          Event/EventInfoMgt
-                          Generators/GeneratorObjects
-                          Generators/AtlasHepMC
-                          MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface
-                          MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData
-                          MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
-                          MuonSpectrometer/MuonDigitContainer
-                          MuonSpectrometer/MuonIdHelpers
-                          Tools/PathResolver )
-
 # External dependencies:
 find_package( AIDA )
 find_package( Boost COMPONENTS filesystem thread system )
@@ -44,7 +19,6 @@ atlas_add_component( RPC_Digitization
                      LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps PileUpToolsLib xAODEventInfo GaudiKernel MuonSimData MuonSimEvent HitManagement AthenaKernel EventInfo GeneratorObjects MuonCondInterface MuonCondData MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib PathResolver GeometryDBSvcLib EventInfoMgtLib )
 
 # Install files from the package:
-atlas_install_headers( RPC_Digitization )
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/RPC_Digitization_jobOptions.txt share/*.py )
 atlas_install_runtime( share/G4RPC_Digitizer.txt share/PermanentDeadPanels.txt share/PermanentGoodPanels.txt )
diff --git a/MuonSpectrometer/MuonDigitization/TGC_Digitization/CMakeLists.txt b/MuonSpectrometer/MuonDigitization/TGC_Digitization/CMakeLists.txt
index 7b78cf64cf3fafae335aa2d97da814a1793dd427..5e7e596f4d046cfd7389d5970e7e4d4a68525b9b 100755
--- a/MuonSpectrometer/MuonDigitization/TGC_Digitization/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDigitization/TGC_Digitization/CMakeLists.txt
@@ -5,27 +5,6 @@
 # Declare the package name:
 atlas_subdir( TGC_Digitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/PileUpTools
-                          DetectorDescription/GeoPrimitives
-                          DetectorDescription/Identifier
-                          GaudiKernel
-                          MuonSpectrometer/MuonSimEvent
-                          Simulation/HitManagement
-                          PRIVATE
-                          Database/RDBAccessSvc
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          Event/xAOD/xAODEventInfo
-                          Generators/GeneratorObjects
-                          MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
-                          MuonSpectrometer/MuonDigitContainer
-                          MuonSpectrometer/MuonIdHelpers
-                          MuonSpectrometer/MuonSimData
-                          Tools/PathResolver )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )
diff --git a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/CMakeLists.txt b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/CMakeLists.txt
index 8f8d38b959401432e90148e729678b5fb3c2ec11..c61183789fcc881c679aa8925263c90377d11c6b 100644
--- a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/CMakeLists.txt
@@ -5,34 +5,6 @@
 # Declare the package name:
 atlas_subdir( sTGC_Digitization )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/AthContainers
-                          Control/PileUpTools
-                          DetectorDescription/Identifier
-                          Event/xAOD/xAODEventInfo
-                          GaudiKernel
-                          MuonSpectrometer/MuonDigitization/MuonDigToolInterfaces
-                          MuonSpectrometer/MuonIdHelpers
-                          MuonSpectrometer/MuonSimEvent
-                          Simulation/HitManagement
-                          PRIVATE
-                          Control/StoreGate
-                          Event/EventInfo
-                          Event/EventInfoMgt
-                          Generators/GeneratorObjects
-                          Generators/AtlasHepMC
-                          MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
-                          MuonSpectrometer/MuonDigitContainer
-                          MuonSpectrometer/MuonSimData
-                          MuonSpectrometer/MuonCalib/NSWCalib/NSWCalibTools
-                          Tools/PathResolver
-                          Tracking/TrkDetDescr/TrkDetDescrUtils
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkEventPrimitives )
-
 # External dependencies:
 find_package( AIDA )
 find_package( CLHEP )
@@ -46,11 +18,10 @@ find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minui
 atlas_add_component( sTGC_Digitization
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${AIDA_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} 
+                     INCLUDE_DIRS ${AIDA_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthenaKernel AthContainers PileUpToolsLib Identifier xAODEventInfo GaudiKernel MuonSimEvent HitManagement StoreGateLib SGtests EventInfo GeneratorObjects MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonSimData PathResolver TrkDetDescrUtils TrkSurfaces TrkEventPrimitives NSWCalibToolsLib MuonDigToolInterfacesLib )
 
 # Install files from the package:
-atlas_install_headers( sTGC_Digitization )
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( share/*.dat )
diff --git a/MuonSpectrometer/MuonOverlay/MM_Overlay/CMakeLists.txt b/MuonSpectrometer/MuonOverlay/MM_Overlay/CMakeLists.txt
index 52e2bc5a1173ed537398b05765826c6d6b6d7e64..bef56ca280611b2bace427e25bb19bc9ed66b925 100644
--- a/MuonSpectrometer/MuonOverlay/MM_Overlay/CMakeLists.txt
+++ b/MuonSpectrometer/MuonOverlay/MM_Overlay/CMakeLists.txt
@@ -5,17 +5,6 @@
 # Declare the package name:
 atlas_subdir( MM_Overlay )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          MuonSpectrometer/MuonDigitContainer
-                          MuonSpectrometer/MuonOverlay/MuonOverlayBase
-                          PRIVATE
-                          AtlasTest/TestTools
-                          Control/StoreGate
-                          MuonSpectrometer/MuonDigitization/MuonDigToolInterfaces
-                          MuonSpectrometer/MuonIdHelpers )
-
 #External dependencies:
 find_package( GTest )
 
@@ -26,5 +15,4 @@ atlas_add_component( MM_Overlay
                      LINK_LIBRARIES GaudiKernel MuonDigitContainer MuonOverlayBase StoreGateLib SGtests MuonIdHelpersLib )
 
 # Install files from the package:
-atlas_install_headers( MM_Overlay )
 atlas_install_python_modules( python/*.py )
diff --git a/MuonSpectrometer/MuonOverlay/MdtOverlay/CMakeLists.txt b/MuonSpectrometer/MuonOverlay/MdtOverlay/CMakeLists.txt
index 1324cf2ba4ec64d4007fd4159e48b70d841d38fd..320586900710bcd38caf90e20d50438dee556de4 100644
--- a/MuonSpectrometer/MuonOverlay/MdtOverlay/CMakeLists.txt
+++ b/MuonSpectrometer/MuonOverlay/MdtOverlay/CMakeLists.txt
@@ -5,17 +5,6 @@
 # Declare the package name:
 atlas_subdir( MdtOverlay )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          MuonSpectrometer/MuonDigitContainer
-                          MuonSpectrometer/MuonOverlay/MuonOverlayBase
-                          PRIVATE
-                          AtlasTest/TestTools
-                          Control/StoreGate
-                          MuonSpectrometer/MuonDigitization/MuonDigToolInterfaces
-                          MuonSpectrometer/MuonIdHelpers )
-
 #External dependencies:
 find_package( GTest )
 
@@ -31,5 +20,4 @@ atlas_add_component( MdtOverlay
                      LINK_LIBRARIES GaudiKernel MuonDigitContainer MuonOverlayBase StoreGateLib SGtests MuonIdHelpersLib )
 
 # Install files from the package:
-atlas_install_headers( MdtOverlay )
 atlas_install_python_modules( python/*.py )
diff --git a/MuonSpectrometer/MuonOverlay/MuonOverlayBase/CMakeLists.txt b/MuonSpectrometer/MuonOverlay/MuonOverlayBase/CMakeLists.txt
index ad4acd746af6c4d603f6566521352b2593662350..12716a6795bf0157cd2ae7b3a4bdbd4dc4be8e15 100644
--- a/MuonSpectrometer/MuonOverlay/MuonOverlayBase/CMakeLists.txt
+++ b/MuonSpectrometer/MuonOverlay/MuonOverlayBase/CMakeLists.txt
@@ -5,10 +5,6 @@
 # Declare the package name:
 atlas_subdir( MuonOverlayBase )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Event/EventOverlay/IDC_OverlayBase )
-
 # Component(s) in the package:
 atlas_add_library( MuonOverlayBase
                    PUBLIC_HEADERS MuonOverlayBase
diff --git a/MuonSpectrometer/MuonOverlay/RpcOverlay/CMakeLists.txt b/MuonSpectrometer/MuonOverlay/RpcOverlay/CMakeLists.txt
index e61b2a39a277c2723995e30308bd49e976635bd8..93d80ac725e350d640dd01fb9048cf1c75f70fe7 100644
--- a/MuonSpectrometer/MuonOverlay/RpcOverlay/CMakeLists.txt
+++ b/MuonSpectrometer/MuonOverlay/RpcOverlay/CMakeLists.txt
@@ -5,17 +5,6 @@
 # Declare the package name:
 atlas_subdir( RpcOverlay )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          MuonSpectrometer/MuonDigitContainer
-                          MuonSpectrometer/MuonOverlay/MuonOverlayBase
-                          PRIVATE
-                          AtlasTest/TestTools
-                          Control/StoreGate
-                          MuonSpectrometer/MuonDigitization/MuonDigToolInterfaces
-                          MuonSpectrometer/MuonIdHelpers )
-
 #External dependencies:
 find_package( GTest )
 
@@ -31,5 +20,4 @@ atlas_add_component( RpcOverlay
                      LINK_LIBRARIES GaudiKernel MuonDigitContainer MuonOverlayBase StoreGateLib SGtests MuonIdHelpersLib )
 
 # Install files from the package:
-atlas_install_headers( RpcOverlay )
 atlas_install_python_modules( python/*.py )
diff --git a/MuonSpectrometer/MuonOverlay/STGC_Overlay/CMakeLists.txt b/MuonSpectrometer/MuonOverlay/STGC_Overlay/CMakeLists.txt
index 6dcd2d16275d108cf8beec91a2a894925925ca31..0a4321b55f7cea248dc7bf35429813850c471f27 100644
--- a/MuonSpectrometer/MuonOverlay/STGC_Overlay/CMakeLists.txt
+++ b/MuonSpectrometer/MuonOverlay/STGC_Overlay/CMakeLists.txt
@@ -5,17 +5,6 @@
 # Declare the package name:
 atlas_subdir( STGC_Overlay )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          MuonSpectrometer/MuonDigitContainer
-                          MuonSpectrometer/MuonOverlay/MuonOverlayBase
-                          PRIVATE
-                          AtlasTest/TestTools
-                          Control/StoreGate
-                          MuonSpectrometer/MuonDigitization/MuonDigToolInterfaces
-                          MuonSpectrometer/MuonIdHelpers )
-
 #External dependencies:
 find_package( GTest )
 
@@ -26,5 +15,4 @@ atlas_add_component( STGC_Overlay
                      LINK_LIBRARIES GaudiKernel MuonDigitContainer MuonOverlayBase StoreGateLib SGtests MuonIdHelpersLib )
 
 # Install files from the package:
-atlas_install_headers( STGC_Overlay )
 atlas_install_python_modules( python/*.py )
diff --git a/MuonSpectrometer/MuonOverlay/TgcOverlay/CMakeLists.txt b/MuonSpectrometer/MuonOverlay/TgcOverlay/CMakeLists.txt
index bc66da952662d5feb4c5950d924c29bdcd770a1f..e84f51f36c80d76559eb03cfa81f328652dfb05f 100644
--- a/MuonSpectrometer/MuonOverlay/TgcOverlay/CMakeLists.txt
+++ b/MuonSpectrometer/MuonOverlay/TgcOverlay/CMakeLists.txt
@@ -5,18 +5,6 @@
 # Declare the package name:
 atlas_subdir( TgcOverlay )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          MuonSpectrometer/MuonDigitContainer
-                          MuonSpectrometer/MuonOverlay/MuonOverlayBase
-                          PRIVATE
-                          AtlasTest/TestTools
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          MuonSpectrometer/MuonDigitization/MuonDigToolInterfaces
-                          MuonSpectrometer/MuonIdHelpers )
-
 #External dependencies:
 find_package( GTest )
 
@@ -32,5 +20,4 @@ atlas_add_component( TgcOverlay
                      LINK_LIBRARIES GaudiKernel MuonDigitContainer MuonOverlayBase AthenaKernel StoreGateLib SGtests MuonIdHelpersLib )
 
 # Install files from the package:
-atlas_install_headers( TgcOverlay )
 atlas_install_python_modules( python/*.py )
diff --git a/TileCalorimeter/TileSimAlgs/CMakeLists.txt b/TileCalorimeter/TileSimAlgs/CMakeLists.txt
index 6bf73dc421443d402fee467b6717e66fb71eaef1..8da5213cb0eaecd2a1d244f4f38d7f7bc0a1adec 100644
--- a/TileCalorimeter/TileSimAlgs/CMakeLists.txt
+++ b/TileCalorimeter/TileSimAlgs/CMakeLists.txt
@@ -5,28 +5,6 @@
 # Declare the package name:
 atlas_subdir( TileSimAlgs )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/PileUpTools
-                          GaudiKernel
-                          TileCalorimeter/TileIdentifier
-                          TileCalorimeter/TileSimEvent
-                          PRIVATE
-                          Calorimeter/CaloDetDescr
-                          Calorimeter/CaloEvent
-                          Calorimeter/CaloIdentifier
-                          Control/AthAllocators
-                          Control/AthenaKernel
-                          Event/EventContainers
-                          TileCalorimeter/TileCalib/TileCalibBlobObjs
-                          TileCalorimeter/TileConditions
-                          TileCalorimeter/TileDetDescr
-                          TileCalorimeter/TileEvent
-                          TileCalorimeter/TilePulseSimulator
-                          TileCalorimeter/TileRecUtils
-                          Tools/PathResolver )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint )
@@ -39,7 +17,6 @@ atlas_add_component( TileSimAlgs
                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps PileUpToolsLib GaudiKernel TileIdentifier TileSimEvent CaloDetDescrLib CaloEvent CaloIdentifier AthAllocators AthenaKernel TileCalibBlobObjs TileConditionsLib TileDetDescr TileEvent TilePulseSimulator TileRecUtilsLib PathResolver )
 
 # Install files from the package:
-atlas_install_headers( TileSimAlgs )
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py )