diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent/CMakeLists.txt b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent/CMakeLists.txt
index 470872ea25ea3cf65bbc4dc34d1b8a6a2ae548a6..e23fa198ca2b010489beef79d73102224f02fd8d 100644
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent/CMakeLists.txt
@@ -1,31 +1,15 @@
-################################################################################
-# Package: AnalysisTriggerEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( AnalysisTriggerEvent )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          Control/Navigation
-                          Event/EventKernel
-                          Event/FourMom )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
 # Component(s) in the package:
 atlas_add_library( AnalysisTriggerEvent
                    src/*.cxx
                    PUBLIC_HEADERS AnalysisTriggerEvent
-                   PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES Navigation AthenaKernel EventKernel FourMom
-                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
+                   LINK_LIBRARIES Navigation AthenaKernel EventKernel FourMom )
 
 atlas_add_dictionary( AnalysisTriggerEventDict
                       AnalysisTriggerEvent/AnalysisTriggerEventDict.h
                       AnalysisTriggerEvent/selection.xml
-                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} Navigation AthenaKernel EventKernel FourMom AnalysisTriggerEvent )
-
+                      LINK_LIBRARIES AnalysisTriggerEvent )
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/CMakeLists.txt b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/CMakeLists.txt
index 9e1b347b3e510e5564c95d2f3364a51c619ebfc5..a3056cde7e005806a8338376ae062bd868079f29 100644
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/CMakeLists.txt
@@ -1,19 +1,8 @@
-################################################################################
-# Package: AnalysisTriggerEventAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( AnalysisTriggerEventAthenaPool )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Database/AthenaPOOL/AthenaPoolUtilities
-                          GaudiKernel
-                          PRIVATE
-                          Database/AthenaPOOL/AthenaPoolCnvSvc
-                          PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
-                          PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv )
-
 # Component(s) in the package:
 atlas_add_poolcnv_library( AnalysisTriggerEventAthenaPoolPoolCnv
                            src/*.cxx
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/CMakeLists.txt b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/CMakeLists.txt
index ed78325ff00c3da4fcdc4e5a1408f877e96a4e58..e5825166ae0ee7f34985abd1ce2f9f34064f3dbd 100644
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/CMakeLists.txt
@@ -1,32 +1,21 @@
-################################################################################
-# Package: AnalysisTriggerEventTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( AnalysisTriggerEventTPCnv )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Database/AthenaPOOL/AthenaPoolCnvSvc
-                          GaudiKernel
-                          PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
-                          PRIVATE
-                          Control/AthenaKernel
-                          Trigger/TrigT1/TrigT1Interfaces )
-
 # External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS Core )
 
 # Component(s) in the package:
 atlas_add_tpcnv_library( AnalysisTriggerEventTPCnv
                          src/*.cxx
                          PUBLIC_HEADERS AnalysisTriggerEventTPCnv
                          PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                         LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib GaudiKernel AnalysisTriggerEvent AthenaKernel TrigT1Interfaces )
+                         LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AnalysisTriggerEvent
+                         PRIVATE_LINK_LIBRARIES AthenaKernel GaudiKernel TrigT1Interfaces )
 
 atlas_add_dictionary( AnalysisTriggerEventTPCnvDict
                       AnalysisTriggerEventTPCnv/AnalysisTriggerEventTPCnvDict.h
                       AnalysisTriggerEventTPCnv/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib GaudiKernel AnalysisTriggerEvent AthenaKernel TrigT1Interfaces AnalysisTriggerEventTPCnv )
-
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} AnalysisTriggerEventTPCnv )