diff --git a/Database/IOVDbPTCnv/CMakeLists.txt b/Database/IOVDbPTCnv/CMakeLists.txt
index 92563d32e6618a45642ee6a3037137687c6d1c67..5ec22f9d6323d7ae00fbf96a5bf053e2305837d2 100644
--- a/Database/IOVDbPTCnv/CMakeLists.txt
+++ b/Database/IOVDbPTCnv/CMakeLists.txt
@@ -1,33 +1,20 @@
-################################################################################
-# Package: IOVDbPTCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( IOVDbPTCnv )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Database/IOVDbDataModel
-                          Database/IOVDbTPCnv
-                          PRIVATE
-                          Database/AthenaPOOL/AthenaPoolUtilities )
-
 # External dependencies:
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( CORAL COMPONENTS CoralBase )
 
 # Component(s) in the package:
 atlas_add_library( IOVDbPTCnv
                    src/*.cxx
                    PUBLIC_HEADERS IOVDbPTCnv
                    INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
-                   PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
                    LINK_LIBRARIES ${CORAL_LIBRARIES} IOVDbDataModel IOVDbTPCnv
-                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolUtilities )
+                   PRIVATE_LINK_LIBRARIES AthenaPoolUtilities )
 
 atlas_add_dictionary( IOVDbPTCnvDict
                       IOVDbPTCnv/IOVDbPTCnvDict.h
                       IOVDbPTCnv/selection.xml
-                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} IOVDbDataModel IOVDbTPCnv AthenaPoolUtilities IOVDbPTCnv )
-
+                      LINK_LIBRARIES IOVDbPTCnv )
diff --git a/Database/IOVDbTPCnv/CMakeLists.txt b/Database/IOVDbTPCnv/CMakeLists.txt
index dc4f68ec2184d06fd920777d53634852cff0c9de..7c171ead70240292db4389519d79b5d5ecf1fc44 100644
--- a/Database/IOVDbTPCnv/CMakeLists.txt
+++ b/Database/IOVDbTPCnv/CMakeLists.txt
@@ -1,39 +1,25 @@
-################################################################################
-# Package: IOVDbTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( IOVDbTPCnv )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Database/AthenaPOOL/AthenaPoolCnvSvc
-                          Database/IOVDbDataModel
-                          PRIVATE
-                          Control/AthenaKernel
-                          Database/AthenaPOOL/AthenaPoolUtilities )
-
 # External dependencies:
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( CORAL COMPONENTS CoralBase )
 
 # Component(s) in the package:
 atlas_add_tpcnv_library( IOVDbTPCnv
                          src/*.cxx
                          PUBLIC_HEADERS IOVDbTPCnv
                          INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
-                         PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                         LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaPoolCnvSvcLib IOVDbDataModel AthenaKernel AthenaPoolUtilities )
+                         LINK_LIBRARIES ${CORAL_LIBRARIES} AthenaPoolCnvSvcLib IOVDbDataModel
+                         PRIVATE_LINK_LIBRARIES AthenaKernel AthenaPoolUtilities )
 
 atlas_add_dictionary( IOVDbTPCnvDict
                       IOVDbTPCnv/IOVDbTPCnvDict.h
                       IOVDbTPCnv/selection.xml
-                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaPoolCnvSvcLib IOVDbDataModel AthenaKernel AthenaPoolUtilities IOVDbTPCnv )
+                      LINK_LIBRARIES IOVDbTPCnv )
 
 atlas_add_dictionary( OLD_IOVDbTPCnvDict
                       IOVDbTPCnv/IOVDbTPCnvDict.h
                       IOVDbTPCnv/OLD_selection.xml
-                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaPoolCnvSvcLib IOVDbDataModel AthenaKernel AthenaPoolUtilities IOVDbTPCnv )
-
+                      LINK_LIBRARIES IOVDbTPCnv )