diff --git a/Generators/Charybdis_i/CMakeLists.txt b/Generators/Charybdis_i/CMakeLists.txt
index fc93de5edb0ffd0e0a7cb3ab3183e98c9c8a08fb..37ff118e17c963bca50a3d466ed989ab2c5fec7a 100644
--- a/Generators/Charybdis_i/CMakeLists.txt
+++ b/Generators/Charybdis_i/CMakeLists.txt
@@ -1,15 +1,8 @@
-################################################################################
-# Package: Charybdis_i
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( Charybdis_i )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PRIVATE
-   Generators/GeneratorFortranCommon )
-
 # External dependencies:
 find_package( Herwig )
 find_package( Lhapdf )
diff --git a/Generators/Epos_i/CMakeLists.txt b/Generators/Epos_i/CMakeLists.txt
index 922105d3edaae19fe12c71721d31c12b0c4f325f..46318ba51bb38e1b3756422c7b376d108d7dc33e 100644
--- a/Generators/Epos_i/CMakeLists.txt
+++ b/Generators/Epos_i/CMakeLists.txt
@@ -1,19 +1,8 @@
-################################################################################
-# Package: Epos_i
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( Epos_i )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Generators/GeneratorModules
-                          Generators/AtlasHepMC
-                          PRIVATE
-                          Control/AthenaKernel
-                          GaudiKernel
-                          Generators/TruthUtils )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Crmc COMPONENTS Epos )
@@ -36,8 +25,7 @@ atlas_add_library( Epos_iLib
 
 atlas_add_component( Epos_i
                      src/components/*.cxx
-                     INCLUDE_DIRS ${CRMC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} 
-                     LINK_LIBRARIES ${CRMC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AtlasHepMCfioLib GeneratorModulesLib AthenaKernel GaudiKernel TruthUtils Epos_iLib )
+                     LINK_LIBRARIES Epos_iLib )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
diff --git a/Generators/EvtGen_i/CMakeLists.txt b/Generators/EvtGen_i/CMakeLists.txt
index 5b34b7b6f48cf79cdad6000922b592da48bdde7a..d4ef9a781c24c61afacaac4e07e94cb3cc4d8b06 100644
--- a/Generators/EvtGen_i/CMakeLists.txt
+++ b/Generators/EvtGen_i/CMakeLists.txt
@@ -1,26 +1,12 @@
-################################################################################
-# Package: EvtGen_i
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( EvtGen_i )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/StoreGate
-                          GaudiKernel
-                          Generators/GeneratorModules
-                          Generators/GeneratorObjects
-                          Generators/AtlasHepMC
-                          PRIVATE
-                          Control/AthenaKernel )
-
 #set( PHOTOSPP_VERSION 3.61 )
 #set( PHOTOSPP_ROOT
 #   /cvmfs/sft.cern.ch/lcg/releases/LCG_88/MCGenerators/photos++/${PHOTOSPP_VERSION}/${LCG_PLATFORM} )
 
-
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )
@@ -58,8 +44,7 @@ atlas_add_library( EvtGen_iLib
 
 atlas_add_component( EvtGen_i
                      src/components/*.cxx
-                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${PYTHIA8_INCLUDE_DIRS} ${PHOTOSPP_INCLUDE_DIRS} ${TAUOLAPP_INCLUDE_DIRS}  ${EVTGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${PYTHIA8_LIBRARIES} ${PHOTOSPP_LIBRARIES} ${TAUOLAPP_LIBRARIES} AtlasHepMCLib ${EVTGEN_LIBRARIES} StoreGateLib SGtests GaudiKernel GeneratorModulesLib GeneratorObjects AthenaKernel EvtGen_iLib )
+                     LINK_LIBRARIES EvtGen_iLib )
 
 # Install files from the package:
 atlas_install_joboptions( share/common/*.py )
diff --git a/Generators/HepMCAnalysis_i/CMakeLists.txt b/Generators/HepMCAnalysis_i/CMakeLists.txt
index b970fb62fa61f15ca3f7071dcca54d926576f9cd..832b31e70c13b677845b594d48b4ef67bb1e2c22 100644
--- a/Generators/HepMCAnalysis_i/CMakeLists.txt
+++ b/Generators/HepMCAnalysis_i/CMakeLists.txt
@@ -1,22 +1,8 @@
-################################################################################
-# Package: HepMCAnalysis_i
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( HepMCAnalysis_i )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthenaBaseComps
-   GaudiKernel
-   Generators/AtlasHepMC
-   PRIVATE
-   Control/StoreGate
-   Event/EventInfo
-   Generators/GeneratorObjects
-   Generators/TruthUtils )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( HEPUtils )
@@ -30,8 +16,6 @@ else()
 set( HEPMC_HepMCAnalysis_INTERFACE_DIR  )
 endif()
 
-
-
 # Component(s) in the package:
 atlas_add_component( HepMCAnalysis_i
    HepMCAnalysis_i/*.h src/*.cxx src/components/*.cxx
diff --git a/Generators/Herwig7_i/CMakeLists.txt b/Generators/Herwig7_i/CMakeLists.txt
index c58fcf1986d03c02b38d55affeecdfbf77ee0df9..0c4b498f6801e290ebba0c7556ed9e8dcae15e7c 100644
--- a/Generators/Herwig7_i/CMakeLists.txt
+++ b/Generators/Herwig7_i/CMakeLists.txt
@@ -1,20 +1,8 @@
-################################################################################
-# Package: Herwig7_i
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( Herwig7_i )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Generators/GeneratorModules
-   Generators/AtlasHepMC
-   PRIVATE
-   Event/EventInfo
-   GaudiKernel
-   Tools/PathResolver )
-
 # External dependencies:
 find_package( Boost )
 find_package( Herwig3 COMPONENTS HerwigAPI )
diff --git a/Generators/Hijing_i/CMakeLists.txt b/Generators/Hijing_i/CMakeLists.txt
index 9eb1adf6f6d33e26d310734f48378abeb66dc98b..ff26151c56c5234402a15dfd30ae14d7d4c8ef2e 100644
--- a/Generators/Hijing_i/CMakeLists.txt
+++ b/Generators/Hijing_i/CMakeLists.txt
@@ -1,25 +1,8 @@
-################################################################################
-# Package: Hijing_i
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( Hijing_i )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Generators/GeneratorFortranCommon
-   Generators/GeneratorModules
-   Generators/AtlasHepMC
-   Control/CxxUtils
-   PRIVATE
-   Control/AthenaKernel
-   Control/StoreGate
-   GaudiKernel
-   Generators/GeneratorObjects
-   Generators/GeneratorUtils
-   Generators/TruthUtils )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Hijing )
@@ -38,7 +21,7 @@ atlas_add_library( Hijing_iLib
    LINK_LIBRARIES ${HIJING_LIBRARIES} ${CLHEP_LIBRARIES}
    GeneratorFortranCommonLib GeneratorModulesLib StoreGateLib
    PRIVATE_LINK_LIBRARIES AtlasHepMCLib AthenaKernel GaudiKernel
-   GeneratorObjects TruthUtils )
+   GeneratorObjects GeneratorUtilsLib TruthUtils )
 
 atlas_add_component( Hijing_i
    src/components/*.cxx
diff --git a/Generators/Hydjet_i/CMakeLists.txt b/Generators/Hydjet_i/CMakeLists.txt
index 8fa501fba7b1e96eeab5e137fb749ca109ab1409..98b4cfd896956e5da80355712083a3961de16cbf 100644
--- a/Generators/Hydjet_i/CMakeLists.txt
+++ b/Generators/Hydjet_i/CMakeLists.txt
@@ -1,25 +1,8 @@
-################################################################################
-# Package: Hydjet_i
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( Hydjet_i )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Generators/GeneratorFortranCommon
-   Generators/GeneratorModules
-   Generators/AtlasHepMC
-   Control/CxxUtils
-   PRIVATE
-   Control/AthenaKernel
-   Control/StoreGate
-   GaudiKernel
-   Generators/GeneratorObjects
-   Generators/GeneratorUtils
-   Generators/TruthUtils )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Hijing )
@@ -39,10 +22,10 @@ atlas_add_library( Hydjet_iLib
    PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} 
    PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
    LINK_LIBRARIES ${PYQUEN_LIBRARIES} ${PYTHIA6_LIBRARIES}
-   ${HYDJET_LIBRARIES} ${HIJING_LIBRARIES} GeneratorFortranCommonLib
-   GeneratorModulesLib StoreGateLib
+   ${HYDJET_LIBRARIES} ${HIJING_LIBRARIES} CxxUtils GeneratorFortranCommonLib
+   GeneratorModulesLib
    PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib
-   AthenaKernel GaudiKernel GeneratorObjects TruthUtils )
+   AthenaKernel GaudiKernel GeneratorObjects GeneratorUtilsLib StoreGateLib TruthUtils )
 
 atlas_add_component( Hydjet_i
    src/components/*.cxx
diff --git a/Generators/Lhef_i/CMakeLists.txt b/Generators/Lhef_i/CMakeLists.txt
index 2657351f8f3698c0317d7941bc896b8968ca0982..11a14dfc1e9a0cf041714f4df821786173841609 100644
--- a/Generators/Lhef_i/CMakeLists.txt
+++ b/Generators/Lhef_i/CMakeLists.txt
@@ -1,14 +1,8 @@
-################################################################################
-# Package: Lhef_i
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( Lhef_i )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Generators/GeneratorFortranCommon )
-
 # External dependencies:
 find_package( Pythia6 )
 
diff --git a/Generators/MCTester_i/CMakeLists.txt b/Generators/MCTester_i/CMakeLists.txt
index 4df0bcb72e4b37ef208a3c96a7f0ca60f7e30303..d649ac1fe69c12f597af6a3d7ec57257e8249bf7 100644
--- a/Generators/MCTester_i/CMakeLists.txt
+++ b/Generators/MCTester_i/CMakeLists.txt
@@ -1,20 +1,8 @@
-################################################################################
-# Package: MCTester_i
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( MCTester_i )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          PRIVATE
-                          Control/StoreGate
-                          Event/EventInfo
-                          Generators/AtlasHepMC
-                          Generators/GeneratorObjects )
-
 # External dependencies:
 find_package( MCTester )
 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/Generators/Photospp_i/CMakeLists.txt b/Generators/Photospp_i/CMakeLists.txt
index cca200250bddeac1eff9a370e63d1e1c544df9b4..4cb57036fb67febc654d38996498fdac77b69f31 100644
--- a/Generators/Photospp_i/CMakeLists.txt
+++ b/Generators/Photospp_i/CMakeLists.txt
@@ -1,19 +1,8 @@
-################################################################################
-# Package: Photospp_i
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( Photospp_i )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthenaBaseComps
-   PRIVATE
-   Control/AthenaKernel
-   GaudiKernel
-   Generators/GeneratorObjects )
-
 # External dependencies:
 find_package( CLHEP )
 if (HEPMC3_USE)
diff --git a/Generators/ProtosLHEF_i/CMakeLists.txt b/Generators/ProtosLHEF_i/CMakeLists.txt
index dfb3990ddc468b8eb027af5eab34a07fae461027..b24a7613d6c76667d11583ee37437b7305823a37 100644
--- a/Generators/ProtosLHEF_i/CMakeLists.txt
+++ b/Generators/ProtosLHEF_i/CMakeLists.txt
@@ -1,17 +1,8 @@
-################################################################################
-# Package: ProtosLHEF_i
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( ProtosLHEF_i )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          PRIVATE
-                          GaudiKernel
-                          Generators/GeneratorFortranCommon )
-
 # Component(s) in the package:
 atlas_add_component( ProtosLHEF_i
                      src/*.cxx
diff --git a/Generators/Pythia8B_i/CMakeLists.txt b/Generators/Pythia8B_i/CMakeLists.txt
index fa41256e694b457f022ef713e085140d503adcf1..d55fb351f1f758f360cc2c241b0aa48fb2e26475 100644
--- a/Generators/Pythia8B_i/CMakeLists.txt
+++ b/Generators/Pythia8B_i/CMakeLists.txt
@@ -1,19 +1,8 @@
-################################################################################
-# Package: Pythia8B_i
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( Pythia8B_i )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          Generators/Pythia8_i
-                          Generators/AtlasHepMC
-                          PRIVATE
-                          Generators/GeneratorObjects )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )
diff --git a/Generators/Pythia8_i/CMakeLists.txt b/Generators/Pythia8_i/CMakeLists.txt
index 2edc52abdaaf9401e419f822df7cf7631ef2f44e..ebcd213390fd32ad2578a793795f972a79d80144 100644
--- a/Generators/Pythia8_i/CMakeLists.txt
+++ b/Generators/Pythia8_i/CMakeLists.txt
@@ -1,20 +1,8 @@
-################################################################################
-# Package: Pythia8_i
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( Pythia8_i )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          Generators/GeneratorModules
-                          Generators/AtlasHepMC
-                          PRIVATE
-                          GaudiKernel
-                          Generators/GeneratorObjects
-                          Tools/PathResolver )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )
diff --git a/Generators/QGSJet_i/CMakeLists.txt b/Generators/QGSJet_i/CMakeLists.txt
index 2a134271151517da9bd1c6ac73944ea3c7db3a92..0f71dd037f340d1e4c28f96cebd3dcf4cd8b8773 100644
--- a/Generators/QGSJet_i/CMakeLists.txt
+++ b/Generators/QGSJet_i/CMakeLists.txt
@@ -1,19 +1,8 @@
-################################################################################
-# Package: QGSJet_i
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( QGSJet_i )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Generators/GeneratorModules
-                          Generators/AtlasHepMC
-                          PRIVATE
-                          Control/AthenaKernel
-                          GaudiKernel
-                          Generators/TruthUtils )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Crmc COMPONENTS QgsjetII04 )
diff --git a/Generators/Sherpa_i/CMakeLists.txt b/Generators/Sherpa_i/CMakeLists.txt
index fde33ef972995b1ea38df45c8ea95a9d3cca5c99..375632d6381da1ea97782a53fe2a44e5403c1206 100644
--- a/Generators/Sherpa_i/CMakeLists.txt
+++ b/Generators/Sherpa_i/CMakeLists.txt
@@ -1,20 +1,8 @@
-################################################################################
-# Package: Sherpa_i
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( Sherpa_i )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          Generators/GeneratorModules
-                          Generators/AtlasHepMC
-                          Generators/TruthUtils
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel )
-
 # Set the version of Sherpa to use:
 #set( SHERPA_VERSION 2.2.2 )
 #set( SHERPA_ROOT
diff --git a/Generators/Starlight_i/CMakeLists.txt b/Generators/Starlight_i/CMakeLists.txt
index 04abb290de4e318dd4868074f7fc4328c86ef936..8dfb8fbf4e65aecb9dd092a6cf2c7f108640d4ab 100644
--- a/Generators/Starlight_i/CMakeLists.txt
+++ b/Generators/Starlight_i/CMakeLists.txt
@@ -1,23 +1,9 @@
-# $Id: CMakeLists.txt 762209 2016-07-15 14:15:34Z krasznaa $
-################################################################################
-# Package: Starlight_i
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
 
 # Declare the package name:
 atlas_subdir( Starlight_i )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Generators/GeneratorModules
-   Generators/AtlasHepMC
-   PRIVATE
-   Control/AthenaKernel
-   Control/StoreGate
-   GaudiKernel
-   Generators/GeneratorUtils
-   Generators/TruthUtils )
-
 # External dependencies:
 find_package( CLHEP )
 find_package( Starlight )
@@ -32,9 +18,9 @@ atlas_add_library( Starlight_iLib
    INCLUDE_DIRS ${STARLIGHT_INCLUDE_DIRS}
    PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} 
    PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
-   LINK_LIBRARIES ${STARLIGHT_LIBRARIES} GeneratorModulesLib StoreGateLib
+   LINK_LIBRARIES ${STARLIGHT_LIBRARIES} GeneratorModulesLib
    PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaKernel
-   GaudiKernel TruthUtils )
+   GaudiKernel GeneratorUtilsLib TruthUtils StoreGateLib )
 
 atlas_add_component( Starlight_i
    src/components/*.cxx