diff --git a/Control/AthenaIPCTools/CMakeLists.txt b/Control/AthenaIPCTools/CMakeLists.txt
index 7f9bd9c8bc23df0b5583fbdb8d00579a2c3fbb6d..432b717e45cac7192a68b89fd4f317dba4e31a17 100644
--- a/Control/AthenaIPCTools/CMakeLists.txt
+++ b/Control/AthenaIPCTools/CMakeLists.txt
@@ -14,5 +14,5 @@ atlas_add_component( AthenaIPCTools
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${YAMPL_INCLUDE_DIRS} ${HDF5_CXX_INCLUDE_DIRS}
LINK_LIBRARIES ${YAMPL_LIBRARIES} ${HDF5_LIBRARIES} ${HDF5_CXX_LIBRARIES}
- AthenaBaseComps AthenaKernel GaudiKernel POOLCore StorageSvc )
+ AthenaBaseComps AthenaKernel GaudiKernel RootUtils StorageSvc )
diff --git a/Control/AthenaIPCTools/src/AthenaHDFStreamTool.cxx b/Control/AthenaIPCTools/src/AthenaHDFStreamTool.cxx
index fa0b9ec2037da2ac23ccf9ebb417c41fa1205f3f..f1ae51cb4ea86bb192bb75072ef13f4a89268416 100644
--- a/Control/AthenaIPCTools/src/AthenaHDFStreamTool.cxx
+++ b/Control/AthenaIPCTools/src/AthenaHDFStreamTool.cxx
@@ -11,7 +11,7 @@
#include "GaudiKernel/FileIncident.h"
#include "StorageSvc/DbReflex.h"
-#include "POOLCore/APRDefaults.h"
+#include "RootUtils/APRDefaults.h"
#include "CxxUtils/starts_with.h"
#include "H5Cpp.h"
diff --git a/Database/APR/POOLCore/POOLCore/APRDefaults.h b/Control/RootUtils/RootUtils/APRDefaults.h
similarity index 100%
rename from Database/APR/POOLCore/POOLCore/APRDefaults.h
rename to Control/RootUtils/RootUtils/APRDefaults.h
diff --git a/Control/RootUtils/RootUtils/RootUtilsDict.h b/Control/RootUtils/RootUtils/RootUtilsDict.h
index 59fb3684abafa7763766c9d1599184b18043be45..048fd4acf716bb78bb28da4dc8bfc884e62a5a1a 100644
--- a/Control/RootUtils/RootUtils/RootUtilsDict.h
+++ b/Control/RootUtils/RootUtils/RootUtilsDict.h
@@ -1,11 +1,9 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-// $Id: RootUtilsDict.h,v 1.11 2008-01-15 05:02:52 ssnyder Exp $
-
/**
* @file RootUtils/RootUtilsDict.h
* @author scott snyder
@@ -27,3 +25,8 @@ struct TreeTest
#include "RootUtils/InitHist.h"
#include "RootUtils/ILogger.h"
#include "RootUtils/ScatterH2.h"
+
+// Default names of ROOT file storage elements used by APR
+#include "RootUtils/APRDefaults.h"
+
+
diff --git a/Control/RootUtils/RootUtils/selection.xml b/Control/RootUtils/RootUtils/selection.xml
index 2549ba44ab4c62bf39706b01abd957a04ed6ccbd..051e630be5dc1f21dad54c9f88ef2eebfa62bb42 100644
--- a/Control/RootUtils/RootUtils/selection.xml
+++ b/Control/RootUtils/RootUtils/selection.xml
@@ -14,5 +14,8 @@
<class name="RootUtils::ScatterH2::Pair" />
<class name="std::vector<RootUtils::ScatterH2::Pair>" />
+ <class name="APRDefaults::TTreeNames" />
+ <class name="APRDefaults::RNTupleNames" />
+
<class name="RootUtilsTest::TreeTest" />
</lcgdict>
diff --git a/Database/APR/RootCollection/CMakeLists.txt b/Database/APR/RootCollection/CMakeLists.txt
index 413942dbbaeeac56cb2bd41ff175e1d421d235ec..c2cd36b3d2bd0a94ec1e342473973565a8747220 100644
--- a/Database/APR/RootCollection/CMakeLists.txt
+++ b/Database/APR/RootCollection/CMakeLists.txt
@@ -23,7 +23,7 @@ atlas_add_library( RootCollection
PRIVATE_INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES}
PRIVATE_LINK_LIBRARIES ${CORAL_LIBRARIES} AthenaKernel CollectionBase
- FileCatalog GaudiKernel POOLCore PersistencySvc PersistentDataModel )
+ FileCatalog GaudiKernel POOLCore PersistencySvc PersistentDataModel RootUtils )
atlas_add_library( RootCollectionComponents
src/components/*.cpp
diff --git a/Database/APR/RootCollection/src/RNTCollection.cpp b/Database/APR/RootCollection/src/RNTCollection.cpp
index 549f2ce3ee437e0dd7a64d33440ff3b609786ce5..864d316b0bb896b4430cfffe8c0a3087a2829e0f 100644
--- a/Database/APR/RootCollection/src/RNTCollection.cpp
+++ b/Database/APR/RootCollection/src/RNTCollection.cpp
@@ -9,7 +9,7 @@
#include "PersistentDataModel/Token.h"
#include "POOLCore/Exception.h"
-#include "POOLCore/APRDefaults.h"
+#include "RootUtils/APRDefaults.h"
#include "CollectionBase/ICollectionColumn.h"
#include "CollectionBase/CollectionBaseNames.h"
diff --git a/Database/APR/RootCollection/src/RNTCollectionSchemaEditor.cpp b/Database/APR/RootCollection/src/RNTCollectionSchemaEditor.cpp
index a630585b5960daf60040b838a8a5b94b40738d1d..ae7c527a819078a36edef71933a537483c103a9a 100644
--- a/Database/APR/RootCollection/src/RNTCollectionSchemaEditor.cpp
+++ b/Database/APR/RootCollection/src/RNTCollectionSchemaEditor.cpp
@@ -8,7 +8,7 @@
#include "RNTCollectionSchemaEditor.h"
#include "POOLCore/Exception.h"
-#include "POOLCore/APRDefaults.h"
+#include "RootUtils/APRDefaults.h"
#include "CoralBase/Attribute.h"
#include "CoralBase/AttributeList.h"
@@ -18,10 +18,8 @@
#include "TROOT.h"
#if ROOT_VERSION_CODE >= ROOT_VERSION( 6, 31, 0 )
#include "ROOT/RNTupleReader.hxx"
-#else
-#include "ROOT/RNTuple.hxx"
#endif
-#include "ROOT/RField.hxx"
+#include "ROOT/RNTuple.hxx"
pool::RootCollection::RNTCollectionSchemaEditor::
diff --git a/Database/APR/RootCollection/src/RootCollection.cpp b/Database/APR/RootCollection/src/RootCollection.cpp
index 4597d9b01420052d83007cac94c2105af721afcb..088694a7aa0a8cdb208870f362e5e36e084edb5b 100755
--- a/Database/APR/RootCollection/src/RootCollection.cpp
+++ b/Database/APR/RootCollection/src/RootCollection.cpp
@@ -8,7 +8,7 @@
#include "PersistentDataModel/Token.h"
#include "POOLCore/Exception.h"
-#include "POOLCore/APRDefaults.h"
+#include "RootUtils/APRDefaults.h"
#include "CollectionBase/ICollectionColumn.h"
#include "CollectionBase/CollectionBaseNames.h"
diff --git a/Database/APR/RootStorageSvc/src/RootDatabase.cpp b/Database/APR/RootStorageSvc/src/RootDatabase.cpp
index 9144240e0864b14123e65f9f3a6418e0a4d246d1..642072f9083de8f689fedcf913fa1b50febfd09c 100644
--- a/Database/APR/RootStorageSvc/src/RootDatabase.cpp
+++ b/Database/APR/RootStorageSvc/src/RootDatabase.cpp
@@ -16,7 +16,7 @@
#include "StorageSvc/DbOption.h"
#include "StorageSvc/DbDomain.h"
#include "POOLCore/DbPrint.h"
-#include "POOLCore/APRDefaults.h"
+#include "RootUtils/APRDefaults.h"
#include "RootAuxDynIO/RootAuxDynIO.h"
#include "GaudiKernel/Bootstrap.h"
diff --git a/Database/APR/StorageSvc/StorageSvc/dict.h b/Database/APR/StorageSvc/StorageSvc/dict.h
index ef63273a399f63a9a622f95563ea6165f650f72f..828c969152a5b2d7cd6a30e087d9268a809097b9 100644
--- a/Database/APR/StorageSvc/StorageSvc/dict.h
+++ b/Database/APR/StorageSvc/StorageSvc/dict.h
@@ -2,9 +2,6 @@
Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
-// Package pool/POOLCore - some Athena default settings
-#include "POOLCore/APRDefaults.h"
-
// Package pool/StorageSvc - interfaces
#include "StorageSvc/IStorageSvc.h"
#include "StorageSvc/IOODatabase.h"
diff --git a/Database/APR/StorageSvc/StorageSvc/dict.xml b/Database/APR/StorageSvc/StorageSvc/dict.xml
index 09293441fba6b33e5883118da03fb3b4082a4a48..436cbbf457c0048378f138d5de675973aef8a702 100644
--- a/Database/APR/StorageSvc/StorageSvc/dict.xml
+++ b/Database/APR/StorageSvc/StorageSvc/dict.xml
@@ -4,8 +4,6 @@
<class pattern="pool::DbHandleBase*" rootmap="false"/>
<class pattern="pool::IDb*" rootmap="false"/>
<class pattern="pool::IStorage*" rootmap="false"/>
- <class name="APRDefaults::TTreeNames" />
- <class name="APRDefaults::RNTupleNames" />
<!-- package: StorageSvc -->
<class name="std::pair<long long,long long>" rootmap="false"/>
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolConverter.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolConverter.cxx
index 5517f0ba8ad672c074d0eb33cb9ccdd4f84fa25b..7bd3911a51a8bd02e796464f8a39b4ff1a79dc9e 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolConverter.cxx
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolConverter.cxx
@@ -17,7 +17,7 @@
#include "PersistentDataModel/Token.h"
#include "PersistentDataModel/TokenAddress.h"
#include "StorageSvc/DbType.h"
-#include "POOLCore/APRDefaults.h"
+#include "RootUtils/APRDefaults.h"
//__________________________________________________________________________
AthenaPoolConverter::~AthenaPoolConverter() {
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.h b/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.h
index f77f3dd712d0d594ea750316d06f920d7710fe5c..d94d488621f2f9ec213181c6b1f0cbfbc4d2d6d9 100644
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.h
+++ b/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
#ifndef EVENTSELECTORATHENAPOOL_H
@@ -16,7 +16,7 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "PersistentDataModel/Guid.h"
-#include "POOLCore/APRDefaults.h"
+#include "RootUtils/APRDefaults.h"
#include "AthenaKernel/IAthenaIPCTool.h"
#include "AthenaKernel/IAthenaSelectorTool.h"