diff --git a/Database/AthenaRoot/AthenaRootComps/CMakeLists.txt b/Database/AthenaRoot/AthenaRootComps/CMakeLists.txt
index 9108375ac40b7f4a4e95eda1ae49164cf6a359ab..fea3eb676f44e6a7554be451e67a68d3e0aaf02b 100644
--- a/Database/AthenaRoot/AthenaRootComps/CMakeLists.txt
+++ b/Database/AthenaRoot/AthenaRootComps/CMakeLists.txt
@@ -1,57 +1,37 @@
-################################################################################
-# Package: AthenaRootComps
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( AthenaRootComps )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/SGTools
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/AthenaPython
-                          Control/DataModelRoot
-                          Control/RootUtils
-                          Control/StoreGate
-                          Database/APR/CollectionBase
-                          Database/APR/CollectionUtilities
-                          Database/APR/FileCatalog
-                          Database/APR/PersistencySvc
-                          Database/AthenaRoot/AthenaRootKernel
-                          Database/PersistentDataModel
-                          Database/AthenaPOOL/PoolSvc
-                          Event/EventInfo
-			  Event/xAOD/xAODEventInfo
-                          GaudiKernel
-			  Control/xAODRootAccess)
-
 # External dependencies:
 find_package( ROOT COMPONENTS RIO Core Graf Tree MathCore Hist pthread )
 find_package( Xrootd )
 find_package( Boost )
 
 # Component(s) in the package:
+atlas_add_library( AthenaRootCompsLib
+                   AthenaRootComps/*.h
+                   INTERFACE
+                   PUBLIC_HEADERS AthenaRootComps
+                   INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+                   LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel )
+
 atlas_add_component( AthenaRootComps
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} SGTools AthenaBaseComps AthenaKernel DataModelRoot RootUtils RootUtilsPyROOT StoreGateLib SGtests CollectionBase CollectionUtilities FileCatalog PersistencySvc AthenaRootKernel PersistentDataModel EventInfo GaudiKernel xAODRootAccess xAODEventInfo PoolSvcLib )
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel AthenaRootCompsLib AthenaRootKernel DataModelRoot EventInfo FileCatalog GaudiKernel PersistentDataModel PoolSvcLib RootUtils SGTools StoreGateLib xAODCore xAODEventInfo xAODRootAccess )
 
 # Install files from the package:
-atlas_install_headers( AthenaRootComps )
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/tests/*.py )
 atlas_install_scripts( test/*.sh test/ref.* test/*.py )
 
-
 atlas_add_test( test_athena_ntuple_dumper_multiple
                 SCRIPT test/test_athena_ntuple_dumper_multiple.sh
                 POST_EXEC_SCRIPT nopost.sh
                 PROPERTIES TIMEOUT 600 )
 
-
 atlas_add_test( test_athena_ntuple_dumper_varhandles_nooutput
                 SCRIPT test/test_athena_ntuple_dumper_varhandles_nooutput.sh
                 POST_EXEC_SCRIPT nopost.sh
diff --git a/Database/AthenaRoot/AthenaRootKernel/CMakeLists.txt b/Database/AthenaRoot/AthenaRootKernel/CMakeLists.txt
index 20a78956568c2eee90a024aa0a7750bb5cdb1ab2..c9b4a9f9c5ce059e56c6f41c84ed5fed92843777 100644
--- a/Database/AthenaRoot/AthenaRootKernel/CMakeLists.txt
+++ b/Database/AthenaRoot/AthenaRootKernel/CMakeLists.txt
@@ -1,18 +1,10 @@
-################################################################################
-# Package: AthenaRootKernel
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( AthenaRootKernel )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/DataModelRoot
-                          GaudiKernel )
-
 # Component(s) in the package:
 atlas_add_library( AthenaRootKernel
                    src/*.cxx
                    PUBLIC_HEADERS AthenaRootKernel
                    LINK_LIBRARIES DataModelRoot GaudiKernel )
-
diff --git a/Database/AthenaRoot/RootAuxDynIO/CMakeLists.txt b/Database/AthenaRoot/RootAuxDynIO/CMakeLists.txt
index 8d557fc5cd80db5daf0d3937c6bcb66367301aa6..fec998fdaf2da5ca19e161f6991270181660bdc9 100644
--- a/Database/AthenaRoot/RootAuxDynIO/CMakeLists.txt
+++ b/Database/AthenaRoot/RootAuxDynIO/CMakeLists.txt
@@ -1,20 +1,8 @@
-################################################################################
-# Package: RootAuxDynIO
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( RootAuxDynIO )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          AtlasTest/TestTools
-                          Control/RootUtils
-                          Control/AthContainers
-                          Control/AthContainersRoot
-                          Control/AthContainersInterfaces
-                          Database/AthenaRoot/AthenaRootComps
-                          GaudiKernel )
-
 find_package( ROOT COMPONENTS Core RIO Tree )
 
 # Component(s) in the package:
@@ -23,4 +11,4 @@ atlas_add_library( RootAuxDynIO
                    PUBLIC_HEADERS RootAuxDynIO
                    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
                    LINK_LIBRARIES ${ROOT_LIBRARIES} 
-                   PRIVATE_LINK_LIBRARIES TestTools AthContainers AthContainersRoot RootUtils GaudiKernel )
+                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthContainersInterfaces AthContainersRoot RootUtils )