diff --git a/Event/EventContainers/CMakeLists.txt b/Event/EventContainers/CMakeLists.txt
index 13966852d9b4f540d4fb08514265de2d32a5a74d..18f750101beb2a398bbfe1aa57ccb6fa0e319046 100644
--- a/Event/EventContainers/CMakeLists.txt
+++ b/Event/EventContainers/CMakeLists.txt
@@ -1,52 +1,41 @@
-################################################################################
-# Package: EventContainers
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( EventContainers )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          DetectorDescription/Identifier
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaKernel )
-
-# Install files from the package:
-
+# Component(s) in the package:
 atlas_add_library( EventContainers 
    src/*.cxx
    PUBLIC_HEADERS EventContainers
-   LINK_LIBRARIES AthenaKernel Identifier GaudiKernel )
-
+   LINK_LIBRARIES AthenaKernel CxxUtils GaudiKernel Identifier )
 
 atlas_add_dictionary( EventContainersDict
                       EventContainers/EventContainersDict.h
                       EventContainers/selection.xml
                       LINK_LIBRARIES EventContainers )
 
-
+# Tests in the package:
 atlas_add_test( IdCont SOURCES test/ID_ContainerTest.cxx
                 INCLUDE_DIRS src test EventContainers
-                LINK_LIBRARIES Identifier AthenaKernel GaudiKernel EventContainers
+                LINK_LIBRARIES EventContainers
                 LOG_IGNORE_PATTERN "elapsed"
                )
 atlas_add_test( IdMTCont SOURCES test/IDMT_ContainerTest.cxx
                 INCLUDE_DIRS src test EventContainers
-                LINK_LIBRARIES Identifier AthenaKernel GaudiKernel EventContainers
+                LINK_LIBRARIES EventContainers
                 LOG_IGNORE_PATTERN "elapsed"
                )
 atlas_add_test( IDStressTest SOURCES test/IDC_Realistic_Test.cxx
                 INCLUDE_DIRS src test EventContainers
-                LINK_LIBRARIES Identifier AthenaKernel GaudiKernel EventContainers
+                LINK_LIBRARIES EventContainers
                 LOG_IGNORE_PATTERN "elapsed|^no lock time|^deleted|^countHit|^lock time"
               )
 atlas_add_test( IDCValueTest SOURCES test/IDCValueTest.cxx
                 INCLUDE_DIRS src test EventContainers
-                LINK_LIBRARIES Identifier AthenaKernel GaudiKernel EventContainers
+                LINK_LIBRARIES EventContainers
               )
 atlas_add_test( IDBenchTest SOURCES test/IDC_Benchmark.cxx
                 INCLUDE_DIRS src test EventContainers
-                LINK_LIBRARIES Identifier AthenaKernel GaudiKernel EventContainers
+                LINK_LIBRARIES EventContainers
                 LOG_IGNORE_PATTERN "time"
               )