diff --git a/Reconstruction/PFlow/PFlowValidation/PFODQA/CMakeLists.txt b/Reconstruction/PFlow/PFlowValidation/PFODQA/CMakeLists.txt
index 1ba0b67b81c6c231bb6c67ce0b488e3913d9dd24..c60af8ea994ce76904a0dcd1e4303648849639c6 100644
--- a/Reconstruction/PFlow/PFlowValidation/PFODQA/CMakeLists.txt
+++ b/Reconstruction/PFlow/PFlowValidation/PFODQA/CMakeLists.txt
@@ -1,29 +1,10 @@
-################################################################################
-# Package: PFODQA
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( PFODQA )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaMonitoring
-			  Control/StoreGate
-                          Event/xAOD/xAODCaloEvent
-                          Event/xAOD/xAODPFlow
-			  Event/xAOD/xAODTracking
-                          Reconstruction/PFlow/PFlowValidation/PFOHistUtils
-                          Tracking/TrkValidation/TrkValHistUtils )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
 # Component(s) in the package:
 atlas_add_component( PFODQA
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel AthenaMonitoringLib xAODCaloEvent xAODPFlow PFOHistUtils TrkValHistUtils )
-
+                     LINK_LIBRARIES AthenaMonitoringLib xAODCaloEvent xAODPFlow xAODTracking PFOHistUtils StoreGateLib TrkValHistUtils )
diff --git a/Reconstruction/PFlow/PFlowValidation/PFOHistUtils/CMakeLists.txt b/Reconstruction/PFlow/PFlowValidation/PFOHistUtils/CMakeLists.txt
index 63fa9fa2631b2cdf9652376076e6ddcc05803aa5..0851308a4ff589d9792c33968e8cebc9f3360d7b 100644
--- a/Reconstruction/PFlow/PFlowValidation/PFOHistUtils/CMakeLists.txt
+++ b/Reconstruction/PFlow/PFlowValidation/PFOHistUtils/CMakeLists.txt
@@ -1,24 +1,10 @@
-################################################################################
-# Package: PFOHistUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( PFOHistUtils )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Event/xAOD/xAODCaloEvent
-                          Event/xAOD/xAODPFlow
-			  Event/xAOD/xAODTracking
-                          Tracking/TrkValidation/TrkValHistUtils )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
 # Component(s) in the package:
 atlas_add_library( PFOHistUtils
                    src/*.cxx
                    PUBLIC_HEADERS PFOHistUtils
-                   INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${ROOT_LIBRARIES} xAODCaloEvent xAODPFlow TrkValHistUtils )
-
+                   LINK_LIBRARIES xAODCaloEvent xAODPFlow xAODTracking TrkValHistUtils )