From 38fa3b5eb5a1a7afa272692ede2637578a27d335 Mon Sep 17 00:00:00 2001
From: Marco Clemencic <marco.clemencic@cern.ch>
Date: Mon, 25 Mar 2024 13:06:27 +0100
Subject: [PATCH 1/2] Add check on use of quotes in #include

---
 .pre-commit-config.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 767806a757..f12de898e7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,6 +8,10 @@ repos:
         exclude: "\\.clang-format$"
     -   id: check-toml
     -   id: check-added-large-files
+-   repo: https://gitlab.cern.ch/lhcb-core/dev-tools/check-include-convention.git
+    rev: 0.1.0
+    hooks:
+    -   id: check-include-convention
 -   repo: https://github.com/pre-commit/mirrors-clang-format
     rev: v16.0.6
     hooks:
-- 
GitLab


From 75f6b2c9c3cda0cdc3d5d508bfab48fa6e98eea0 Mon Sep 17 00:00:00 2001
From: Marco Clemencic <marco.clemencic@cern.ch>
Date: Fri, 20 Sep 2024 13:51:20 +0200
Subject: [PATCH 2/2] Use include with quotes only for relative paths

---
 Gaudi/src/main.cpp                            |   4 +-
 GaudiAud/src/AlgContextAuditor.cpp            |  14 +-
 GaudiAud/src/AlgContextAuditor.h              |   6 +-
 GaudiAud/src/ChronoAuditor.h                  |   4 +-
 GaudiAud/src/CommonAuditor.cpp                |   4 +-
 GaudiAud/src/CommonAuditor.h                  |   4 +-
 GaudiAud/src/MemStatAuditor.cpp               |   8 +-
 GaudiAud/src/MemoryAuditor.cpp                |   4 +-
 .../include/GaudiCommonSvc/Annotation.h       |   4 +-
 GaudiCommonSvc/include/GaudiCommonSvc/Axis.h  |   4 +-
 .../include/GaudiCommonSvc/Generic1D.h        |   8 +-
 .../include/GaudiCommonSvc/Generic2D.h        |   8 +-
 .../include/GaudiCommonSvc/Generic3D.h        |   8 +-
 GaudiCommonSvc/include/GaudiCommonSvc/H2D.h   |   4 +-
 .../include/GaudiCommonSvc/HistogramSvc.h     |  24 +--
 .../include/GaudiCommonSvc/HistogramUtility.h |   4 +-
 GaudiCommonSvc/src/AuditorSvc.cpp             |  16 +-
 GaudiCommonSvc/src/AuditorSvc.h               |   6 +-
 GaudiCommonSvc/src/ChronoStatSvc.cpp          |  20 +-
 GaudiCommonSvc/src/ChronoStatSvc.h            |  14 +-
 GaudiCommonSvc/src/DataSvc/EvtDataSvc.cpp     |   6 +-
 GaudiCommonSvc/src/DataSvc/EvtDataSvc.h       |   6 +-
 GaudiCommonSvc/src/DataSvc/EvtStoreSvc.cpp    |  34 ++--
 GaudiCommonSvc/src/DataSvc/MultiStoreSvc.cpp  |  32 ++--
 .../src/DataSvc/PartitionSwitchAlg.cpp        |  12 +-
 .../src/DataSvc/PartitionSwitchTool.cpp       |  10 +-
 GaudiCommonSvc/src/DataSvc/RecordDataSvc.cpp  |  20 +-
 GaudiCommonSvc/src/DataSvc/RecordDataSvc.h    |   8 +-
 .../src/DataSvc/StoreExplorerAlg.cpp          |  26 +--
 .../src/DataSvc/StoreSnifferAlg.cpp           |  18 +-
 .../HistogramPersistencySvc.cpp               |  16 +-
 .../src/HistogramSvc/AIDA_visibility_hack.cpp |   4 +-
 GaudiCommonSvc/src/HistogramSvc/H3D.cpp       |   4 +-
 .../src/HistogramSvc/HistogramSvc.cpp         |  10 +-
 .../src/PersistencySvc/CopyInputStream.cpp    |  20 +-
 .../PersistencySvc/DataSvcFileEntriesTool.cpp |  28 +--
 .../src/PersistencySvc/DetPersistencySvc.cpp  |   4 +-
 .../PersistencySvc/EvtCollectionStream.cpp    |  10 +-
 .../src/PersistencySvc/EvtCollectionStream.h  |   4 +-
 .../src/PersistencySvc/EvtPersistencySvc.cpp  |   4 +-
 .../src/PersistencySvc/InputCopyStream.cpp    |  18 +-
 .../src/PersistencySvc/OutputStream.cpp       |  34 ++--
 .../src/PersistencySvc/OutputStream.h         |   8 +-
 .../src/PersistencySvc/RecordStream.cpp       |  16 +-
 .../src/PersistencySvc/RunRecordStream.cpp    |  16 +-
 .../PersistencySvc/SequentialOutputStream.cpp |  16 +-
 .../PersistencySvc/TagCollectionStream.cpp    |  16 +-
 .../src/PersistencySvc/TagCollectionStream.h  |   4 +-
 .../src/AlgExecStateSvc/AlgExecStateSvc.cpp   |  12 +-
 .../src/AlgExecStateSvc/AlgExecStateSvc.h     |   8 +-
 .../src/ApplicationMgr/AlgorithmManager.cpp   |  14 +-
 .../src/ApplicationMgr/AlgorithmManager.h     |  14 +-
 .../src/ApplicationMgr/AppMgrRunable.cpp      |   8 +-
 .../src/ApplicationMgr/AppMgrRunable.h        |   6 +-
 .../src/ApplicationMgr/DLLClassManager.cpp    |  24 +--
 .../src/ApplicationMgr/DLLClassManager.h      |   8 +-
 .../src/ApplicationMgr/EventLoopMgr.cpp       |   4 +-
 .../ApplicationMgr/MinimalEventLoopMgr.cpp    |   4 +-
 .../src/ApplicationMgr/ServiceManager.cpp     |  24 +--
 .../src/ApplicationMgr/ServiceManager.h       |  16 +-
 GaudiCoreSvc/src/ApplicationMgr/ToolSvc.cpp   |  22 +--
 .../EventSelector/DataStreamToolFactory.cpp   |   4 +-
 .../EventSelector/EventCollectionSelector.cpp |  22 +--
 .../EventSelector/EventCollectionSelector.h   |   8 +-
 .../src/EventSelector/EventIterator.h         |   6 +-
 .../src/EventSelector/EventSelector.cpp       |  24 +--
 .../src/EventSelector/EventSelector.h         |   6 +-
 .../src/IncidentSvc/DODBasicMapper.cpp        |   4 +-
 GaudiCoreSvc/src/IncidentSvc/DODBasicMapper.h |  10 +-
 .../src/IncidentSvc/DataOnDemandSvc.cpp       |  32 ++--
 .../src/IncidentSvc/DataOnDemandSvc.h         |  18 +-
 .../src/IncidentSvc/IncidentProcAlg.cpp       |  10 +-
 .../src/IncidentSvc/IncidentProcAlg.h         |   8 +-
 GaudiCoreSvc/src/IncidentSvc/IncidentSvc.cpp  |  18 +-
 GaudiCoreSvc/src/IncidentSvc/IncidentSvc.h    |  16 +-
 GaudiCoreSvc/src/JobOptionsSvc/Analyzer.cpp   |   4 +-
 GaudiCoreSvc/src/JobOptionsSvc/Messages.h     |   4 +-
 GaudiCoreSvc/src/JobOptionsSvc/Parser.cpp     |   4 +-
 .../src/JobOptionsSvc/PropertyValue.cpp       |   8 +-
 .../src/JobOptionsSvc/PythonConfig.cpp        |   4 +-
 GaudiCoreSvc/src/JobOptionsSvc/PythonConfig.h |   6 +-
 GaudiCoreSvc/src/JobOptionsSvc/Utils.cpp      |   4 +-
 GaudiCoreSvc/src/MessageSvc/InertMessageSvc.h |   4 +-
 GaudiCoreSvc/src/MessageSvc/MessageSvc.cpp    |  10 +-
 GaudiCoreSvc/src/MessageSvc/MessageSvc.h      |  10 +-
 .../src/MessageSvc/MessageSvcSink.cpp         |   8 +-
 GaudiHive/src/AlgTask.h                       |  18 +-
 GaudiHive/src/AlgsExecutionStates.h           |   8 +-
 GaudiHive/src/AvalancheSchedulerSvc.cpp       |  16 +-
 GaudiHive/src/AvalancheSchedulerSvc.h         |  22 +--
 GaudiHive/src/ContextEventCounter.h           |   6 +-
 GaudiHive/src/EventSlot.h                     |   4 +-
 GaudiHive/src/FiberManager.h                  |  12 +-
 GaudiHive/src/GPUCruncher.cu                  |   2 +-
 GaudiHive/src/HistogramAgent.h                |  12 +-
 GaudiHive/src/HiveDataBroker.cpp              |  24 +--
 GaudiHive/src/HiveNumbers.cpp                 |  10 +-
 GaudiHive/src/HiveNumbers.h                   |   8 +-
 GaudiHive/src/HiveSlimEventLoopMgr.cpp        |  16 +-
 GaudiHive/src/HiveSlimEventLoopMgr.h          |  22 +--
 GaudiHive/src/HiveTestAlgorithm.cpp           |   6 +-
 GaudiHive/src/HiveWhiteBoard.cpp              |  46 ++---
 GaudiHive/src/IPrecedenceSvc.h                |   4 +-
 .../src/PRGraph/PrecedenceRulesGraph.cpp      |   2 +-
 GaudiHive/src/PRGraph/PrecedenceRulesGraph.h  |  12 +-
 GaudiHive/src/PRGraph/Visitors/Promoters.cpp  |   6 +-
 GaudiHive/src/PrecedenceSvc.h                 |   6 +-
 GaudiHive/src/RetCodeGuard.h                  |   6 +-
 GaudiHive/src/ThreadInitTask.cpp              |  14 +-
 GaudiHive/src/ThreadInitTask.h                |  12 +-
 GaudiHive/src/ThreadPoolSvc.cpp               |   4 +-
 GaudiHive/src/ThreadPoolSvc.h                 |  18 +-
 GaudiHive/src/TimelineSvc.cpp                 |   6 +-
 GaudiHive/src/TimelineSvc.h                   |   8 +-
 GaudiHive/src/bin/concurrentRun.cpp           |  14 +-
 GaudiKernel/dict/dictionary.h                 | 174 +++++++++---------
 GaudiKernel/include/Gaudi/Accumulators.h      |  10 +-
 GaudiKernel/include/Gaudi/Algorithm.h         |  56 +++---
 .../include/Gaudi/AsynchronousAlgorithm.h     |  10 +-
 .../Gaudi/CUDAAsynchronousAlgHelper.cuh       |   2 +-
 GaudiKernel/include/Gaudi/MonitoringHub.h     |   4 +-
 .../include/Gaudi/Parsers/CommonParsers.h     |   6 +-
 GaudiKernel/include/Gaudi/Parsers/Grammars.h  |  14 +-
 GaudiKernel/include/Gaudi/Timers.h            |   6 +-
 .../include/Gaudi/Timers/GenericTimer.h       |   4 +-
 GaudiKernel/include/GaudiKernel/AlgTool.h     |  38 ++--
 .../include/GaudiKernel/AlgToolHistory.h      |   6 +-
 .../include/GaudiKernel/AlgorithmHistory.h    |   6 +-
 GaudiKernel/include/GaudiKernel/Allocator.h   |   4 +-
 .../include/GaudiKernel/AllocatorPool.h       |   4 +-
 .../include/GaudiKernel/AnyDataWrapper.h      |   4 +-
 .../include/GaudiKernel/AppReturnCode.h       |   4 +-
 .../include/GaudiKernel/AttribStringParser.h  |   6 +-
 GaudiKernel/include/GaudiKernel/Auditor.h     |  14 +-
 .../GaudiKernel/BoostArrayAsProperty.h        |   4 +-
 GaudiKernel/include/GaudiKernel/Bootstrap.h   |   4 +-
 GaudiKernel/include/GaudiKernel/Chrono.h      |   8 +-
 .../include/GaudiKernel/ChronoEntity.h        |   8 +-
 GaudiKernel/include/GaudiKernel/ClassID.h     |   4 +-
 .../include/GaudiKernel/CommonMessaging.h     |  16 +-
 .../include/GaudiKernel/ComponentManager.h    |   6 +-
 .../include/GaudiKernel/ConcurrencyFlags.h    |   4 +-
 .../include/GaudiKernel/ContainedObject.h     |   6 +-
 .../GaudiKernel/ContainerFactoryDefs.h        |   8 +-
 .../include/GaudiKernel/ContextSpecificPtr.h  |   6 +-
 .../include/GaudiKernel/ConversionSvc.h       |  12 +-
 GaudiKernel/include/GaudiKernel/Converter.h   |  14 +-
 .../include/GaudiKernel/Coord3DTypes.h        |  10 +-
 GaudiKernel/include/GaudiKernel/DataHandle.h  |   6 +-
 .../include/GaudiKernel/DataHandleFinder.h    |   6 +-
 .../GaudiKernel/DataHandleHolderBase.h        |  10 +-
 .../GaudiKernel/DataHandleHolderVisitor.h     |   6 +-
 .../include/GaudiKernel/DataHandleProperty.h  |   6 +-
 GaudiKernel/include/GaudiKernel/DataHistory.h |   8 +-
 .../include/GaudiKernel/DataIncident.h        |   4 +-
 GaudiKernel/include/GaudiKernel/DataObjID.h   |   4 +-
 .../include/GaudiKernel/DataObjectHandle.h    |  18 +-
 .../GaudiKernel/DataObjectHandleBase.h        |  12 +-
 .../include/GaudiKernel/DataStreamTool.h      |  12 +-
 GaudiKernel/include/GaudiKernel/DataSvc.h     |  18 +-
 .../include/GaudiKernel/DataTypeInfo.h        |   4 +-
 GaudiKernel/include/GaudiKernel/Debugger.h    |   4 +-
 .../include/GaudiKernel/DirSearchPath.h       |   8 +-
 GaudiKernel/include/GaudiKernel/Environment.h |   8 +-
 .../include/GaudiKernel/EventContextHash.h    |   4 +-
 GaudiKernel/include/GaudiKernel/EventIDBase.h |   4 +-
 .../include/GaudiKernel/EventIDRange.h        |   4 +-
 .../GaudiKernel/EventSelectorDataStream.h     |   4 +-
 .../include/GaudiKernel/FileIncident.h        |   4 +-
 .../GaudiKernel/FunctionalFilterDecision.h    |   4 +-
 .../include/GaudiKernel/GaudiException.h      |   8 +-
 GaudiKernel/include/GaudiKernel/GaudiHandle.h |   8 +-
 .../include/GaudiKernel/GenericAddress.h      |   6 +-
 .../include/GaudiKernel/GenericMatrixTypes.h  |   4 +-
 .../include/GaudiKernel/GenericVectorTypes.h  |   4 +-
 GaudiKernel/include/GaudiKernel/Guards.h      |  10 +-
 GaudiKernel/include/GaudiKernel/Hash.h        |   4 +-
 GaudiKernel/include/GaudiKernel/HashMap.h     |   6 +-
 GaudiKernel/include/GaudiKernel/HistoDef.h    |   4 +-
 .../include/GaudiKernel/HistoProperty.h       |   4 +-
 .../include/GaudiKernel/HistogramBase.h       |   4 +-
 GaudiKernel/include/GaudiKernel/HistoryObj.h  |   6 +-
 .../include/GaudiKernel/IAIDATupleSvc.h       |   4 +-
 .../include/GaudiKernel/IAddressCreator.h     |   6 +-
 .../include/GaudiKernel/IAlgContextSvc.h      |  10 +-
 .../include/GaudiKernel/IAlgExecStateSvc.h    |  10 +-
 GaudiKernel/include/GaudiKernel/IAlgManager.h |   8 +-
 .../include/GaudiKernel/IAlgResourcePool.h    |   4 +-
 GaudiKernel/include/GaudiKernel/IAlgTool.h    |   6 +-
 GaudiKernel/include/GaudiKernel/IAlgorithm.h  |   6 +-
 GaudiKernel/include/GaudiKernel/IAppMgrUI.h   |   8 +-
 GaudiKernel/include/GaudiKernel/IAuditor.h    |   4 +-
 GaudiKernel/include/GaudiKernel/IAuditorSvc.h |   8 +-
 GaudiKernel/include/GaudiKernel/IBinder.h     |   6 +-
 .../include/GaudiKernel/ICPUCrunchSvc.h       |   4 +-
 .../include/GaudiKernel/IChronoStatSvc.h      |   8 +-
 GaudiKernel/include/GaudiKernel/IChronoSvc.h  |   4 +-
 GaudiKernel/include/GaudiKernel/IClassIDSvc.h |   8 +-
 GaudiKernel/include/GaudiKernel/IClassInfo.h  |   6 +-
 .../include/GaudiKernel/IClassManager.h       |   4 +-
 .../include/GaudiKernel/IComponentManager.h   |   4 +-
 GaudiKernel/include/GaudiKernel/ICondSvc.h    |  14 +-
 .../include/GaudiKernel/IConversionSvc.h      |   4 +-
 GaudiKernel/include/GaudiKernel/IConverter.h  |   6 +-
 .../include/GaudiKernel/ICounterSummarySvc.h  |   4 +-
 .../include/GaudiKernel/IDODAlgMapper.h       |   6 +-
 .../include/GaudiKernel/IDODNodeMapper.h      |   6 +-
 GaudiKernel/include/GaudiKernel/IDataBroker.h |   8 +-
 .../include/GaudiKernel/IDataHandleHolder.h   |  10 +-
 .../include/GaudiKernel/IDataManagerSvc.h     |  10 +-
 .../include/GaudiKernel/IDataProviderSvc.h    |   8 +-
 .../include/GaudiKernel/IDataSourceMgr.h      |   4 +-
 .../include/GaudiKernel/IDataStoreAgent.h     |   4 +-
 .../include/GaudiKernel/IDataStoreLeaves.h    |   4 +-
 .../include/GaudiKernel/IDataStreamTool.h     |   4 +-
 GaudiKernel/include/GaudiKernel/IDetDataSvc.h |   4 +-
 .../include/GaudiKernel/IEventTimeDecoder.h   |   6 +-
 .../include/GaudiKernel/IEvtSelector.h        |   8 +-
 .../include/GaudiKernel/IExceptionSvc.h       |   6 +-
 GaudiKernel/include/GaudiKernel/IFileAccess.h |   4 +-
 GaudiKernel/include/GaudiKernel/IFileMgr.h    |   4 +-
 .../include/GaudiKernel/IHistogramSvc.h       |   6 +-
 GaudiKernel/include/GaudiKernel/IHistorySvc.h |   6 +-
 .../include/GaudiKernel/IHiveWhiteBoard.h     |   6 +-
 .../include/GaudiKernel/IIncidentListener.h   |   6 +-
 .../include/GaudiKernel/IIncidentSvc.h        |   8 +-
 .../include/GaudiKernel/IInspectable.h        |   4 +-
 GaudiKernel/include/GaudiKernel/IInspector.h  |   2 +-
 GaudiKernel/include/GaudiKernel/IInterface.h  |  14 +-
 .../include/GaudiKernel/IIoComponent.h        |   6 +-
 .../include/GaudiKernel/IIoComponentMgr.h     |   6 +-
 .../include/GaudiKernel/IMagneticFieldSvc.h   |   6 +-
 GaudiKernel/include/GaudiKernel/IMessageSvc.h |   4 +-
 .../include/GaudiKernel/IMetaDataSvc.h        |   4 +-
 GaudiKernel/include/GaudiKernel/IMonitorSvc.h |   4 +-
 GaudiKernel/include/GaudiKernel/INTuple.h     |   6 +-
 GaudiKernel/include/GaudiKernel/INTupleSvc.h  |   6 +-
 .../include/GaudiKernel/INamedInterface.h     |   4 +-
 .../include/GaudiKernel/IOpaqueAddress.h      |   6 +-
 .../include/GaudiKernel/IPartPropSvc.h        |   4 +-
 .../include/GaudiKernel/IPartitionControl.h   |   4 +-
 .../include/GaudiKernel/IPersistencySvc.h     |   6 +-
 GaudiKernel/include/GaudiKernel/IPublishSvc.h |   4 +-
 GaudiKernel/include/GaudiKernel/IRegistry.h   |   4 +-
 GaudiKernel/include/GaudiKernel/IRndmEngine.h |   4 +-
 GaudiKernel/include/GaudiKernel/IRndmGen.h    |   4 +-
 GaudiKernel/include/GaudiKernel/IRndmGenSvc.h |   8 +-
 GaudiKernel/include/GaudiKernel/IRunable.h    |   4 +-
 GaudiKernel/include/GaudiKernel/IScheduler.h  |   6 +-
 .../include/GaudiKernel/ISelectStatement.h    |   4 +-
 GaudiKernel/include/GaudiKernel/ISerialize.h  |   4 +-
 GaudiKernel/include/GaudiKernel/IService.h    |   6 +-
 GaudiKernel/include/GaudiKernel/IStagerSvc.h  |   4 +-
 GaudiKernel/include/GaudiKernel/IStatSvc.h    |   4 +-
 GaudiKernel/include/GaudiKernel/IStateful.h   |   6 +-
 GaudiKernel/include/GaudiKernel/ISvcLocator.h |  10 +-
 GaudiKernel/include/GaudiKernel/ISvcManager.h |  10 +-
 GaudiKernel/include/GaudiKernel/ITHistSvc.h   |   4 +-
 .../include/GaudiKernel/IThreadInitTool.h     |   4 +-
 .../include/GaudiKernel/IThreadPoolSvc.h      |   6 +-
 .../include/GaudiKernel/ITimelineSvc.h        |   4 +-
 GaudiKernel/include/GaudiKernel/IToolSvc.h    |   6 +-
 .../include/GaudiKernel/IUpdateManagerSvc.h   |   4 +-
 GaudiKernel/include/GaudiKernel/IUpdateable.h |   6 +-
 GaudiKernel/include/GaudiKernel/IValidity.h   |   4 +-
 .../include/GaudiKernel/IVersHistoryObj.h     |   4 +-
 GaudiKernel/include/GaudiKernel/Incident.h    |   6 +-
 GaudiKernel/include/GaudiKernel/JobHistory.h  |   6 +-
 .../include/GaudiKernel/KeyedContainer.h      |   6 +-
 GaudiKernel/include/GaudiKernel/KeyedObject.h |   8 +-
 .../include/GaudiKernel/KeyedObjectManager.h  |   8 +-
 GaudiKernel/include/GaudiKernel/KeyedTraits.h |   4 +-
 GaudiKernel/include/GaudiKernel/LinkManager.h |   4 +-
 GaudiKernel/include/GaudiKernel/ListItem.h    |   4 +-
 .../include/GaudiKernel/LoadFactoryEntries.h  |   4 +-
 .../include/GaudiKernel/LockedChrono.h        |   4 +-
 GaudiKernel/include/GaudiKernel/Map.h         |   4 +-
 GaudiKernel/include/GaudiKernel/MapBase.h     |   4 +-
 GaudiKernel/include/GaudiKernel/Memory.h      |   6 +-
 GaudiKernel/include/GaudiKernel/Message.h     |   4 +-
 .../include/GaudiKernel/ModuleIncident.h      |   4 +-
 GaudiKernel/include/GaudiKernel/ModuleInfo.h  |   4 +-
 GaudiKernel/include/GaudiKernel/MsgStream.h   |   6 +-
 GaudiKernel/include/GaudiKernel/NTuple.h      |  10 +-
 .../GaudiKernel/NTupleImplementation.h        |   8 +-
 GaudiKernel/include/GaudiKernel/NTupleItems.h |   4 +-
 GaudiKernel/include/GaudiKernel/NamedRange.h  |   4 +-
 .../include/GaudiKernel/ObjectContainerBase.h |   6 +-
 GaudiKernel/include/GaudiKernel/ObjectList.h  |  10 +-
 .../include/GaudiKernel/ObjectVector.h        |  10 +-
 .../include/GaudiKernel/PathResolver.h        |   4 +-
 .../include/GaudiKernel/PhysicalConstants.h   |   4 +-
 .../include/GaudiKernel/Plane3DTypes.h        |   4 +-
 .../include/GaudiKernel/Point3DTypes.h        |   4 +-
 .../include/GaudiKernel/Point4DTypes.h        |   4 +-
 .../include/GaudiKernel/PropertyHolder.h      |  18 +-
 GaudiKernel/include/GaudiKernel/PropertyMgr.h |   8 +-
 GaudiKernel/include/GaudiKernel/Range.h       |   6 +-
 .../include/GaudiKernel/RegistryEntry.h       |   8 +-
 .../GaudiKernel/RenounceToolInputsVisitor.h   |   6 +-
 .../include/GaudiKernel/RndmGenerators.h      |   6 +-
 .../include/GaudiKernel/SVectorAsProperty.h   |   4 +-
 .../include/GaudiKernel/SelectStatement.h     |   4 +-
 GaudiKernel/include/GaudiKernel/Selector.h    |   4 +-
 .../include/GaudiKernel/SerializeSTL.h        |   4 +-
 GaudiKernel/include/GaudiKernel/Service.h     |  22 +--
 .../include/GaudiKernel/ServiceHandle.h       |  18 +-
 .../include/GaudiKernel/ServiceHistory.h      |   6 +-
 .../GaudiKernel/SharedObjectsContainer.h      |   8 +-
 GaudiKernel/include/GaudiKernel/Sleep.h       |   4 +-
 .../include/GaudiKernel/SmartDataLocator.h    |   4 +-
 .../include/GaudiKernel/SmartDataObjectPtr.h  |   4 +-
 .../include/GaudiKernel/SmartDataPtr.h        |   6 +-
 .../include/GaudiKernel/SmartDataStorePtr.h   |   4 +-
 GaudiKernel/include/GaudiKernel/SmartIF.h     |   4 +-
 GaudiKernel/include/GaudiKernel/SmartRef.h    |   6 +-
 .../include/GaudiKernel/SmartRefBase.h        |   4 +-
 .../include/GaudiKernel/SmartRefVector.h      |   4 +-
 GaudiKernel/include/GaudiKernel/Stat.h        |   8 +-
 .../include/GaudiKernel/StateMachine.h        |   4 +-
 GaudiKernel/include/GaudiKernel/StatusCode.h  |   6 +-
 .../include/GaudiKernel/StdArrayAsProperty.h  |   4 +-
 .../include/GaudiKernel/StreamBuffer.h        |   6 +-
 GaudiKernel/include/GaudiKernel/StringKey.h   |   6 +-
 .../GaudiKernel/SymmetricMatrixTypes.h        |   4 +-
 GaudiKernel/include/GaudiKernel/System.h      |   8 +-
 .../include/GaudiKernel/ThreadLocalContext.h  |   4 +-
 GaudiKernel/include/GaudiKernel/Time.h        |  10 +-
 GaudiKernel/include/GaudiKernel/Timing.h      |   6 +-
 GaudiKernel/include/GaudiKernel/ToStream.h    |  10 +-
 GaudiKernel/include/GaudiKernel/ToolHandle.h  |  16 +-
 GaudiKernel/include/GaudiKernel/ToolVisitor.h |   4 +-
 .../include/GaudiKernel/Transform3DTypes.h    |  20 +-
 .../include/GaudiKernel/Transform4DTypes.h    |   4 +-
 GaudiKernel/include/GaudiKernel/TsDataSvc.h   |  12 +-
 .../GaudiKernel/UpdateManagerException.h      |   4 +-
 .../include/GaudiKernel/Vector3DTypes.h       |   4 +-
 .../include/GaudiKernel/Vector4DTypes.h       |   4 +-
 GaudiKernel/include/GaudiKernel/VectorMap.h   |   6 +-
 .../include/GaudiKernel/VectorsAsProperty.h   |  12 +-
 .../include/GaudiKernel/extend_interfaces.h   |   4 +-
 GaudiKernel/include/GaudiKernel/extends.h     |   4 +-
 GaudiKernel/include/GaudiKernel/implements.h  |   2 +-
 GaudiKernel/src/Lib/AlgTool.cpp               |  28 +--
 GaudiKernel/src/Lib/AlgToolHistory.cpp        |   8 +-
 GaudiKernel/src/Lib/Algorithm.cpp             |  52 +++---
 GaudiKernel/src/Lib/AlgorithmHistory.cpp      |   6 +-
 GaudiKernel/src/Lib/AllocatorPool.cpp         |   4 +-
 GaudiKernel/src/Lib/AsynchronousAlgorithm.cu  |   2 +-
 GaudiKernel/src/Lib/Auditor.cpp               |  14 +-
 GaudiKernel/src/Lib/Bootstrap.cpp             |  28 +--
 GaudiKernel/src/Lib/ChronoEntity.cpp          |   8 +-
 GaudiKernel/src/Lib/ComponentManager.cpp      |   4 +-
 GaudiKernel/src/Lib/ConcurrencyFlags.cpp      |   4 +-
 GaudiKernel/src/Lib/ContainedObject.cpp       |   4 +-
 GaudiKernel/src/Lib/ConversionSvc.cpp         |  18 +-
 GaudiKernel/src/Lib/Converter.cpp             |  20 +-
 GaudiKernel/src/Lib/DataHandle.cpp            |   6 +-
 GaudiKernel/src/Lib/DataHandleFinder.cpp      |   4 +-
 .../src/Lib/DataHandleHolderVisitor.cpp       |  12 +-
 GaudiKernel/src/Lib/DataHandleProperty.cpp    |   8 +-
 GaudiKernel/src/Lib/DataHistory.cpp           |   6 +-
 GaudiKernel/src/Lib/DataObjID.cpp             |  12 +-
 GaudiKernel/src/Lib/DataObjectHandleBase.cpp  |  12 +-
 GaudiKernel/src/Lib/DataStreamTool.cpp        |  22 +--
 GaudiKernel/src/Lib/DataSvc.cpp               |  18 +-
 GaudiKernel/src/Lib/DataTypeInfo.cpp          |   8 +-
 GaudiKernel/src/Lib/Debugger.cpp              |   8 +-
 GaudiKernel/src/Lib/Dictionary.cpp            |   4 +-
 GaudiKernel/src/Lib/DirSearchPath.cpp         |   8 +-
 GaudiKernel/src/Lib/Environment.cpp           |   6 +-
 GaudiKernel/src/Lib/EventIDBase.cpp           |   4 +-
 GaudiKernel/src/Lib/EventIDRange.cpp          |   4 +-
 .../src/Lib/EventSelectorDataStream.cpp       |  18 +-
 .../src/Lib/FunctionalFilterDecision.cpp      |   4 +-
 GaudiKernel/src/Lib/GaudiException.cpp        |   4 +-
 GaudiKernel/src/Lib/GaudiHandle.cpp           |   4 +-
 GaudiKernel/src/Lib/Guards.cpp                |  10 +-
 GaudiKernel/src/Lib/HistoDef.cpp              |   8 +-
 GaudiKernel/src/Lib/HistoryObj.cpp            |   4 +-
 GaudiKernel/src/Lib/IConversionSvc.cpp        |   6 +-
 GaudiKernel/src/Lib/IDataProviderSvc.cpp      |   6 +-
 GaudiKernel/src/Lib/IInterface.cpp            |   6 +-
 GaudiKernel/src/Lib/IPartitionControl.cpp     |   6 +-
 GaudiKernel/src/Lib/ISvcLocator.cpp           |   5 +-
 GaudiKernel/src/Lib/ITimelineSvc.cpp          |   6 +-
 GaudiKernel/src/Lib/Incident.cpp              |   6 +-
 GaudiKernel/src/Lib/JobHistory.cpp            |   6 +-
 GaudiKernel/src/Lib/KeyedObjectManager.cpp    |  12 +-
 GaudiKernel/src/Lib/LegacyAlgorithm.cpp       |   4 +-
 GaudiKernel/src/Lib/LinkManager.cpp           |   8 +-
 GaudiKernel/src/Lib/MapBase.cpp               |   6 +-
 GaudiKernel/src/Lib/Memory.cpp                |  12 +-
 GaudiKernel/src/Lib/Message.cpp               |  12 +-
 GaudiKernel/src/Lib/MinimalEventLoopMgr.cpp   |  28 +--
 GaudiKernel/src/Lib/ModuleInfo.cpp            |  18 +-
 GaudiKernel/src/Lib/MsgStream.cpp             |   8 +-
 GaudiKernel/src/Lib/NTupleImplementation.cpp  |  10 +-
 GaudiKernel/src/Lib/NTupleItems.cpp           |   8 +-
 GaudiKernel/src/Lib/ParsersCollections.cpp    |   4 +-
 .../src/Lib/ParsersStandardMiscCommon.h       |   6 +-
 GaudiKernel/src/Lib/ParsersVct.cpp            |   6 +-
 GaudiKernel/src/Lib/PathResolver.cpp          |   6 +-
 GaudiKernel/src/Lib/PrintAlgsSequences.cpp    |  14 +-
 GaudiKernel/src/Lib/ProcessDescriptor.cpp     |  13 +-
 GaudiKernel/src/Lib/ProcessDescriptor.h       |   4 +-
 GaudiKernel/src/Lib/Property.cpp              |  10 +-
 GaudiKernel/src/Lib/PropertyMgr.cpp           |  14 +-
 GaudiKernel/src/Lib/Range.cpp                 |   6 +-
 GaudiKernel/src/Lib/RegistryEntry.cpp         |  10 +-
 .../src/Lib/RenounceToolInputsVisitor.cpp     |   8 +-
 GaudiKernel/src/Lib/RndmGenerators.cpp        |  12 +-
 GaudiKernel/src/Lib/RndmTypeInfos.cpp         |   6 +-
 GaudiKernel/src/Lib/Selector.cpp              |   6 +-
 GaudiKernel/src/Lib/Sequence.cpp              |   4 +-
 GaudiKernel/src/Lib/Service.cpp               |  24 +--
 GaudiKernel/src/Lib/ServiceHistory.cpp        |  10 +-
 GaudiKernel/src/Lib/ServiceLocatorHelper.cpp  |  10 +-
 GaudiKernel/src/Lib/Sleep.cpp                 |   4 +-
 GaudiKernel/src/Lib/SmartDataObjectPtr.cpp    |   8 +-
 GaudiKernel/src/Lib/SmartRefBase.cpp          |  20 +-
 GaudiKernel/src/Lib/SmartRefVector.cpp        |   8 +-
 GaudiKernel/src/Lib/Stat.cpp                  |   8 +-
 GaudiKernel/src/Lib/StateMachine.cpp          |   4 +-
 GaudiKernel/src/Lib/StatusCode.cpp            |  16 +-
 GaudiKernel/src/Lib/StringKey.cpp             |   6 +-
 GaudiKernel/src/Lib/System.cpp                |  20 +-
 GaudiKernel/src/Lib/ThreadLocalContext.cpp    |  10 +-
 GaudiKernel/src/Lib/Time.cpp                  |   4 +-
 GaudiKernel/src/Lib/Timing.cpp                |   4 +-
 GaudiKernel/src/Lib/ToolVisitor.cpp           |   6 +-
 GaudiKernel/src/Lib/TsDataSvc.cpp             |  18 +-
 GaudiKernel/tests/src/CountersUnitTest.cpp    |   8 +-
 GaudiKernel/tests/src/DirSearchPath_test.cpp  |   4 +-
 GaudiKernel/tests/src/GenericSinkUnitTest.cpp |   4 +-
 GaudiKernel/tests/src/Memory_test.cpp         |   2 +-
 GaudiKernel/tests/src/PathResolver_test.cpp   |   6 +-
 GaudiKernel/tests/src/custom_factory.cpp      |   4 +-
 GaudiKernel/tests/src/parsers.cpp             |  10 +-
 GaudiKernel/tests/src/test_AnyDataObject.cpp  |   4 +-
 .../tests/src/test_AttribStringParser.cpp     |   4 +-
 .../tests/src/test_ContextSpecificPtr.cpp     |   4 +-
 .../tests/src/test_DataHandleVector.cpp       |   4 +-
 GaudiKernel/tests/src/test_EventIDBase.cpp    |   4 +-
 GaudiKernel/tests/src/test_EventIDRange.cpp   |   4 +-
 GaudiKernel/tests/src/test_GaudiTime.cpp      |   4 +-
 GaudiKernel/tests/src/test_GaudiTimer.cpp     |   4 +-
 GaudiKernel/tests/src/test_GaudiTiming.cpp    |  10 +-
 GaudiKernel/tests/src/test_LockedHandle.cpp   |   8 +-
 GaudiKernel/tests/src/test_MonotonicArena.cpp |   2 +-
 GaudiKernel/tests/src/test_PropertyHolder.cpp |   6 +-
 GaudiKernel/tests/src/test_SerializeSTL.cpp   |   4 +-
 GaudiKernel/tests/src/test_StatusCode.cpp     |   4 +-
 .../tests/src/test_StatusCode_fail.cxx        |   4 +-
 .../tests/src/test_SystemCmdLineArgs.cpp      |   4 +-
 .../tests/src/test_SystemTypeinfoName.cpp     |   4 +-
 GaudiKernel/tests/src/test_compose.cpp        |   4 +-
 GaudiKernel/tests/src/test_reverse.cpp        |   2 +-
 GaudiMP/dict/gaudimp_dict.h                   |  24 +--
 GaudiMP/include/GaudiMP/PyROOTPickle.h        |   6 +-
 GaudiMP/include/GaudiMP/TESSerializer.h       |  10 +-
 GaudiMP/src/Lib/PyROOTPickle.cpp              |  14 +-
 GaudiMP/src/Lib/TESSerializer.cpp             |  42 ++---
 GaudiMP/src/component/IoComponentMgr.cpp      |  10 +-
 GaudiMP/src/component/IoComponentMgr.h        |  10 +-
 GaudiMonitor/src/ExceptionSvc.cpp             |   2 +-
 GaudiMonitor/src/ExceptionSvc.h               |   8 +-
 GaudiMonitor/src/HistorySvc.cpp               |  52 +++---
 GaudiMonitor/src/HistorySvc.h                 |  20 +-
 .../Gaudi/Details/PluginServiceDetailsV1.h    |   4 +-
 .../Gaudi/Details/PluginServiceDetailsV2.h    |   4 +-
 .../include/Gaudi/PluginService.h             |   8 +-
 .../src/component/PerfMonAuditor.cpp          |  14 +-
 .../component/intel/IntelProfilerAuditor.cpp  |  16 +-
 .../component/jemalloc/JemallocProfileSvc.cpp |   8 +-
 .../component/jemalloc/JemallocProfileSvc.h   |   6 +-
 .../src/component/valgrind/CallgrindProfile.h |   4 +-
 GaudiPython/dict/kernel.h                     |  80 ++++----
 GaudiPython/include/GaudiPython/Algorithm.h   |  10 +-
 .../include/GaudiPython/CallbackStreamBuf.h   |   8 +-
 GaudiPython/include/GaudiPython/Helpers.h     |  20 +-
 GaudiPython/include/GaudiPython/Interface.h   |   8 +-
 GaudiPython/include/GaudiPython/Printer.h     |   6 +-
 GaudiPython/include/GaudiPython/Vector.h      |   4 +-
 GaudiPython/src/Lib/Algorithm.cpp             |   8 +-
 GaudiPython/src/Lib/CallbackStreamBuf.cpp     |   4 +-
 GaudiPython/src/Lib/Helpers.cpp               |  22 +--
 .../src/Services/PythonScriptingSvc.cpp       |  12 +-
 GaudiPython/src/Services/PythonScriptingSvc.h |   6 +-
 GaudiSvc/doc/readMetaData.C                   |  26 +--
 GaudiSvc/src/CPUCrunchSvc/CPUCrunchSvc.cpp    |   4 +-
 GaudiSvc/src/CPUCrunchSvc/CPUCrunchSvc.h      |  10 +-
 GaudiSvc/src/DetectorDataSvc/DetDataSvc.cpp   |  18 +-
 GaudiSvc/src/DetectorDataSvc/DetDataSvc.h     |  12 +-
 GaudiSvc/src/FileMgr/FileMgr.cpp              |   4 +-
 GaudiSvc/src/FileMgr/FileMgr.h                |  12 +-
 GaudiSvc/src/FileMgr/POSIXFileHandler.cpp     |   6 +-
 GaudiSvc/src/FileMgr/POSIXFileHandler.h       |   8 +-
 GaudiSvc/src/FileMgr/RootFileHandler.cpp      |  14 +-
 GaudiSvc/src/FileMgr/RootFileHandler.h        |   8 +-
 GaudiSvc/src/MetaDataSvc/MetaDataSvc.cpp      |  16 +-
 GaudiSvc/src/MetaDataSvc/MetaDataSvc.h        |   6 +-
 GaudiSvc/src/NTupleSvc/CollectionCloneAlg.cpp |  26 +--
 GaudiSvc/src/NTupleSvc/NTupleSvc.cpp          |  32 ++--
 GaudiSvc/src/NTupleSvc/NTupleSvc.h            |   8 +-
 GaudiSvc/src/NTupleSvc/TagCollectionSvc.cpp   |  22 +--
 GaudiSvc/src/RndmGenSvc/HepRndmBaseEngine.h   |   4 +-
 GaudiSvc/src/RndmGenSvc/HepRndmEngines.cpp    |  30 +--
 GaudiSvc/src/RndmGenSvc/HepRndmGenerators.cpp |  30 +--
 GaudiSvc/src/RndmGenSvc/RndmEngine.cpp        |  16 +-
 GaudiSvc/src/RndmGenSvc/RndmEngine.h          |   8 +-
 GaudiSvc/src/RndmGenSvc/RndmGen.cpp           |   6 +-
 GaudiSvc/src/RndmGenSvc/RndmGen.h             |   6 +-
 GaudiSvc/src/RndmGenSvc/RndmGenSvc.cpp        |  10 +-
 GaudiSvc/src/RndmGenSvc/RndmGenSvc.h          |  12 +-
 GaudiSvc/src/THistSvc/THistSvc.cpp            |  32 ++--
 GaudiSvc/src/THistSvc/THistSvc.h              |  28 +--
 .../Gaudi/TestSuite/Conditions/CondSvc.h      |  12 +-
 .../include/GaudiExamples/Collision.h         |   8 +-
 .../include/GaudiExamples/Counter.h           |   4 +-
 GaudiTestSuite/include/GaudiExamples/Event.h  |  12 +-
 .../include/GaudiExamples/MyTrack.h           |  14 +-
 .../include/GaudiExamples/MyVertex.h          |  12 +-
 .../src/AIDATuples/AIDATupleAlgorithmRead.h   |   6 +-
 .../src/AIDATuples/AIDATupleAlgorithmWrite.h  |   6 +-
 .../src/AbortEvent/AbortEventAlg.cpp          |   6 +-
 GaudiTestSuite/src/AbortEvent/AbortEventAlg.h |   4 +-
 .../src/AlgSequencer/HelloWorld.cpp           |   6 +-
 GaudiTestSuite/src/AlgSequencer/HelloWorld.h  |   6 +-
 GaudiTestSuite/src/AlgSequencer/ParentAlg.cpp |  10 +-
 GaudiTestSuite/src/AlgSequencer/SubAlg.cpp    |   8 +-
 GaudiTestSuite/src/AlgSequencer/SubAlg.h      |   6 +-
 GaudiTestSuite/src/AlgTools/IMyTool.h         |   2 +-
 GaudiTestSuite/src/AlgTools/ITestTool.h       |   4 +-
 .../src/AlgTools/MyServiceWithTool.cpp        |   4 +-
 GaudiTestSuite/src/AlgTools/MyTool.cpp        |   6 +-
 GaudiTestSuite/src/AlgTools/MyTool.h          |   4 +-
 GaudiTestSuite/src/AlgTools/TestToolAlg.cpp   |   4 +-
 GaudiTestSuite/src/AlgTools/TestToolAlg.h     |   4 +-
 .../src/AlgTools/TestToolAlgFailure.cpp       |   4 +-
 .../src/AlgTools/TestToolAlgFailure.h         |   4 +-
 .../src/AlgTools/TestToolFailing.cpp          |   4 +-
 GaudiTestSuite/src/Allocator/Allocator.cpp    |   8 +-
 GaudiTestSuite/src/Allocator/MyClass1A.cpp    |   4 +-
 .../src/AnyData/AnyDataAlgorithm.cpp          |   8 +-
 .../src/Auditors/AuditorTestAlg.cpp           |   4 +-
 .../src/Auditors/LoggingAuditor.cpp           |   6 +-
 GaudiTestSuite/src/ColorMsg/ColorMsgAlg.cpp   |   6 +-
 GaudiTestSuite/src/ColorMsg/ColorMsgAlg.h     |   4 +-
 .../src/CounterEx/CounterSvcAlg.cpp           |   4 +-
 GaudiTestSuite/src/CounterEx/StatSvcAlg.cpp   |   6 +-
 .../src/DataOnDemand/DataCreator.cpp          |   4 +-
 GaudiTestSuite/src/DataOnDemand/DataCreator.h |   4 +-
 .../src/DataOnDemand/MyDataAlgorithm.cpp      |   4 +-
 .../src/DataOnDemand/MyDataAlgorithm.h        |   4 +-
 .../BoostArrayProperties.cpp                  |   4 +-
 .../ExtendedProperties/ExtendedProperties.cpp |   6 +-
 .../ExtendedProperties2.cpp                   |  14 +-
 GaudiTestSuite/src/FileMgr/FileMgrTest.cpp    |  12 +-
 GaudiTestSuite/src/FileMgr/FileMgrTest.h      |   6 +-
 .../src/FileSvc/HistogramWriterAlg.cpp        |   2 +-
 .../src/Histograms/HistoAlgorithm.cpp         |  10 +-
 .../src/Histograms/HistoAlgorithm.h           |  20 +-
 GaudiTestSuite/src/Histograms/HistoProps.cpp  |   8 +-
 GaudiTestSuite/src/History/History.h          |   6 +-
 GaudiTestSuite/src/IO/EvtCollectionWrite.cpp  |  14 +-
 GaudiTestSuite/src/IO/EvtCollectionWrite.h    |   6 +-
 GaudiTestSuite/src/IO/ReadAlg.cpp             |  26 +--
 GaudiTestSuite/src/IO/ReadAlg.h               |   6 +-
 GaudiTestSuite/src/IO/ReadTES.h               |   4 +-
 GaudiTestSuite/src/IO/WriteAlg.cpp            |  16 +-
 GaudiTestSuite/src/IO/WriteAlg.h              |   6 +-
 GaudiTestSuite/src/IO/dict.h                  |  30 +--
 .../src/IncidentSvc/IIncidentAsyncTestSvc.h   |   4 +-
 .../src/IncidentSvc/IncidentAsyncTestAlg.cpp  |  10 +-
 .../src/IncidentSvc/IncidentAsyncTestAlg.h    |   6 +-
 .../src/IncidentSvc/IncidentAsyncTestSvc.cpp  |  18 +-
 .../src/IncidentSvc/IncidentAsyncTestSvc.h    |  12 +-
 .../src/IncidentSvc/IncidentListenerTest.cpp  |  14 +-
 .../src/IncidentSvc/IncidentListenerTest.h    |   6 +-
 .../IncidentSvc/IncidentListenerTestAlg.cpp   |   6 +-
 .../src/IncidentSvc/IncidentListenerTestAlg.h |   4 +-
 .../src/IntelProfiler/CpuHungryAlg.cpp        |   4 +-
 GaudiTestSuite/src/Lib/Counter.cpp            |   4 +-
 GaudiTestSuite/src/Lib/Event.cpp              |   4 +-
 GaudiTestSuite/src/Lib/MyTrack.cpp            |   4 +-
 GaudiTestSuite/src/Lib/MyVertex.cpp           |   4 +-
 GaudiTestSuite/src/Lib/legacy_examples.cpp    |   8 +-
 GaudiTestSuite/src/Maps/MapAlg.cpp            |  16 +-
 GaudiTestSuite/src/MultiInput/DumpAddress.cpp |  14 +-
 GaudiTestSuite/src/MultiInput/MIHelpers.h     |   4 +-
 GaudiTestSuite/src/MultiInput/MIReadAlg.cpp   |  14 +-
 GaudiTestSuite/src/MultiInput/MIReadAlg.h     |   6 +-
 GaudiTestSuite/src/MultiInput/MIWriteAlg.cpp  |  18 +-
 GaudiTestSuite/src/MultiInput/MIWriteAlg.h    |   4 +-
 .../src/MultipleLogStreams/QotdAlg.cpp        |   4 +-
 .../src/MultipleLogStreams/QotdAlg.h          |   6 +-
 .../src/NTuples/NTupleAlgorithm.cpp           |  10 +-
 GaudiTestSuite/src/NTuples/NTupleAlgorithm.h  |   6 +-
 GaudiTestSuite/src/PartProp/PartPropAlg.h     |   6 +-
 GaudiTestSuite/src/PartProp/PartPropExa.cpp   |  10 +-
 GaudiTestSuite/src/PartProp/PartPropExa.h     |  10 +-
 .../BackwardCompatibleAliases.cpp             |   4 +-
 .../PluginService/SpecialCustomFactory.cpp    |   6 +-
 .../src/Properties/CustomPropertiesAlg.cpp    |   4 +-
 GaudiTestSuite/src/Properties/PropertyAlg.cpp |  12 +-
 GaudiTestSuite/src/Properties/PropertyAlg.h   |   4 +-
 .../src/Properties/PropertyProxy.cpp          |  14 +-
 GaudiTestSuite/src/Properties/PropertyProxy.h |   6 +-
 .../src/RandomNumber/RandomNumberAlg.cpp      |  30 +--
 .../src/RandomNumber/RandomNumberAlg.h        |   8 +-
 GaudiTestSuite/src/ReEntAlg/ReEntAlg.cpp      |   6 +-
 GaudiTestSuite/src/StringKeys/StringKeyEx.cpp |   8 +-
 GaudiTestSuite/src/SvcInitLoop/LoopAlg.cpp    |   4 +-
 GaudiTestSuite/src/SvcInitLoop/LoopAlg.h      |   4 +-
 GaudiTestSuite/src/SvcInitLoop/ServiceA.h     |   4 +-
 GaudiTestSuite/src/SvcInitLoop/ServiceB.h     |   4 +-
 GaudiTestSuite/src/THist/THistRead.cpp        |  24 +--
 GaudiTestSuite/src/THist/THistRead.h          |   4 +-
 GaudiTestSuite/src/THist/THistWrite.cpp       |  24 +--
 GaudiTestSuite/src/THist/THistWrite.h         |   4 +-
 GaudiTestSuite/src/ToolHandles/FloatTool.h    |   6 +-
 GaudiTestSuite/src/ToolVisitorTest/GaudiEnv.h |  16 +-
 .../src/ToolVisitorTest/ITestTool.h           |   4 +-
 .../ToolVisitorTest/ToolVisitorTestLib.cpp    |  10 +-
 .../ToolVisitorTest/ToolVisitorTest_test.cpp  |   8 +-
 .../src/bug_34121/bug34121_MyAlgorithm.cpp    |  12 +-
 .../src/bug_34121/bug34121_Tool.cpp           |  10 +-
 GaudiTestSuite/src/testing/GAUDI-1185.cpp     |   4 +-
 .../src/testing/TestAppMgrStateMachine.cpp    |  12 +-
 GaudiTestSuite/src/testing/TestingSvcs.cpp    |   4 +-
 GaudiUtils/include/GaudiUtils/Aida2ROOT.h     |   2 +-
 GaudiUtils/include/GaudiUtils/Histo2String.h  |   4 +-
 GaudiUtils/include/GaudiUtils/HistoDump.h     |   4 +-
 GaudiUtils/include/GaudiUtils/HistoLabels.h   |   4 +-
 GaudiUtils/include/GaudiUtils/HistoParsers.h  |   4 +-
 GaudiUtils/include/GaudiUtils/HistoStats.h    |   4 +-
 GaudiUtils/include/GaudiUtils/HistoStrings.h  |   4 +-
 .../include/GaudiUtils/HistoTableFormat.h     |   2 +-
 GaudiUtils/include/GaudiUtils/HistoXML.h      |   4 +-
 GaudiUtils/include/GaudiUtils/IFileCatalog.h  |   4 +-
 .../include/GaudiUtils/IFileCatalogMgr.h      |   4 +-
 .../include/GaudiUtils/IIODataManager.h       |   4 +-
 .../include/GaudiUtils/ISignalMonitor.h       |   4 +-
 GaudiUtils/src/Lib/Aida2ROOT.cpp              |  24 +--
 GaudiUtils/src/Lib/Histo2String.cpp           |  28 +--
 GaudiUtils/src/Lib/HistoDump.cpp              |  24 +--
 GaudiUtils/src/Lib/HistoLabels.cpp            |  14 +-
 GaudiUtils/src/Lib/HistoParsers.cpp           |  26 +--
 GaudiUtils/src/Lib/HistoStats.cpp             |  10 +-
 GaudiUtils/src/Lib/HistoStrings.cpp           |  10 +-
 GaudiUtils/src/Lib/HistoTableFormat.cpp       |  20 +-
 GaudiUtils/src/Lib/HistoXML.cpp               |  36 ++--
 GaudiUtils/src/Lib/QuasiRandom.cpp            |   4 +-
 GaudiUtils/src/component/FileReadTool.cpp     |   6 +-
 GaudiUtils/src/component/IODataManager.cpp    |  18 +-
 GaudiUtils/src/component/IODataManager.h      |   6 +-
 GaudiUtils/src/component/MultiFileCatalog.cpp |   6 +-
 GaudiUtils/src/component/MultiFileCatalog.h   |   8 +-
 GaudiUtils/src/component/SignalMonitorSvc.cpp |  16 +-
 GaudiUtils/src/component/VFSSvc.cpp           |  14 +-
 GaudiUtils/src/component/XMLFileCatalog.cpp   |  30 +--
 GaudiUtils/src/component/XMLFileCatalog.h     |  12 +-
 PartPropSvc/src/PartPropSvc.cpp               |  10 +-
 PartPropSvc/src/PartPropSvc.h                 |  10 +-
 RootCnv/components/Components.cpp             |   8 +-
 RootCnv/dict/RootCnv_dict.h                   |   6 +-
 RootCnv/include/RootCnv/PoolClasses.h         |   2 +-
 RootCnv/include/RootCnv/RootAddress.h         |   6 +-
 RootCnv/include/RootCnv/RootCnvSvc.h          |  18 +-
 RootCnv/include/RootCnv/RootConverter.h       |   6 +-
 RootCnv/include/RootCnv/RootDataConnection.h  |  16 +-
 RootCnv/include/RootCnv/RootDatabaseCnv.h     |   4 +-
 RootCnv/include/RootCnv/RootDirectoryCnv.h    |   4 +-
 RootCnv/include/RootCnv/RootEvtSelector.h     |   6 +-
 RootCnv/include/RootCnv/RootNTupleCnv.h       |   6 +-
 RootCnv/include/RootCnv/RootPerfMonSvc.h      |  14 +-
 RootCnv/include/RootCnv/RootRefs.h            |   2 +-
 RootCnv/include/RootCnv/RootStatCnv.h         |   6 +-
 RootCnv/merge/extractEvt.C                    |  16 +-
 RootCnv/merge/merge.C                         |  22 +--
 RootCnv/merge/merge.cpp                       |   4 +-
 RootCnv/src/PoolTool.h                        |   4 +-
 RootCnv/src/RootCnvSvc.cpp                    |  40 ++--
 RootCnv/src/RootDataConnection.cpp            |  36 ++--
 RootCnv/src/RootDatabaseCnv.cpp               |  12 +-
 RootCnv/src/RootDirectoryCnv.cpp              |  14 +-
 RootCnv/src/RootEvtSelector.cpp               |  22 +--
 RootCnv/src/RootIOHandler.cpp                 |  28 +--
 RootCnv/src/RootNTupleCnv.cpp                 |  34 ++--
 RootCnv/src/RootPerfMonSvc.cpp                |  26 +--
 RootCnv/src/RootStatCnv.cpp                   |  18 +-
 RootCnv/src/SysProcStat.cpp                   |   4 +-
 RootHistCnv/src/DirectoryCnv.h                |   4 +-
 RootHistCnv/src/PersSvc.cpp                   |  14 +-
 RootHistCnv/src/PersSvc.h                     |   4 +-
 RootHistCnv/src/RCWNTupleCnv.cpp              |  16 +-
 RootHistCnv/src/RCWNTupleCnv.h                |   8 +-
 RootHistCnv/src/RConverter.cpp                |  22 +--
 RootHistCnv/src/RConverter.h                  |   6 +-
 RootHistCnv/src/RDirectoryCnv.cpp             |  34 ++--
 RootHistCnv/src/RDirectoryCnv.h               |   4 +-
 RootHistCnv/src/RFileCnv.cpp                  |  20 +-
 RootHistCnv/src/RFileCnv.h                    |   6 +-
 RootHistCnv/src/RHistogramCnv.cpp             |  22 +--
 RootHistCnv/src/RHistogramCnv.h               |  16 +-
 RootHistCnv/src/RNTupleCnv.cpp                |  20 +-
 RootHistCnv/src/RRWNTupleCnv.cpp              |  10 +-
 RootHistCnv/src/RootCompressionSettings.cpp   |   4 +-
 RootHistCnv/src/RootDirFcn.cpp                |   8 +-
 RootHistCnv/src/RootObjAddress.h              |   4 +-
 711 files changed, 3390 insertions(+), 3392 deletions(-)

diff --git a/Gaudi/src/main.cpp b/Gaudi/src/main.cpp
index e3578fbb4f..e84bd0e12c 100644
--- a/Gaudi/src/main.cpp
+++ b/Gaudi/src/main.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 extern "C" GAUDI_IMPORT int GaudiMain( int argc, char* argv[] );
 
 int main( int argc, char* argv[] ) { return GaudiMain( argc, argv ); }
diff --git a/GaudiAud/src/AlgContextAuditor.cpp b/GaudiAud/src/AlgContextAuditor.cpp
index 429c750481..4e7dcae1af 100644
--- a/GaudiAud/src/AlgContextAuditor.cpp
+++ b/GaudiAud/src/AlgContextAuditor.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,12 +10,12 @@
 \***********************************************************************************/
 #include "AlgContextAuditor.h"
 
-#include "GaudiKernel/EventContext.h"
-#include "GaudiKernel/IAlgContextSvc.h"
-#include "GaudiKernel/IAlgorithm.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/SmartIF.h"
-#include "GaudiKernel/ThreadLocalContext.h"
+#include <GaudiKernel/EventContext.h>
+#include <GaudiKernel/IAlgContextSvc.h>
+#include <GaudiKernel/IAlgorithm.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/SmartIF.h>
+#include <GaudiKernel/ThreadLocalContext.h>
 
 #include <cassert>
 
diff --git a/GaudiAud/src/AlgContextAuditor.h b/GaudiAud/src/AlgContextAuditor.h
index 1a087b7065..f67a054576 100644
--- a/GaudiAud/src/AlgContextAuditor.h
+++ b/GaudiAud/src/AlgContextAuditor.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,8 +15,8 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/Auditor.h"
-#include "GaudiKernel/IAlgorithm.h"
+#include <GaudiKernel/Auditor.h>
+#include <GaudiKernel/IAlgorithm.h>
 // ============================================================================
 // Forward declarations
 // ============================================================================
diff --git a/GaudiAud/src/ChronoAuditor.h b/GaudiAud/src/ChronoAuditor.h
index 2d896a39a7..4ebe4f00f0 100644
--- a/GaudiAud/src/ChronoAuditor.h
+++ b/GaudiAud/src/ChronoAuditor.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -13,7 +13,7 @@
 
 #include "CommonAuditor.h"
 
-#include "GaudiKernel/IChronoStatSvc.h"
+#include <GaudiKernel/IChronoStatSvc.h>
 
 /** @class ChronoAuditor
     Monitors the cpu time usage of each algorithm
diff --git a/GaudiAud/src/CommonAuditor.cpp b/GaudiAud/src/CommonAuditor.cpp
index 6c8500e26c..e07b050c62 100644
--- a/GaudiAud/src/CommonAuditor.cpp
+++ b/GaudiAud/src/CommonAuditor.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,7 +9,7 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 #include "CommonAuditor.h"
-#include "GaudiKernel/GaudiException.h"
+#include <GaudiKernel/GaudiException.h>
 
 void CommonAuditor::before( StandardEventType evt, INamedInterface* caller ) {
   if ( caller ) before( toStr( evt ), caller->name() );
diff --git a/GaudiAud/src/CommonAuditor.h b/GaudiAud/src/CommonAuditor.h
index 6132a1399e..6ec42f5b1c 100644
--- a/GaudiAud/src/CommonAuditor.h
+++ b/GaudiAud/src/CommonAuditor.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef GAUDIAUD_COMMONAUDITOR_H
 #define GAUDIAUD_COMMONAUDITOR_H
 
-#include "GaudiKernel/Auditor.h"
+#include <GaudiKernel/Auditor.h>
 
 /// Base class with common functionalities shared by few auditor implementations.
 /// @author Marco Clemencic
diff --git a/GaudiAud/src/MemStatAuditor.cpp b/GaudiAud/src/MemStatAuditor.cpp
index d3fbf7d69f..54c4927be6 100644
--- a/GaudiAud/src/MemStatAuditor.cpp
+++ b/GaudiAud/src/MemStatAuditor.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,10 +20,10 @@
 */
 
 #include "CommonAuditor.h"
-#include "GaudiKernel/IChronoStatSvc.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Stat.h"
 #include "ProcStats.h"
+#include <GaudiKernel/IChronoStatSvc.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/Stat.h>
 
 class MemStatAuditor : public CommonAuditor {
 public:
diff --git a/GaudiAud/src/MemoryAuditor.cpp b/GaudiAud/src/MemoryAuditor.cpp
index 7d8468b479..2fd331fdd6 100644
--- a/GaudiAud/src/MemoryAuditor.cpp
+++ b/GaudiAud/src/MemoryAuditor.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 //  An auditor that monitors memory usage
 
 #include "CommonAuditor.h"
-#include "GaudiKernel/MsgStream.h"
 #include "ProcStats.h"
+#include <GaudiKernel/MsgStream.h>
 
 /// Monitors the memory use of each algorithm
 ///
diff --git a/GaudiCommonSvc/include/GaudiCommonSvc/Annotation.h b/GaudiCommonSvc/include/GaudiCommonSvc/Annotation.h
index b26ecbfde2..cfaded9ba2 100644
--- a/GaudiCommonSvc/include/GaudiCommonSvc/Annotation.h
+++ b/GaudiCommonSvc/include/GaudiCommonSvc/Annotation.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -17,7 +17,7 @@
 #include <string>
 #include <vector>
 
-#include "AIDA/IAnnotation.h"
+#include <AIDA/IAnnotation.h>
 
 namespace AIDA {
 
diff --git a/GaudiCommonSvc/include/GaudiCommonSvc/Axis.h b/GaudiCommonSvc/include/GaudiCommonSvc/Axis.h
index 31566f2c0d..8cb8c98371 100644
--- a/GaudiCommonSvc/include/GaudiCommonSvc/Axis.h
+++ b/GaudiCommonSvc/include/GaudiCommonSvc/Axis.h
@@ -12,9 +12,9 @@
 //  This library is free software and under the terms of the
 //  GNU Library General Public License described in the LGPL.txt
 
-#include "AIDA/IAxis.h"
+#include <AIDA/IAxis.h>
 
-#include "TAxis.h"
+#include <TAxis.h>
 
 namespace Gaudi {
 
diff --git a/GaudiCommonSvc/include/GaudiCommonSvc/Generic1D.h b/GaudiCommonSvc/include/GaudiCommonSvc/Generic1D.h
index e8af116410..0e281fff18 100644
--- a/GaudiCommonSvc/include/GaudiCommonSvc/Generic1D.h
+++ b/GaudiCommonSvc/include/GaudiCommonSvc/Generic1D.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,11 +11,11 @@
 #ifndef GAUDISVC_GENERIC1D_H
 #define GAUDISVC_GENERIC1D_H 1
 
-#include "AIDA/IProfile1D.h"
 #include "Annotation.h"
 #include "Axis.h"
-#include "GaudiKernel/HistogramBase.h"
-#include "TFile.h"
+#include <AIDA/IProfile1D.h>
+#include <GaudiKernel/HistogramBase.h>
+#include <TFile.h>
 #include <memory>
 #include <stdexcept>
 
diff --git a/GaudiCommonSvc/include/GaudiCommonSvc/Generic2D.h b/GaudiCommonSvc/include/GaudiCommonSvc/Generic2D.h
index 0403cf7b44..e2ff6cb719 100644
--- a/GaudiCommonSvc/include/GaudiCommonSvc/Generic2D.h
+++ b/GaudiCommonSvc/include/GaudiCommonSvc/Generic2D.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,11 +11,11 @@
 #ifndef GAUDISVC_GENERIC2D_H
 #define GAUDISVC_GENERIC2D_H 1
 
-#include "AIDA/IProfile2D.h"
 #include "Annotation.h"
 #include "Axis.h"
-#include "GaudiKernel/HistogramBase.h"
-#include "TFile.h"
+#include <AIDA/IProfile2D.h>
+#include <GaudiKernel/HistogramBase.h>
+#include <TFile.h>
 #include <memory>
 #include <stdexcept>
 
diff --git a/GaudiCommonSvc/include/GaudiCommonSvc/Generic3D.h b/GaudiCommonSvc/include/GaudiCommonSvc/Generic3D.h
index 8a0e85e891..05705640e8 100644
--- a/GaudiCommonSvc/include/GaudiCommonSvc/Generic3D.h
+++ b/GaudiCommonSvc/include/GaudiCommonSvc/Generic3D.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,11 +11,11 @@
 #ifndef GAUDISVC_GENERIC3D_H
 #define GAUDISVC_GENERIC3D_H 1
 
-#include "AIDA/IHistogram3D.h"
 #include "Annotation.h"
 #include "Axis.h"
-#include "GaudiKernel/HistogramBase.h"
-#include "TFile.h"
+#include <AIDA/IHistogram3D.h>
+#include <GaudiKernel/HistogramBase.h>
+#include <TFile.h>
 #include <memory>
 #include <stdexcept>
 
diff --git a/GaudiCommonSvc/include/GaudiCommonSvc/H2D.h b/GaudiCommonSvc/include/GaudiCommonSvc/H2D.h
index 24b2725362..bf7f8bcc3e 100644
--- a/GaudiCommonSvc/include/GaudiCommonSvc/H2D.h
+++ b/GaudiCommonSvc/include/GaudiCommonSvc/H2D.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,8 +10,8 @@
 \***********************************************************************************/
 #pragma once
 
-#include "AIDA/IHistogram2D.h"
 #include "Generic2D.h"
+#include <AIDA/IHistogram2D.h>
 #include <Gaudi/Histograming/Sink/Utils.h>
 #include <GaudiKernel/DataObject.h>
 #include <TH2D.h>
diff --git a/GaudiCommonSvc/include/GaudiCommonSvc/HistogramSvc.h b/GaudiCommonSvc/include/GaudiCommonSvc/HistogramSvc.h
index b5d5e651a1..9be943e06a 100644
--- a/GaudiCommonSvc/include/GaudiCommonSvc/HistogramSvc.h
+++ b/GaudiCommonSvc/include/GaudiCommonSvc/HistogramSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -16,26 +16,26 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/DataSvc.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/HistoProperty.h"
-#include "GaudiKernel/IHistogramSvc.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/DataSvc.h>
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/HistoProperty.h>
+#include <GaudiKernel/IHistogramSvc.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/System.h>
 // ============================================================================
 // AIDA
 // ============================================================================
 /// @FIXME: AIDA interfaces visibility
-#include "AIDA/IAnnotation.h"
-#include "AIDA/IHistogramFactory.h"
+#include <AIDA/IAnnotation.h>
+#include <AIDA/IHistogramFactory.h>
 // ============================================================================
 // local (+PI)
 // ============================================================================
 #include "Axis.h"
 #include "HistogramUtility.h"
-#include "TH1.h"
-#include "TH2.h"
-#include "TH3.h"
+#include <TH1.h>
+#include <TH2.h>
+#include <TH3.h>
 // ============================================================================
 namespace AIDA {
   class ICloud1D;
diff --git a/GaudiCommonSvc/include/GaudiCommonSvc/HistogramUtility.h b/GaudiCommonSvc/include/GaudiCommonSvc/HistogramUtility.h
index 9a77f84b70..f5d31106b7 100644
--- a/GaudiCommonSvc/include/GaudiCommonSvc/HistogramUtility.h
+++ b/GaudiCommonSvc/include/GaudiCommonSvc/HistogramUtility.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef GAUDICOMMONSVC_HISTOGRAMUTILITY_H
 #define GAUDICOMMONSVC_HISTOGRAMUTILITY_H 1
 
-#include "GaudiKernel/HistogramBase.h"
+#include <GaudiKernel/HistogramBase.h>
 
 namespace Gaudi {
   template <class Q, class T>
diff --git a/GaudiCommonSvc/src/AuditorSvc.cpp b/GaudiCommonSvc/src/AuditorSvc.cpp
index 40b256c769..82a52a3db3 100644
--- a/GaudiCommonSvc/src/AuditorSvc.cpp
+++ b/GaudiCommonSvc/src/AuditorSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,13 +10,13 @@
 \***********************************************************************************/
 // Include Files
 #include "AuditorSvc.h"
-#include "GaudiKernel/Auditor.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IAuditor.h"
-#include "GaudiKernel/INamedInterface.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/TypeNameString.h"
+#include <GaudiKernel/Auditor.h>
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IAuditor.h>
+#include <GaudiKernel/INamedInterface.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/TypeNameString.h>
 
 // Instantiation of a static factory class used by clients to create
 //  instances of this service
diff --git a/GaudiCommonSvc/src/AuditorSvc.h b/GaudiCommonSvc/src/AuditorSvc.h
index d385240f1c..8446ec94d3 100644
--- a/GaudiCommonSvc/src/AuditorSvc.h
+++ b/GaudiCommonSvc/src/AuditorSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define AuditorSvc_AuditorSvc_H
 
 // Include Files
-#include "GaudiKernel/IAuditorSvc.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/IAuditorSvc.h>
+#include <GaudiKernel/Service.h>
 #include <list>
 #include <vector>
 
diff --git a/GaudiCommonSvc/src/ChronoStatSvc.cpp b/GaudiCommonSvc/src/ChronoStatSvc.cpp
index d3bfe343a4..516a1bf03e 100644
--- a/GaudiCommonSvc/src/ChronoStatSvc.cpp
+++ b/GaudiCommonSvc/src/ChronoStatSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,15 +23,15 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/ChronoEntity.h"
-#include "GaudiKernel/IChronoStatSvc.h"
-#include "GaudiKernel/IHiveWhiteBoard.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Stat.h"
-#include "GaudiKernel/StatEntity.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/ChronoEntity.h>
+#include <GaudiKernel/IChronoStatSvc.h>
+#include <GaudiKernel/IHiveWhiteBoard.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/Stat.h>
+#include <GaudiKernel/StatEntity.h>
+#include <GaudiKernel/StatusCode.h>
 // ============================================================================
 /// local
 // ============================================================================
diff --git a/GaudiCommonSvc/src/ChronoStatSvc.h b/GaudiCommonSvc/src/ChronoStatSvc.h
index a9424dde63..1800bde4e9 100644
--- a/GaudiCommonSvc/src/ChronoStatSvc.h
+++ b/GaudiCommonSvc/src/ChronoStatSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,12 +23,12 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/IChronoStatSvc.h"
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/ThreadLocalContext.h"
+#include <GaudiKernel/IChronoStatSvc.h>
+#include <GaudiKernel/IIncidentListener.h>
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/Service.h>
+#include <GaudiKernel/ServiceHandle.h>
+#include <GaudiKernel/ThreadLocalContext.h>
 // ============================================================================
 /// forward declarations
 // ============================================================================
diff --git a/GaudiCommonSvc/src/DataSvc/EvtDataSvc.cpp b/GaudiCommonSvc/src/DataSvc/EvtDataSvc.cpp
index 329297c745..3366612aa8 100644
--- a/GaudiCommonSvc/src/DataSvc/EvtDataSvc.cpp
+++ b/GaudiCommonSvc/src/DataSvc/EvtDataSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -27,8 +27,8 @@
 //====================================================================
 #define DATASVC_EVTDATASVC_CPP
 
-#include "GaudiKernel/IConversionSvc.h"
-#include "GaudiKernel/ISvcLocator.h"
+#include <GaudiKernel/IConversionSvc.h>
+#include <GaudiKernel/ISvcLocator.h>
 
 #include "EvtDataSvc.h"
 
diff --git a/GaudiCommonSvc/src/DataSvc/EvtDataSvc.h b/GaudiCommonSvc/src/DataSvc/EvtDataSvc.h
index 2ba751c040..c573b5baca 100644
--- a/GaudiCommonSvc/src/DataSvc/EvtDataSvc.h
+++ b/GaudiCommonSvc/src/DataSvc/EvtDataSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,8 +11,8 @@
 #ifndef DATASVC_EVTDATASVC_H
 #define DATASVC_EVTDATASVC_H
 
-#include "GaudiKernel/DataSvc.h"
-#include "GaudiKernel/IConversionSvc.h"
+#include <GaudiKernel/DataSvc.h>
+#include <GaudiKernel/IConversionSvc.h>
 
 /** @class EvtDataSvc EvtDataSvc.h
  *
diff --git a/GaudiCommonSvc/src/DataSvc/EvtStoreSvc.cpp b/GaudiCommonSvc/src/DataSvc/EvtStoreSvc.cpp
index a1564a790f..7c3007b87e 100644
--- a/GaudiCommonSvc/src/DataSvc/EvtStoreSvc.cpp
+++ b/GaudiCommonSvc/src/DataSvc/EvtStoreSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,22 +8,22 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "Gaudi/Accumulators.h"
-#include "Gaudi/Arena/Monotonic.h"
-#include "GaudiKernel/ConcurrencyFlags.h"
-#include "GaudiKernel/IConversionSvc.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IHiveWhiteBoard.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/System.h"
-#include "tbb/concurrent_queue.h"
-
-#include "ThreadLocalStorage.h"
-
-#include "boost/algorithm/string/predicate.hpp"
+#include <Gaudi/Accumulators.h>
+#include <Gaudi/Arena/Monotonic.h>
+#include <GaudiKernel/ConcurrencyFlags.h>
+#include <GaudiKernel/IConversionSvc.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IHiveWhiteBoard.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/Service.h>
+#include <GaudiKernel/System.h>
+#include <tbb/concurrent_queue.h>
+
+#include <ThreadLocalStorage.h>
+
+#include <boost/algorithm/string/predicate.hpp>
 
 #include <algorithm>
 #include <iomanip>
diff --git a/GaudiCommonSvc/src/DataSvc/MultiStoreSvc.cpp b/GaudiCommonSvc/src/DataSvc/MultiStoreSvc.cpp
index 25e9c676f4..4a1932c6b1 100644
--- a/GaudiCommonSvc/src/DataSvc/MultiStoreSvc.cpp
+++ b/GaudiCommonSvc/src/DataSvc/MultiStoreSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -28,21 +28,21 @@
 #define DATASVC_MULTISTORESVC_CPP
 
 // Include files
-#include "GaudiKernel/AttribStringParser.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IAddressCreator.h"
-#include "GaudiKernel/IConversionSvc.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/IPartitionControl.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/ISvcManager.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/SmartIF.h"
-#include "GaudiKernel/TypeNameString.h"
-#include "GaudiKernel/compose.h"
+#include <GaudiKernel/AttribStringParser.h>
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IAddressCreator.h>
+#include <GaudiKernel/IConversionSvc.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/IPartitionControl.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/ISvcManager.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/Service.h>
+#include <GaudiKernel/SmartIF.h>
+#include <GaudiKernel/TypeNameString.h>
+#include <GaudiKernel/compose.h>
 #include <map>
 #include <variant>
 
diff --git a/GaudiCommonSvc/src/DataSvc/PartitionSwitchAlg.cpp b/GaudiCommonSvc/src/DataSvc/PartitionSwitchAlg.cpp
index bfa0730598..471b44ba1c 100644
--- a/GaudiCommonSvc/src/DataSvc/PartitionSwitchAlg.cpp
+++ b/GaudiCommonSvc/src/DataSvc/PartitionSwitchAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,11 +15,11 @@
 //	Author    : Markus Frank
 //
 //	====================================================================
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/IAlgTool.h"
-#include "GaudiKernel/IPartitionControl.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiKernel/IAlgTool.h>
+#include <GaudiKernel/IPartitionControl.h>
+#include <GaudiKernel/IToolSvc.h>
+#include <GaudiKernel/SmartIF.h>
 
 /**@class PartitionSwitchAlg
  *
diff --git a/GaudiCommonSvc/src/DataSvc/PartitionSwitchTool.cpp b/GaudiCommonSvc/src/DataSvc/PartitionSwitchTool.cpp
index 233dd75bd1..700a427c35 100644
--- a/GaudiCommonSvc/src/DataSvc/PartitionSwitchTool.cpp
+++ b/GaudiCommonSvc/src/DataSvc/PartitionSwitchTool.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,10 +9,10 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Framework include files
-#include "GaudiKernel/AlgTool.h"
-#include "GaudiKernel/IPartitionControl.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/AlgTool.h>
+#include <GaudiKernel/IPartitionControl.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/SmartIF.h>
 
 /** @class PartitionSwitchTool
  *
diff --git a/GaudiCommonSvc/src/DataSvc/RecordDataSvc.cpp b/GaudiCommonSvc/src/DataSvc/RecordDataSvc.cpp
index 4363fca22d..76795bb731 100644
--- a/GaudiCommonSvc/src/DataSvc/RecordDataSvc.cpp
+++ b/GaudiCommonSvc/src/DataSvc/RecordDataSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -27,15 +27,15 @@
 //====================================================================
 #define DATASVC_RECORDDATASVC_CPP
 
-#include "GaudiKernel/DataIncident.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IConversionSvc.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/RegistryEntry.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/DataIncident.h>
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IConversionSvc.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/IProperty.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/RegistryEntry.h>
+#include <GaudiKernel/SmartIF.h>
 
 #include "RecordDataSvc.h"
 using namespace std;
diff --git a/GaudiCommonSvc/src/DataSvc/RecordDataSvc.h b/GaudiCommonSvc/src/DataSvc/RecordDataSvc.h
index a20f3a6157..d18ece7ebb 100644
--- a/GaudiCommonSvc/src/DataSvc/RecordDataSvc.h
+++ b/GaudiCommonSvc/src/DataSvc/RecordDataSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,9 +11,9 @@
 #ifndef DATASVC_RECORDDATASVC_H
 #define DATASVC_RECORDDATASVC_H
 
-#include "GaudiKernel/DataSvc.h"
-#include "GaudiKernel/IConversionSvc.h"
-#include "GaudiKernel/IIncidentListener.h"
+#include <GaudiKernel/DataSvc.h>
+#include <GaudiKernel/IConversionSvc.h>
+#include <GaudiKernel/IIncidentListener.h>
 
 /** @class RecordDataSvc RecordDataSvc.h
  *
diff --git a/GaudiCommonSvc/src/DataSvc/StoreExplorerAlg.cpp b/GaudiCommonSvc/src/DataSvc/StoreExplorerAlg.cpp
index 9e15c335e7..3a7515fa71 100644
--- a/GaudiCommonSvc/src/DataSvc/StoreExplorerAlg.cpp
+++ b/GaudiCommonSvc/src/DataSvc/StoreExplorerAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,18 +15,18 @@
 //	Author    : Markus Frank
 //
 //	====================================================================
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/KeyedContainer.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/ObjectContainerBase.h"
-#include "GaudiKernel/ObjectList.h"
-#include "GaudiKernel/ObjectVector.h"
-#include "GaudiKernel/SmartDataPtr.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/KeyedContainer.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/ObjectContainerBase.h>
+#include <GaudiKernel/ObjectList.h>
+#include <GaudiKernel/ObjectVector.h>
+#include <GaudiKernel/SmartDataPtr.h>
+#include <GaudiKernel/SmartIF.h>
 
 #include <numeric>
 
diff --git a/GaudiCommonSvc/src/DataSvc/StoreSnifferAlg.cpp b/GaudiCommonSvc/src/DataSvc/StoreSnifferAlg.cpp
index a802c93618..e5b6277961 100644
--- a/GaudiCommonSvc/src/DataSvc/StoreSnifferAlg.cpp
+++ b/GaudiCommonSvc/src/DataSvc/StoreSnifferAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,14 +15,14 @@
 //  Author    : Markus Frank
 //
 //  ====================================================================
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/LinkManager.h"
-#include "GaudiKernel/SmartDataPtr.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/LinkManager.h>
+#include <GaudiKernel/SmartDataPtr.h>
+#include <GaudiKernel/SmartIF.h>
 
 using namespace std;
 
diff --git a/GaudiCommonSvc/src/HistogramPersistencySvc/HistogramPersistencySvc.cpp b/GaudiCommonSvc/src/HistogramPersistencySvc/HistogramPersistencySvc.cpp
index 3294ed1885..0274dcabc5 100644
--- a/GaudiCommonSvc/src/HistogramPersistencySvc/HistogramPersistencySvc.cpp
+++ b/GaudiCommonSvc/src/HistogramPersistencySvc/HistogramPersistencySvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -33,12 +33,12 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/SmartIF.h>
 // ============================================================================
 // local
 // ============================================================================
@@ -55,7 +55,7 @@
 #ifdef __clang__
 #  pragma clang diagnostic pop
 #endif
-#include "AIDA/IBaseHistogram.h"
+#include <AIDA/IBaseHistogram.h>
 #undef class
 // ============================================================================
 // Instantiation of a static factory class used by clients to create
diff --git a/GaudiCommonSvc/src/HistogramSvc/AIDA_visibility_hack.cpp b/GaudiCommonSvc/src/HistogramSvc/AIDA_visibility_hack.cpp
index b4287ffc85..1d2f6b56a6 100644
--- a/GaudiCommonSvc/src/HistogramSvc/AIDA_visibility_hack.cpp
+++ b/GaudiCommonSvc/src/HistogramSvc/AIDA_visibility_hack.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,7 +23,7 @@
 #endif
 
 // For the GAUDI_API macro
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 
 // To avoid breaking STL
 #include <string>
diff --git a/GaudiCommonSvc/src/HistogramSvc/H3D.cpp b/GaudiCommonSvc/src/HistogramSvc/H3D.cpp
index 410fd7f2db..0c36ee7d73 100644
--- a/GaudiCommonSvc/src/HistogramSvc/H3D.cpp
+++ b/GaudiCommonSvc/src/HistogramSvc/H3D.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -28,7 +28,7 @@
 #include <GaudiKernel/ObjectFactory.h>
 
 #include "GaudiPI.h"
-#include "TH3D.h"
+#include <TH3D.h>
 
 #include <cmath>
 
diff --git a/GaudiCommonSvc/src/HistogramSvc/HistogramSvc.cpp b/GaudiCommonSvc/src/HistogramSvc/HistogramSvc.cpp
index 9ddf8c1f11..5fc2cb4948 100644
--- a/GaudiCommonSvc/src/HistogramSvc/HistogramSvc.cpp
+++ b/GaudiCommonSvc/src/HistogramSvc/HistogramSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -26,11 +26,11 @@
 #include <stdexcept>
 
 // GaudiKernel
-#include "GaudiKernel/AttribStringParser.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/GenericAddress.h"
-#include "GaudiKernel/IConversionSvc.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/AttribStringParser.h>
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/GenericAddress.h>
+#include <GaudiKernel/IConversionSvc.h>
 
 // Local
 #include "GaudiPI.h"
diff --git a/GaudiCommonSvc/src/PersistencySvc/CopyInputStream.cpp b/GaudiCommonSvc/src/PersistencySvc/CopyInputStream.cpp
index 1055a107a7..96e50635c1 100644
--- a/GaudiCommonSvc/src/PersistencySvc/CopyInputStream.cpp
+++ b/GaudiCommonSvc/src/PersistencySvc/CopyInputStream.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,16 +9,16 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Framework include files
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/DataObjectHandle.h"
-#include "GaudiKernel/DataStoreItem.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IDataStoreLeaves.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/MsgStream.h"
 #include "OutputStream.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/DataObjectHandle.h>
+#include <GaudiKernel/DataStoreItem.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IDataStoreLeaves.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/MsgStream.h>
 
 class CopyInputStream : public OutputStream {
 
diff --git a/GaudiCommonSvc/src/PersistencySvc/DataSvcFileEntriesTool.cpp b/GaudiCommonSvc/src/PersistencySvc/DataSvcFileEntriesTool.cpp
index 8f0a6125c3..18c2ca4835 100644
--- a/GaudiCommonSvc/src/PersistencySvc/DataSvcFileEntriesTool.cpp
+++ b/GaudiCommonSvc/src/PersistencySvc/DataSvcFileEntriesTool.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,10 +9,10 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // ========== header
-#include "GaudiKernel/AlgTool.h"
-#include "GaudiKernel/IDataStoreLeaves.h"
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/AlgTool.h>
+#include <GaudiKernel/IDataStoreLeaves.h>
+#include <GaudiKernel/IIncidentListener.h>
+#include <GaudiKernel/SmartIF.h>
 
 class IIncidentSvc;
 struct IDataManagerSvc;
@@ -93,15 +93,15 @@ private:
 };
 
 // ========== implementation
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/DataStoreItem.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/IRegistry.h"
-
-#include "GaudiKernel/GaudiException.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/DataStoreItem.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/IRegistry.h>
+
+#include <GaudiKernel/GaudiException.h>
 
 StatusCode DataSvcFileEntriesTool::initialize() {
   StatusCode sc = AlgTool::initialize();
diff --git a/GaudiCommonSvc/src/PersistencySvc/DetPersistencySvc.cpp b/GaudiCommonSvc/src/PersistencySvc/DetPersistencySvc.cpp
index e87a07eb41..bd3a6b1533 100644
--- a/GaudiCommonSvc/src/PersistencySvc/DetPersistencySvc.cpp
+++ b/GaudiCommonSvc/src/PersistencySvc/DetPersistencySvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -14,7 +14,7 @@
 
 // Implementation specific definitions
 #include "DetPersistencySvc.h"
-#include "GaudiKernel/ISvcLocator.h"
+#include <GaudiKernel/ISvcLocator.h>
 
 // Instantiation of a static factory class used by clients to create
 // instances of this service
diff --git a/GaudiCommonSvc/src/PersistencySvc/EvtCollectionStream.cpp b/GaudiCommonSvc/src/PersistencySvc/EvtCollectionStream.cpp
index 5ed18b8221..90128bc33b 100644
--- a/GaudiCommonSvc/src/PersistencySvc/EvtCollectionStream.cpp
+++ b/GaudiCommonSvc/src/PersistencySvc/EvtCollectionStream.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,12 +20,12 @@
 #define GAUDISVC_PERSISTENCYSVC_EVTCOLLECTIONSTREAM_CPP
 
 // Framework include files
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/INTupleSvc.h"
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/INTupleSvc.h>
+#include <GaudiKernel/MsgStream.h>
 
 #include "EvtCollectionStream.h"
-#include "GaudiKernel/DataStoreItem.h"
+#include <GaudiKernel/DataStoreItem.h>
 
 // Define the algorithm factory for the standard output data writer
 DECLARE_COMPONENT( EvtCollectionStream )
diff --git a/GaudiCommonSvc/src/PersistencySvc/EvtCollectionStream.h b/GaudiCommonSvc/src/PersistencySvc/EvtCollectionStream.h
index 3607d87328..a9a5ece6f3 100644
--- a/GaudiCommonSvc/src/PersistencySvc/EvtCollectionStream.h
+++ b/GaudiCommonSvc/src/PersistencySvc/EvtCollectionStream.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -26,7 +26,7 @@
 #include <vector>
 
 // Required for inheritance
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 
 /** A small to stream Data I/O.
     Author:  M.Frank
diff --git a/GaudiCommonSvc/src/PersistencySvc/EvtPersistencySvc.cpp b/GaudiCommonSvc/src/PersistencySvc/EvtPersistencySvc.cpp
index 53ae64b962..df39e7d937 100644
--- a/GaudiCommonSvc/src/PersistencySvc/EvtPersistencySvc.cpp
+++ b/GaudiCommonSvc/src/PersistencySvc/EvtPersistencySvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -31,7 +31,7 @@
 
 // Implementation specific definitions
 #include "EvtPersistencySvc.h"
-#include "GaudiKernel/ISvcLocator.h"
+#include <GaudiKernel/ISvcLocator.h>
 
 // Instantiation of a static factory class used by clients to create
 // instances of this service
diff --git a/GaudiCommonSvc/src/PersistencySvc/InputCopyStream.cpp b/GaudiCommonSvc/src/PersistencySvc/InputCopyStream.cpp
index 5ded9e2b9a..f7bba0a175 100644
--- a/GaudiCommonSvc/src/PersistencySvc/InputCopyStream.cpp
+++ b/GaudiCommonSvc/src/PersistencySvc/InputCopyStream.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,14 +10,14 @@
 \***********************************************************************************/
 // Framework include files
 #include "InputCopyStream.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/DataStoreItem.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IDataStoreLeaves.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/DataStoreItem.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IDataStoreLeaves.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/MsgStream.h>
 
 // Define the algorithm factory for the standard output data writer
 DECLARE_COMPONENT( InputCopyStream )
diff --git a/GaudiCommonSvc/src/PersistencySvc/OutputStream.cpp b/GaudiCommonSvc/src/PersistencySvc/OutputStream.cpp
index f194b0a604..ca7a4b6953 100644
--- a/GaudiCommonSvc/src/PersistencySvc/OutputStream.cpp
+++ b/GaudiCommonSvc/src/PersistencySvc/OutputStream.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2023 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,22 +9,22 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Framework include files
-#include "GaudiKernel/IAlgManager.h"
-#include "GaudiKernel/IConversionSvc.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/IPersistencySvc.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/Incident.h"
-
-#include "GaudiKernel/AttribStringParser.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/DataStoreItem.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/strcasecmp.h"
+#include <GaudiKernel/IAlgManager.h>
+#include <GaudiKernel/IConversionSvc.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/IPersistencySvc.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/Incident.h>
+
+#include <GaudiKernel/AttribStringParser.h>
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/DataStoreItem.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/strcasecmp.h>
 
 #include "OutputStream.h"
 
diff --git a/GaudiCommonSvc/src/PersistencySvc/OutputStream.h b/GaudiCommonSvc/src/PersistencySvc/OutputStream.h
index f131f5e70a..498cc86f83 100644
--- a/GaudiCommonSvc/src/PersistencySvc/OutputStream.h
+++ b/GaudiCommonSvc/src/PersistencySvc/OutputStream.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2023 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,10 +12,10 @@
 #define GAUDISVC_PERSISTENCYSVC_OUTPUTSTREAM_H
 
 // Required for inheritance
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/IDataSelector.h"
-#include "GaudiKernel/IIncidentSvc.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiKernel/IDataSelector.h>
+#include <GaudiKernel/IIncidentSvc.h>
 
 // STL include files
 #include <memory>
diff --git a/GaudiCommonSvc/src/PersistencySvc/RecordStream.cpp b/GaudiCommonSvc/src/PersistencySvc/RecordStream.cpp
index 1af2f5f686..01fbcd2144 100644
--- a/GaudiCommonSvc/src/PersistencySvc/RecordStream.cpp
+++ b/GaudiCommonSvc/src/PersistencySvc/RecordStream.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,13 +10,13 @@
 \***********************************************************************************/
 // Framework include files
 #include "RecordStream.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/DataStoreItem.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/DataStoreItem.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/MsgStream.h>
 
 // Define the algorithm factory for the standard output data writer
 DECLARE_COMPONENT( RecordStream )
diff --git a/GaudiCommonSvc/src/PersistencySvc/RunRecordStream.cpp b/GaudiCommonSvc/src/PersistencySvc/RunRecordStream.cpp
index f92cfca49c..0485e3aac6 100644
--- a/GaudiCommonSvc/src/PersistencySvc/RunRecordStream.cpp
+++ b/GaudiCommonSvc/src/PersistencySvc/RunRecordStream.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,13 +10,13 @@
 \***********************************************************************************/
 // Framework include files
 #include "RunRecordStream.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/DataStoreItem.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/DataStoreItem.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/MsgStream.h>
 
 // Define the algorithm factory for the standard output data writer
 DECLARE_COMPONENT( RunRecordStream )
diff --git a/GaudiCommonSvc/src/PersistencySvc/SequentialOutputStream.cpp b/GaudiCommonSvc/src/PersistencySvc/SequentialOutputStream.cpp
index 0541bdd5cd..4d9a030f03 100644
--- a/GaudiCommonSvc/src/PersistencySvc/SequentialOutputStream.cpp
+++ b/GaudiCommonSvc/src/PersistencySvc/SequentialOutputStream.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,14 +15,14 @@
 #include <boost/filesystem.hpp>
 
 // Framework include files
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/DataStoreItem.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/MsgStream.h"
 #include "SequentialOutputStream.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/DataStoreItem.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/MsgStream.h>
 
 // Define the algorithm factory for the standard output data writer
 DECLARE_COMPONENT( SequentialOutputStream )
diff --git a/GaudiCommonSvc/src/PersistencySvc/TagCollectionStream.cpp b/GaudiCommonSvc/src/PersistencySvc/TagCollectionStream.cpp
index e62256c39b..685744ef07 100644
--- a/GaudiCommonSvc/src/PersistencySvc/TagCollectionStream.cpp
+++ b/GaudiCommonSvc/src/PersistencySvc/TagCollectionStream.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,13 +10,13 @@
 \***********************************************************************************/
 // Framework include files
 #include "TagCollectionStream.h"
-#include "GaudiKernel/AttribStringParser.h"
-#include "GaudiKernel/GenericAddress.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataSourceMgr.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/SmartDataPtr.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/AttribStringParser.h>
+#include <GaudiKernel/GenericAddress.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataSourceMgr.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/SmartDataPtr.h>
+#include <GaudiKernel/SmartIF.h>
 
 // Define the algorithm factory for the standard output data writer
 DECLARE_COMPONENT( TagCollectionStream )
diff --git a/GaudiCommonSvc/src/PersistencySvc/TagCollectionStream.h b/GaudiCommonSvc/src/PersistencySvc/TagCollectionStream.h
index 0a5171fd9e..117dd04415 100644
--- a/GaudiCommonSvc/src/PersistencySvc/TagCollectionStream.h
+++ b/GaudiCommonSvc/src/PersistencySvc/TagCollectionStream.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDISVC_PERSISTENCYSVC_TAGCOLLECTIONSTREAM_H
 
 // Required for inheritance
-#include "GaudiKernel/NTuple.h"
 #include "OutputStream.h"
+#include <GaudiKernel/NTuple.h>
 
 // forward declarations
 class GenericAddress;
diff --git a/GaudiCoreSvc/src/AlgExecStateSvc/AlgExecStateSvc.cpp b/GaudiCoreSvc/src/AlgExecStateSvc/AlgExecStateSvc.cpp
index e724488403..775db8bd2f 100644
--- a/GaudiCoreSvc/src/AlgExecStateSvc/AlgExecStateSvc.cpp
+++ b/GaudiCoreSvc/src/AlgExecStateSvc/AlgExecStateSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2020 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,11 +9,11 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 #include "AlgExecStateSvc.h"
-#include "GaudiKernel/ConcurrencyFlags.h"
-#include "GaudiKernel/EventContext.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IAlgManager.h"
-#include "GaudiKernel/ThreadLocalContext.h"
+#include <GaudiKernel/ConcurrencyFlags.h>
+#include <GaudiKernel/EventContext.h>
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IAlgManager.h>
+#include <GaudiKernel/ThreadLocalContext.h>
 
 DECLARE_COMPONENT( AlgExecStateSvc )
 
diff --git a/GaudiCoreSvc/src/AlgExecStateSvc/AlgExecStateSvc.h b/GaudiCoreSvc/src/AlgExecStateSvc/AlgExecStateSvc.h
index 22dd573c8d..7166068e0f 100644
--- a/GaudiCoreSvc/src/AlgExecStateSvc/AlgExecStateSvc.h
+++ b/GaudiCoreSvc/src/AlgExecStateSvc/AlgExecStateSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2020 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,9 +11,9 @@
 #ifndef GAUDICORESVC_ALGEXECSTATESVC_H
 #define GAUDICORESVC_ALGEXECSTATESVC_H 1
 
-#include "GaudiKernel/IAlgExecStateSvc.h"
-#include "GaudiKernel/IAlgorithm.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/IAlgExecStateSvc.h>
+#include <GaudiKernel/IAlgorithm.h>
+#include <GaudiKernel/Service.h>
 
 #include <mutex>
 #include <unordered_map>
diff --git a/GaudiCoreSvc/src/ApplicationMgr/AlgorithmManager.cpp b/GaudiCoreSvc/src/ApplicationMgr/AlgorithmManager.cpp
index a0f2b5eb48..de0762d1a4 100644
--- a/GaudiCoreSvc/src/ApplicationMgr/AlgorithmManager.cpp
+++ b/GaudiCoreSvc/src/ApplicationMgr/AlgorithmManager.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,13 +10,13 @@
 \***********************************************************************************/
 // Include files
 #include "AlgorithmManager.h"
-#include "GaudiKernel/IAlgExecStateSvc.h"
-#include "GaudiKernel/IAlgorithm.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/System.h"
-#include "GaudiKernel/TypeNameString.h"
 #include <Gaudi/Algorithm.h>
+#include <GaudiKernel/IAlgExecStateSvc.h>
+#include <GaudiKernel/IAlgorithm.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/System.h>
+#include <GaudiKernel/TypeNameString.h>
 #include <iostream>
 #ifndef _WIN32
 #  include <errno.h>
diff --git a/GaudiCoreSvc/src/ApplicationMgr/AlgorithmManager.h b/GaudiCoreSvc/src/ApplicationMgr/AlgorithmManager.h
index 428481ba04..a10b7354da 100644
--- a/GaudiCoreSvc/src/ApplicationMgr/AlgorithmManager.h
+++ b/GaudiCoreSvc/src/ApplicationMgr/AlgorithmManager.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,12 +12,12 @@
 #define GAUDISVC_ALGORITHMMANAGER_H
 
 // Include files
-#include "GaudiKernel/ComponentManager.h"
-#include "GaudiKernel/IAlgManager.h"
-#include "GaudiKernel/IAlgorithm.h"
-#include "GaudiKernel/IStateful.h"
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/ComponentManager.h>
+#include <GaudiKernel/IAlgManager.h>
+#include <GaudiKernel/IAlgorithm.h>
+#include <GaudiKernel/IStateful.h>
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/SmartIF.h>
 #include <map>
 #include <string>
 #include <unordered_map>
diff --git a/GaudiCoreSvc/src/ApplicationMgr/AppMgrRunable.cpp b/GaudiCoreSvc/src/ApplicationMgr/AppMgrRunable.cpp
index 0a473e5ec2..f23e3bf9c4 100644
--- a/GaudiCoreSvc/src/ApplicationMgr/AppMgrRunable.cpp
+++ b/GaudiCoreSvc/src/ApplicationMgr/AppMgrRunable.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,9 +10,9 @@
 \***********************************************************************************/
 #define GAUDISVC_APPMGRRUNABLE_CPP
 
-#include "GaudiKernel/IAppMgrUI.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/IAppMgrUI.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/SmartIF.h>
 
 #include "AppMgrRunable.h"
 
diff --git a/GaudiCoreSvc/src/ApplicationMgr/AppMgrRunable.h b/GaudiCoreSvc/src/ApplicationMgr/AppMgrRunable.h
index 7e2be02ecc..4d7586d794 100644
--- a/GaudiCoreSvc/src/ApplicationMgr/AppMgrRunable.h
+++ b/GaudiCoreSvc/src/ApplicationMgr/AppMgrRunable.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDISVC_APPMGRRUNABLE_H 1
 
 // Framework includes
-#include "GaudiKernel/IRunable.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/IRunable.h>
+#include <GaudiKernel/Service.h>
 
 // Forward declarations
 class IAppMgrUI;
diff --git a/GaudiCoreSvc/src/ApplicationMgr/DLLClassManager.cpp b/GaudiCoreSvc/src/ApplicationMgr/DLLClassManager.cpp
index e888e0ba56..34e79262e5 100644
--- a/GaudiCoreSvc/src/ApplicationMgr/DLLClassManager.cpp
+++ b/GaudiCoreSvc/src/ApplicationMgr/DLLClassManager.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,18 +10,18 @@
 \***********************************************************************************/
 // Include files
 #include "DLLClassManager.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IAlgManager.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/ISvcManager.h"
-#include "GaudiKernel/ModuleIncident.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IAlgManager.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/IService.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/ISvcManager.h>
+#include <GaudiKernel/ModuleIncident.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/System.h>
 
-#include "GaudiKernel/IAlgorithm.h"
+#include <GaudiKernel/IAlgorithm.h>
 
 #include <cassert>
 #include <iostream>
diff --git a/GaudiCoreSvc/src/ApplicationMgr/DLLClassManager.h b/GaudiCoreSvc/src/ApplicationMgr/DLLClassManager.h
index 81830fbefb..2bb9c9c528 100644
--- a/GaudiCoreSvc/src/ApplicationMgr/DLLClassManager.h
+++ b/GaudiCoreSvc/src/ApplicationMgr/DLLClassManager.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,9 +12,9 @@
 #define GAUDI_DLLCLASSMANAGER_H 1
 
 // Include files
-#include "GaudiKernel/IClassManager.h"
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/IClassManager.h>
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/SmartIF.h>
 #include <list>
 #include <map>
 #include <string>
diff --git a/GaudiCoreSvc/src/ApplicationMgr/EventLoopMgr.cpp b/GaudiCoreSvc/src/ApplicationMgr/EventLoopMgr.cpp
index 25c576bc8b..74b7fbdf24 100644
--- a/GaudiCoreSvc/src/ApplicationMgr/EventLoopMgr.cpp
+++ b/GaudiCoreSvc/src/ApplicationMgr/EventLoopMgr.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -268,7 +268,7 @@ StatusCode EventLoopMgr::executeEvent( EventContext&& ctx ) {
 // implementation of IAppMgrUI::nextEvent
 //--------------------------------------------------------------------------------------------
 // External libraries
-#include "GaudiKernel/Memory.h"
+#include <GaudiKernel/Memory.h>
 StatusCode EventLoopMgr::nextEvent( int maxevt ) {
 
   // DP Monitoring
diff --git a/GaudiCoreSvc/src/ApplicationMgr/MinimalEventLoopMgr.cpp b/GaudiCoreSvc/src/ApplicationMgr/MinimalEventLoopMgr.cpp
index 953cc798fd..5947c214dd 100644
--- a/GaudiCoreSvc/src/ApplicationMgr/MinimalEventLoopMgr.cpp
+++ b/GaudiCoreSvc/src/ApplicationMgr/MinimalEventLoopMgr.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/MinimalEventLoopMgr.h"
+#include <GaudiKernel/MinimalEventLoopMgr.h>
 
 // Instantiation of a static factory class used by clients to create instances of this service
 DECLARE_COMPONENT( MinimalEventLoopMgr )
diff --git a/GaudiCoreSvc/src/ApplicationMgr/ServiceManager.cpp b/GaudiCoreSvc/src/ApplicationMgr/ServiceManager.cpp
index 3ac00b5a5d..948c286b77 100644
--- a/GaudiCoreSvc/src/ApplicationMgr/ServiceManager.cpp
+++ b/GaudiCoreSvc/src/ApplicationMgr/ServiceManager.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,17 +11,17 @@
 
 // Include files
 #include "ServiceManager.h"
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/Incident.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/ObjectFactory.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/SmartIF.h"
-#include "GaudiKernel/System.h"
-#include "GaudiKernel/TypeNameString.h"
-#include "GaudiKernel/reverse.h"
+#include <GaudiKernel/IIncidentListener.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/IService.h>
+#include <GaudiKernel/Incident.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/ObjectFactory.h>
+#include <GaudiKernel/Service.h>
+#include <GaudiKernel/SmartIF.h>
+#include <GaudiKernel/System.h>
+#include <GaudiKernel/TypeNameString.h>
+#include <GaudiKernel/reverse.h>
 
 #include <algorithm>
 #include <cassert>
diff --git a/GaudiCoreSvc/src/ApplicationMgr/ServiceManager.h b/GaudiCoreSvc/src/ApplicationMgr/ServiceManager.h
index e489b5d7d3..abe7f23f23 100644
--- a/GaudiCoreSvc/src/ApplicationMgr/ServiceManager.h
+++ b/GaudiCoreSvc/src/ApplicationMgr/ServiceManager.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,13 +12,13 @@
 #define GAUDISVC_ServiceManager_H
 
 // Include files
-#include "GaudiKernel/ComponentManager.h"
-#include "GaudiKernel/IStateful.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/ISvcManager.h"
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/Map.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/ComponentManager.h>
+#include <GaudiKernel/IStateful.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/ISvcManager.h>
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/Map.h>
+#include <GaudiKernel/SmartIF.h>
 
 #include <algorithm>
 #include <list>
diff --git a/GaudiCoreSvc/src/ApplicationMgr/ToolSvc.cpp b/GaudiCoreSvc/src/ApplicationMgr/ToolSvc.cpp
index 5a8f8e2a5e..0e4bb46140 100644
--- a/GaudiCoreSvc/src/ApplicationMgr/ToolSvc.cpp
+++ b/GaudiCoreSvc/src/ApplicationMgr/ToolSvc.cpp
@@ -8,18 +8,18 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/AlgTool.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IAlgorithm.h"
-#include "GaudiKernel/IHistorySvc.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Service.h"
-#include "boost/algorithm/string/erase.hpp"
-#include "boost/algorithm/string/predicate.hpp"
-#include "boost/circular_buffer.hpp"
+#include <GaudiKernel/AlgTool.h>
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IAlgorithm.h>
+#include <GaudiKernel/IHistorySvc.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/IToolSvc.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/Service.h>
 #include <algorithm>
+#include <boost/algorithm/string/erase.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/circular_buffer.hpp>
 #include <cassert>
 #include <functional>
 #include <map>
diff --git a/GaudiCoreSvc/src/EventSelector/DataStreamToolFactory.cpp b/GaudiCoreSvc/src/EventSelector/DataStreamToolFactory.cpp
index ca22c3da23..6aee471f4c 100644
--- a/GaudiCoreSvc/src/EventSelector/DataStreamToolFactory.cpp
+++ b/GaudiCoreSvc/src/EventSelector/DataStreamToolFactory.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,5 +8,5 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/DataStreamTool.h"
+#include <GaudiKernel/DataStreamTool.h>
 DECLARE_COMPONENT( DataStreamTool )
diff --git a/GaudiCoreSvc/src/EventSelector/EventCollectionSelector.cpp b/GaudiCoreSvc/src/EventSelector/EventCollectionSelector.cpp
index ed9dc173a9..94fc494346 100644
--- a/GaudiCoreSvc/src/EventSelector/EventCollectionSelector.cpp
+++ b/GaudiCoreSvc/src/EventSelector/EventCollectionSelector.cpp
@@ -9,17 +9,17 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Include files
-#include "GaudiKernel/EventSelectorDataStream.h"
-#include "GaudiKernel/GenericAddress.h"
-#include "GaudiKernel/IAddressCreator.h"
-#include "GaudiKernel/IDataSourceMgr.h"
-#include "GaudiKernel/INTupleSvc.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/ISelectStatement.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/NTuple.h"
-#include "GaudiKernel/ObjectFactory.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/EventSelectorDataStream.h>
+#include <GaudiKernel/GenericAddress.h>
+#include <GaudiKernel/IAddressCreator.h>
+#include <GaudiKernel/IDataSourceMgr.h>
+#include <GaudiKernel/INTupleSvc.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/ISelectStatement.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/NTuple.h>
+#include <GaudiKernel/ObjectFactory.h>
+#include <GaudiKernel/SmartIF.h>
 
 #include "EventCollectionSelector.h"
 
diff --git a/GaudiCoreSvc/src/EventSelector/EventCollectionSelector.h b/GaudiCoreSvc/src/EventSelector/EventCollectionSelector.h
index 56d289d308..2cbe0cbbdf 100644
--- a/GaudiCoreSvc/src/EventSelector/EventCollectionSelector.h
+++ b/GaudiCoreSvc/src/EventSelector/EventCollectionSelector.h
@@ -22,10 +22,10 @@
 #define GAUDISVC_EventCollectionSelector_EventCollectionSelector_H 1
 
 // Include files
-#include "GaudiKernel/GenericAddress.h"
-#include "GaudiKernel/IEvtSelector.h"
-#include "GaudiKernel/NTuple.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/GenericAddress.h>
+#include <GaudiKernel/IEvtSelector.h>
+#include <GaudiKernel/NTuple.h>
+#include <GaudiKernel/Service.h>
 
 // Forward declarations
 class INTuple;
diff --git a/GaudiCoreSvc/src/EventSelector/EventIterator.h b/GaudiCoreSvc/src/EventSelector/EventIterator.h
index ebc9e5bee7..6c31c52499 100644
--- a/GaudiCoreSvc/src/EventSelector/EventIterator.h
+++ b/GaudiCoreSvc/src/EventSelector/EventIterator.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -22,8 +22,8 @@
 #define GAUDISVC_EVENTSELECTOR_EVENTITERATOR_H 1
 
 // Include files
-#include "GaudiKernel/IDataStreamTool.h"
-#include "GaudiKernel/IEvtSelector.h"
+#include <GaudiKernel/IDataStreamTool.h>
+#include <GaudiKernel/IEvtSelector.h>
 
 /** Definition of class EventIterator
 
diff --git a/GaudiCoreSvc/src/EventSelector/EventSelector.cpp b/GaudiCoreSvc/src/EventSelector/EventSelector.cpp
index 021cc915bd..3ba23a5191 100644
--- a/GaudiCoreSvc/src/EventSelector/EventSelector.cpp
+++ b/GaudiCoreSvc/src/EventSelector/EventSelector.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,17 +9,17 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Include files
-#include "GaudiKernel/EventSelectorDataStream.h"
-#include "GaudiKernel/IAddressCreator.h"
-#include "GaudiKernel/IDataStreamTool.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/ISvcManager.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/Incident.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/PropertyHolder.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/EventSelectorDataStream.h>
+#include <GaudiKernel/IAddressCreator.h>
+#include <GaudiKernel/IDataStreamTool.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/ISvcManager.h>
+#include <GaudiKernel/IToolSvc.h>
+#include <GaudiKernel/Incident.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/PropertyHolder.h>
+#include <GaudiKernel/SmartIF.h>
 
 #include "EventIterator.h"
 #include "EventSelector.h"
diff --git a/GaudiCoreSvc/src/EventSelector/EventSelector.h b/GaudiCoreSvc/src/EventSelector/EventSelector.h
index 2a36c1ad10..9b04839466 100644
--- a/GaudiCoreSvc/src/EventSelector/EventSelector.h
+++ b/GaudiCoreSvc/src/EventSelector/EventSelector.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -29,8 +29,8 @@
 #define GAUDISVC_EVENTSELECTOR_EVENTSELECTOR_H 1
 
 // Include files
-#include "GaudiKernel/IEvtSelector.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/IEvtSelector.h>
+#include <GaudiKernel/Service.h>
 
 // STL include files
 #include <vector>
diff --git a/GaudiCoreSvc/src/IncidentSvc/DODBasicMapper.cpp b/GaudiCoreSvc/src/IncidentSvc/DODBasicMapper.cpp
index 9c51cbfe8d..301ba76b63 100644
--- a/GaudiCoreSvc/src/IncidentSvc/DODBasicMapper.cpp
+++ b/GaudiCoreSvc/src/IncidentSvc/DODBasicMapper.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,8 +10,8 @@
 \***********************************************************************************/
 // Include files
 
-#include "GaudiKernel/HashMap.h"
 #include <Gaudi/Parsers/CommonParsers.h>
+#include <GaudiKernel/HashMap.h>
 // Local implementation of parsers from HashMap
 namespace Gaudi {
   namespace Parsers {
diff --git a/GaudiCoreSvc/src/IncidentSvc/DODBasicMapper.h b/GaudiCoreSvc/src/IncidentSvc/DODBasicMapper.h
index 9299473be5..5349017916 100644
--- a/GaudiCoreSvc/src/IncidentSvc/DODBasicMapper.h
+++ b/GaudiCoreSvc/src/IncidentSvc/DODBasicMapper.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,12 +12,12 @@
 #define INCIDENTSVC_DODBASICMAPPER_H 1
 // Include files
 // from Gaudi
-#include "GaudiKernel/AlgTool.h"
-#include "GaudiKernel/HashMap.h"
+#include <GaudiKernel/AlgTool.h>
+#include <GaudiKernel/HashMap.h>
 
 // Implemented interfaces
-#include "GaudiKernel/IDODAlgMapper.h"
-#include "GaudiKernel/IDODNodeMapper.h"
+#include <GaudiKernel/IDODAlgMapper.h>
+#include <GaudiKernel/IDODNodeMapper.h>
 
 /** @class DODBasicMapper DODBasicMapper.h IncidentSvc/DODBasicMapper.h
  *
diff --git a/GaudiCoreSvc/src/IncidentSvc/DataOnDemandSvc.cpp b/GaudiCoreSvc/src/IncidentSvc/DataOnDemandSvc.cpp
index 59e3e07468..c7c6eb8f58 100644
--- a/GaudiCoreSvc/src/IncidentSvc/DataOnDemandSvc.cpp
+++ b/GaudiCoreSvc/src/IncidentSvc/DataOnDemandSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2020 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,21 +9,21 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 #include "DataOnDemandSvc.h"
-#include "GaudiKernel/AttribStringParser.h"
-#include "GaudiKernel/Chrono.h"
-#include "GaudiKernel/DataIncident.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IAlgManager.h"
-#include "GaudiKernel/IAlgorithm.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/LockedChrono.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/ThreadLocalContext.h"
-#include "GaudiKernel/ToStream.h"
-#include "GaudiKernel/TypeNameString.h"
+#include <GaudiKernel/AttribStringParser.h>
+#include <GaudiKernel/Chrono.h>
+#include <GaudiKernel/DataIncident.h>
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IAlgManager.h>
+#include <GaudiKernel/IAlgorithm.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/IToolSvc.h>
+#include <GaudiKernel/LockedChrono.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/ThreadLocalContext.h>
+#include <GaudiKernel/ToStream.h>
+#include <GaudiKernel/TypeNameString.h>
 #include <fmt/format.h>
 #include <map>
 #include <math.h>
diff --git a/GaudiCoreSvc/src/IncidentSvc/DataOnDemandSvc.h b/GaudiCoreSvc/src/IncidentSvc/DataOnDemandSvc.h
index 45010a4281..59fd6db9d7 100644
--- a/GaudiCoreSvc/src/IncidentSvc/DataOnDemandSvc.h
+++ b/GaudiCoreSvc/src/IncidentSvc/DataOnDemandSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,17 +20,17 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/ChronoEntity.h"
-#include "GaudiKernel/IDODAlgMapper.h"
-#include "GaudiKernel/IDODNodeMapper.h"
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/StatEntity.h"
-#include "GaudiKernel/StringKey.h"
+#include <GaudiKernel/ChronoEntity.h>
+#include <GaudiKernel/IDODAlgMapper.h>
+#include <GaudiKernel/IDODNodeMapper.h>
+#include <GaudiKernel/IIncidentListener.h>
+#include <GaudiKernel/Service.h>
+#include <GaudiKernel/StatEntity.h>
+#include <GaudiKernel/StringKey.h>
 // ============================================================================
 // ROOT TClass
 // ============================================================================
-#include "TClass.h"
+#include <TClass.h>
 // ============================================================================
 // Forward declarations
 // ============================================================================
diff --git a/GaudiCoreSvc/src/IncidentSvc/IncidentProcAlg.cpp b/GaudiCoreSvc/src/IncidentSvc/IncidentProcAlg.cpp
index 8d9a009b6f..aaa9d7b616 100644
--- a/GaudiCoreSvc/src/IncidentSvc/IncidentProcAlg.cpp
+++ b/GaudiCoreSvc/src/IncidentSvc/IncidentProcAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,10 +9,10 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 #include "IncidentProcAlg.h"
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/Incident.h"
-#include "GaudiKernel/ThreadLocalContext.h"
+#include <GaudiKernel/IIncidentListener.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/Incident.h>
+#include <GaudiKernel/ThreadLocalContext.h>
 DECLARE_COMPONENT( IncidentProcAlg )
 
 namespace {
diff --git a/GaudiCoreSvc/src/IncidentSvc/IncidentProcAlg.h b/GaudiCoreSvc/src/IncidentSvc/IncidentProcAlg.h
index 54a5323f46..0249942ab0 100644
--- a/GaudiCoreSvc/src/IncidentSvc/IncidentProcAlg.h
+++ b/GaudiCoreSvc/src/IncidentSvc/IncidentProcAlg.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2020 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,10 +11,10 @@
 #ifndef __INCIDENT_PROC_ALG_H
 #define __INCIDENT_PROC_ALG_H
 
-#include "Gaudi/Algorithm.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/MsgStream.h"
+#include <Gaudi/Algorithm.h>
 #include <Gaudi/Property.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/MsgStream.h>
 
 class GAUDI_API IncidentProcAlg : public Gaudi::Algorithm {
 public:
diff --git a/GaudiCoreSvc/src/IncidentSvc/IncidentSvc.cpp b/GaudiCoreSvc/src/IncidentSvc/IncidentSvc.cpp
index 7ea43ab558..3a69f8e999 100644
--- a/GaudiCoreSvc/src/IncidentSvc/IncidentSvc.cpp
+++ b/GaudiCoreSvc/src/IncidentSvc/IncidentSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -18,14 +18,14 @@
 // ============================================================================
 // Include Files
 // ============================================================================
-#include "GaudiKernel/AppReturnCode.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/Incident.h"
-#include "GaudiKernel/LockedChrono.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/AppReturnCode.h>
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IIncidentListener.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/Incident.h>
+#include <GaudiKernel/LockedChrono.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/SmartIF.h>
 #include <functional>
 // ============================================================================
 // Local
diff --git a/GaudiCoreSvc/src/IncidentSvc/IncidentSvc.h b/GaudiCoreSvc/src/IncidentSvc/IncidentSvc.h
index 8e7b82cf2f..32f68caf61 100644
--- a/GaudiCoreSvc/src/IncidentSvc/IncidentSvc.h
+++ b/GaudiCoreSvc/src/IncidentSvc/IncidentSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -21,16 +21,16 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/ChronoEntity.h"
-#include "GaudiKernel/HashMap.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/StringKey.h"
+#include <GaudiKernel/ChronoEntity.h>
+#include <GaudiKernel/HashMap.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/Service.h>
+#include <GaudiKernel/StringKey.h>
 // ============================================================================
 // TBB
 // ============================================================================
-#include "tbb/concurrent_queue.h"
-#include "tbb/concurrent_unordered_map.h"
+#include <tbb/concurrent_queue.h>
+#include <tbb/concurrent_unordered_map.h>
 // ============================================================================
 /**
  * @class IncidentSvc
diff --git a/GaudiCoreSvc/src/JobOptionsSvc/Analyzer.cpp b/GaudiCoreSvc/src/JobOptionsSvc/Analyzer.cpp
index f10b20abd0..29906c4c9b 100644
--- a/GaudiCoreSvc/src/JobOptionsSvc/Analyzer.cpp
+++ b/GaudiCoreSvc/src/JobOptionsSvc/Analyzer.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2020 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,7 +10,6 @@
 \***********************************************************************************/
 #include "Analyzer.h"
 #include "Catalog.h"
-#include "GaudiKernel/Environment.h"
 #include "IncludedFiles.h"
 #include "Messages.h"
 #include "Node.h"
@@ -19,6 +18,7 @@
 #include "PropertyName.h"
 #include "PropertyValue.h"
 #include "Units.h"
+#include <GaudiKernel/Environment.h>
 #include <fmt/format.h>
 #include <iostream>
 #include <memory>
diff --git a/GaudiCoreSvc/src/JobOptionsSvc/Messages.h b/GaudiCoreSvc/src/JobOptionsSvc/Messages.h
index 73ca2717f9..966f3b7815 100644
--- a/GaudiCoreSvc/src/JobOptionsSvc/Messages.h
+++ b/GaudiCoreSvc/src/JobOptionsSvc/Messages.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,8 +23,8 @@
 // ============================================================================
 // Gaudi:
 // ============================================================================
-#include "GaudiKernel/MsgStream.h"
 #include "Position.h"
+#include <GaudiKernel/MsgStream.h>
 // ============================================================================
 namespace Gaudi {
   namespace Parsers {
diff --git a/GaudiCoreSvc/src/JobOptionsSvc/Parser.cpp b/GaudiCoreSvc/src/JobOptionsSvc/Parser.cpp
index 24c920f3f9..1bd11afad5 100644
--- a/GaudiCoreSvc/src/JobOptionsSvc/Parser.cpp
+++ b/GaudiCoreSvc/src/JobOptionsSvc/Parser.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2023 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,13 +9,13 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 #include "Parser.h"
-#include "GaudiKernel/PathResolver.h"
 #include "Grammar.h"
 #include "IncludedFiles.h"
 #include "Iterator.h"
 #include "Messages.h"
 #include "Node.h"
 #include "Utils.h"
+#include <GaudiKernel/PathResolver.h>
 #include <boost/filesystem.hpp>
 #include <fmt/format.h>
 #include <fstream>
diff --git a/GaudiCoreSvc/src/JobOptionsSvc/PropertyValue.cpp b/GaudiCoreSvc/src/JobOptionsSvc/PropertyValue.cpp
index 179f1b5338..8c111359bb 100644
--- a/GaudiCoreSvc/src/JobOptionsSvc/PropertyValue.cpp
+++ b/GaudiCoreSvc/src/JobOptionsSvc/PropertyValue.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,15 +12,15 @@
 // Include files
 // ============================================================================
 #include "PropertyValue.h"
-#include "GaudiKernel/compose.h"
+#include <GaudiKernel/compose.h>
 // ============================================================================
 // STD & STL:
 // ============================================================================
 // ============================================================================
 // Boost:
 // ============================================================================
-#include "boost/algorithm/string/join.hpp"
-#include "boost/format.hpp"
+#include <boost/algorithm/string/join.hpp>
+#include <boost/format.hpp>
 // ============================================================================
 namespace gp = Gaudi::Parsers;
 // ============================================================================
diff --git a/GaudiCoreSvc/src/JobOptionsSvc/PythonConfig.cpp b/GaudiCoreSvc/src/JobOptionsSvc/PythonConfig.cpp
index 77bbfe636c..e84ef8492f 100644
--- a/GaudiCoreSvc/src/JobOptionsSvc/PythonConfig.cpp
+++ b/GaudiCoreSvc/src/JobOptionsSvc/PythonConfig.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -13,7 +13,7 @@
 #include <iostream>
 
 // boost includes
-#include "boost/python.hpp"
+#include <boost/python.hpp>
 using namespace boost::python;
 
 //-----------------------------------------------------------------------------
diff --git a/GaudiCoreSvc/src/JobOptionsSvc/PythonConfig.h b/GaudiCoreSvc/src/JobOptionsSvc/PythonConfig.h
index 0c24807ddf..bec687c0a9 100644
--- a/GaudiCoreSvc/src/JobOptionsSvc/PythonConfig.h
+++ b/GaudiCoreSvc/src/JobOptionsSvc/PythonConfig.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,9 +10,9 @@
 \***********************************************************************************/
 #ifndef GAUDISVC_PYTHONCONFIG_H
 #define GAUDISVC_PYTHONCONFIG_H
-#include "Gaudi/Interfaces/IOptionsSvc.h"
+#include <Gaudi/Interfaces/IOptionsSvc.h>
 
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/StatusCode.h>
 
 #include <string>
 
diff --git a/GaudiCoreSvc/src/JobOptionsSvc/Utils.cpp b/GaudiCoreSvc/src/JobOptionsSvc/Utils.cpp
index 7cc4b8c41a..594a1c6aa5 100644
--- a/GaudiCoreSvc/src/JobOptionsSvc/Utils.cpp
+++ b/GaudiCoreSvc/src/JobOptionsSvc/Utils.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,7 +20,7 @@
 // ===========================================================================
 // Gaudi
 // ===========================================================================
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/System.h>
 // ===========================================================================
 
 namespace gpu = Gaudi::Parsers::Utils;
diff --git a/GaudiCoreSvc/src/MessageSvc/InertMessageSvc.h b/GaudiCoreSvc/src/MessageSvc/InertMessageSvc.h
index 471ce4412b..1054a3ff84 100644
--- a/GaudiCoreSvc/src/MessageSvc/InertMessageSvc.h
+++ b/GaudiCoreSvc/src/MessageSvc/InertMessageSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -18,7 +18,7 @@
 #include <memory>
 #include <thread>
 // External libs
-#include "tbb/concurrent_queue.h"
+#include <tbb/concurrent_queue.h>
 
 /** @class InertMessageSvc InertMessageSvc.h MessageSvc/InertMessageSvc.h
  *
diff --git a/GaudiCoreSvc/src/MessageSvc/MessageSvc.cpp b/GaudiCoreSvc/src/MessageSvc/MessageSvc.cpp
index d4e872276f..be9b65908e 100644
--- a/GaudiCoreSvc/src/MessageSvc/MessageSvc.cpp
+++ b/GaudiCoreSvc/src/MessageSvc/MessageSvc.cpp
@@ -15,11 +15,11 @@
 #endif
 
 #include "MessageSvc.h"
-#include "GaudiKernel/IAppMgrUI.h"
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/Message.h"
-#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/IAppMgrUI.h>
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/Message.h>
+#include <GaudiKernel/StatusCode.h>
+#include <GaudiKernel/System.h>
 
 #include <fstream>
 #include <iostream>
diff --git a/GaudiCoreSvc/src/MessageSvc/MessageSvc.h b/GaudiCoreSvc/src/MessageSvc/MessageSvc.h
index 1d302a2b46..1682a4e5ec 100644
--- a/GaudiCoreSvc/src/MessageSvc/MessageSvc.h
+++ b/GaudiCoreSvc/src/MessageSvc/MessageSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,11 +20,11 @@
 #include <string>
 #include <vector>
 
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/Message.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/StatusCode.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/Message.h>
+#include <GaudiKernel/Service.h>
+#include <GaudiKernel/StatusCode.h>
 
 // Forward declarations
 class ISvcLocator;
diff --git a/GaudiCoreSvc/src/MessageSvc/MessageSvcSink.cpp b/GaudiCoreSvc/src/MessageSvc/MessageSvcSink.cpp
index 12fb101dcc..5ecdb0e7a0 100644
--- a/GaudiCoreSvc/src/MessageSvc/MessageSvcSink.cpp
+++ b/GaudiCoreSvc/src/MessageSvc/MessageSvcSink.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,9 +9,9 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 
-#include "Gaudi/BaseSink.h"
-#include "Gaudi/MonitoringHub.h"
-#include "GaudiKernel/MsgStream.h"
+#include <Gaudi/BaseSink.h>
+#include <Gaudi/MonitoringHub.h>
+#include <GaudiKernel/MsgStream.h>
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/GaudiHive/src/AlgTask.h b/GaudiHive/src/AlgTask.h
index 1031488a2f..b330641a9f 100644
--- a/GaudiHive/src/AlgTask.h
+++ b/GaudiHive/src/AlgTask.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,15 +15,15 @@
 #include "RetCodeGuard.h"
 
 // Framework include files
-#include "GaudiKernel/EventContext.h"
-#include "GaudiKernel/IAlgExecStateSvc.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/IThreadPoolSvc.h"
-#include "GaudiKernel/SmartIF.h"
-#include "GaudiKernel/ThreadLocalContext.h"
 #include <Gaudi/Algorithm.h>
+#include <GaudiKernel/EventContext.h>
+#include <GaudiKernel/IAlgExecStateSvc.h>
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/IProperty.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/IThreadPoolSvc.h>
+#include <GaudiKernel/SmartIF.h>
+#include <GaudiKernel/ThreadLocalContext.h>
 
 #include <functional>
 
diff --git a/GaudiHive/src/AlgsExecutionStates.h b/GaudiHive/src/AlgsExecutionStates.h
index 2273bcb8e0..639169087c 100644
--- a/GaudiHive/src/AlgsExecutionStates.h
+++ b/GaudiHive/src/AlgsExecutionStates.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDIHIVE_ALGSEXECUTIONSTATES_H
 
 // Framework include files
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/Service.h>
 
 // C++ include files
 #include <algorithm>
@@ -22,7 +22,7 @@
 #include <vector>
 
 // Boost include files
-#include "boost/container/flat_set.hpp"
+#include <boost/container/flat_set.hpp>
 
 //---------------------------------------------------------------------------
 
diff --git a/GaudiHive/src/AvalancheSchedulerSvc.cpp b/GaudiHive/src/AvalancheSchedulerSvc.cpp
index 1a3daee3fd..cc361aa7a2 100644
--- a/GaudiHive/src/AvalancheSchedulerSvc.cpp
+++ b/GaudiHive/src/AvalancheSchedulerSvc.cpp
@@ -14,13 +14,13 @@
 #include "ThreadPoolSvc.h"
 
 // Framework includes
-#include "GaudiKernel/ConcurrencyFlags.h"
-#include "GaudiKernel/DataHandleHolderVisitor.h"
-#include "GaudiKernel/IAlgorithm.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/ThreadLocalContext.h"
 #include <Gaudi/Algorithm.h> // can be removed ASA dynamic casts to Algorithm are removed
+#include <GaudiKernel/ConcurrencyFlags.h>
+#include <GaudiKernel/DataHandleHolderVisitor.h>
+#include <GaudiKernel/IAlgorithm.h>
+#include <GaudiKernel/IDataManagerSvc.h>
 #include <GaudiKernel/SerializeSTL.h>
+#include <GaudiKernel/ThreadLocalContext.h>
 
 // C++
 #include <algorithm>
@@ -34,9 +34,9 @@
 #include <unordered_set>
 
 // External libs
-#include "boost/algorithm/string.hpp"
-#include "boost/thread.hpp"
-#include "boost/tokenizer.hpp"
+#include <boost/algorithm/string.hpp>
+#include <boost/thread.hpp>
+#include <boost/tokenizer.hpp>
 
 // Instantiation of a static factory class used by clients to create instances of this service
 DECLARE_COMPONENT( AvalancheSchedulerSvc )
diff --git a/GaudiHive/src/AvalancheSchedulerSvc.h b/GaudiHive/src/AvalancheSchedulerSvc.h
index 1395a2c734..7162d60431 100644
--- a/GaudiHive/src/AvalancheSchedulerSvc.h
+++ b/GaudiHive/src/AvalancheSchedulerSvc.h
@@ -18,14 +18,14 @@
 #include "PrecedenceSvc.h"
 
 // Framework include files
-#include "GaudiKernel/IAlgExecStateSvc.h"
-#include "GaudiKernel/IAlgResourcePool.h"
-#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/IHiveWhiteBoard.h"
-#include "GaudiKernel/IRunable.h"
-#include "GaudiKernel/IScheduler.h"
-#include "GaudiKernel/IThreadPoolSvc.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/IAlgExecStateSvc.h>
+#include <GaudiKernel/IAlgResourcePool.h>
+#include <GaudiKernel/ICondSvc.h>
+#include <GaudiKernel/IHiveWhiteBoard.h>
+#include <GaudiKernel/IRunable.h>
+#include <GaudiKernel/IScheduler.h>
+#include <GaudiKernel/IThreadPoolSvc.h>
+#include <GaudiKernel/Service.h>
 
 // C++ include files
 #include <functional>
@@ -38,9 +38,9 @@
 #include <vector>
 
 // External libs
-#include "tbb/concurrent_priority_queue.h"
-#include "tbb/concurrent_queue.h"
-#include "tbb/task_arena.h"
+#include <tbb/concurrent_priority_queue.h>
+#include <tbb/concurrent_queue.h>
+#include <tbb/task_arena.h>
 
 class IAlgorithm;
 
diff --git a/GaudiHive/src/ContextEventCounter.h b/GaudiHive/src/ContextEventCounter.h
index 4590356585..de60ef30f4 100644
--- a/GaudiHive/src/ContextEventCounter.h
+++ b/GaudiHive/src/ContextEventCounter.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define SRC_CONTEXTEVENTCOUNTER_H 1
 // Include files
 // from Gaudi
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/ContextSpecificPtr.h"
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiKernel/ContextSpecificPtr.h>
 
 /** @class ContextEventCounter ContextEventCounter.h src/ContextEventCounter.h
  *
diff --git a/GaudiHive/src/EventSlot.h b/GaudiHive/src/EventSlot.h
index 9cb15e08bd..d0a92d7264 100644
--- a/GaudiHive/src/EventSlot.h
+++ b/GaudiHive/src/EventSlot.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -13,7 +13,7 @@
 
 // Framework includes
 #include "AlgsExecutionStates.h"
-#include "GaudiKernel/EventContext.h"
+#include <GaudiKernel/EventContext.h>
 
 #include <string>
 #include <tuple>
diff --git a/GaudiHive/src/FiberManager.h b/GaudiHive/src/FiberManager.h
index 8072797768..405411df18 100644
--- a/GaudiHive/src/FiberManager.h
+++ b/GaudiHive/src/FiberManager.h
@@ -1,6 +1,6 @@
 
 /***********************************************************************************\
-* (c) Copyright 1998-2023 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,12 +11,12 @@
 \***********************************************************************************/
 #pragma once
 
-#include "boost/fiber/algo/shared_work.hpp"
-#include "boost/fiber/condition_variable.hpp"
-#include "boost/fiber/fiber.hpp"
-#include "boost/fiber/mutex.hpp"
+#include <boost/fiber/algo/shared_work.hpp>
+#include <boost/fiber/condition_variable.hpp>
+#include <boost/fiber/fiber.hpp>
+#include <boost/fiber/mutex.hpp>
 
-#include "fmt/format.h"
+#include <fmt/format.h>
 
 /** @class FiberManager FiberManager.h
  *
diff --git a/GaudiHive/src/GPUCruncher.cu b/GaudiHive/src/GPUCruncher.cu
index 3dd4dfbe8b..546685f99a 100644
--- a/GaudiHive/src/GPUCruncher.cu
+++ b/GaudiHive/src/GPUCruncher.cu
@@ -14,7 +14,7 @@
 #include <cstdio>
 #include <memory_resource>
 
-#include "cub/cub.cuh"
+#include <cub/cub.cuh>
 __global__ void makeGrid( const double* input, double* workspace ) {
   double at                                        = threadIdx.x * input[blockIdx.x];
   workspace[blockIdx.x * blockDim.x + threadIdx.x] = at;
diff --git a/GaudiHive/src/HistogramAgent.h b/GaudiHive/src/HistogramAgent.h
index 37772566ae..a761a188f3 100644
--- a/GaudiHive/src/HistogramAgent.h
+++ b/GaudiHive/src/HistogramAgent.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,11 +11,11 @@
 #ifndef GAUDIKERNEL_HISTOGRAMAGENT_H
 #define GAUDIKERNEL_HISTOGRAMAGENT_H
 
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IDataSelector.h"
-#include "GaudiKernel/IDataStoreAgent.h"
-#include "GaudiKernel/IRegistry.h"
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IDataSelector.h>
+#include <GaudiKernel/IDataStoreAgent.h>
+#include <GaudiKernel/IRegistry.h>
 
 /** @class HistogramAgent HistogramAgent.h GaudiKernel/HistogramAgent.h
 
diff --git a/GaudiHive/src/HiveDataBroker.cpp b/GaudiHive/src/HiveDataBroker.cpp
index d2fea492ad..26967e0b52 100644
--- a/GaudiHive/src/HiveDataBroker.cpp
+++ b/GaudiHive/src/HiveDataBroker.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,25 +8,25 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IAlgManager.h"
-#include "GaudiKernel/IDataBroker.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/System.h"
-#include "boost/lexical_cast.hpp"
-#include "boost/tokenizer.hpp"
 #include <Gaudi/Algorithm.h>
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IAlgManager.h>
+#include <GaudiKernel/IDataBroker.h>
+#include <GaudiKernel/Service.h>
+#include <GaudiKernel/System.h>
 #include <algorithm>
+#include <boost/lexical_cast.hpp>
+#include <boost/tokenizer.hpp>
 #include <iomanip>
 #include <stdexcept>
 #ifdef __cpp_lib_ranges
 #  include <ranges>
 namespace ranges = std::ranges;
 #else
-#  include "range/v3/algorithm/for_each.hpp"
-#  include "range/v3/view/filter.hpp"
-#  include "range/v3/view/reverse.hpp"
-#  include "range/v3/view/transform.hpp"
+#  include <range/v3/algorithm/for_each.hpp>
+#  include <range/v3/view/filter.hpp>
+#  include <range/v3/view/reverse.hpp>
+#  include <range/v3/view/transform.hpp>
 // upstream has renamed namespace ranges::view ranges::views
 #  if RANGE_V3_VERSION < 900
 namespace ranges::views {
diff --git a/GaudiHive/src/HiveNumbers.cpp b/GaudiHive/src/HiveNumbers.cpp
index 0407c4ff66..906bd1edd0 100644
--- a/GaudiHive/src/HiveNumbers.cpp
+++ b/GaudiHive/src/HiveNumbers.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,10 +10,10 @@
 \***********************************************************************************/
 // Framework include files
 #include "HiveNumbers.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IRndmGen.h"
-#include "GaudiKernel/IRndmGenSvc.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IRndmGen.h>
+#include <GaudiKernel/IRndmGenSvc.h>
+#include <GaudiKernel/SmartIF.h>
 
 namespace {
   constexpr double HIVENUMBERS_BUFFER_SIZE = 1000;
diff --git a/GaudiHive/src/HiveNumbers.h b/GaudiHive/src/HiveNumbers.h
index d10a1dbaa3..f2e22007b3 100644
--- a/GaudiHive/src/HiveNumbers.h
+++ b/GaudiHive/src/HiveNumbers.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,14 +12,14 @@
 #define GAUDIHIVE_HIVENUMBERS_H
 
 // Framework include files
-#include "GaudiKernel/IRndmGen.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/IRndmGen.h>
+#include <GaudiKernel/SmartIF.h>
 
 // STL includes
 #include <memory>
 #include <vector>
 
-#include "tbb/spin_rw_mutex.h"
+#include <tbb/spin_rw_mutex.h>
 
 // Forward declarations
 class IRndmGen;
diff --git a/GaudiHive/src/HiveSlimEventLoopMgr.cpp b/GaudiHive/src/HiveSlimEventLoopMgr.cpp
index 2e14a5977e..1e2386e3d8 100644
--- a/GaudiHive/src/HiveSlimEventLoopMgr.cpp
+++ b/GaudiHive/src/HiveSlimEventLoopMgr.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,15 +10,15 @@
 \***********************************************************************************/
 // Local includes
 #include "HiveSlimEventLoopMgr.h"
-#include "GaudiKernel/StatusCode.h"
 #include "HistogramAgent.h"
+#include <GaudiKernel/StatusCode.h>
 
 // Framework includes
-#include "GaudiKernel/AppReturnCode.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/DataSvc.h"
-#include "GaudiKernel/EventContext.h"
-#include "GaudiKernel/Incident.h"
+#include <GaudiKernel/AppReturnCode.h>
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/DataSvc.h>
+#include <GaudiKernel/EventContext.h>
+#include <GaudiKernel/Incident.h>
 
 // External libraries
 #include <chrono>
@@ -357,7 +357,7 @@ StatusCode HiveSlimEventLoopMgr::stopRun() {
 // Here the loop on the events takes place.
 // This is also the natural place to put the preparation of the algorithms
 // contexts, which contain the event specific data.
-#include "GaudiKernel/Memory.h"
+#include <GaudiKernel/Memory.h>
 StatusCode HiveSlimEventLoopMgr::nextEvent( int maxevt ) {
 
   // Calculate runtime
diff --git a/GaudiHive/src/HiveSlimEventLoopMgr.h b/GaudiHive/src/HiveSlimEventLoopMgr.h
index aeea466c15..c940858a9d 100644
--- a/GaudiHive/src/HiveSlimEventLoopMgr.h
+++ b/GaudiHive/src/HiveSlimEventLoopMgr.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,16 +12,16 @@
 #define GAUDIHIVE_HIVESLIMEVENTLOOPMGR_H 1
 
 // Framework include files
-#include "GaudiKernel/IAlgExecStateSvc.h"
-#include "GaudiKernel/IAlgResourcePool.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IEvtSelector.h"
-#include "GaudiKernel/IHiveWhiteBoard.h"
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/IScheduler.h"
-#include "GaudiKernel/MinimalEventLoopMgr.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/IAlgExecStateSvc.h>
+#include <GaudiKernel/IAlgResourcePool.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IEvtSelector.h>
+#include <GaudiKernel/IHiveWhiteBoard.h>
+#include <GaudiKernel/IIncidentListener.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/IScheduler.h>
+#include <GaudiKernel/MinimalEventLoopMgr.h>
+#include <GaudiKernel/SmartIF.h>
 
 // External Libraries
 #include <boost/dynamic_bitset.hpp>
diff --git a/GaudiHive/src/HiveTestAlgorithm.cpp b/GaudiHive/src/HiveTestAlgorithm.cpp
index c3bd940e9a..fc309ce171 100644
--- a/GaudiHive/src/HiveTestAlgorithm.cpp
+++ b/GaudiHive/src/HiveTestAlgorithm.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,8 +9,8 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 #include "HiveTestAlgorithm.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/ThreadLocalContext.h"
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/ThreadLocalContext.h>
 
 #include <atomic>
 
diff --git a/GaudiHive/src/HiveWhiteBoard.cpp b/GaudiHive/src/HiveWhiteBoard.cpp
index e9f5c84b72..04667a577f 100644
--- a/GaudiHive/src/HiveWhiteBoard.cpp
+++ b/GaudiHive/src/HiveWhiteBoard.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -14,32 +14,32 @@
 //
 //====================================================================
 // Include files
-#include "GaudiKernel/ConcurrencyFlags.h"
-#include "GaudiKernel/DataObjID.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/DataSvc.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/SmartIF.h"
-#include "GaudiKernel/TypeNameString.h"
-#include "Rtypes.h"
-#include "ThreadLocalStorage.h"
-#include "boost/callable_traits.hpp"
-#include "tbb/concurrent_queue.h"
+#include <GaudiKernel/ConcurrencyFlags.h>
+#include <GaudiKernel/DataObjID.h>
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/DataSvc.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/Service.h>
+#include <GaudiKernel/SmartIF.h>
+#include <GaudiKernel/TypeNameString.h>
+#include <Rtypes.h>
+#include <ThreadLocalStorage.h>
+#include <boost/callable_traits.hpp>
 #include <mutex>
+#include <tbb/concurrent_queue.h>
 #include <utility>
 
 // Interfaces
-#include "GaudiKernel/IAddressCreator.h"
-#include "GaudiKernel/IConversionSvc.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IDataStoreAgent.h"
-#include "GaudiKernel/IHiveWhiteBoard.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/ISvcManager.h"
+#include <GaudiKernel/IAddressCreator.h>
+#include <GaudiKernel/IConversionSvc.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IDataStoreAgent.h>
+#include <GaudiKernel/IHiveWhiteBoard.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/ISvcManager.h>
 
 namespace {
   struct Partition final {
diff --git a/GaudiHive/src/IPrecedenceSvc.h b/GaudiHive/src/IPrecedenceSvc.h
index 62b1a904a9..996c1b6e83 100644
--- a/GaudiHive/src/IPrecedenceSvc.h
+++ b/GaudiHive/src/IPrecedenceSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef GAUDIHIVE_IPRECEDENCESVC_H_
 #define GAUDIHIVE_IPRECEDENCESVC_H_
 
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 
 #include <string>
 
diff --git a/GaudiHive/src/PRGraph/PrecedenceRulesGraph.cpp b/GaudiHive/src/PRGraph/PrecedenceRulesGraph.cpp
index bb22476d3b..87702e6115 100644
--- a/GaudiHive/src/PRGraph/PrecedenceRulesGraph.cpp
+++ b/GaudiHive/src/PRGraph/PrecedenceRulesGraph.cpp
@@ -11,7 +11,7 @@
 #include "PrecedenceRulesGraph.h"
 #include "Visitors/Promoters.h"
 
-#include "GaudiKernel/DataHandleFinder.h"
+#include <GaudiKernel/DataHandleFinder.h>
 
 #include <algorithm>
 #include <boost/property_map/transform_value_property_map.hpp>
diff --git a/GaudiHive/src/PRGraph/PrecedenceRulesGraph.h b/GaudiHive/src/PRGraph/PrecedenceRulesGraph.h
index f4cd650a39..52c58d55bb 100644
--- a/GaudiHive/src/PRGraph/PrecedenceRulesGraph.h
+++ b/GaudiHive/src/PRGraph/PrecedenceRulesGraph.h
@@ -26,14 +26,14 @@
 // fwk includes
 #include "../AlgsExecutionStates.h"
 #include "../EventSlot.h"
-#include "GaudiKernel/CommonMessaging.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/IHiveWhiteBoard.h"
-#include "GaudiKernel/ITimelineSvc.h"
-#include "GaudiKernel/TaggedBool.h"
 #include "Visitors/IGraphVisitor.h"
 #include <Gaudi/Algorithm.h>
+#include <GaudiKernel/CommonMessaging.h>
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/ICondSvc.h>
+#include <GaudiKernel/IHiveWhiteBoard.h>
+#include <GaudiKernel/ITimelineSvc.h>
+#include <GaudiKernel/TaggedBool.h>
 
 namespace concurrency {
   using Concurrent     = Gaudi::tagged_bool<class Concurrent_tag>;
diff --git a/GaudiHive/src/PRGraph/Visitors/Promoters.cpp b/GaudiHive/src/PRGraph/Visitors/Promoters.cpp
index 6312a9d1bc..7d701099b5 100644
--- a/GaudiHive/src/PRGraph/Visitors/Promoters.cpp
+++ b/GaudiHive/src/PRGraph/Visitors/Promoters.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #include "../../AlgsExecutionStates.h"
 #include "Validators.h"
 
-#include "GaudiKernel/DataObjID.h"
-#include "GaudiKernel/ICondSvc.h"
+#include <GaudiKernel/DataObjID.h>
+#include <GaudiKernel/ICondSvc.h>
 
 #include <queue>
 
diff --git a/GaudiHive/src/PrecedenceSvc.h b/GaudiHive/src/PrecedenceSvc.h
index 2b1b7cfccf..f6aaea11b1 100644
--- a/GaudiHive/src/PrecedenceSvc.h
+++ b/GaudiHive/src/PrecedenceSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,8 +15,8 @@
 #include "PRGraph/PrecedenceRulesGraph.h"
 
 // Framework include files
-#include "GaudiKernel/IAlgResourcePool.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/IAlgResourcePool.h>
+#include <GaudiKernel/Service.h>
 
 #include <boost/filesystem.hpp>
 
diff --git a/GaudiHive/src/RetCodeGuard.h b/GaudiHive/src/RetCodeGuard.h
index 5e8eeb6436..a6d97c8f0a 100644
--- a/GaudiHive/src/RetCodeGuard.h
+++ b/GaudiHive/src/RetCodeGuard.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,8 +11,8 @@
 #ifndef GAUDIHIVE_RETCODEGUARD_H
 #define GAUDIHIVE_RETCODEGUARD_H
 
-#include "GaudiKernel/AppReturnCode.h"
-#include "GaudiKernel/IProperty.h"
+#include <GaudiKernel/AppReturnCode.h>
+#include <GaudiKernel/IProperty.h>
 
 /// Helper class to set the application return code in case of early exit
 /// (e.g. exception).
diff --git a/GaudiHive/src/ThreadInitTask.cpp b/GaudiHive/src/ThreadInitTask.cpp
index 020375c6a8..e0140de1ca 100644
--- a/GaudiHive/src/ThreadInitTask.cpp
+++ b/GaudiHive/src/ThreadInitTask.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,12 +9,12 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 #include "ThreadInitTask.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/IThreadInitTool.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/SmartIF.h"
-#include "GaudiKernel/ToolHandle.h"
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/IThreadInitTool.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/SmartIF.h>
+#include <GaudiKernel/ToolHandle.h>
 #include <thread>
 
 namespace Gaudi {
diff --git a/GaudiHive/src/ThreadInitTask.h b/GaudiHive/src/ThreadInitTask.h
index c8a6909088..d5722bd6b8 100644
--- a/GaudiHive/src/ThreadInitTask.h
+++ b/GaudiHive/src/ThreadInitTask.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,12 +11,12 @@
 #ifndef GAUDIHIVE_THREADINITTASK_H
 #define GAUDIHIVE_THREADINITTASK_H
 
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/IThreadInitTool.h"
-#include "GaudiKernel/SmartIF.h"
-#include "GaudiKernel/ToolHandle.h"
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/IThreadInitTool.h>
+#include <GaudiKernel/SmartIF.h>
+#include <GaudiKernel/ToolHandle.h>
 
-#include "boost/thread.hpp"
+#include <boost/thread.hpp>
 #include <string>
 #include <vector>
 
diff --git a/GaudiHive/src/ThreadPoolSvc.cpp b/GaudiHive/src/ThreadPoolSvc.cpp
index 167fe30d38..33cd10aa61 100644
--- a/GaudiHive/src/ThreadPoolSvc.cpp
+++ b/GaudiHive/src/ThreadPoolSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,8 +10,8 @@
 \***********************************************************************************/
 #include "ThreadPoolSvc.h"
 
-#include "GaudiKernel/ConcurrencyFlags.h"
 #include "ThreadInitTask.h"
+#include <GaudiKernel/ConcurrencyFlags.h>
 
 #include <chrono>
 #include <thread>
diff --git a/GaudiHive/src/ThreadPoolSvc.h b/GaudiHive/src/ThreadPoolSvc.h
index 033da9c95f..8e9fb4b6f8 100644
--- a/GaudiHive/src/ThreadPoolSvc.h
+++ b/GaudiHive/src/ThreadPoolSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,16 +11,16 @@
 #ifndef GAUDIHIVE_THREADPOOLSVC_H
 #define GAUDIHIVE_THREADPOOLSVC_H
 
-#include "GaudiKernel/IThreadInitTool.h"
-#include "GaudiKernel/IThreadPoolSvc.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/ToolHandle.h"
+#include <GaudiKernel/IThreadInitTool.h>
+#include <GaudiKernel/IThreadPoolSvc.h>
+#include <GaudiKernel/Service.h>
+#include <GaudiKernel/ToolHandle.h>
 
-#include "boost/thread/barrier.hpp"
+#include <boost/thread/barrier.hpp>
 
-#include "tbb/global_control.h"
-#include "tbb/spin_mutex.h"
-#include "tbb/task_arena.h"
+#include <tbb/global_control.h>
+#include <tbb/spin_mutex.h>
+#include <tbb/task_arena.h>
 
 #include <memory>
 #include <vector>
diff --git a/GaudiHive/src/TimelineSvc.cpp b/GaudiHive/src/TimelineSvc.cpp
index 3d770e129e..adf3a1ac24 100644
--- a/GaudiHive/src/TimelineSvc.cpp
+++ b/GaudiHive/src/TimelineSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,8 +9,8 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 #include "TimelineSvc.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/StatusCode.h>
 
 #include <fstream>
 
diff --git a/GaudiHive/src/TimelineSvc.h b/GaudiHive/src/TimelineSvc.h
index 6c780b05ee..e55d99e538 100644
--- a/GaudiHive/src/TimelineSvc.h
+++ b/GaudiHive/src/TimelineSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,12 +12,12 @@
 #ifndef GAUDIHIVE_TIMELINESVC_H
 #define GAUDIHIVE_TIMELINESVC_H
 
-#include "GaudiKernel/ITimelineSvc.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/ITimelineSvc.h>
+#include <GaudiKernel/Service.h>
 
 #include <string>
 
-#include "tbb/concurrent_vector.h"
+#include <tbb/concurrent_vector.h>
 
 class TimelineSvc : public extends<Service, ITimelineSvc> {
 public:
diff --git a/GaudiHive/src/bin/concurrentRun.cpp b/GaudiHive/src/bin/concurrentRun.cpp
index 9273f05392..73c999cb0c 100644
--- a/GaudiHive/src/bin/concurrentRun.cpp
+++ b/GaudiHive/src/bin/concurrentRun.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,17 +8,17 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/IAppMgrUI.h"
-#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/SmartIF.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/Bootstrap.h>
+#include <GaudiKernel/IAppMgrUI.h>
+#include <GaudiKernel/IProperty.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/SmartIF.h>
 #include <iostream>
 #include <string>
 
 // boost includes
-#include "boost/program_options.hpp"
+#include <boost/program_options.hpp>
 
 using namespace boost::program_options;
 
diff --git a/GaudiKernel/dict/dictionary.h b/GaudiKernel/dict/dictionary.h
index d9778bc142..2c35b7c2b4 100644
--- a/GaudiKernel/dict/dictionary.h
+++ b/GaudiKernel/dict/dictionary.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,94 +15,94 @@
 // we do not care about deprecation warnings (as they may arise from stub functions)
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
-#include "GaudiKernel/AlgTool.h"
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/ContainedObject.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/DataStreamTool.h"
-#include "GaudiKernel/Debugger.h"
-#include "GaudiKernel/Environment.h"
-#include "GaudiKernel/EventSelectorDataStream.h"
-#include "GaudiKernel/GaudiHandle.h"
-#include "GaudiKernel/GenericAddress.h"
-#include "GaudiKernel/KeyedObject.h"
-#include "GaudiKernel/LinkManager.h"
-#include "GaudiKernel/Memory.h"
-#include "GaudiKernel/NTuple.h"
-#include "GaudiKernel/NTupleImplementation.h"
-#include "GaudiKernel/ObjectVector.h"
-#include "GaudiKernel/RegistryEntry.h"
-#include "GaudiKernel/RndmGenerators.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/SmartDataPtr.h"
-#include "GaudiKernel/SmartRefVector.h"
-#include "GaudiKernel/System.h"
-#include "GaudiKernel/Time.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/AlgTool.h>
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiKernel/Bootstrap.h>
+#include <GaudiKernel/ContainedObject.h>
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/DataStreamTool.h>
+#include <GaudiKernel/Debugger.h>
+#include <GaudiKernel/Environment.h>
+#include <GaudiKernel/EventSelectorDataStream.h>
+#include <GaudiKernel/GaudiHandle.h>
+#include <GaudiKernel/GenericAddress.h>
+#include <GaudiKernel/KeyedObject.h>
+#include <GaudiKernel/LinkManager.h>
+#include <GaudiKernel/Memory.h>
+#include <GaudiKernel/NTuple.h>
+#include <GaudiKernel/NTupleImplementation.h>
+#include <GaudiKernel/ObjectVector.h>
+#include <GaudiKernel/RegistryEntry.h>
+#include <GaudiKernel/RndmGenerators.h>
+#include <GaudiKernel/Service.h>
+#include <GaudiKernel/SmartDataPtr.h>
+#include <GaudiKernel/SmartRefVector.h>
+#include <GaudiKernel/System.h>
+#include <GaudiKernel/Time.h>
 
-#include "GaudiKernel/DataObjectHandle.h"
-#include "GaudiKernel/IAddressCreator.h"
-#include "GaudiKernel/IAlgContextSvc.h"
-#include "GaudiKernel/IAlgManager.h"
-#include "GaudiKernel/IAlgTool.h"
-#include "GaudiKernel/IAlgorithm.h"
-#include "GaudiKernel/IAppMgrUI.h"
-#include "GaudiKernel/IAuditor.h"
-#include "GaudiKernel/IAuditorSvc.h"
-#include "GaudiKernel/IChronoStatSvc.h"
-#include "GaudiKernel/IClassInfo.h"
-#include "GaudiKernel/IClassManager.h"
-#include "GaudiKernel/IConversionSvc.h"
-#include "GaudiKernel/IConverter.h"
-#include "GaudiKernel/ICounterSummarySvc.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IDataSelector.h"
-#include "GaudiKernel/IDataSourceMgr.h"
-#include "GaudiKernel/IDataStoreAgent.h"
-#include "GaudiKernel/IDataStoreLeaves.h"
-#include "GaudiKernel/IDataStreamTool.h"
-#include "GaudiKernel/IDetDataSvc.h"
-#include "GaudiKernel/IEventProcessor.h"
-#include "GaudiKernel/IEventTimeDecoder.h"
-#include "GaudiKernel/IEvtSelector.h"
-#include "GaudiKernel/IExceptionSvc.h"
-#include "GaudiKernel/IHistogramSvc.h"
-#include "GaudiKernel/IHistorySvc.h"
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/IInspectable.h"
-#include "GaudiKernel/IInspector.h"
-#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/IMagneticFieldSvc.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/IMonitorSvc.h"
-#include "GaudiKernel/INTuple.h"
-#include "GaudiKernel/INTupleSvc.h"
-#include "GaudiKernel/INamedInterface.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/IPartPropSvc.h"
-#include "GaudiKernel/IPartitionControl.h"
-#include "GaudiKernel/IPersistencySvc.h"
-#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/IRndmEngine.h"
-#include "GaudiKernel/IRndmGen.h"
-#include "GaudiKernel/IRndmGenSvc.h"
-#include "GaudiKernel/IRunable.h"
-#include "GaudiKernel/ISelectStatement.h"
-#include "GaudiKernel/ISerialize.h"
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/IStagerSvc.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/ISvcManager.h"
-#include "GaudiKernel/ITHistSvc.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/IUpdateManagerSvc.h"
-#include "GaudiKernel/IUpdateable.h"
-#include "GaudiKernel/IValidity.h"
-#include "GaudiKernel/Incident.h"
+#include <GaudiKernel/DataObjectHandle.h>
+#include <GaudiKernel/IAddressCreator.h>
+#include <GaudiKernel/IAlgContextSvc.h>
+#include <GaudiKernel/IAlgManager.h>
+#include <GaudiKernel/IAlgTool.h>
+#include <GaudiKernel/IAlgorithm.h>
+#include <GaudiKernel/IAppMgrUI.h>
+#include <GaudiKernel/IAuditor.h>
+#include <GaudiKernel/IAuditorSvc.h>
+#include <GaudiKernel/IChronoStatSvc.h>
+#include <GaudiKernel/IClassInfo.h>
+#include <GaudiKernel/IClassManager.h>
+#include <GaudiKernel/IConversionSvc.h>
+#include <GaudiKernel/IConverter.h>
+#include <GaudiKernel/ICounterSummarySvc.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IDataSelector.h>
+#include <GaudiKernel/IDataSourceMgr.h>
+#include <GaudiKernel/IDataStoreAgent.h>
+#include <GaudiKernel/IDataStoreLeaves.h>
+#include <GaudiKernel/IDataStreamTool.h>
+#include <GaudiKernel/IDetDataSvc.h>
+#include <GaudiKernel/IEventProcessor.h>
+#include <GaudiKernel/IEventTimeDecoder.h>
+#include <GaudiKernel/IEvtSelector.h>
+#include <GaudiKernel/IExceptionSvc.h>
+#include <GaudiKernel/IHistogramSvc.h>
+#include <GaudiKernel/IHistorySvc.h>
+#include <GaudiKernel/IIncidentListener.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/IInspectable.h>
+#include <GaudiKernel/IInspector.h>
+#include <GaudiKernel/IInterface.h>
+#include <GaudiKernel/IMagneticFieldSvc.h>
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/IMonitorSvc.h>
+#include <GaudiKernel/INTuple.h>
+#include <GaudiKernel/INTupleSvc.h>
+#include <GaudiKernel/INamedInterface.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/IPartPropSvc.h>
+#include <GaudiKernel/IPartitionControl.h>
+#include <GaudiKernel/IPersistencySvc.h>
+#include <GaudiKernel/IProperty.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/IRndmEngine.h>
+#include <GaudiKernel/IRndmGen.h>
+#include <GaudiKernel/IRndmGenSvc.h>
+#include <GaudiKernel/IRunable.h>
+#include <GaudiKernel/ISelectStatement.h>
+#include <GaudiKernel/ISerialize.h>
+#include <GaudiKernel/IService.h>
+#include <GaudiKernel/IStagerSvc.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/ISvcManager.h>
+#include <GaudiKernel/ITHistSvc.h>
+#include <GaudiKernel/IToolSvc.h>
+#include <GaudiKernel/IUpdateManagerSvc.h>
+#include <GaudiKernel/IUpdateable.h>
+#include <GaudiKernel/IValidity.h>
+#include <GaudiKernel/Incident.h>
 
 namespace GaudiKernelDict {
   struct __Instantiations {
diff --git a/GaudiKernel/include/Gaudi/Accumulators.h b/GaudiKernel/include/Gaudi/Accumulators.h
index 8d9460e83b..3ac803f85f 100644
--- a/GaudiKernel/include/Gaudi/Accumulators.h
+++ b/GaudiKernel/include/Gaudi/Accumulators.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -231,8 +231,8 @@ namespace std::chrono {
  * @endcode
  */
 
-#include "boost/format.hpp"
 #include <atomic>
+#include <boost/format.hpp>
 #include <cmath>
 #include <iostream>
 #include <limits>
@@ -242,9 +242,9 @@ namespace std::chrono {
 #include <type_traits>
 #include <utility>
 
-#include "GaudiKernel/CommonMessaging.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/detected.h"
+#include <GaudiKernel/CommonMessaging.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/detected.h>
 
 // Json serialization for std::chrono::duration
 namespace nlohmann {
diff --git a/GaudiKernel/include/Gaudi/Algorithm.h b/GaudiKernel/include/Gaudi/Algorithm.h
index dc225cc211..40ea395af7 100644
--- a/GaudiKernel/include/Gaudi/Algorithm.h
+++ b/GaudiKernel/include/Gaudi/Algorithm.h
@@ -12,43 +12,43 @@
 // ============================================================================
 // Include files
 // ============================================================================
-#include "GaudiKernel/IAlgorithm.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/IStateful.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/ITimelineSvc.h"
+#include <GaudiKernel/IAlgorithm.h>
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/IProperty.h>
+#include <GaudiKernel/IService.h>
+#include <GaudiKernel/IStateful.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/ITimelineSvc.h>
 
 #include <string>
 #include <vector>
 
 // Extra include files (forward declarations should be sufficient)
-#include "GaudiKernel/CommonMessaging.h"
-#include "GaudiKernel/DataObjID.h" // must be include before Property.h, which is included in PropertyHolder.h
-#include "GaudiKernel/IAlgContextSvc.h"
-#include "GaudiKernel/IAuditorSvc.h"
-#include "GaudiKernel/IChronoStatSvc.h"
-#include "GaudiKernel/IConversionSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IExceptionSvc.h"
-#include "GaudiKernel/IHistogramSvc.h"
-#include "GaudiKernel/IHiveWhiteBoard.h"
-#include "GaudiKernel/IMonitorSvc.h"
-#include "GaudiKernel/INTupleSvc.h"
-#include "GaudiKernel/IRndmGenSvc.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/PropertyHolder.h"
-#include "GaudiKernel/System.h"
-#include "GaudiKernel/ToolHandle.h"
 #include <Gaudi/PluginService.h>
 #include <Gaudi/Property.h>
+#include <GaudiKernel/CommonMessaging.h>
+#include <GaudiKernel/DataObjID.h> // must be include before Property.h, which is included in PropertyHolder.h
+#include <GaudiKernel/IAlgContextSvc.h>
+#include <GaudiKernel/IAuditorSvc.h>
+#include <GaudiKernel/IChronoStatSvc.h>
+#include <GaudiKernel/IConversionSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IExceptionSvc.h>
+#include <GaudiKernel/IHistogramSvc.h>
+#include <GaudiKernel/IHiveWhiteBoard.h>
+#include <GaudiKernel/IMonitorSvc.h>
+#include <GaudiKernel/INTupleSvc.h>
+#include <GaudiKernel/IRndmGenSvc.h>
+#include <GaudiKernel/IToolSvc.h>
+#include <GaudiKernel/PropertyHolder.h>
+#include <GaudiKernel/System.h>
+#include <GaudiKernel/ToolHandle.h>
 
 // For concurrency
-#include "GaudiKernel/DataHandle.h"
-#include "GaudiKernel/DataHandleHolderBase.h"
-#include "GaudiKernel/EventContext.h"
-#include "GaudiKernel/IAlgExecStateSvc.h"
+#include <GaudiKernel/DataHandle.h>
+#include <GaudiKernel/DataHandleHolderBase.h>
+#include <GaudiKernel/EventContext.h>
+#include <GaudiKernel/IAlgExecStateSvc.h>
 
 class IAlgTool;
 class ToolHandleInfo;
diff --git a/GaudiKernel/include/Gaudi/AsynchronousAlgorithm.h b/GaudiKernel/include/Gaudi/AsynchronousAlgorithm.h
index 6935b25895..1a0848ec89 100644
--- a/GaudiKernel/include/Gaudi/AsynchronousAlgorithm.h
+++ b/GaudiKernel/include/Gaudi/AsynchronousAlgorithm.h
@@ -1,6 +1,6 @@
 
 /***********************************************************************************\
-* (c) Copyright 2023 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 2023-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -14,18 +14,18 @@
 // Include files
 // ============================================================================
 // Gaudi
-#include "Gaudi/Algorithm.h"
-#include "GaudiKernel/IHiveWhiteBoard.h"
+#include <Gaudi/Algorithm.h>
+#include <GaudiKernel/IHiveWhiteBoard.h>
 // Gaudi CUDA
 #ifdef GAUDI_USE_CUDA
-#  include "Gaudi/CUDAAsynchronousAlgHelper.cuh"
+#  include <Gaudi/CUDAAsynchronousAlgHelper.cuh>
 #endif
 // Others
-#include "fmt/format.h"
 #include <atomic>
 #include <boost/fiber/all.hpp>
 #include <boost/unordered/unordered_flat_set.hpp>
 #include <chrono>
+#include <fmt/format.h>
 
 namespace Gaudi {
   /** Base class for asynchronous algorithms.
diff --git a/GaudiKernel/include/Gaudi/CUDAAsynchronousAlgHelper.cuh b/GaudiKernel/include/Gaudi/CUDAAsynchronousAlgHelper.cuh
index ea62bb0790..bbb1280740 100644
--- a/GaudiKernel/include/Gaudi/CUDAAsynchronousAlgHelper.cuh
+++ b/GaudiKernel/include/Gaudi/CUDAAsynchronousAlgHelper.cuh
@@ -10,7 +10,7 @@
 \***********************************************************************************/
 
 #ifndef __CUDACC__
-#  include "cuda_runtime.h"
+#  include <cuda_runtime.h>
 #endif
 #include <fmt/format.h>
 
diff --git a/GaudiKernel/include/Gaudi/MonitoringHub.h b/GaudiKernel/include/Gaudi/MonitoringHub.h
index 5d9e463e9f..a89cbe9e58 100644
--- a/GaudiKernel/include/Gaudi/MonitoringHub.h
+++ b/GaudiKernel/include/Gaudi/MonitoringHub.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2020-2022 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2020-2024 CERN for the benefit of the LHCb Collaboration      *
 *                                                                             *
 * This software is distributed under the terms of the GNU General Public      *
 * Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   *
@@ -10,7 +10,7 @@
 \*****************************************************************************/
 #pragma once
 
-#include "GaudiKernel/detected.h"
+#include <GaudiKernel/detected.h>
 
 #include <deque>
 #include <functional>
diff --git a/GaudiKernel/include/Gaudi/Parsers/CommonParsers.h b/GaudiKernel/include/Gaudi/Parsers/CommonParsers.h
index 62bd23e6dc..f9033572a3 100644
--- a/GaudiKernel/include/Gaudi/Parsers/CommonParsers.h
+++ b/GaudiKernel/include/Gaudi/Parsers/CommonParsers.h
@@ -22,9 +22,9 @@
 #include <vector>
 
 // ============================================================================
-#include "GaudiKernel/HistoDef.h"
-#include "GaudiKernel/Map.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/HistoDef.h>
+#include <GaudiKernel/Map.h>
+#include <GaudiKernel/StatusCode.h>
 // ============================================================================
 #define PARSERS_DECL_FOR_SINGLE( Type ) GAUDI_API StatusCode parse( Type& result, std::string_view input );
 
diff --git a/GaudiKernel/include/Gaudi/Parsers/Grammars.h b/GaudiKernel/include/Gaudi/Parsers/Grammars.h
index 6b1bcb5156..17abf3dd93 100644
--- a/GaudiKernel/include/Gaudi/Parsers/Grammars.h
+++ b/GaudiKernel/include/Gaudi/Parsers/Grammars.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2023 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -41,12 +41,12 @@
 //==============================================================================
 // Gaudi:
 //==============================================================================
-#include "GaudiKernel/HashMap.h"
-#include "GaudiKernel/HistoDef.h"
-#include "GaudiKernel/Point3DTypes.h"
-#include "GaudiKernel/Point4DTypes.h"
-#include "GaudiKernel/StringKey.h"
-#include "GaudiKernel/VectorMap.h"
+#include <GaudiKernel/HashMap.h>
+#include <GaudiKernel/HistoDef.h>
+#include <GaudiKernel/Point3DTypes.h>
+#include <GaudiKernel/Point4DTypes.h>
+#include <GaudiKernel/StringKey.h>
+#include <GaudiKernel/VectorMap.h>
 //==============================================================================
 namespace Gaudi {
   namespace Parsers {
diff --git a/GaudiKernel/include/Gaudi/Timers.h b/GaudiKernel/include/Gaudi/Timers.h
index f4a2919797..e25f6f9f55 100644
--- a/GaudiKernel/include/Gaudi/Timers.h
+++ b/GaudiKernel/include/Gaudi/Timers.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2020 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,9 +10,9 @@
 \***********************************************************************************/
 #pragma once
 
-#include "Gaudi/Timers/GenericTimer.h"
+#include <Gaudi/Timers/GenericTimer.h>
 #ifdef __x86_64__
-#  include "Gaudi/Timers/RdtscClock.h"
+#  include <Gaudi/Timers/RdtscClock.h>
 #endif // __x86_64__
 
 #include <chrono>
diff --git a/GaudiKernel/include/Gaudi/Timers/GenericTimer.h b/GaudiKernel/include/Gaudi/Timers/GenericTimer.h
index 23a977c3a6..ef5927271f 100644
--- a/GaudiKernel/include/Gaudi/Timers/GenericTimer.h
+++ b/GaudiKernel/include/Gaudi/Timers/GenericTimer.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,7 +10,7 @@
 \***********************************************************************************/
 #pragma once
 
-#include "Gaudi/Chrono/Counters.h"
+#include <Gaudi/Chrono/Counters.h>
 
 #include <atomic>
 #include <chrono>
diff --git a/GaudiKernel/include/GaudiKernel/AlgTool.h b/GaudiKernel/include/GaudiKernel/AlgTool.h
index 415998e68c..030452a1f9 100644
--- a/GaudiKernel/include/GaudiKernel/AlgTool.h
+++ b/GaudiKernel/include/GaudiKernel/AlgTool.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2022 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,25 +12,25 @@
 #define GAUDIKERNEL_ALGTOOL_H
 // ============================================================================
 // Include files
-#include "GaudiKernel/CommonMessaging.h"
-#include "GaudiKernel/DataObjID.h"
-#include "GaudiKernel/IAlgTool.h"
-#include "GaudiKernel/IAuditorSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/IMonitorSvc.h"
-#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/IStateful.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/PropertyHolder.h"
-#include "GaudiKernel/ToolHandle.h"
 #include <Gaudi/PluginService.h>
-
-#include "GaudiKernel/DataHandle.h"
-#include "GaudiKernel/DataHandleHolderBase.h"
-#include "GaudiKernel/IDataHandleHolder.h"
+#include <GaudiKernel/CommonMessaging.h>
+#include <GaudiKernel/DataObjID.h>
+#include <GaudiKernel/IAlgTool.h>
+#include <GaudiKernel/IAuditorSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/IMonitorSvc.h>
+#include <GaudiKernel/IProperty.h>
+#include <GaudiKernel/IService.h>
+#include <GaudiKernel/IStateful.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/IToolSvc.h>
+#include <GaudiKernel/PropertyHolder.h>
+#include <GaudiKernel/ToolHandle.h>
+
+#include <GaudiKernel/DataHandle.h>
+#include <GaudiKernel/DataHandleHolderBase.h>
+#include <GaudiKernel/IDataHandleHolder.h>
 
 template <class T>
 class DataObjectHandle;
diff --git a/GaudiKernel/include/GaudiKernel/AlgToolHistory.h b/GaudiKernel/include/GaudiKernel/AlgToolHistory.h
index 80394124d2..4b7b06ed6e 100644
--- a/GaudiKernel/include/GaudiKernel/AlgToolHistory.h
+++ b/GaudiKernel/include/GaudiKernel/AlgToolHistory.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,8 +11,8 @@
 #ifndef GAUDIKERNEL_ALGTOOLHISTORY_H
 #define GAUDIKERNEL_ALGTOOLHISTORY_H
 
-#include "GaudiKernel/HistoryObj.h"
-#include "GaudiKernel/IVersHistoryObj.h"
+#include <GaudiKernel/HistoryObj.h>
+#include <GaudiKernel/IVersHistoryObj.h>
 
 class AlgTool;
 class JobHistory;
diff --git a/GaudiKernel/include/GaudiKernel/AlgorithmHistory.h b/GaudiKernel/include/GaudiKernel/AlgorithmHistory.h
index dcec6ba57c..e468bf5f34 100644
--- a/GaudiKernel/include/GaudiKernel/AlgorithmHistory.h
+++ b/GaudiKernel/include/GaudiKernel/AlgorithmHistory.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -14,8 +14,8 @@
 // An object of this class carries the history information
 // which is specific to a Gaudi algorithm.
 
-#include "GaudiKernel/HistoryObj.h"
-#include "GaudiKernel/IVersHistoryObj.h"
+#include <GaudiKernel/HistoryObj.h>
+#include <GaudiKernel/IVersHistoryObj.h>
 
 #include <iosfwd>
 #include <string>
diff --git a/GaudiKernel/include/GaudiKernel/Allocator.h b/GaudiKernel/include/GaudiKernel/Allocator.h
index 3364111429..508221e744 100644
--- a/GaudiKernel/include/GaudiKernel/Allocator.h
+++ b/GaudiKernel/include/GaudiKernel/Allocator.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -66,7 +66,7 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/AllocatorPool.h"
+#include <GaudiKernel/AllocatorPool.h>
 // ============================================================================
 
 namespace GaudiUtils {
diff --git a/GaudiKernel/include/GaudiKernel/AllocatorPool.h b/GaudiKernel/include/GaudiKernel/AllocatorPool.h
index 55bd941ea0..25f85d8a72 100644
--- a/GaudiKernel/include/GaudiKernel/AllocatorPool.h
+++ b/GaudiKernel/include/GaudiKernel/AllocatorPool.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -58,7 +58,7 @@
 #ifndef GAUDIKERNEL_AllocatorPool_h
 #define GAUDIKERNEL_AllocatorPool_h 1
 
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 #include <memory>
 
 namespace GaudiUtils {
diff --git a/GaudiKernel/include/GaudiKernel/AnyDataWrapper.h b/GaudiKernel/include/GaudiKernel/AnyDataWrapper.h
index 714ab1d7b4..6ca86fc3c7 100644
--- a/GaudiKernel/include/GaudiKernel/AnyDataWrapper.h
+++ b/GaudiKernel/include/GaudiKernel/AnyDataWrapper.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,7 +9,7 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 #pragma once
-#include "GaudiKernel/DataObject.h"
+#include <GaudiKernel/DataObject.h>
 #include <cstddef>
 #include <iterator>
 #include <optional>
diff --git a/GaudiKernel/include/GaudiKernel/AppReturnCode.h b/GaudiKernel/include/GaudiKernel/AppReturnCode.h
index 1473f57eda..b7a8c45d32 100644
--- a/GaudiKernel/include/GaudiKernel/AppReturnCode.h
+++ b/GaudiKernel/include/GaudiKernel/AppReturnCode.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -16,8 +16,8 @@
 #ifndef APPRETURNCODE_H_
 #define APPRETURNCODE_H_
 
-#include "GaudiKernel/IProperty.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/IProperty.h>
 
 namespace Gaudi {
   /// ApplicationMgr return code definitions.
diff --git a/GaudiKernel/include/GaudiKernel/AttribStringParser.h b/GaudiKernel/include/GaudiKernel/AttribStringParser.h
index 0459cacff5..19a413ab05 100644
--- a/GaudiKernel/include/GaudiKernel/AttribStringParser.h
+++ b/GaudiKernel/include/GaudiKernel/AttribStringParser.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,8 +11,8 @@
 #ifndef _ATTRIB_STRING_PARSER_H_
 #define _ATTRIB_STRING_PARSER_H_
 
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/System.h>
 #include <iterator>
 #ifdef __clang__
 #  pragma clang diagnostic push
diff --git a/GaudiKernel/include/GaudiKernel/Auditor.h b/GaudiKernel/include/GaudiKernel/Auditor.h
index 5124300962..faa1a7673b 100644
--- a/GaudiKernel/include/GaudiKernel/Auditor.h
+++ b/GaudiKernel/include/GaudiKernel/Auditor.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2022 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,14 +12,14 @@
 #define GAUDIKERNEL_AUDITOR_H
 
 // Include files
-#include "GaudiKernel/CommonMessaging.h"
-#include "GaudiKernel/IAuditor.h"
-#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/ISvcLocator.h" /*used by service(..)*/
-#include "GaudiKernel/PropertyHolder.h"
 #include <Gaudi/PluginService.h>
 #include <Gaudi/PropertyFwd.h>
+#include <GaudiKernel/CommonMessaging.h>
+#include <GaudiKernel/IAuditor.h>
+#include <GaudiKernel/IProperty.h>
+#include <GaudiKernel/IService.h>
+#include <GaudiKernel/ISvcLocator.h> /*used by service(..)*/
+#include <GaudiKernel/PropertyHolder.h>
 #include <string>
 #include <vector>
 
diff --git a/GaudiKernel/include/GaudiKernel/BoostArrayAsProperty.h b/GaudiKernel/include/GaudiKernel/BoostArrayAsProperty.h
index df4efb6587..34559c5cb8 100644
--- a/GaudiKernel/include/GaudiKernel/BoostArrayAsProperty.h
+++ b/GaudiKernel/include/GaudiKernel/BoostArrayAsProperty.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -19,7 +19,7 @@
 // ============================================================================
 // Boost
 // ============================================================================
-#include "boost/array.hpp"
+#include <boost/array.hpp>
 // ============================================================================
 /** @file
  *  Collection of utilities, which allows to use class boost::array
diff --git a/GaudiKernel/include/GaudiKernel/Bootstrap.h b/GaudiKernel/include/GaudiKernel/Bootstrap.h
index 57c464da19..8ebbb027d3 100644
--- a/GaudiKernel/include/GaudiKernel/Bootstrap.h
+++ b/GaudiKernel/include/GaudiKernel/Bootstrap.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,7 +15,7 @@
 #include <string>
 
 // Framework include files
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 
 // Forward declarations
 class IAppMgrUI;
diff --git a/GaudiKernel/include/GaudiKernel/Chrono.h b/GaudiKernel/include/GaudiKernel/Chrono.h
index f591ac80ee..c8ae96e0cb 100644
--- a/GaudiKernel/include/GaudiKernel/Chrono.h
+++ b/GaudiKernel/include/GaudiKernel/Chrono.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -19,9 +19,9 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/ChronoEntity.h"
-#include "GaudiKernel/IChronoSvc.h"
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/ChronoEntity.h>
+#include <GaudiKernel/IChronoSvc.h>
+#include <GaudiKernel/Kernel.h>
 // ============================================================================
 /** @class Chrono GaudiKernel/Chrono.h
  *
diff --git a/GaudiKernel/include/GaudiKernel/ChronoEntity.h b/GaudiKernel/include/GaudiKernel/ChronoEntity.h
index 6192e18967..a7a6ab8260 100644
--- a/GaudiKernel/include/GaudiKernel/ChronoEntity.h
+++ b/GaudiKernel/include/GaudiKernel/ChronoEntity.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,9 +15,9 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/IChronoSvc.h"
-#include "GaudiKernel/StatEntity.h"
-#include "GaudiKernel/Timing.h"
+#include <GaudiKernel/IChronoSvc.h>
+#include <GaudiKernel/StatEntity.h>
+#include <GaudiKernel/Timing.h>
 // ============================================================================
 /** @class ChronoEntity ChronoEntity.h GaudiKernel/ChronoEntity.h
  *
diff --git a/GaudiKernel/include/GaudiKernel/ClassID.h b/GaudiKernel/include/GaudiKernel/ClassID.h
index af2f60891e..067b376749 100644
--- a/GaudiKernel/include/GaudiKernel/ClassID.h
+++ b/GaudiKernel/include/GaudiKernel/ClassID.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIKERNEL_CLASSID_H
 
 // Include files
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 
 /// Class ID definition
 typedef unsigned int CLID;
diff --git a/GaudiKernel/include/GaudiKernel/CommonMessaging.h b/GaudiKernel/include/GaudiKernel/CommonMessaging.h
index 42a3399f95..3844dfb563 100644
--- a/GaudiKernel/include/GaudiKernel/CommonMessaging.h
+++ b/GaudiKernel/include/GaudiKernel/CommonMessaging.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -17,13 +17,13 @@
 
 #ifndef COMMONMESSAGING_H_
 #define COMMONMESSAGING_H_
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/SmartIF.h"
-#include "GaudiKernel/detected.h"
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/IService.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/SmartIF.h>
+#include <GaudiKernel/detected.h>
 #include <boost/thread/tss.hpp>
 
 #include <memory>
diff --git a/GaudiKernel/include/GaudiKernel/ComponentManager.h b/GaudiKernel/include/GaudiKernel/ComponentManager.h
index 07e4bb7c86..4a9c4342ac 100644
--- a/GaudiKernel/include/GaudiKernel/ComponentManager.h
+++ b/GaudiKernel/include/GaudiKernel/ComponentManager.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,8 +11,8 @@
 #ifndef COMPONENTMANAGER_H_
 #define COMPONENTMANAGER_H_
 
-#include "GaudiKernel/CommonMessaging.h"
-#include "GaudiKernel/IComponentManager.h"
+#include <GaudiKernel/CommonMessaging.h>
+#include <GaudiKernel/IComponentManager.h>
 
 class ApplicationMgr;
 
diff --git a/GaudiKernel/include/GaudiKernel/ConcurrencyFlags.h b/GaudiKernel/include/GaudiKernel/ConcurrencyFlags.h
index fe210deda6..5419b8220c 100644
--- a/GaudiKernel/include/GaudiKernel/ConcurrencyFlags.h
+++ b/GaudiKernel/include/GaudiKernel/ConcurrencyFlags.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -13,7 +13,7 @@
 
 #include <cstddef>
 
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 
 class ThreadPoolSvc;
 class HiveWhiteBoard;
diff --git a/GaudiKernel/include/GaudiKernel/ContainedObject.h b/GaudiKernel/include/GaudiKernel/ContainedObject.h
index 5c8107eb64..d76193e755 100644
--- a/GaudiKernel/include/GaudiKernel/ContainedObject.h
+++ b/GaudiKernel/include/GaudiKernel/ContainedObject.h
@@ -12,9 +12,9 @@
 #define GAUDIKERNEL_CONTAINEDOBJECT_H
 
 // Include files
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/ObjectContainerBase.h"
-#include "GaudiKernel/StreamBuffer.h"
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/ObjectContainerBase.h>
+#include <GaudiKernel/StreamBuffer.h>
 #include <iostream>
 
 // Forward declarations
diff --git a/GaudiKernel/include/GaudiKernel/ContainerFactoryDefs.h b/GaudiKernel/include/GaudiKernel/ContainerFactoryDefs.h
index 31c8ba8321..a0c6335871 100644
--- a/GaudiKernel/include/GaudiKernel/ContainerFactoryDefs.h
+++ b/GaudiKernel/include/GaudiKernel/ContainerFactoryDefs.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -31,9 +31,9 @@
 #define DLL_DECL_CONTAINERDICT( x )
 #define DLL_DECL_OBJECTDICT( x )
 
-#include "GaudiKernel/ObjectFactory.h"
-#include "GaudiKernel/ObjectList.h"
-#include "GaudiKernel/ObjectVector.h"
+#include <GaudiKernel/ObjectFactory.h>
+#include <GaudiKernel/ObjectList.h>
+#include <GaudiKernel/ObjectVector.h>
 
 #define _ImplementContainedFactories( x )                                                                              \
   _ImplementContainerDictionaryFactory( x ) _ImplementContainedObjectFactory( x )                                      \
diff --git a/GaudiKernel/include/GaudiKernel/ContextSpecificPtr.h b/GaudiKernel/include/GaudiKernel/ContextSpecificPtr.h
index 10caf35c4a..280471452b 100644
--- a/GaudiKernel/include/GaudiKernel/ContextSpecificPtr.h
+++ b/GaudiKernel/include/GaudiKernel/ContextSpecificPtr.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -18,8 +18,8 @@
 #include <unordered_map>
 
 // For the definition of GAUDI_API
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/ThreadLocalContext.h"
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/ThreadLocalContext.h>
 
 class EventContext;
 
diff --git a/GaudiKernel/include/GaudiKernel/ConversionSvc.h b/GaudiKernel/include/GaudiKernel/ConversionSvc.h
index 0566299ddf..131d096fbb 100644
--- a/GaudiKernel/include/GaudiKernel/ConversionSvc.h
+++ b/GaudiKernel/include/GaudiKernel/ConversionSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,11 +12,11 @@
 #define GAUDIKERNEL_CONVERSIONSVC_H 1
 
 // Include files
-#include "GaudiKernel/IAddressCreator.h"
-#include "GaudiKernel/IConversionSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/IAddressCreator.h>
+#include <GaudiKernel/IConversionSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/Service.h>
 #include <algorithm>
 #include <utility>
 #include <vector>
diff --git a/GaudiKernel/include/GaudiKernel/Converter.h b/GaudiKernel/include/GaudiKernel/Converter.h
index 28311f968e..f5f4215a2d 100644
--- a/GaudiKernel/include/GaudiKernel/Converter.h
+++ b/GaudiKernel/include/GaudiKernel/Converter.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,12 +12,12 @@
 #define GAUDIKERNEL_CONVERTER_H
 
 // generic experiment headers
-#include "GaudiKernel/ConversionSvc.h"
-#include "GaudiKernel/IConverter.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/ISvcLocator.h"
+#include <GaudiKernel/ConversionSvc.h>
+#include <GaudiKernel/IConverter.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IService.h>
+#include <GaudiKernel/ISvcLocator.h>
 
 // Forward declarations
 class IMessageSvc;
diff --git a/GaudiKernel/include/GaudiKernel/Coord3DTypes.h b/GaudiKernel/include/GaudiKernel/Coord3DTypes.h
index 66fcdac494..d1c6af77bb 100644
--- a/GaudiKernel/include/GaudiKernel/Coord3DTypes.h
+++ b/GaudiKernel/include/GaudiKernel/Coord3DTypes.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -29,10 +29,10 @@
  *  @author Juan PALACIOS
  *  @date   2005-11-21
  */
-#include "Math/Cartesian3D.h"
-#include "Math/Cylindrical3D.h"
-#include "Math/CylindricalEta3D.h"
-#include "Math/Polar3D.h"
+#include <Math/Cartesian3D.h>
+#include <Math/Cylindrical3D.h>
+#include <Math/CylindricalEta3D.h>
+#include <Math/Polar3D.h>
 namespace Gaudi {
 
   // NB : Please remember to give a simple doxygen comment for each typedef
diff --git a/GaudiKernel/include/GaudiKernel/DataHandle.h b/GaudiKernel/include/GaudiKernel/DataHandle.h
index 80e4ec56c3..938a0ca6f7 100644
--- a/GaudiKernel/include/GaudiKernel/DataHandle.h
+++ b/GaudiKernel/include/GaudiKernel/DataHandle.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2020 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,8 +11,8 @@
 #ifndef GAUDIKERNEL_DATAHANDLE
 #define GAUDIKERNEL_DATAHANDLE 1
 
-#include "GaudiKernel/DataHandleProperty.h"
-#include "GaudiKernel/DataObjID.h"
+#include <GaudiKernel/DataHandleProperty.h>
+#include <GaudiKernel/DataObjID.h>
 
 //---------------------------------------------------------------------------
 
diff --git a/GaudiKernel/include/GaudiKernel/DataHandleFinder.h b/GaudiKernel/include/GaudiKernel/DataHandleFinder.h
index 38ee0403de..c91aafda07 100644
--- a/GaudiKernel/include/GaudiKernel/DataHandleFinder.h
+++ b/GaudiKernel/include/GaudiKernel/DataHandleFinder.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,8 +11,8 @@
 #ifndef GAUDIKERNEL_DATAHANDLEFINDER
 #define GAUDIKERNEL_DATAHANDLEFINDER 1
 
-#include "GaudiKernel/DataObjID.h"
-#include "GaudiKernel/IDataHandleHolder.h"
+#include <GaudiKernel/DataObjID.h>
+#include <GaudiKernel/IDataHandleHolder.h>
 
 /** @class DataHandleFinder DataHandleFinder.h GaudiKernel/DataHandleFinder.h
  *
diff --git a/GaudiKernel/include/GaudiKernel/DataHandleHolderBase.h b/GaudiKernel/include/GaudiKernel/DataHandleHolderBase.h
index 821d3d71ea..6fc5bd5c3b 100644
--- a/GaudiKernel/include/GaudiKernel/DataHandleHolderBase.h
+++ b/GaudiKernel/include/GaudiKernel/DataHandleHolderBase.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,11 +11,11 @@
 #ifndef GAUDIKERNEL_DATAHANDLEHOLDERBASE
 #define GAUDIKERNEL_DATAHANDLEHOLDERBASE 1
 
-#include "GaudiKernel/DataHandle.h"
-#include "GaudiKernel/DataObjID.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IDataHandleHolder.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/DataHandle.h>
+#include <GaudiKernel/DataObjID.h>
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IDataHandleHolder.h>
 
 #include <algorithm>
 #include <unordered_set>
diff --git a/GaudiKernel/include/GaudiKernel/DataHandleHolderVisitor.h b/GaudiKernel/include/GaudiKernel/DataHandleHolderVisitor.h
index 3c3042991f..2f69066dd8 100644
--- a/GaudiKernel/include/GaudiKernel/DataHandleHolderVisitor.h
+++ b/GaudiKernel/include/GaudiKernel/DataHandleHolderVisitor.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,8 +11,8 @@
 #ifndef GAUDIKERNEL_DATAHANDLEHOLDERVISTOR
 #define GAUDIKERNEL_DATAHANDLEHOLDERVISTOR 1
 
-#include "GaudiKernel/DataObjID.h"
-#include "GaudiKernel/IDataHandleHolder.h"
+#include <GaudiKernel/DataObjID.h>
+#include <GaudiKernel/IDataHandleHolder.h>
 #include <map>
 #include <set>
 #include <string>
diff --git a/GaudiKernel/include/GaudiKernel/DataHandleProperty.h b/GaudiKernel/include/GaudiKernel/DataHandleProperty.h
index 4cb1f6dec8..8238cb577e 100644
--- a/GaudiKernel/include/GaudiKernel/DataHandleProperty.h
+++ b/GaudiKernel/include/GaudiKernel/DataHandleProperty.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2020 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,8 +10,8 @@
 \***********************************************************************************/
 #pragma once
 
-#include "Gaudi/Property.h"
-#include "GaudiKernel/StatusCode.h"
+#include <Gaudi/Property.h>
+#include <GaudiKernel/StatusCode.h>
 
 #include <iostream>
 
diff --git a/GaudiKernel/include/GaudiKernel/DataHistory.h b/GaudiKernel/include/GaudiKernel/DataHistory.h
index fbef442435..2cc583f51e 100644
--- a/GaudiKernel/include/GaudiKernel/DataHistory.h
+++ b/GaudiKernel/include/GaudiKernel/DataHistory.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -13,10 +13,10 @@
 
 // History for an event data object.
 
-#include "GaudiKernel/HistoryObj.h"
+#include <GaudiKernel/HistoryObj.h>
 
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/StatusCode.h>
 #include <iostream>
 #include <string>
 #include <vector>
diff --git a/GaudiKernel/include/GaudiKernel/DataIncident.h b/GaudiKernel/include/GaudiKernel/DataIncident.h
index adefbac485..529d645f3a 100644
--- a/GaudiKernel/include/GaudiKernel/DataIncident.h
+++ b/GaudiKernel/include/GaudiKernel/DataIncident.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDI_DATAINCIDENT_H
 
 // Include files
-#include "GaudiKernel/Incident.h"
+#include <GaudiKernel/Incident.h>
 
 /**
  * @class DataIncident DataIncident.h GaudiKernel/DataIncident.h
diff --git a/GaudiKernel/include/GaudiKernel/DataObjID.h b/GaudiKernel/include/GaudiKernel/DataObjID.h
index 3835a8588a..f37c39e767 100644
--- a/GaudiKernel/include/GaudiKernel/DataObjID.h
+++ b/GaudiKernel/include/GaudiKernel/DataObjID.h
@@ -11,8 +11,8 @@
 #ifndef GAUDIKERNEL_DATAOBJID
 #define GAUDIKERNEL_DATAOBJID 1
 
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/StatusCode.h>
 
 #include <iostream>
 #include <mutex>
diff --git a/GaudiKernel/include/GaudiKernel/DataObjectHandle.h b/GaudiKernel/include/GaudiKernel/DataObjectHandle.h
index 246422a4aa..61087f54c8 100644
--- a/GaudiKernel/include/GaudiKernel/DataObjectHandle.h
+++ b/GaudiKernel/include/GaudiKernel/DataObjectHandle.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,14 +10,14 @@
 \***********************************************************************************/
 #pragma once
 
-#include "GaudiKernel/AnyDataWrapper.h"
-#include "GaudiKernel/DataObjectHandleBase.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IDataHandleHolder.h"
-#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/NamedRange.h"
-#include "boost/algorithm/string/replace.hpp"
+#include <GaudiKernel/AnyDataWrapper.h>
+#include <GaudiKernel/DataObjectHandleBase.h>
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IDataHandleHolder.h>
+#include <GaudiKernel/IProperty.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/NamedRange.h>
+#include <boost/algorithm/string/replace.hpp>
 #include <type_traits>
 
 //---------------------------------------------------------------------------
diff --git a/GaudiKernel/include/GaudiKernel/DataObjectHandleBase.h b/GaudiKernel/include/GaudiKernel/DataObjectHandleBase.h
index 9db44e7ec0..234f393239 100644
--- a/GaudiKernel/include/GaudiKernel/DataObjectHandleBase.h
+++ b/GaudiKernel/include/GaudiKernel/DataObjectHandleBase.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2020 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -13,11 +13,11 @@
 
 #include <mutex>
 
-#include "GaudiKernel/DataHandle.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/DataHandle.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/IProperty.h>
+#include <GaudiKernel/SmartIF.h>
 
 //---------------------------------------------------------------------------
 
diff --git a/GaudiKernel/include/GaudiKernel/DataStreamTool.h b/GaudiKernel/include/GaudiKernel/DataStreamTool.h
index cc6228415c..40ab5c8ab4 100644
--- a/GaudiKernel/include/GaudiKernel/DataStreamTool.h
+++ b/GaudiKernel/include/GaudiKernel/DataStreamTool.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -16,11 +16,11 @@
 #include <vector>
 
 // from Gaudi
-#include "GaudiKernel/AlgTool.h"
-#include "GaudiKernel/IDataStreamTool.h"
-#include "GaudiKernel/IEvtSelector.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/AlgTool.h>
+#include <GaudiKernel/IDataStreamTool.h>
+#include <GaudiKernel/IEvtSelector.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/Service.h>
 
 class IIncidentSvc;
 
diff --git a/GaudiKernel/include/GaudiKernel/DataSvc.h b/GaudiKernel/include/GaudiKernel/DataSvc.h
index ceee2c7d35..d48ea8fca5 100644
--- a/GaudiKernel/include/GaudiKernel/DataSvc.h
+++ b/GaudiKernel/include/GaudiKernel/DataSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,14 +12,14 @@
 #define GAUDIKERNEL_DATASVC_H
 
 // Include files
-#include "GaudiKernel/DataStoreItem.h"
-#include "GaudiKernel/IConversionSvc.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/RegistryEntry.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/DataStoreItem.h>
+#include <GaudiKernel/IConversionSvc.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/RegistryEntry.h>
+#include <GaudiKernel/Service.h>
+#include <GaudiKernel/SmartIF.h>
 
 #include <string_view>
 
diff --git a/GaudiKernel/include/GaudiKernel/DataTypeInfo.h b/GaudiKernel/include/GaudiKernel/DataTypeInfo.h
index a38459745b..9427d3aa4f 100644
--- a/GaudiKernel/include/GaudiKernel/DataTypeInfo.h
+++ b/GaudiKernel/include/GaudiKernel/DataTypeInfo.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef GAUDIKERNEL_DATATYPES_H
 #define GAUDIKERNEL_DATATYPES_H
 
-#include "GaudiKernel/SmartRef.h"
+#include <GaudiKernel/SmartRef.h>
 #include <cstring>
 #include <string>
 
diff --git a/GaudiKernel/include/GaudiKernel/Debugger.h b/GaudiKernel/include/GaudiKernel/Debugger.h
index a56cab467c..22d8e6f2ae 100644
--- a/GaudiKernel/include/GaudiKernel/Debugger.h
+++ b/GaudiKernel/include/GaudiKernel/Debugger.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -24,7 +24,7 @@
 #ifndef GAUDI_SYSTEM_DEBUGGER_H
 #define GAUDI_SYSTEM_DEBUGGER_H
 
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 
 namespace System {
   /// Break the execution of the application and invoke the debugger
diff --git a/GaudiKernel/include/GaudiKernel/DirSearchPath.h b/GaudiKernel/include/GaudiKernel/DirSearchPath.h
index dae7a9b0a1..252160a28a 100644
--- a/GaudiKernel/include/GaudiKernel/DirSearchPath.h
+++ b/GaudiKernel/include/GaudiKernel/DirSearchPath.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -14,9 +14,9 @@
  * @brief search for files in a list of directories
  * @author Paolo Calafiura <pcalafiura@lbl.gov> - ATLAS Collaboration
  */
-#include "GaudiKernel/Kernel.h"           /* GAUDI_API */
-#include "boost/filesystem/exception.hpp" /*filesystem_error*/
-#include "boost/filesystem/path.hpp"
+#include <GaudiKernel/Kernel.h>           /* GAUDI_API */
+#include <boost/filesystem/exception.hpp> /*filesystem_error*/
+#include <boost/filesystem/path.hpp>
 #include <functional> /* binary_function */
 #include <list>
 #include <string>
diff --git a/GaudiKernel/include/GaudiKernel/Environment.h b/GaudiKernel/include/GaudiKernel/Environment.h
index 78cdfe96dd..da2b6d7a2a 100644
--- a/GaudiKernel/include/GaudiKernel/Environment.h
+++ b/GaudiKernel/include/GaudiKernel/Environment.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -24,9 +24,9 @@
 #define GAUDIKERNEL_ENVIRONMENT_H
 
 // Framework include files
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/SystemBase.h"
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/StatusCode.h>
+#include <GaudiKernel/SystemBase.h>
 
 // C++ include files
 #include <string>
diff --git a/GaudiKernel/include/GaudiKernel/EventContextHash.h b/GaudiKernel/include/GaudiKernel/EventContextHash.h
index 462f93ce1e..6e9d28dffd 100644
--- a/GaudiKernel/include/GaudiKernel/EventContextHash.h
+++ b/GaudiKernel/include/GaudiKernel/EventContextHash.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,7 +10,7 @@
 \***********************************************************************************/
 #ifndef __EVENT_CONTEXT_HASH_H
 #define __EVENT_CONTEXT_HASH_H
-#include "GaudiKernel/EventContext.h"
+#include <GaudiKernel/EventContext.h>
 /**
  * @class EventContextHash Create a hash from EventContext so
  * EvenContexts can be used as keys in unordered maps. Hash is crated
diff --git a/GaudiKernel/include/GaudiKernel/EventIDBase.h b/GaudiKernel/include/GaudiKernel/EventIDBase.h
index d2e544d9ae..b84ef254d5 100644
--- a/GaudiKernel/include/GaudiKernel/EventIDBase.h
+++ b/GaudiKernel/include/GaudiKernel/EventIDBase.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -28,7 +28,7 @@
 #include <iostream>
 #include <tuple>
 
-#include "GaudiKernel/compose.h"
+#include <GaudiKernel/compose.h>
 namespace details {
   template <typename lambda>
   struct arg_helper : public arg_helper<decltype( &lambda::operator() )> {};
diff --git a/GaudiKernel/include/GaudiKernel/EventIDRange.h b/GaudiKernel/include/GaudiKernel/EventIDRange.h
index 74ba7a1447..9937ad8d49 100644
--- a/GaudiKernel/include/GaudiKernel/EventIDRange.h
+++ b/GaudiKernel/include/GaudiKernel/EventIDRange.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,7 +20,7 @@
  *
  *****************************************************************************/
 
-#include "GaudiKernel/EventIDBase.h"
+#include <GaudiKernel/EventIDBase.h>
 #include <iostream>
 #include <sstream>
 #include <string>
diff --git a/GaudiKernel/include/GaudiKernel/EventSelectorDataStream.h b/GaudiKernel/include/GaudiKernel/EventSelectorDataStream.h
index 27e39d1ce8..767c08327a 100644
--- a/GaudiKernel/include/GaudiKernel/EventSelectorDataStream.h
+++ b/GaudiKernel/include/GaudiKernel/EventSelectorDataStream.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,8 +23,8 @@
 #define GAUDIKERNEL_EVENTSELECTORDATASTREAM_H 1
 
 // Include files
-#include "GaudiKernel/IEvtSelector.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/IEvtSelector.h>
 
 // STL include files
 #include <iostream>
diff --git a/GaudiKernel/include/GaudiKernel/FileIncident.h b/GaudiKernel/include/GaudiKernel/FileIncident.h
index 2e13fbbc55..e2bf58bf7e 100644
--- a/GaudiKernel/include/GaudiKernel/FileIncident.h
+++ b/GaudiKernel/include/GaudiKernel/FileIncident.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -17,7 +17,7 @@
  *  @author Charles Leggett
  **/
 
-#include "GaudiKernel/Incident.h"
+#include <GaudiKernel/Incident.h>
 
 #include <string>
 
diff --git a/GaudiKernel/include/GaudiKernel/FunctionalFilterDecision.h b/GaudiKernel/include/GaudiKernel/FunctionalFilterDecision.h
index eafe95a56d..72645625a9 100644
--- a/GaudiKernel/include/GaudiKernel/FunctionalFilterDecision.h
+++ b/GaudiKernel/include/GaudiKernel/FunctionalFilterDecision.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,7 +10,7 @@
 \***********************************************************************************/
 #pragma once
 
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/StatusCode.h>
 
 namespace Gaudi::Functional {
   // define error enum / category
diff --git a/GaudiKernel/include/GaudiKernel/GaudiException.h b/GaudiKernel/include/GaudiKernel/GaudiException.h
index 35437e4daf..2222d659a7 100644
--- a/GaudiKernel/include/GaudiKernel/GaudiException.h
+++ b/GaudiKernel/include/GaudiKernel/GaudiException.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,9 +12,9 @@
 #define GAUDIKERNEL_GAUDIEXCEPTION_H
 
 // Include files
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/StatusCode.h>
 
 #include <exception>
 #include <iostream>
diff --git a/GaudiKernel/include/GaudiKernel/GaudiHandle.h b/GaudiKernel/include/GaudiKernel/GaudiHandle.h
index 568ed7d497..9d7868e59c 100644
--- a/GaudiKernel/include/GaudiKernel/GaudiHandle.h
+++ b/GaudiKernel/include/GaudiKernel/GaudiHandle.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2023 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,10 +12,10 @@
 #define GAUDIKERNEL_GAUDIHANDLE_H
 
 // Includes
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/System.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IInterface.h>
+#include <GaudiKernel/System.h>
 
 #include <algorithm>
 #include <iostream>
diff --git a/GaudiKernel/include/GaudiKernel/GenericAddress.h b/GaudiKernel/include/GaudiKernel/GenericAddress.h
index fcfcf35266..54fe9e0732 100644
--- a/GaudiKernel/include/GaudiKernel/GenericAddress.h
+++ b/GaudiKernel/include/GaudiKernel/GenericAddress.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDIKERNEL_GENERICADDRESS_H
 
 // Framework include files
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/Kernel.h>
 
 // Forward declarations
 class IRegistry;
diff --git a/GaudiKernel/include/GaudiKernel/GenericMatrixTypes.h b/GaudiKernel/include/GaudiKernel/GenericMatrixTypes.h
index 2840f5333e..f54f9a8400 100644
--- a/GaudiKernel/include/GaudiKernel/GenericMatrixTypes.h
+++ b/GaudiKernel/include/GaudiKernel/GenericMatrixTypes.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,7 +23,7 @@
 #define GAUDIKERNEL_GENERICMATRIXTYPES_H 1
 
 // Include files
-#include "Math/SMatrix.h"
+#include <Math/SMatrix.h>
 
 /** @namespace Gaudi
  *
diff --git a/GaudiKernel/include/GaudiKernel/GenericVectorTypes.h b/GaudiKernel/include/GaudiKernel/GenericVectorTypes.h
index 83ae2483b4..dd9a017ccd 100644
--- a/GaudiKernel/include/GaudiKernel/GenericVectorTypes.h
+++ b/GaudiKernel/include/GaudiKernel/GenericVectorTypes.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,7 +23,7 @@
 #define GAUDIKERNEL_GENERICVECTORTYPES_H 1
 
 // Include files
-#include "Math/SVector.h"
+#include <Math/SVector.h>
 
 /** @namespace Gaudi
  *
diff --git a/GaudiKernel/include/GaudiKernel/Guards.h b/GaudiKernel/include/GaudiKernel/Guards.h
index a7676863e9..6572315353 100644
--- a/GaudiKernel/include/GaudiKernel/Guards.h
+++ b/GaudiKernel/include/GaudiKernel/Guards.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -19,10 +19,10 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/IAuditor.h"
-#include "GaudiKernel/IExceptionSvc.h"
-#include "GaudiKernel/INamedInterface.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/IAuditor.h>
+#include <GaudiKernel/IExceptionSvc.h>
+#include <GaudiKernel/INamedInterface.h>
+#include <GaudiKernel/SmartIF.h>
 // ============================================================================
 // forward declaration
 // ============================================================================
diff --git a/GaudiKernel/include/GaudiKernel/Hash.h b/GaudiKernel/include/GaudiKernel/Hash.h
index 961c9e5b8f..843cc12946 100644
--- a/GaudiKernel/include/GaudiKernel/Hash.h
+++ b/GaudiKernel/include/GaudiKernel/Hash.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,7 +20,7 @@
 // ============================================================================
 // Boost
 // ============================================================================
-#include "boost/functional/hash.hpp"
+#include <boost/functional/hash.hpp>
 // ============================================================================
 namespace GaudiUtils {
   /// Generic hash implementation (for easy migration to the new Hash class).
diff --git a/GaudiKernel/include/GaudiKernel/HashMap.h b/GaudiKernel/include/GaudiKernel/HashMap.h
index ad0fc39cb6..99f2ba40a4 100644
--- a/GaudiKernel/include/GaudiKernel/HashMap.h
+++ b/GaudiKernel/include/GaudiKernel/HashMap.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDIKERNEL_HASHMAP_H 1
 
 // Include files
-#include "GaudiKernel/Hash.h"
-#include "GaudiKernel/Map.h"
+#include <GaudiKernel/Hash.h>
+#include <GaudiKernel/Map.h>
 #include <unordered_map>
 
 namespace GaudiUtils {
diff --git a/GaudiKernel/include/GaudiKernel/HistoDef.h b/GaudiKernel/include/GaudiKernel/HistoDef.h
index 38e8e26f88..2c2434e3eb 100644
--- a/GaudiKernel/include/GaudiKernel/HistoDef.h
+++ b/GaudiKernel/include/GaudiKernel/HistoDef.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,7 +20,7 @@
 // ============================================================================
 // Gaudi
 // ============================================================================
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 // ============================================================================
 // Forward decalrations
 // ============================================================================
diff --git a/GaudiKernel/include/GaudiKernel/HistoProperty.h b/GaudiKernel/include/GaudiKernel/HistoProperty.h
index d41585f960..637debb0dd 100644
--- a/GaudiKernel/include/GaudiKernel/HistoProperty.h
+++ b/GaudiKernel/include/GaudiKernel/HistoProperty.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,8 +15,8 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/HistoDef.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/HistoDef.h>
 namespace Gaudi {
   namespace Details {
     namespace Property {
diff --git a/GaudiKernel/include/GaudiKernel/HistogramBase.h b/GaudiKernel/include/GaudiKernel/HistogramBase.h
index 20f0127af8..f65172a032 100644
--- a/GaudiKernel/include/GaudiKernel/HistogramBase.h
+++ b/GaudiKernel/include/GaudiKernel/HistogramBase.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef HISTOGRAMSVC_BASE_H
 #define HISTOGRAMSVC_BASE_H
 
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 #include <iostream>
 
 class TObject;
diff --git a/GaudiKernel/include/GaudiKernel/HistoryObj.h b/GaudiKernel/include/GaudiKernel/HistoryObj.h
index 629deea151..5e70753a05 100644
--- a/GaudiKernel/include/GaudiKernel/HistoryObj.h
+++ b/GaudiKernel/include/GaudiKernel/HistoryObj.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,8 +11,8 @@
 #ifndef GAUDIKERNEL_HISTORYOBJ_H
 #define GAUDIKERNEL_HISTORYOBJ_H
 
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/DataObject.h"
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/DataObject.h>
 
 #include <ostream>
 #include <string>
diff --git a/GaudiKernel/include/GaudiKernel/IAIDATupleSvc.h b/GaudiKernel/include/GaudiKernel/IAIDATupleSvc.h
index 15e0c728b0..f222cfef08 100644
--- a/GaudiKernel/include/GaudiKernel/IAIDATupleSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IAIDATupleSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIKERNEL_IAIDATUPLESVC_H 1
 
 // Include files:
-#include "GaudiKernel/IDataProviderSvc.h"
+#include <GaudiKernel/IDataProviderSvc.h>
 
 // Forward declarations:
 class DataObject;
diff --git a/GaudiKernel/include/GaudiKernel/IAddressCreator.h b/GaudiKernel/include/GaudiKernel/IAddressCreator.h
index 302e4371b2..5f918eef24 100644
--- a/GaudiKernel/include/GaudiKernel/IAddressCreator.h
+++ b/GaudiKernel/include/GaudiKernel/IAddressCreator.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDIKERNEL_IADDRESSCREATOR_H
 
 // Framework include files
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/IInterface.h>
 
 // C++ include files
 #include <string>
diff --git a/GaudiKernel/include/GaudiKernel/IAlgContextSvc.h b/GaudiKernel/include/GaudiKernel/IAlgContextSvc.h
index d05b5fcb04..322fd8f41f 100644
--- a/GaudiKernel/include/GaudiKernel/IAlgContextSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IAlgContextSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -19,10 +19,10 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/EventContext.h"
-#include "GaudiKernel/IAlgorithm.h"
-#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/EventContext.h>
+#include <GaudiKernel/IAlgorithm.h>
+#include <GaudiKernel/IInterface.h>
+#include <GaudiKernel/SmartIF.h>
 // ============================================================================
 /** @class IAlgContextSvc
  *  An abstract interface for Algorithm Context Service
diff --git a/GaudiKernel/include/GaudiKernel/IAlgExecStateSvc.h b/GaudiKernel/include/GaudiKernel/IAlgExecStateSvc.h
index 922c4dce7f..cd45a23fb7 100644
--- a/GaudiKernel/include/GaudiKernel/IAlgExecStateSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IAlgExecStateSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,10 +11,10 @@
 #ifndef GAUDIKERNEL_IALGEXECSTATESVC_H
 #define GAUDIKERNEL_IALGEXECSTATESVC_H 1
 
-#include "GaudiKernel/IAlgorithm.h"
-#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/StringKey.h"
+#include <GaudiKernel/IAlgorithm.h>
+#include <GaudiKernel/IInterface.h>
+#include <GaudiKernel/StatusCode.h>
+#include <GaudiKernel/StringKey.h>
 #include <map>
 #include <sstream>
 #include <string>
diff --git a/GaudiKernel/include/GaudiKernel/IAlgManager.h b/GaudiKernel/include/GaudiKernel/IAlgManager.h
index 4590a53cc1..e0ecce0bef 100644
--- a/GaudiKernel/include/GaudiKernel/IAlgManager.h
+++ b/GaudiKernel/include/GaudiKernel/IAlgManager.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,9 +12,9 @@
 #define GAUDIKERNEL_IALGMANAGER_H
 
 // Include files
-#include "GaudiKernel/IComponentManager.h"
-#include "GaudiKernel/SmartIF.h"
-#include "GaudiKernel/TypeNameString.h"
+#include <GaudiKernel/IComponentManager.h>
+#include <GaudiKernel/SmartIF.h>
+#include <GaudiKernel/TypeNameString.h>
 #include <list>
 #include <string>
 
diff --git a/GaudiKernel/include/GaudiKernel/IAlgResourcePool.h b/GaudiKernel/include/GaudiKernel/IAlgResourcePool.h
index 3e951803a3..d0b4580d1f 100644
--- a/GaudiKernel/include/GaudiKernel/IAlgResourcePool.h
+++ b/GaudiKernel/include/GaudiKernel/IAlgResourcePool.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIKERNEL_IALGRESOURCEPOOL_H
 
 // Framework includes
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 
 // C++ includes
 #include <list>
diff --git a/GaudiKernel/include/GaudiKernel/IAlgTool.h b/GaudiKernel/include/GaudiKernel/IAlgTool.h
index 83832a8920..caa1575e20 100644
--- a/GaudiKernel/include/GaudiKernel/IAlgTool.h
+++ b/GaudiKernel/include/GaudiKernel/IAlgTool.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDIKERNEL_IALGTOOL_H
 
 // Include files
-#include "GaudiKernel/INamedInterface.h"
-#include "GaudiKernel/IStateful.h"
+#include <GaudiKernel/INamedInterface.h>
+#include <GaudiKernel/IStateful.h>
 #include <string>
 
 // Forward declarations
diff --git a/GaudiKernel/include/GaudiKernel/IAlgorithm.h b/GaudiKernel/include/GaudiKernel/IAlgorithm.h
index 7961f503fd..3414561d31 100644
--- a/GaudiKernel/include/GaudiKernel/IAlgorithm.h
+++ b/GaudiKernel/include/GaudiKernel/IAlgorithm.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDIKERNEL_IALGORITHM_H
 
 // Include files
-#include "GaudiKernel/INamedInterface.h"
-#include "GaudiKernel/IStateful.h"
+#include <GaudiKernel/INamedInterface.h>
+#include <GaudiKernel/IStateful.h>
 #include <string>
 
 class IAlgTool;
diff --git a/GaudiKernel/include/GaudiKernel/IAppMgrUI.h b/GaudiKernel/include/GaudiKernel/IAppMgrUI.h
index 9bb94c70fb..f081604d4c 100644
--- a/GaudiKernel/include/GaudiKernel/IAppMgrUI.h
+++ b/GaudiKernel/include/GaudiKernel/IAppMgrUI.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,9 +12,9 @@
 #define GAUDIKERNEL_IAPPMGRUI_H 1
 
 // Include files
-#include "GaudiKernel/INamedInterface.h"
-#include "GaudiKernel/StateMachine.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/INamedInterface.h>
+#include <GaudiKernel/StateMachine.h>
+#include <GaudiKernel/StatusCode.h>
 
 #include <string>
 
diff --git a/GaudiKernel/include/GaudiKernel/IAuditor.h b/GaudiKernel/include/GaudiKernel/IAuditor.h
index 609ac3c33d..a3b52ce2fc 100644
--- a/GaudiKernel/include/GaudiKernel/IAuditor.h
+++ b/GaudiKernel/include/GaudiKernel/IAuditor.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDI_IAUDITOR_H
 
 // Include files
-#include "GaudiKernel/INamedInterface.h"
+#include <GaudiKernel/INamedInterface.h>
 #include <array>
 #include <string>
 
diff --git a/GaudiKernel/include/GaudiKernel/IAuditorSvc.h b/GaudiKernel/include/GaudiKernel/IAuditorSvc.h
index 87960132de..de6d100613 100644
--- a/GaudiKernel/include/GaudiKernel/IAuditorSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IAuditorSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,9 +11,9 @@
 #ifndef GAUDIKERNEL_IAUDITORSVC_H
 #define GAUDIKERNEL_IAUDITORSVC_H
 
-#include "GaudiKernel/IAuditor.h"
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/IAuditor.h>
+#include <GaudiKernel/IService.h>
+#include <GaudiKernel/System.h>
 #include <string>
 
 /** @class IAuditorSvc IAuditorSvc.h GaudiKernel/IAuditorSvc.h
diff --git a/GaudiKernel/include/GaudiKernel/IBinder.h b/GaudiKernel/include/GaudiKernel/IBinder.h
index 16fd7b1bce..34f5c8bc4f 100644
--- a/GaudiKernel/include/GaudiKernel/IBinder.h
+++ b/GaudiKernel/include/GaudiKernel/IBinder.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration           *
+* (c) Copyright 2021-2024 CERN for the benefit of the LHCb Collaboration      *
 *                                                                             *
 * This software is distributed under the terms of the GNU General Public      *
 * Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   *
@@ -9,8 +9,8 @@
 * or submit itself to any jurisdiction.                                       *
 \*****************************************************************************/
 #pragma once
-#include "GaudiKernel/IAlgTool.h"
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IAlgTool.h>
+#include <GaudiKernel/IInterface.h>
 #include <type_traits>
 #include <utility>
 
diff --git a/GaudiKernel/include/GaudiKernel/ICPUCrunchSvc.h b/GaudiKernel/include/GaudiKernel/ICPUCrunchSvc.h
index 98730ed535..a21104c575 100644
--- a/GaudiKernel/include/GaudiKernel/ICPUCrunchSvc.h
+++ b/GaudiKernel/include/GaudiKernel/ICPUCrunchSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef GAUDIKERNEL_ICPUCRUNCHSVC_H
 #define GAUDIKERNEL_ICPUCRUNCHSVC_H 1
 
-#include "GaudiKernel/IService.h"
+#include <GaudiKernel/IService.h>
 #include <chrono>
 
 class GAUDI_API ICPUCrunchSvc : virtual public IService {
diff --git a/GaudiKernel/include/GaudiKernel/IChronoStatSvc.h b/GaudiKernel/include/GaudiKernel/IChronoStatSvc.h
index c8307a894b..8a80740b85 100644
--- a/GaudiKernel/include/GaudiKernel/IChronoStatSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IChronoStatSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -21,9 +21,9 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/IChronoSvc.h"
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/IStatSvc.h"
+#include <GaudiKernel/IChronoSvc.h>
+#include <GaudiKernel/IService.h>
+#include <GaudiKernel/IStatSvc.h>
 // ============================================================================
 /** @class IChronoStatSvc IChronoStatSvc.h GaudiKernel/IChronoStatSvc.h
  *
diff --git a/GaudiKernel/include/GaudiKernel/IChronoSvc.h b/GaudiKernel/include/GaudiKernel/IChronoSvc.h
index 23184a2e32..bafbc14f16 100644
--- a/GaudiKernel/include/GaudiKernel/IChronoSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IChronoSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -19,7 +19,7 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 // ============================================================================
 // forward declaration
 // ============================================================================
diff --git a/GaudiKernel/include/GaudiKernel/IClassIDSvc.h b/GaudiKernel/include/GaudiKernel/IClassIDSvc.h
index f7064f2188..a7b4f6aa6d 100644
--- a/GaudiKernel/include/GaudiKernel/IClassIDSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IClassIDSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -13,9 +13,9 @@
 
 #include <string>
 
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/IService.h>
+#include <GaudiKernel/StatusCode.h>
 
 /** @class IClassIDSvc
  *  @brief  interface to the CLID database
diff --git a/GaudiKernel/include/GaudiKernel/IClassInfo.h b/GaudiKernel/include/GaudiKernel/IClassInfo.h
index 1e3f817da3..7f2e0ab3e7 100644
--- a/GaudiKernel/include/GaudiKernel/IClassInfo.h
+++ b/GaudiKernel/include/GaudiKernel/IClassInfo.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDIKERNEL_ICLASSINFO_H
 
 // Experiment specific include files
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/Kernel.h>
 
 /** @class IClassInfo IClassInfo.h GaudiKernel/IClassInfo.h
 
diff --git a/GaudiKernel/include/GaudiKernel/IClassManager.h b/GaudiKernel/include/GaudiKernel/IClassManager.h
index bc16dd4a51..d0d0c8d18c 100644
--- a/GaudiKernel/include/GaudiKernel/IClassManager.h
+++ b/GaudiKernel/include/GaudiKernel/IClassManager.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIKERNEL_ICLASSMANAGER_H
 
 // Include files
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 #include <string>
 
 // Forward class declaration
diff --git a/GaudiKernel/include/GaudiKernel/IComponentManager.h b/GaudiKernel/include/GaudiKernel/IComponentManager.h
index 9aed235aa0..ed27f77d55 100644
--- a/GaudiKernel/include/GaudiKernel/IComponentManager.h
+++ b/GaudiKernel/include/GaudiKernel/IComponentManager.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define ICOMPONENTMANAGER_H_
 
 // Include files
-#include "GaudiKernel/IStateful.h"
+#include <GaudiKernel/IStateful.h>
 
 /** @class IComponentManager IComponentManager.h GaudiKernel/IComponentManager.h
 
diff --git a/GaudiKernel/include/GaudiKernel/ICondSvc.h b/GaudiKernel/include/GaudiKernel/ICondSvc.h
index cad73b864b..a068348c65 100644
--- a/GaudiKernel/include/GaudiKernel/ICondSvc.h
+++ b/GaudiKernel/include/GaudiKernel/ICondSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,12 +11,12 @@
 #ifndef GAUDIKERNEL_ICONDSVC_H
 #define GAUDIKERNEL_ICONDSVC_H 1
 
-#include "GaudiKernel/DataHandle.h"
-#include "GaudiKernel/DataObjID.h"
-#include "GaudiKernel/EventContext.h"
-#include "GaudiKernel/EventIDRange.h"
-#include "GaudiKernel/IAlgorithm.h"
-#include "GaudiKernel/IService.h"
+#include <GaudiKernel/DataHandle.h>
+#include <GaudiKernel/DataObjID.h>
+#include <GaudiKernel/EventContext.h>
+#include <GaudiKernel/EventIDRange.h>
+#include <GaudiKernel/IAlgorithm.h>
+#include <GaudiKernel/IService.h>
 
 #include <set>
 #include <sstream>
diff --git a/GaudiKernel/include/GaudiKernel/IConversionSvc.h b/GaudiKernel/include/GaudiKernel/IConversionSvc.h
index f88386161e..758c79d63b 100644
--- a/GaudiKernel/include/GaudiKernel/IConversionSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IConversionSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -14,7 +14,7 @@
 // Include files
 #include <string>
 
-#include "GaudiKernel/IConverter.h"
+#include <GaudiKernel/IConverter.h>
 
 // Forward declarations
 class ICnvFactory;
diff --git a/GaudiKernel/include/GaudiKernel/IConverter.h b/GaudiKernel/include/GaudiKernel/IConverter.h
index cf3cd906f2..40ee4f0e82 100644
--- a/GaudiKernel/include/GaudiKernel/IConverter.h
+++ b/GaudiKernel/include/GaudiKernel/IConverter.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDIKERNEL_ICONVERTER_H
 
 // Include files
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/IInterface.h>
 
 // Forward declarations
 class IDataProviderSvc;
diff --git a/GaudiKernel/include/GaudiKernel/ICounterSummarySvc.h b/GaudiKernel/include/GaudiKernel/ICounterSummarySvc.h
index 7e966680ec..92f322632b 100644
--- a/GaudiKernel/include/GaudiKernel/ICounterSummarySvc.h
+++ b/GaudiKernel/include/GaudiKernel/ICounterSummarySvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIKERNEL_ICOUNTERSUMMARYSVC_H
 
 // Include files
-#include "GaudiKernel/IService.h"
+#include <GaudiKernel/IService.h>
 #include <string>
 
 // forward declarations
diff --git a/GaudiKernel/include/GaudiKernel/IDODAlgMapper.h b/GaudiKernel/include/GaudiKernel/IDODAlgMapper.h
index b3d68cbfff..a1ecd4949b 100644
--- a/GaudiKernel/include/GaudiKernel/IDODAlgMapper.h
+++ b/GaudiKernel/include/GaudiKernel/IDODAlgMapper.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,8 +15,8 @@
 #include <string>
 
 // from Gaudi
-#include "GaudiKernel/IAlgTool.h"
-#include "GaudiKernel/TypeNameString.h"
+#include <GaudiKernel/IAlgTool.h>
+#include <GaudiKernel/TypeNameString.h>
 
 /** Interface of tools used by the DataOnDemandSvc to choose the algorithm to be
  * run to produce the data at a path.
diff --git a/GaudiKernel/include/GaudiKernel/IDODNodeMapper.h b/GaudiKernel/include/GaudiKernel/IDODNodeMapper.h
index cb024b292d..bde1dbb212 100644
--- a/GaudiKernel/include/GaudiKernel/IDODNodeMapper.h
+++ b/GaudiKernel/include/GaudiKernel/IDODNodeMapper.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,8 +15,8 @@
 #include <string>
 
 // from Gaudi
-#include "GaudiKernel/IAlgTool.h"
-#include "GaudiKernel/TypeNameString.h"
+#include <GaudiKernel/IAlgTool.h>
+#include <GaudiKernel/TypeNameString.h>
 
 /** Interface of tools used by the DataOnDemandSvc to choose the type of node to
  * be created at a path.
diff --git a/GaudiKernel/include/GaudiKernel/IDataBroker.h b/GaudiKernel/include/GaudiKernel/IDataBroker.h
index 9d44b38e63..258424d0e6 100644
--- a/GaudiKernel/include/GaudiKernel/IDataBroker.h
+++ b/GaudiKernel/include/GaudiKernel/IDataBroker.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,9 +12,9 @@
 #define GAUDIKERNEL_IDATABROKER_H
 
 // Framework includes
-#include "GaudiKernel/DataObjID.h"
-#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/TypeNameString.h"
+#include <GaudiKernel/DataObjID.h>
+#include <GaudiKernel/IInterface.h>
+#include <GaudiKernel/TypeNameString.h>
 
 // C++ includes
 #include <string>
diff --git a/GaudiKernel/include/GaudiKernel/IDataHandleHolder.h b/GaudiKernel/include/GaudiKernel/IDataHandleHolder.h
index 6e8d71ab95..df09cfe959 100644
--- a/GaudiKernel/include/GaudiKernel/IDataHandleHolder.h
+++ b/GaudiKernel/include/GaudiKernel/IDataHandleHolder.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,10 +11,10 @@
 #ifndef GAUDIKERNEL_IDATAHANDLEHOLDER
 #define GAUDIKERNEL_IDATAHANDLEHOLDER 1
 
-#include "GaudiKernel/DataHandle.h"
-#include "GaudiKernel/DataObjID.h"
-#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/INamedInterface.h"
+#include <GaudiKernel/DataHandle.h>
+#include <GaudiKernel/DataObjID.h>
+#include <GaudiKernel/IInterface.h>
+#include <GaudiKernel/INamedInterface.h>
 
 #include <set>
 #include <vector>
diff --git a/GaudiKernel/include/GaudiKernel/IDataManagerSvc.h b/GaudiKernel/include/GaudiKernel/IDataManagerSvc.h
index 376cb6d837..5720dc402d 100644
--- a/GaudiKernel/include/GaudiKernel/IDataManagerSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IDataManagerSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,16 +12,16 @@
 #define GAUDIKERNEL_IDATAMANAGERSVC_H
 
 // Include files
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/IDataStoreAgent.h"
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/IDataStoreAgent.h>
+#include <GaudiKernel/IInterface.h>
 #include <string>
 #include <string_view>
 #include <vector>
 
 // Forward declarations
 // Generic interface to data object class
-#include "GaudiKernel/DataObject.h"
+#include <GaudiKernel/DataObject.h>
 // Interface to persistency service
 class IConversionSvc;
 // Opaque addresses
diff --git a/GaudiKernel/include/GaudiKernel/IDataProviderSvc.h b/GaudiKernel/include/GaudiKernel/IDataProviderSvc.h
index 6021294b16..20c023ebc0 100644
--- a/GaudiKernel/include/GaudiKernel/IDataProviderSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IDataProviderSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIKERNEL_IDATAPROVIDERSVC_H
 
 // Framework include files
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 
 // C/C++ include files
 #include <string>
@@ -21,8 +21,8 @@
 // Forward declarations
 class IOpaqueAddress;
 class IRegistry;
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/DataStoreItem.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/DataStoreItem.h>
 
 /** @class IDataProviderSvc IDataProviderSvc.h GaudiKernel/IDataProviderSvc.h
  *
diff --git a/GaudiKernel/include/GaudiKernel/IDataSourceMgr.h b/GaudiKernel/include/GaudiKernel/IDataSourceMgr.h
index e0bd3ed080..980ef786b1 100644
--- a/GaudiKernel/include/GaudiKernel/IDataSourceMgr.h
+++ b/GaudiKernel/include/GaudiKernel/IDataSourceMgr.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIKERNEL_IDATASOURCEMGR_H
 
 // Framework include files
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 
 /** @class IDataSourceMgr IDataSourceMgr.h GaudiKernel/IDataSourceMgr.h
 
diff --git a/GaudiKernel/include/GaudiKernel/IDataStoreAgent.h b/GaudiKernel/include/GaudiKernel/IDataStoreAgent.h
index 6ad25b9652..d996c21e9e 100644
--- a/GaudiKernel/include/GaudiKernel/IDataStoreAgent.h
+++ b/GaudiKernel/include/GaudiKernel/IDataStoreAgent.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIKERNEL_IDATASTOREAGENT_H
 
 // Framework include files
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 #include <functional>
 
 // Forward declarations:
diff --git a/GaudiKernel/include/GaudiKernel/IDataStoreLeaves.h b/GaudiKernel/include/GaudiKernel/IDataStoreLeaves.h
index 2743f0a3c8..e57a400cfc 100644
--- a/GaudiKernel/include/GaudiKernel/IDataStoreLeaves.h
+++ b/GaudiKernel/include/GaudiKernel/IDataStoreLeaves.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIKERNEL_IDATASTORELEAVES_H
 
 // Include Files
-#include "GaudiKernel/IAlgTool.h"
+#include <GaudiKernel/IAlgTool.h>
 #include <vector>
 
 class DataObject;
diff --git a/GaudiKernel/include/GaudiKernel/IDataStreamTool.h b/GaudiKernel/include/GaudiKernel/IDataStreamTool.h
index b8061a6d9b..7c4c4e97f2 100644
--- a/GaudiKernel/include/GaudiKernel/IDataStreamTool.h
+++ b/GaudiKernel/include/GaudiKernel/IDataStreamTool.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -16,7 +16,7 @@
 #include <string>
 
 // from Gaudi
-#include "GaudiKernel/IAlgTool.h"
+#include <GaudiKernel/IAlgTool.h>
 
 class IEvtSelector;
 class EventSelectorDataStream;
diff --git a/GaudiKernel/include/GaudiKernel/IDetDataSvc.h b/GaudiKernel/include/GaudiKernel/IDetDataSvc.h
index 254d057df5..2857d86a2e 100644
--- a/GaudiKernel/include/GaudiKernel/IDetDataSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IDetDataSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIKERNEL_IDETDATASVC_H 1
 
 // Base class
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 
 // Forward declarations
 namespace Gaudi {
diff --git a/GaudiKernel/include/GaudiKernel/IEventTimeDecoder.h b/GaudiKernel/include/GaudiKernel/IEventTimeDecoder.h
index 12a69fabd8..f1b3d327b4 100644
--- a/GaudiKernel/include/GaudiKernel/IEventTimeDecoder.h
+++ b/GaudiKernel/include/GaudiKernel/IEventTimeDecoder.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -16,8 +16,8 @@
 #include <string>
 
 // from Gaudi
-#include "GaudiKernel/IAlgTool.h"
-#include "GaudiKernel/Time.h"
+#include <GaudiKernel/IAlgTool.h>
+#include <GaudiKernel/Time.h>
 
 /** @class IEventTimeDecoder IEventTimeDecoder.h GaudiKernel/IEventTimeDecoder.h
  *
diff --git a/GaudiKernel/include/GaudiKernel/IEvtSelector.h b/GaudiKernel/include/GaudiKernel/IEvtSelector.h
index e2e474bac7..8c086d1bc3 100644
--- a/GaudiKernel/include/GaudiKernel/IEvtSelector.h
+++ b/GaudiKernel/include/GaudiKernel/IEvtSelector.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,9 +12,9 @@
 #define GAUDIKERNEL_IEVTSELECTOR_H 1
 
 // Include files
-#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/IInterface.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/StatusCode.h>
 #include <string>
 
 /** @class IEvtSelector IEvtSelector.h GaudiKernel/IEvtSelector.h
diff --git a/GaudiKernel/include/GaudiKernel/IExceptionSvc.h b/GaudiKernel/include/GaudiKernel/IExceptionSvc.h
index d98dec0489..7a6bfddd09 100644
--- a/GaudiKernel/include/GaudiKernel/IExceptionSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IExceptionSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -16,8 +16,8 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IInterface.h>
 // ============================================================================
 // Forward declarations
 // ============================================================================
diff --git a/GaudiKernel/include/GaudiKernel/IFileAccess.h b/GaudiKernel/include/GaudiKernel/IFileAccess.h
index 07e438c884..acaabc7275 100644
--- a/GaudiKernel/include/GaudiKernel/IFileAccess.h
+++ b/GaudiKernel/include/GaudiKernel/IFileAccess.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GaudiKernel_IFileAccess_H
 
 // Include Files
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 #include <istream>
 #include <memory>
 #include <optional>
diff --git a/GaudiKernel/include/GaudiKernel/IFileMgr.h b/GaudiKernel/include/GaudiKernel/IFileMgr.h
index dfb65806be..b260b3730e 100644
--- a/GaudiKernel/include/GaudiKernel/IFileMgr.h
+++ b/GaudiKernel/include/GaudiKernel/IFileMgr.h
@@ -17,8 +17,8 @@
 #ifndef GAUDIKERNEL_IFILEMGR_H
 #define GAUDIKERNEL_IFILEMGR_H 1
 
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/IService.h"
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/IService.h>
 
 #include <bitset>
 #include <fcntl.h>
diff --git a/GaudiKernel/include/GaudiKernel/IHistogramSvc.h b/GaudiKernel/include/GaudiKernel/IHistogramSvc.h
index cf32911404..8e9797575a 100644
--- a/GaudiKernel/include/GaudiKernel/IHistogramSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IHistogramSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDIKERNEL_IHISTOGRAMSVC_H
 
 // Include files
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IService.h"
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IService.h>
 #include <iostream>
 #include <string>
 #include <vector>
diff --git a/GaudiKernel/include/GaudiKernel/IHistorySvc.h b/GaudiKernel/include/GaudiKernel/IHistorySvc.h
index 4a52aed10f..88c7e96cc6 100644
--- a/GaudiKernel/include/GaudiKernel/IHistorySvc.h
+++ b/GaudiKernel/include/GaudiKernel/IHistorySvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,8 +11,8 @@
 #ifndef GAUDIKERNEL_IHISTORYSVC_H
 #define GAUDIKERNEL_IHISTORYSVC_H
 
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/IService.h"
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/IService.h>
 
 #include <set>
 #include <string>
diff --git a/GaudiKernel/include/GaudiKernel/IHiveWhiteBoard.h b/GaudiKernel/include/GaudiKernel/IHiveWhiteBoard.h
index 92ab15263f..09fd74262d 100644
--- a/GaudiKernel/include/GaudiKernel/IHiveWhiteBoard.h
+++ b/GaudiKernel/include/GaudiKernel/IHiveWhiteBoard.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDIKERNEL_IHIVEWHITEBOARD_H
 
 // Framework include files
-#include "GaudiKernel/DataObjID.h"
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/DataObjID.h>
+#include <GaudiKernel/IInterface.h>
 
 // C++ include files
 #include <string>
diff --git a/GaudiKernel/include/GaudiKernel/IIncidentListener.h b/GaudiKernel/include/GaudiKernel/IIncidentListener.h
index 398cb14040..00b5ccb4da 100644
--- a/GaudiKernel/include/GaudiKernel/IIncidentListener.h
+++ b/GaudiKernel/include/GaudiKernel/IIncidentListener.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDIKERNEL_IINCIDENTLISTENER_H
 
 // Include Files
-#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/Incident.h"
+#include <GaudiKernel/IInterface.h>
+#include <GaudiKernel/Incident.h>
 #include <string>
 
 class EventContext;
diff --git a/GaudiKernel/include/GaudiKernel/IIncidentSvc.h b/GaudiKernel/include/GaudiKernel/IIncidentSvc.h
index a75646ac24..acaef854df 100644
--- a/GaudiKernel/include/GaudiKernel/IIncidentSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IIncidentSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,9 +12,9 @@
 #define INTERFACES_IINCIDENTSVC_H
 
 // Include Files
-#include "GaudiKernel/EventContextHash.h"
-#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/Incident.h"
+#include <GaudiKernel/EventContextHash.h>
+#include <GaudiKernel/IInterface.h>
+#include <GaudiKernel/Incident.h>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/GaudiKernel/include/GaudiKernel/IInspectable.h b/GaudiKernel/include/GaudiKernel/IInspectable.h
index 5054a666dc..a2eab7fae3 100644
--- a/GaudiKernel/include/GaudiKernel/IInspectable.h
+++ b/GaudiKernel/include/GaudiKernel/IInspectable.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIKERNEL_IINSPECTABLE_H
 
 // Include Files
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 
 // Forward declaration
 class IInspector;
diff --git a/GaudiKernel/include/GaudiKernel/IInspector.h b/GaudiKernel/include/GaudiKernel/IInspector.h
index b4e243c794..d1929b5f92 100644
--- a/GaudiKernel/include/GaudiKernel/IInspector.h
+++ b/GaudiKernel/include/GaudiKernel/IInspector.h
@@ -16,7 +16,7 @@
 #include <typeinfo>
 
 // Framework Include files
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 
 /** @class IInspector IInspector.h GaudiKernel/IInspector.h
 
diff --git a/GaudiKernel/include/GaudiKernel/IInterface.h b/GaudiKernel/include/GaudiKernel/IInterface.h
index e6bfbb5363..8d5c8a799a 100644
--- a/GaudiKernel/include/GaudiKernel/IInterface.h
+++ b/GaudiKernel/include/GaudiKernel/IInterface.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,9 +12,9 @@
 #define GAUDIKERNEL_IINTERFACE_H
 
 // Include files
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/StatusCode.h>
+#include <GaudiKernel/System.h>
 #include <ostream>
 #include <type_traits>
 #include <typeinfo>
@@ -351,8 +351,8 @@ inline DEST** pp_cast( SRC** ptr ) {
   return reinterpret_cast<DEST**>( ptr );
 }
 
-#include "GaudiKernel/extend_interfaces.h"
-#include "GaudiKernel/extends.h"
-#include "GaudiKernel/implements.h"
+#include <GaudiKernel/extend_interfaces.h>
+#include <GaudiKernel/extends.h>
+#include <GaudiKernel/implements.h>
 
 #endif // GAUDIKERNEL_IINTERFACE_H
diff --git a/GaudiKernel/include/GaudiKernel/IIoComponent.h b/GaudiKernel/include/GaudiKernel/IIoComponent.h
index 1dbe4256c8..b2529c7bdc 100644
--- a/GaudiKernel/include/GaudiKernel/IIoComponent.h
+++ b/GaudiKernel/include/GaudiKernel/IIoComponent.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,8 +20,8 @@
  */
 
 // GaudiKernel includes
-#include "GaudiKernel/INamedInterface.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/INamedInterface.h>
+#include <GaudiKernel/StatusCode.h>
 
 class GAUDI_API IIoComponent : virtual public INamedInterface {
 
diff --git a/GaudiKernel/include/GaudiKernel/IIoComponentMgr.h b/GaudiKernel/include/GaudiKernel/IIoComponentMgr.h
index ba3990ed0b..a02266fc11 100644
--- a/GaudiKernel/include/GaudiKernel/IIoComponentMgr.h
+++ b/GaudiKernel/include/GaudiKernel/IIoComponentMgr.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,8 +23,8 @@
 #include <string>
 
 // GaudiKernel includes
-#include "GaudiKernel/INamedInterface.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/INamedInterface.h>
+#include <GaudiKernel/StatusCode.h>
 
 // forward declare
 class IIoComponent;
diff --git a/GaudiKernel/include/GaudiKernel/IMagneticFieldSvc.h b/GaudiKernel/include/GaudiKernel/IMagneticFieldSvc.h
index 273eda3835..664af6789c 100644
--- a/GaudiKernel/include/GaudiKernel/IMagneticFieldSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IMagneticFieldSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDIKERNEL_IMAGNETICFIELDSVC_H
 
 // Include files
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/IService.h>
+#include <GaudiKernel/StatusCode.h>
 
 // Forward declarations
 namespace ROOT {
diff --git a/GaudiKernel/include/GaudiKernel/IMessageSvc.h b/GaudiKernel/include/GaudiKernel/IMessageSvc.h
index a9d57dc680..9af1facb47 100644
--- a/GaudiKernel/include/GaudiKernel/IMessageSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IMessageSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIKERNEL_IMESSAGESVC_H
 
 // Include files
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 #include <iostream>
 #include <string>
 
diff --git a/GaudiKernel/include/GaudiKernel/IMetaDataSvc.h b/GaudiKernel/include/GaudiKernel/IMetaDataSvc.h
index 2ab450e7dc..ac852cab4a 100644
--- a/GaudiKernel/include/GaudiKernel/IMetaDataSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IMetaDataSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -18,7 +18,7 @@
 #ifndef GAUDIKERNEL_GAUDIKERNEL_IMETADATASVC_H_
 #define GAUDIKERNEL_GAUDIKERNEL_IMETADATASVC_H_
 
-#include "GaudiKernel/IService.h"
+#include <GaudiKernel/IService.h>
 #include <map>
 struct GAUDI_API IMetaDataSvc : extend_interfaces<IService> {
   DeclareInterfaceID( IMetaDataSvc, 2, 0 );
diff --git a/GaudiKernel/include/GaudiKernel/IMonitorSvc.h b/GaudiKernel/include/GaudiKernel/IMonitorSvc.h
index 683b09f9cb..4bb062469d 100644
--- a/GaudiKernel/include/GaudiKernel/IMonitorSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IMonitorSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef GAUDIKERNEL_IMONITORSVC_H
 #define GAUDIKERNEL_IMONITORSVC_H
 
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 #include <set>
 #include <string>
 
diff --git a/GaudiKernel/include/GaudiKernel/INTuple.h b/GaudiKernel/include/GaudiKernel/INTuple.h
index 09ad4b5917..9a1ce4b3bd 100644
--- a/GaudiKernel/include/GaudiKernel/INTuple.h
+++ b/GaudiKernel/include/GaudiKernel/INTuple.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -17,8 +17,8 @@
 #include <vector>
 
 // Framework include files
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/StatusCode.h>
 
 // Forward declarations
 class INTuple;
diff --git a/GaudiKernel/include/GaudiKernel/INTupleSvc.h b/GaudiKernel/include/GaudiKernel/INTupleSvc.h
index 5b05d77586..a5d83051bd 100644
--- a/GaudiKernel/include/GaudiKernel/INTupleSvc.h
+++ b/GaudiKernel/include/GaudiKernel/INTupleSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDIKERNEL_INTUPLESVC_H
 
 // Framework include files
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/IDataProviderSvc.h"
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/IDataProviderSvc.h>
 
 // Forward declarations
 namespace NTuple {
diff --git a/GaudiKernel/include/GaudiKernel/INamedInterface.h b/GaudiKernel/include/GaudiKernel/INamedInterface.h
index ea254e1a67..7621bf5068 100644
--- a/GaudiKernel/include/GaudiKernel/INamedInterface.h
+++ b/GaudiKernel/include/GaudiKernel/INamedInterface.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIKERNEL_INAMEDINTERFACE_H
 
 // Include files
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 #include <string>
 
 /**
diff --git a/GaudiKernel/include/GaudiKernel/IOpaqueAddress.h b/GaudiKernel/include/GaudiKernel/IOpaqueAddress.h
index 0cd0971107..d056a6cf55 100644
--- a/GaudiKernel/include/GaudiKernel/IOpaqueAddress.h
+++ b/GaudiKernel/include/GaudiKernel/IOpaqueAddress.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,8 +15,8 @@
 #include <string>
 
 // Experiment specific include files
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/Kernel.h>
 
 // forward declarations
 class IRegistry;
diff --git a/GaudiKernel/include/GaudiKernel/IPartPropSvc.h b/GaudiKernel/include/GaudiKernel/IPartPropSvc.h
index ed0403cff0..1a2dfb0a9b 100644
--- a/GaudiKernel/include/GaudiKernel/IPartPropSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IPartPropSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIKERNEL_IPARTPROPSVC_H
 
 // Include Files
-#include "GaudiKernel/IService.h"
+#include <GaudiKernel/IService.h>
 #include <map>
 
 namespace HepPDT {
diff --git a/GaudiKernel/include/GaudiKernel/IPartitionControl.h b/GaudiKernel/include/GaudiKernel/IPartitionControl.h
index 1b7ff7c6ac..067c35fa49 100644
--- a/GaudiKernel/include/GaudiKernel/IPartitionControl.h
+++ b/GaudiKernel/include/GaudiKernel/IPartitionControl.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIKERNEL_IPARTITIONCONTROL_H
 
 // Framework include files
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 
 // C++ include files
 #include <string>
diff --git a/GaudiKernel/include/GaudiKernel/IPersistencySvc.h b/GaudiKernel/include/GaudiKernel/IPersistencySvc.h
index f79231235a..4a23d11440 100644
--- a/GaudiKernel/include/GaudiKernel/IPersistencySvc.h
+++ b/GaudiKernel/include/GaudiKernel/IPersistencySvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define KERNEL_IPERSISTENCYSVC_H
 
 // Include files
-#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/IInterface.h>
+#include <GaudiKernel/Kernel.h>
 
 // Forward declarations
 // Generic interface to data object class
diff --git a/GaudiKernel/include/GaudiKernel/IPublishSvc.h b/GaudiKernel/include/GaudiKernel/IPublishSvc.h
index 14943fa37e..74e834eb7a 100644
--- a/GaudiKernel/include/GaudiKernel/IPublishSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IPublishSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef GAUDIKERNEL_IPUBLISH_H
 #define GAUDIKERNEL_IPUBLISH_H
 
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 #include <string>
 
 /** @class IPublishSvc IPublishSvc.h GaudiKernel/IPublishSvc.h
diff --git a/GaudiKernel/include/GaudiKernel/IRegistry.h b/GaudiKernel/include/GaudiKernel/IRegistry.h
index 9c0c94bc6c..c894af98e4 100644
--- a/GaudiKernel/include/GaudiKernel/IRegistry.h
+++ b/GaudiKernel/include/GaudiKernel/IRegistry.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIKERNEL_IREGISTRY_H
 
 // Include files
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 #include <string>
 
 // forward declarations
diff --git a/GaudiKernel/include/GaudiKernel/IRndmEngine.h b/GaudiKernel/include/GaudiKernel/IRndmEngine.h
index fcdb05bb82..cc7b070d75 100644
--- a/GaudiKernel/include/GaudiKernel/IRndmEngine.h
+++ b/GaudiKernel/include/GaudiKernel/IRndmEngine.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,7 +15,7 @@
 #include <vector>
 
 // Framework include files
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 
 /** @class IRndmEngine IRndmEngine.h GaudiKernel/IRndmEngine.h
 
diff --git a/GaudiKernel/include/GaudiKernel/IRndmGen.h b/GaudiKernel/include/GaudiKernel/IRndmGen.h
index cd0b8b1ac4..5b37233a28 100644
--- a/GaudiKernel/include/GaudiKernel/IRndmGen.h
+++ b/GaudiKernel/include/GaudiKernel/IRndmGen.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -16,7 +16,7 @@
 #include <vector>
 
 // Framework include files
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 
 // Declaration of the interface ID ( interface id, major version, minor version)
 static const InterfaceID IID_IRndmBit( 150, 1, 0 );
diff --git a/GaudiKernel/include/GaudiKernel/IRndmGenSvc.h b/GaudiKernel/include/GaudiKernel/IRndmGenSvc.h
index c0f873a130..7bf9dd77e0 100644
--- a/GaudiKernel/include/GaudiKernel/IRndmGenSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IRndmGenSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -16,9 +16,9 @@
 #include <vector>
 
 // Framework include files
-#include "GaudiKernel/IRndmGen.h"
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/IRndmGen.h>
+#include <GaudiKernel/IService.h>
+#include <GaudiKernel/SmartIF.h>
 
 // Forward declarations
 class IRndmGen;
diff --git a/GaudiKernel/include/GaudiKernel/IRunable.h b/GaudiKernel/include/GaudiKernel/IRunable.h
index a179fe43fa..3553e032c8 100644
--- a/GaudiKernel/include/GaudiKernel/IRunable.h
+++ b/GaudiKernel/include/GaudiKernel/IRunable.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef GAUDIKERNEL_IRUNNABLE_H
 #define GAUDIKERNEL_IRUNNABLE_H
 
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 
 /** @class IRunable IRunable.h GaudiKernel/IRunable.h
 
diff --git a/GaudiKernel/include/GaudiKernel/IScheduler.h b/GaudiKernel/include/GaudiKernel/IScheduler.h
index 0d0cfc5151..2adc1e9073 100644
--- a/GaudiKernel/include/GaudiKernel/IScheduler.h
+++ b/GaudiKernel/include/GaudiKernel/IScheduler.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDIKERNEL_ISCHEDULER_H
 
 // Framework include files
-#include "GaudiKernel/EventContext.h"
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/EventContext.h>
+#include <GaudiKernel/IInterface.h>
 
 // C++ include files
 #include <chrono>
diff --git a/GaudiKernel/include/GaudiKernel/ISelectStatement.h b/GaudiKernel/include/GaudiKernel/ISelectStatement.h
index 94a6cd0755..f766b782e7 100644
--- a/GaudiKernel/include/GaudiKernel/ISelectStatement.h
+++ b/GaudiKernel/include/GaudiKernel/ISelectStatement.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,7 +15,7 @@
 #include <string>
 
 // Framework include files
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 
 /** @class ISelectStatement ISelectStatement.h GaudiKernel/ISelectStatement.h
 
diff --git a/GaudiKernel/include/GaudiKernel/ISerialize.h b/GaudiKernel/include/GaudiKernel/ISerialize.h
index 040db3c8aa..47b79141ec 100644
--- a/GaudiKernel/include/GaudiKernel/ISerialize.h
+++ b/GaudiKernel/include/GaudiKernel/ISerialize.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIKERNEL_ISERIALIZE_H
 
 // Framework include files
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 
 // Forward declarations
 class StreamBuffer;
diff --git a/GaudiKernel/include/GaudiKernel/IService.h b/GaudiKernel/include/GaudiKernel/IService.h
index 91a5dd223b..d3c60c8da7 100644
--- a/GaudiKernel/include/GaudiKernel/IService.h
+++ b/GaudiKernel/include/GaudiKernel/IService.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDIKERNEL_ISERVICE_H
 
 // Include files
-#include "GaudiKernel/INamedInterface.h"
-#include "GaudiKernel/IStateful.h"
+#include <GaudiKernel/INamedInterface.h>
+#include <GaudiKernel/IStateful.h>
 #include <string>
 
 /** @class IService IService.h GaudiKernel/IService.h
diff --git a/GaudiKernel/include/GaudiKernel/IStagerSvc.h b/GaudiKernel/include/GaudiKernel/IStagerSvc.h
index 964d69cce0..8fd759a968 100644
--- a/GaudiKernel/include/GaudiKernel/IStagerSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IStagerSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define INTERFACES_ISTAGERSVC_H
 
 // Include Files
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 
 // Forward declarations
 class IIncidentListener;
diff --git a/GaudiKernel/include/GaudiKernel/IStatSvc.h b/GaudiKernel/include/GaudiKernel/IStatSvc.h
index c14d2fe756..55a8386873 100644
--- a/GaudiKernel/include/GaudiKernel/IStatSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IStatSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -19,7 +19,7 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 // ============================================================================
 // forward declaration
 // ============================================================================
diff --git a/GaudiKernel/include/GaudiKernel/IStateful.h b/GaudiKernel/include/GaudiKernel/IStateful.h
index 691e13f3a8..08bc5855c0 100644
--- a/GaudiKernel/include/GaudiKernel/IStateful.h
+++ b/GaudiKernel/include/GaudiKernel/IStateful.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDIKERNEL_ISTATEFUL_H
 
 // Include Files
-#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/StateMachine.h"
+#include <GaudiKernel/IInterface.h>
+#include <GaudiKernel/StateMachine.h>
 #include <string>
 
 /** @class IStateful IStateful.h GaudiKernel/IStateful.h
diff --git a/GaudiKernel/include/GaudiKernel/ISvcLocator.h b/GaudiKernel/include/GaudiKernel/ISvcLocator.h
index 3dd38efb1a..abe2369c21 100644
--- a/GaudiKernel/include/GaudiKernel/ISvcLocator.h
+++ b/GaudiKernel/include/GaudiKernel/ISvcLocator.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,10 +12,10 @@
 #define GAUDIKERNEL_ISVCLOCATOR_H 1
 
 // Include files
-#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/ISvcManager.h"
-#include "GaudiKernel/SmartIF.h"
-#include "GaudiKernel/TypeNameString.h"
+#include <GaudiKernel/IInterface.h>
+#include <GaudiKernel/ISvcManager.h>
+#include <GaudiKernel/SmartIF.h>
+#include <GaudiKernel/TypeNameString.h>
 
 #include <list>
 #include <string>
diff --git a/GaudiKernel/include/GaudiKernel/ISvcManager.h b/GaudiKernel/include/GaudiKernel/ISvcManager.h
index 497e2086d8..e90d9c1731 100644
--- a/GaudiKernel/include/GaudiKernel/ISvcManager.h
+++ b/GaudiKernel/include/GaudiKernel/ISvcManager.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,15 +12,15 @@
 #define GAUDIKERNEL_ISVCMANAGER_H
 
 // Include files
-#include "GaudiKernel/IComponentManager.h"
-#include "GaudiKernel/SmartIF.h"
-#include "GaudiKernel/TypeNameString.h"
+#include <GaudiKernel/IComponentManager.h>
+#include <GaudiKernel/SmartIF.h>
+#include <GaudiKernel/TypeNameString.h>
 #include <string>
 
 // Forward class declaration
 #if defined( GAUDI_V20_COMPAT ) || ( !defined( GAUDI_V22_API ) || defined( G22_NEW_SVCLOCATOR ) )
 class ISvcFactory;
-#  include "GaudiKernel/IService.h"
+#  include <GaudiKernel/IService.h>
 #else
 class IService;
 #endif
diff --git a/GaudiKernel/include/GaudiKernel/ITHistSvc.h b/GaudiKernel/include/GaudiKernel/ITHistSvc.h
index 245bbe3a11..5b3cdbdf94 100644
--- a/GaudiKernel/include/GaudiKernel/ITHistSvc.h
+++ b/GaudiKernel/include/GaudiKernel/ITHistSvc.h
@@ -16,10 +16,10 @@
 #include <vector>
 
 #ifndef GAUDIKERNEL_ISERVICE_H
-#  include "GaudiKernel/IService.h"
+#  include <GaudiKernel/IService.h>
 #endif
 
-#include "GaudiKernel/LockedHandle.h"
+#include <GaudiKernel/LockedHandle.h>
 
 class TObject;
 class TH1;
diff --git a/GaudiKernel/include/GaudiKernel/IThreadInitTool.h b/GaudiKernel/include/GaudiKernel/IThreadInitTool.h
index 059d1e897c..a9fef1b2e3 100644
--- a/GaudiKernel/include/GaudiKernel/IThreadInitTool.h
+++ b/GaudiKernel/include/GaudiKernel/IThreadInitTool.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef GAUDIKERNEL_ITHREADINITTOOL_H
 #define GAUDIKERNEL_ITHREADINITTOOL_H 1
 
-#include "GaudiKernel/IAlgTool.h"
+#include <GaudiKernel/IAlgTool.h>
 
 //-----------------------------------------------------------------------------
 
diff --git a/GaudiKernel/include/GaudiKernel/IThreadPoolSvc.h b/GaudiKernel/include/GaudiKernel/IThreadPoolSvc.h
index 72d219aafc..51de04b62e 100644
--- a/GaudiKernel/include/GaudiKernel/IThreadPoolSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IThreadPoolSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,8 +11,8 @@
 #ifndef GAUDIKERNEL_ITHREADPOOLSVC_H
 #define GAUDIKERNEL_ITHREADPOOLSVC_H
 
-#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/IThreadInitTool.h"
+#include <GaudiKernel/IInterface.h>
+#include <GaudiKernel/IThreadInitTool.h>
 #include <vector>
 
 //-----------------------------------------------------------------------------
diff --git a/GaudiKernel/include/GaudiKernel/ITimelineSvc.h b/GaudiKernel/include/GaudiKernel/ITimelineSvc.h
index ff5236624d..e5986e5b83 100644
--- a/GaudiKernel/include/GaudiKernel/ITimelineSvc.h
+++ b/GaudiKernel/include/GaudiKernel/ITimelineSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef GAUDIKERNEL_ITIMELINESVC_H
 #define GAUDIKERNEL_ITIMELINESVC_H
 
-#include "GaudiKernel/IService.h"
+#include <GaudiKernel/IService.h>
 
 #include <pthread.h>
 #include <string>
diff --git a/GaudiKernel/include/GaudiKernel/IToolSvc.h b/GaudiKernel/include/GaudiKernel/IToolSvc.h
index b4212b8c84..e8ce0f3c3b 100644
--- a/GaudiKernel/include/GaudiKernel/IToolSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IToolSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,8 +11,8 @@
 #ifndef GAUDIKERNEL_ITOOLSVC_H
 #define GAUDIKERNEL_ITOOLSVC_H
 
-#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/IInterface.h>
+#include <GaudiKernel/System.h>
 #include <functional>
 #include <list>
 #include <string>
diff --git a/GaudiKernel/include/GaudiKernel/IUpdateManagerSvc.h b/GaudiKernel/include/GaudiKernel/IUpdateManagerSvc.h
index de604afd48..d0fe8b6a51 100644
--- a/GaudiKernel/include/GaudiKernel/IUpdateManagerSvc.h
+++ b/GaudiKernel/include/GaudiKernel/IUpdateManagerSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -17,7 +17,7 @@
 #include <typeinfo>
 
 // from Gaudi
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 
 // forward declarations
 class DataObject;
diff --git a/GaudiKernel/include/GaudiKernel/IUpdateable.h b/GaudiKernel/include/GaudiKernel/IUpdateable.h
index de669997a5..5872e589d0 100644
--- a/GaudiKernel/include/GaudiKernel/IUpdateable.h
+++ b/GaudiKernel/include/GaudiKernel/IUpdateable.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,8 +11,8 @@
 #ifndef GAUDIKERNEL_IUPDATEABLE_H
 #define GAUDIKERNEL_IUPDATEABLE_H
 
-#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/IInterface.h>
+#include <GaudiKernel/StatusCode.h>
 
 /** @class IUpdateable IUpdateable.h GaudiKernel/IUpdateable.h
  *
diff --git a/GaudiKernel/include/GaudiKernel/IValidity.h b/GaudiKernel/include/GaudiKernel/IValidity.h
index 2b112b1745..0c66ba7016 100644
--- a/GaudiKernel/include/GaudiKernel/IValidity.h
+++ b/GaudiKernel/include/GaudiKernel/IValidity.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef __GAUDI_INTERFACES_IVALIDITY_H__
 #define __GAUDI_INTERFACES_IVALIDITY_H__
 
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 namespace Gaudi {
   class Time;
 }
diff --git a/GaudiKernel/include/GaudiKernel/IVersHistoryObj.h b/GaudiKernel/include/GaudiKernel/IVersHistoryObj.h
index 3f8029f03a..deb18b9cde 100644
--- a/GaudiKernel/include/GaudiKernel/IVersHistoryObj.h
+++ b/GaudiKernel/include/GaudiKernel/IVersHistoryObj.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,8 +11,8 @@
 #ifndef GAUDIKERNEL_IVERSHISTORYOBJ_H
 #define GAUDIKERNEL_IVERSHISTORYOBJ_H
 
-#include "GaudiKernel/Kernel.h" // GAUDI_API
 #include <Gaudi/PropertyFwd.h>
+#include <GaudiKernel/Kernel.h> // GAUDI_API
 #include <string>
 #include <vector>
 
diff --git a/GaudiKernel/include/GaudiKernel/Incident.h b/GaudiKernel/include/GaudiKernel/Incident.h
index 4ca08a07de..9db647fe9e 100644
--- a/GaudiKernel/include/GaudiKernel/Incident.h
+++ b/GaudiKernel/include/GaudiKernel/Incident.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDI_INCIDENT_H
 
 // Include files
-#include "GaudiKernel/EventContext.h"
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/EventContext.h>
+#include <GaudiKernel/Kernel.h>
 #include <string>
 
 /** @class Incident Incident.h GaudiKernel/Incident.h
diff --git a/GaudiKernel/include/GaudiKernel/JobHistory.h b/GaudiKernel/include/GaudiKernel/JobHistory.h
index a48e8eba04..876bdf74fc 100644
--- a/GaudiKernel/include/GaudiKernel/JobHistory.h
+++ b/GaudiKernel/include/GaudiKernel/JobHistory.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2022 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,9 +12,9 @@
 #ifndef GAUDIKERNEL_JOBHISTORY_H
 #define GAUDIKERNEL_JOBHISTORY_H
 
-#include "GaudiKernel/HistoryObj.h"
-#include "GaudiKernel/IVersHistoryObj.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/HistoryObj.h>
+#include <GaudiKernel/IVersHistoryObj.h>
 
 #include <ctime>
 #include <iosfwd>
diff --git a/GaudiKernel/include/GaudiKernel/KeyedContainer.h b/GaudiKernel/include/GaudiKernel/KeyedContainer.h
index e5d9aa9048..d8c1bd942c 100644
--- a/GaudiKernel/include/GaudiKernel/KeyedContainer.h
+++ b/GaudiKernel/include/GaudiKernel/KeyedContainer.h
@@ -21,9 +21,9 @@ namespace GaudiDict {
 }
 
 // Framework include files
-#include "GaudiKernel/KeyedObject.h"
-#include "GaudiKernel/KeyedObjectManager.h"
-#include "GaudiKernel/ObjectContainerBase.h"
+#include <GaudiKernel/KeyedObject.h>
+#include <GaudiKernel/KeyedObjectManager.h>
+#include <GaudiKernel/ObjectContainerBase.h>
 
 // Forward declarations
 // template <class T, class M> class KeyedContainer;
diff --git a/GaudiKernel/include/GaudiKernel/KeyedObject.h b/GaudiKernel/include/GaudiKernel/KeyedObject.h
index 7fc3b69801..8625bb7a99 100644
--- a/GaudiKernel/include/GaudiKernel/KeyedObject.h
+++ b/GaudiKernel/include/GaudiKernel/KeyedObject.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -17,9 +17,9 @@ namespace GaudiDict {
 }
 
 // Framework include files
-#include "GaudiKernel/ContainedObject.h"
-#include "GaudiKernel/KeyedContainer.h"
-#include "GaudiKernel/KeyedTraits.h"
+#include <GaudiKernel/ContainedObject.h>
+#include <GaudiKernel/KeyedContainer.h>
+#include <GaudiKernel/KeyedTraits.h>
 
 /** Definition of the templated KeyedObject class.
  *
diff --git a/GaudiKernel/include/GaudiKernel/KeyedObjectManager.h b/GaudiKernel/include/GaudiKernel/KeyedObjectManager.h
index 6653099b00..bbacf9a5d1 100644
--- a/GaudiKernel/include/GaudiKernel/KeyedObjectManager.h
+++ b/GaudiKernel/include/GaudiKernel/KeyedObjectManager.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,9 +12,9 @@
 #define GAUDIKERNEL_KEYEDOBJECTMANAGER_H
 
 // Framework include files
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/KeyedTraits.h"
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/KeyedTraits.h>
 
 // STL includes
 #include <vector>
diff --git a/GaudiKernel/include/GaudiKernel/KeyedTraits.h b/GaudiKernel/include/GaudiKernel/KeyedTraits.h
index c07b59792c..b8d58a3a16 100644
--- a/GaudiKernel/include/GaudiKernel/KeyedTraits.h
+++ b/GaudiKernel/include/GaudiKernel/KeyedTraits.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -14,7 +14,7 @@
 #define CHECK_KEYED_CONTAINER
 
 // Include files
-#include "GaudiKernel/Kernel.h" // GAUDI_API
+#include <GaudiKernel/Kernel.h> // GAUDI_API
 #include <vector>
 
 // Forward declarations
diff --git a/GaudiKernel/include/GaudiKernel/LinkManager.h b/GaudiKernel/include/GaudiKernel/LinkManager.h
index 08a0e7fb3a..2cde07bf45 100644
--- a/GaudiKernel/include/GaudiKernel/LinkManager.h
+++ b/GaudiKernel/include/GaudiKernel/LinkManager.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -16,7 +16,7 @@
 #include <string>
 #include <vector>
 // Gaudi
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 
 class DataObject;
 class IOpaqueAddress;
diff --git a/GaudiKernel/include/GaudiKernel/ListItem.h b/GaudiKernel/include/GaudiKernel/ListItem.h
index 1a4aa4cc19..4676bfc9b7 100644
--- a/GaudiKernel/include/GaudiKernel/ListItem.h
+++ b/GaudiKernel/include/GaudiKernel/ListItem.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -13,7 +13,7 @@
 
 // Include files
 #if !defined( GAUDI_V22_API ) || defined( G22_NO_DEPRECATED )
-#  include "GaudiKernel/TypeNameString.h"
+#  include <GaudiKernel/TypeNameString.h>
 typedef Gaudi::Utils::TypeNameString ListItem;
 #else
 #  error "Deprecated header file, use TypeNameString.h instead"
diff --git a/GaudiKernel/include/GaudiKernel/LoadFactoryEntries.h b/GaudiKernel/include/GaudiKernel/LoadFactoryEntries.h
index 6e9a18934e..299c2fffdd 100644
--- a/GaudiKernel/include/GaudiKernel/LoadFactoryEntries.h
+++ b/GaudiKernel/include/GaudiKernel/LoadFactoryEntries.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,7 +23,7 @@
 //====================================================================
 
 // DllMain entry point
-#include "GaudiKernel/DllMain.icpp"
+#include <GaudiKernel/DllMain.icpp>
 
 #if !defined( __APPLE__ )
 void GaudiDll::initialize( void* ) {}
diff --git a/GaudiKernel/include/GaudiKernel/LockedChrono.h b/GaudiKernel/include/GaudiKernel/LockedChrono.h
index dc318ccb5c..081ceb216f 100644
--- a/GaudiKernel/include/GaudiKernel/LockedChrono.h
+++ b/GaudiKernel/include/GaudiKernel/LockedChrono.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,7 +15,7 @@
 // ===========================================================================
 // GaudiKernel
 // ===========================================================================
-#include "GaudiKernel/ChronoEntity.h"
+#include <GaudiKernel/ChronoEntity.h>
 // ===========================================================================
 namespace Gaudi {
   // =========================================================================
diff --git a/GaudiKernel/include/GaudiKernel/Map.h b/GaudiKernel/include/GaudiKernel/Map.h
index 684ed75ca2..7fe66b06c4 100644
--- a/GaudiKernel/include/GaudiKernel/Map.h
+++ b/GaudiKernel/include/GaudiKernel/Map.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -19,7 +19,7 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/MapBase.h"
+#include <GaudiKernel/MapBase.h>
 // ============================================================================
 namespace GaudiUtils {
   // ==========================================================================
diff --git a/GaudiKernel/include/GaudiKernel/MapBase.h b/GaudiKernel/include/GaudiKernel/MapBase.h
index 17b35b5be0..07a0d834f2 100644
--- a/GaudiKernel/include/GaudiKernel/MapBase.h
+++ b/GaudiKernel/include/GaudiKernel/MapBase.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,7 +15,7 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 // ============================================================================
 namespace Gaudi {
   // ==========================================================================
diff --git a/GaudiKernel/include/GaudiKernel/Memory.h b/GaudiKernel/include/GaudiKernel/Memory.h
index 05d54994ff..e0a0ff7a58 100644
--- a/GaudiKernel/include/GaudiKernel/Memory.h
+++ b/GaudiKernel/include/GaudiKernel/Memory.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -25,8 +25,8 @@
 #define GAUDIKERNEL_MEMORY_H
 
 // Framework include files
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/SystemBase.h"
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/SystemBase.h>
 
 /** Note: OS specific details for memory usage
 
diff --git a/GaudiKernel/include/GaudiKernel/Message.h b/GaudiKernel/include/GaudiKernel/Message.h
index 5da9e1f229..e56e3ac122 100644
--- a/GaudiKernel/include/GaudiKernel/Message.h
+++ b/GaudiKernel/include/GaudiKernel/Message.h
@@ -11,8 +11,8 @@
 #ifndef GAUDIKERNEL_MESSAGE_H
 #define GAUDIKERNEL_MESSAGE_H
 
-#include "GaudiKernel/EventContext.h"
-#include "GaudiKernel/Kernel.h" // for GAUDI_API
+#include <GaudiKernel/EventContext.h>
+#include <GaudiKernel/Kernel.h> // for GAUDI_API
 #include <iostream>
 #include <string>
 
diff --git a/GaudiKernel/include/GaudiKernel/ModuleIncident.h b/GaudiKernel/include/GaudiKernel/ModuleIncident.h
index 73d8c4fd59..1bf661e409 100644
--- a/GaudiKernel/include/GaudiKernel/ModuleIncident.h
+++ b/GaudiKernel/include/GaudiKernel/ModuleIncident.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIKERNEL_MODULEINCIDENT_H
 
 // Include files
-#include "GaudiKernel/Incident.h"
+#include <GaudiKernel/Incident.h>
 #include <string>
 
 /**
diff --git a/GaudiKernel/include/GaudiKernel/ModuleInfo.h b/GaudiKernel/include/GaudiKernel/ModuleInfo.h
index f504c86064..dd3f9e65e2 100644
--- a/GaudiKernel/include/GaudiKernel/ModuleInfo.h
+++ b/GaudiKernel/include/GaudiKernel/ModuleInfo.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -24,7 +24,7 @@
 #define GAUDIKERNEL_MODULEINFO_H
 
 // Framework include files
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 // STL include files
 #include <string>
 #include <vector>
diff --git a/GaudiKernel/include/GaudiKernel/MsgStream.h b/GaudiKernel/include/GaudiKernel/MsgStream.h
index 84fd24745b..75468a3de6 100644
--- a/GaudiKernel/include/GaudiKernel/MsgStream.h
+++ b/GaudiKernel/include/GaudiKernel/MsgStream.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDIKERNEL_MSGSTREAM_H
 
 // Include files
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/SerializeSTL.h"
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/SerializeSTL.h>
 // Standard C++ classes
 #include <cstdio>
 #include <iomanip>
diff --git a/GaudiKernel/include/GaudiKernel/NTuple.h b/GaudiKernel/include/GaudiKernel/NTuple.h
index e243b34980..ca4cc9901d 100644
--- a/GaudiKernel/include/GaudiKernel/NTuple.h
+++ b/GaudiKernel/include/GaudiKernel/NTuple.h
@@ -13,11 +13,11 @@
 // ============================================================================
 // Framework include files
 // ============================================================================
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/DataTypeInfo.h"
-#include "GaudiKernel/INTuple.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/SmartDataPtr.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/DataTypeInfo.h>
+#include <GaudiKernel/INTuple.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/SmartDataPtr.h>
 // ============================================================================
 // STL include files
 // ============================================================================
diff --git a/GaudiKernel/include/GaudiKernel/NTupleImplementation.h b/GaudiKernel/include/GaudiKernel/NTupleImplementation.h
index 8f5f90eb79..e05d3cb4ca 100644
--- a/GaudiKernel/include/GaudiKernel/NTupleImplementation.h
+++ b/GaudiKernel/include/GaudiKernel/NTupleImplementation.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -13,9 +13,9 @@
 
 #include <memory>
 // Framework include files
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/NTuple.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/NTuple.h>
+#include <GaudiKernel/SmartIF.h>
 
 // Forward declarations
 class INTupleSvc;
diff --git a/GaudiKernel/include/GaudiKernel/NTupleItems.h b/GaudiKernel/include/GaudiKernel/NTupleItems.h
index f367765ca3..b9733ae521 100644
--- a/GaudiKernel/include/GaudiKernel/NTupleItems.h
+++ b/GaudiKernel/include/GaudiKernel/NTupleItems.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -18,8 +18,8 @@
 #include <vector>
 
 // Framework include files
-#include "GaudiKernel/System.h"
 #include "NTuple.h"
+#include <GaudiKernel/System.h>
 /**
  * @class NTupleItems NTupleItems.h GaudiKernel/NTupleItems.h
  *
diff --git a/GaudiKernel/include/GaudiKernel/NamedRange.h b/GaudiKernel/include/GaudiKernel/NamedRange.h
index b76bfd6825..31149d59a5 100644
--- a/GaudiKernel/include/GaudiKernel/NamedRange.h
+++ b/GaudiKernel/include/GaudiKernel/NamedRange.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -19,7 +19,7 @@
 // ============================================================================
 // GaudiUtils
 // ============================================================================
-#include "GaudiKernel/Range.h"
+#include <GaudiKernel/Range.h>
 // ============================================================================
 /** @file
  *
diff --git a/GaudiKernel/include/GaudiKernel/ObjectContainerBase.h b/GaudiKernel/include/GaudiKernel/ObjectContainerBase.h
index e94b803f41..d0dbe526e5 100644
--- a/GaudiKernel/include/GaudiKernel/ObjectContainerBase.h
+++ b/GaudiKernel/include/GaudiKernel/ObjectContainerBase.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDI_OBJECTCONTAINERBASE_H 1
 
 // Include files
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/Kernel.h>
 
 // Forward declarations
 class ContainedObject;
diff --git a/GaudiKernel/include/GaudiKernel/ObjectList.h b/GaudiKernel/include/GaudiKernel/ObjectList.h
index df2ebb0c1f..d31cac3030 100644
--- a/GaudiKernel/include/GaudiKernel/ObjectList.h
+++ b/GaudiKernel/include/GaudiKernel/ObjectList.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,10 +12,10 @@
 #define GAUDIKERNEL_OBJECTLIST_H
 
 // Include files
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/ObjectContainerBase.h"
-#include "GaudiKernel/StreamBuffer.h"
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/ObjectContainerBase.h>
+#include <GaudiKernel/StreamBuffer.h>
 
 #include <iomanip>
 #include <list>
diff --git a/GaudiKernel/include/GaudiKernel/ObjectVector.h b/GaudiKernel/include/GaudiKernel/ObjectVector.h
index 80d9dde73c..e4c5d2b5cd 100644
--- a/GaudiKernel/include/GaudiKernel/ObjectVector.h
+++ b/GaudiKernel/include/GaudiKernel/ObjectVector.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,10 +12,10 @@
 #define GAUDIKERNEL_OBJECTVECTOR_H
 
 // Include files
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/ObjectContainerBase.h"
-#include "GaudiKernel/StreamBuffer.h"
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/ObjectContainerBase.h>
+#include <GaudiKernel/StreamBuffer.h>
 
 #include <iomanip>
 #include <vector>
diff --git a/GaudiKernel/include/GaudiKernel/PathResolver.h b/GaudiKernel/include/GaudiKernel/PathResolver.h
index 04daf117cc..a1c6b12442 100644
--- a/GaudiKernel/include/GaudiKernel/PathResolver.h
+++ b/GaudiKernel/include/GaudiKernel/PathResolver.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef GAUDIKERNEL_PATHRESOLVER_H
 #define GAUDIKERNEL_PATHRESOLVER_H
 
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 #include <string>
 
 namespace System {
diff --git a/GaudiKernel/include/GaudiKernel/PhysicalConstants.h b/GaudiKernel/include/GaudiKernel/PhysicalConstants.h
index 5f1296fc98..598c824489 100644
--- a/GaudiKernel/include/GaudiKernel/PhysicalConstants.h
+++ b/GaudiKernel/include/GaudiKernel/PhysicalConstants.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -47,7 +47,7 @@
 #ifndef GAUDI_PHYSICAL_CONSTANTS_H
 #define GAUDI_PHYSICAL_CONSTANTS_H
 
-#include "GaudiKernel/SystemOfUnits.h"
+#include <GaudiKernel/SystemOfUnits.h>
 
 namespace Gaudi {
   namespace Units {
diff --git a/GaudiKernel/include/GaudiKernel/Plane3DTypes.h b/GaudiKernel/include/GaudiKernel/Plane3DTypes.h
index d657ca5c62..d5f105f68b 100644
--- a/GaudiKernel/include/GaudiKernel/Plane3DTypes.h
+++ b/GaudiKernel/include/GaudiKernel/Plane3DTypes.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,7 +10,7 @@
 \***********************************************************************************/
 #pragma once
 
-#include "Math/Plane3D.h"
+#include <Math/Plane3D.h>
 
 /** @namespace Gaudi
  *
diff --git a/GaudiKernel/include/GaudiKernel/Point3DTypes.h b/GaudiKernel/include/GaudiKernel/Point3DTypes.h
index c91d97f159..e2427a3565 100644
--- a/GaudiKernel/include/GaudiKernel/Point3DTypes.h
+++ b/GaudiKernel/include/GaudiKernel/Point3DTypes.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,7 +23,7 @@
 #define GAUDIKERNEL_POINT3DTYPES_H 1
 
 // Include files
-#include "Math/Point3D.h"
+#include <Math/Point3D.h>
 
 /** @namespace Gaudi
  *
diff --git a/GaudiKernel/include/GaudiKernel/Point4DTypes.h b/GaudiKernel/include/GaudiKernel/Point4DTypes.h
index f797b3f77e..16364264d5 100644
--- a/GaudiKernel/include/GaudiKernel/Point4DTypes.h
+++ b/GaudiKernel/include/GaudiKernel/Point4DTypes.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,7 +23,7 @@
 #define GAUDIKERNEL_POINT4DTYPES_H 1
 
 // Include files
-#include "GaudiKernel/Vector4DTypes.h"
+#include <GaudiKernel/Vector4DTypes.h>
 
 /** @namespace Gaudi
  *
diff --git a/GaudiKernel/include/GaudiKernel/PropertyHolder.h b/GaudiKernel/include/GaudiKernel/PropertyHolder.h
index e159907bb9..344c1d1934 100644
--- a/GaudiKernel/include/GaudiKernel/PropertyHolder.h
+++ b/GaudiKernel/include/GaudiKernel/PropertyHolder.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -25,16 +25,16 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/DataHandleProperty.h"
-#include "GaudiKernel/INamedInterface.h"
-#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/detected.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/Bootstrap.h>
+#include <GaudiKernel/DataHandleProperty.h>
+#include <GaudiKernel/INamedInterface.h>
+#include <GaudiKernel/IProperty.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/detected.h>
 
-#include "Gaudi/Interfaces/IOptionsSvc.h"
+#include <Gaudi/Interfaces/IOptionsSvc.h>
 // ============================================================================
 namespace Gaudi {
   namespace Details {
diff --git a/GaudiKernel/include/GaudiKernel/PropertyMgr.h b/GaudiKernel/include/GaudiKernel/PropertyMgr.h
index c3ec1ded30..a5d76ff930 100644
--- a/GaudiKernel/include/GaudiKernel/PropertyMgr.h
+++ b/GaudiKernel/include/GaudiKernel/PropertyMgr.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2020 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -22,10 +22,10 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/DataHandle.h"
-#include "GaudiKernel/GaudiHandle.h"
-#include "GaudiKernel/IProperty.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/DataHandle.h>
+#include <GaudiKernel/GaudiHandle.h>
+#include <GaudiKernel/IProperty.h>
 
 // ============================================================================
 
diff --git a/GaudiKernel/include/GaudiKernel/Range.h b/GaudiKernel/include/GaudiKernel/Range.h
index eb750211a5..728c8b1b37 100644
--- a/GaudiKernel/include/GaudiKernel/Range.h
+++ b/GaudiKernel/include/GaudiKernel/Range.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -21,8 +21,8 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/detected.h"
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/detected.h>
 // ============================================================================
 /** @file
  *
diff --git a/GaudiKernel/include/GaudiKernel/RegistryEntry.h b/GaudiKernel/include/GaudiKernel/RegistryEntry.h
index fdc4aaa8cf..1f47a9712a 100644
--- a/GaudiKernel/include/GaudiKernel/RegistryEntry.h
+++ b/GaudiKernel/include/GaudiKernel/RegistryEntry.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,9 +12,9 @@
 #define GAUDIKERNEL_REGISTRYENTRY_H
 
 // Framework include files
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/StatusCode.h>
 
 // STL include files
 #include <string_view>
diff --git a/GaudiKernel/include/GaudiKernel/RenounceToolInputsVisitor.h b/GaudiKernel/include/GaudiKernel/RenounceToolInputsVisitor.h
index 6f3d9984aa..6b0fd6f463 100644
--- a/GaudiKernel/include/GaudiKernel/RenounceToolInputsVisitor.h
+++ b/GaudiKernel/include/GaudiKernel/RenounceToolInputsVisitor.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,8 +9,8 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 #pragma once
-#include "GaudiKernel/DataObjID.h"
-#include "GaudiKernel/ToolVisitor.h"
+#include <GaudiKernel/DataObjID.h>
+#include <GaudiKernel/ToolVisitor.h>
 #include <functional>
 #include <string>
 #include <type_traits>
diff --git a/GaudiKernel/include/GaudiKernel/RndmGenerators.h b/GaudiKernel/include/GaudiKernel/RndmGenerators.h
index fc78d4221f..2dc6d8a8f7 100644
--- a/GaudiKernel/include/GaudiKernel/RndmGenerators.h
+++ b/GaudiKernel/include/GaudiKernel/RndmGenerators.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2022 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,8 +15,8 @@
 #include <vector>
 
 // Framework include files
-#include "GaudiKernel/IRndmGen.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/IRndmGen.h>
+#include <GaudiKernel/SmartIF.h>
 
 // Forward declarations
 class IRndmGen;
diff --git a/GaudiKernel/include/GaudiKernel/SVectorAsProperty.h b/GaudiKernel/include/GaudiKernel/SVectorAsProperty.h
index f46e2edbf8..d4c77b2ee1 100644
--- a/GaudiKernel/include/GaudiKernel/SVectorAsProperty.h
+++ b/GaudiKernel/include/GaudiKernel/SVectorAsProperty.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -24,7 +24,7 @@
 // ============================================================================
 // ROOT/SVector
 // ============================================================================
-#include "Math/SVector.h"
+#include <Math/SVector.h>
 // ============================================================================
 /** @file
  *  Declaration of parsing functions for generic vectors to allow
diff --git a/GaudiKernel/include/GaudiKernel/SelectStatement.h b/GaudiKernel/include/GaudiKernel/SelectStatement.h
index 019d0285f5..534e2598f5 100644
--- a/GaudiKernel/include/GaudiKernel/SelectStatement.h
+++ b/GaudiKernel/include/GaudiKernel/SelectStatement.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -22,7 +22,7 @@
 #include <string>
 
 // Framework include files
-#include "GaudiKernel/ISelectStatement.h"
+#include <GaudiKernel/ISelectStatement.h>
 
 /** Class of a selection statement.
   A select statement can either contain
diff --git a/GaudiKernel/include/GaudiKernel/Selector.h b/GaudiKernel/include/GaudiKernel/Selector.h
index 99d5a09241..c7f2b9bbc0 100644
--- a/GaudiKernel/include/GaudiKernel/Selector.h
+++ b/GaudiKernel/include/GaudiKernel/Selector.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -25,7 +25,7 @@
 #define GAUDI_NTUPLESVC_SELECTOR_H 1
 
 // Framework include files
-#include "GaudiKernel/SelectStatement.h"
+#include <GaudiKernel/SelectStatement.h>
 
 // Forward declarations
 namespace NTuple {
diff --git a/GaudiKernel/include/GaudiKernel/SerializeSTL.h b/GaudiKernel/include/GaudiKernel/SerializeSTL.h
index 136aea4d44..f8471fc227 100644
--- a/GaudiKernel/include/GaudiKernel/SerializeSTL.h
+++ b/GaudiKernel/include/GaudiKernel/SerializeSTL.h
@@ -22,8 +22,8 @@
 #ifndef GAUDIKERNEL_SERIALIZESTL_H_
 #define GAUDIKERNEL_SERIALIZESTL_H_
 
-#include "GaudiKernel/HashMap.h"
-#include "GaudiKernel/Map.h"
+#include <GaudiKernel/HashMap.h>
+#include <GaudiKernel/Map.h>
 #include <array>
 #include <list>
 #include <map>
diff --git a/GaudiKernel/include/GaudiKernel/Service.h b/GaudiKernel/include/GaudiKernel/Service.h
index 2d247490e0..6b7f234eb2 100644
--- a/GaudiKernel/include/GaudiKernel/Service.h
+++ b/GaudiKernel/include/GaudiKernel/Service.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2022 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -13,18 +13,18 @@
 // ============================================================================
 // Include files
 // ============================================================================
-#include "GaudiKernel/CommonMessaging.h"
-#include "GaudiKernel/IAuditorSvc.h"
-#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/IStateful.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/PropertyHolder.h"
-#include "GaudiKernel/ServiceLocatorHelper.h"
-#include "GaudiKernel/SmartIF.h"
-#include "GaudiKernel/ToolHandle.h"
 #include <Gaudi/PluginService.h>
 #include <Gaudi/Property.h>
+#include <GaudiKernel/CommonMessaging.h>
+#include <GaudiKernel/IAuditorSvc.h>
+#include <GaudiKernel/IProperty.h>
+#include <GaudiKernel/IService.h>
+#include <GaudiKernel/IStateful.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/PropertyHolder.h>
+#include <GaudiKernel/ServiceLocatorHelper.h>
+#include <GaudiKernel/SmartIF.h>
+#include <GaudiKernel/ToolHandle.h>
 
 // ============================================================================
 #include <mutex>
diff --git a/GaudiKernel/include/GaudiKernel/ServiceHandle.h b/GaudiKernel/include/GaudiKernel/ServiceHandle.h
index 93af3f82b6..303583cae2 100644
--- a/GaudiKernel/include/GaudiKernel/ServiceHandle.h
+++ b/GaudiKernel/include/GaudiKernel/ServiceHandle.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,14 +12,14 @@
 #define GAUDIKERNEL_SERVICEHANDLE_H
 
 // Includes
-#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/GaudiHandle.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/ServiceLocatorHelper.h"
+#include <GaudiKernel/Bootstrap.h>
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/GaudiHandle.h>
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/IProperty.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/ServiceLocatorHelper.h>
 
 #include <stdexcept>
 #include <string>
diff --git a/GaudiKernel/include/GaudiKernel/ServiceHistory.h b/GaudiKernel/include/GaudiKernel/ServiceHistory.h
index bd3e264fa0..b17770d660 100644
--- a/GaudiKernel/include/GaudiKernel/ServiceHistory.h
+++ b/GaudiKernel/include/GaudiKernel/ServiceHistory.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,8 +11,8 @@
 #ifndef GAUDIKERNEL_SERVICEHISTORY_H
 #define GAUDIKERNEL_SERVICEHISTORY_H
 
-#include "GaudiKernel/HistoryObj.h"
-#include "GaudiKernel/IVersHistoryObj.h"
+#include <GaudiKernel/HistoryObj.h>
+#include <GaudiKernel/IVersHistoryObj.h>
 
 #include <string>
 #include <vector>
diff --git a/GaudiKernel/include/GaudiKernel/SharedObjectsContainer.h b/GaudiKernel/include/GaudiKernel/SharedObjectsContainer.h
index 7ae5c5fb0f..e21d5b8e8c 100644
--- a/GaudiKernel/include/GaudiKernel/SharedObjectsContainer.h
+++ b/GaudiKernel/include/GaudiKernel/SharedObjectsContainer.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,9 +20,9 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/ObjectContainerBase.h"
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/ObjectContainerBase.h>
 // ============================================================================
 /** @class SharedObjectsContainer GaudiKernel/SharedObjectsContainer.h
  *
diff --git a/GaudiKernel/include/GaudiKernel/Sleep.h b/GaudiKernel/include/GaudiKernel/Sleep.h
index ad7848d532..e5fe92018e 100644
--- a/GaudiKernel/include/GaudiKernel/Sleep.h
+++ b/GaudiKernel/include/GaudiKernel/Sleep.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef GAUDIKERNEL_SLEEP_H_
 #define GAUDIKERNEL_SLEEP_H_
 
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 
 namespace Gaudi {
 
diff --git a/GaudiKernel/include/GaudiKernel/SmartDataLocator.h b/GaudiKernel/include/GaudiKernel/SmartDataLocator.h
index 55a3748619..15862ec353 100644
--- a/GaudiKernel/include/GaudiKernel/SmartDataLocator.h
+++ b/GaudiKernel/include/GaudiKernel/SmartDataLocator.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,7 +23,7 @@
 #define GAUDIKERNEL_SMARTDATALOCATOR_H 1
 
 // Framework include files
-#include "GaudiKernel/SmartDataPtr.h"
+#include <GaudiKernel/SmartDataPtr.h>
 
 /** A small class used to access easily (and efficiently) data items
     residing in data stores.
diff --git a/GaudiKernel/include/GaudiKernel/SmartDataObjectPtr.h b/GaudiKernel/include/GaudiKernel/SmartDataObjectPtr.h
index 75713f032f..c33c1ee0bd 100644
--- a/GaudiKernel/include/GaudiKernel/SmartDataObjectPtr.h
+++ b/GaudiKernel/include/GaudiKernel/SmartDataObjectPtr.h
@@ -15,8 +15,8 @@
 #include <string>
 
 // Framework include files
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/StatusCode.h>
 
 // Forward declarations
 class SmartDataObjectPtr;
diff --git a/GaudiKernel/include/GaudiKernel/SmartDataPtr.h b/GaudiKernel/include/GaudiKernel/SmartDataPtr.h
index 6b322d8539..6c17739c70 100644
--- a/GaudiKernel/include/GaudiKernel/SmartDataPtr.h
+++ b/GaudiKernel/include/GaudiKernel/SmartDataPtr.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,8 +23,8 @@
 #define GAUDIKERNEL_SMARTDATAPTR_H 1
 
 // Framework include files
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/SmartDataStorePtr.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/SmartDataStorePtr.h>
 
 /** A small class used to access easily (and efficiently) data items
     residing in data stores.
diff --git a/GaudiKernel/include/GaudiKernel/SmartDataStorePtr.h b/GaudiKernel/include/GaudiKernel/SmartDataStorePtr.h
index 35291ff741..db0ed8af3c 100644
--- a/GaudiKernel/include/GaudiKernel/SmartDataStorePtr.h
+++ b/GaudiKernel/include/GaudiKernel/SmartDataStorePtr.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,7 +23,7 @@
 #define GAUDIKERNEL_SMARTDATASTOREPTR_H 1
 
 // Framework include files
-#include "GaudiKernel/SmartDataObjectPtr.h"
+#include <GaudiKernel/SmartDataObjectPtr.h>
 
 /** A small class used to access easily (and efficiently) data items
     residing in data stores.
diff --git a/GaudiKernel/include/GaudiKernel/SmartIF.h b/GaudiKernel/include/GaudiKernel/SmartIF.h
index 8bcb14cfcc..02b4825245 100644
--- a/GaudiKernel/include/GaudiKernel/SmartIF.h
+++ b/GaudiKernel/include/GaudiKernel/SmartIF.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDI_SMARTIF_H 1
 
 // Framework include files
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 
 /** @class SmartIF SmartIF.h GaudiKernel/SmartIF.h
  *
diff --git a/GaudiKernel/include/GaudiKernel/SmartRef.h b/GaudiKernel/include/GaudiKernel/SmartRef.h
index c9e50de8a2..1d97b10df7 100644
--- a/GaudiKernel/include/GaudiKernel/SmartRef.h
+++ b/GaudiKernel/include/GaudiKernel/SmartRef.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -21,8 +21,8 @@
 #define KERNEL_SMARTREF_H 1
 
 // Include files
-#include "GaudiKernel/ContainedObject.h"
-#include "GaudiKernel/SmartRefBase.h"
+#include <GaudiKernel/ContainedObject.h>
+#include <GaudiKernel/SmartRefBase.h>
 
 #include <typeinfo>
 
diff --git a/GaudiKernel/include/GaudiKernel/SmartRefBase.h b/GaudiKernel/include/GaudiKernel/SmartRefBase.h
index b1e97dc46a..b955d38a09 100644
--- a/GaudiKernel/include/GaudiKernel/SmartRefBase.h
+++ b/GaudiKernel/include/GaudiKernel/SmartRefBase.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -22,7 +22,7 @@
 #define KERNEL_SMARTREFBASE_H 1
 
 // Framework include files
-#include "GaudiKernel/StreamBuffer.h"
+#include <GaudiKernel/StreamBuffer.h>
 
 class ObjectContainerBase;
 class SmartRefBase;
diff --git a/GaudiKernel/include/GaudiKernel/SmartRefVector.h b/GaudiKernel/include/GaudiKernel/SmartRefVector.h
index 55d3ceef98..c1698af134 100644
--- a/GaudiKernel/include/GaudiKernel/SmartRefVector.h
+++ b/GaudiKernel/include/GaudiKernel/SmartRefVector.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -24,7 +24,7 @@
 #include <vector>
 
 // Include files
-#include "GaudiKernel/SmartRef.h"
+#include <GaudiKernel/SmartRef.h>
 
 // forward declare _object and PyObject to avoid including Python.h here
 struct _object;
diff --git a/GaudiKernel/include/GaudiKernel/Stat.h b/GaudiKernel/include/GaudiKernel/Stat.h
index 9ef21705f9..6cdc894f89 100644
--- a/GaudiKernel/include/GaudiKernel/Stat.h
+++ b/GaudiKernel/include/GaudiKernel/Stat.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,9 +20,9 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/IStatSvc.h"
-#include "GaudiKernel/SmartIF.h"
-#include "GaudiKernel/StatEntity.h"
+#include <GaudiKernel/IStatSvc.h>
+#include <GaudiKernel/SmartIF.h>
+#include <GaudiKernel/StatEntity.h>
 // ============================================================================
 /** @class Stat  Stat.h GaudiKernel/Stat.h
  *
diff --git a/GaudiKernel/include/GaudiKernel/StateMachine.h b/GaudiKernel/include/GaudiKernel/StateMachine.h
index d51fef0360..59374ddd76 100644
--- a/GaudiKernel/include/GaudiKernel/StateMachine.h
+++ b/GaudiKernel/include/GaudiKernel/StateMachine.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef GAUDIKERNEL_STATEMACHINE_H_
 #define GAUDIKERNEL_STATEMACHINE_H_
 
-#include "GaudiKernel/GaudiException.h"
+#include <GaudiKernel/GaudiException.h>
 
 namespace Gaudi {
   namespace StateMachine {
diff --git a/GaudiKernel/include/GaudiKernel/StatusCode.h b/GaudiKernel/include/GaudiKernel/StatusCode.h
index 9121fd9023..d35678070a 100644
--- a/GaudiKernel/include/GaudiKernel/StatusCode.h
+++ b/GaudiKernel/include/GaudiKernel/StatusCode.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2022 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,13 +11,13 @@
 #ifndef GAUDIKERNEL_STATUSCODE_H
 #define GAUDIKERNEL_STATUSCODE_H
 
-#include "boost/preprocessor/facilities/overload.hpp"
+#include <boost/preprocessor/facilities/overload.hpp>
 #include <functional>
 #include <ostream>
 #include <type_traits>
 #include <utility>
 
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 
 template <typename T>
 struct is_StatusCode_enum : std::false_type {};
diff --git a/GaudiKernel/include/GaudiKernel/StdArrayAsProperty.h b/GaudiKernel/include/GaudiKernel/StdArrayAsProperty.h
index dbf9760925..538c167ce9 100644
--- a/GaudiKernel/include/GaudiKernel/StdArrayAsProperty.h
+++ b/GaudiKernel/include/GaudiKernel/StdArrayAsProperty.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,7 +15,7 @@
 // ============================================================================
 // STD & STL
 // ============================================================================
-#include "GaudiKernel/ToStream.h"
+#include <GaudiKernel/ToStream.h>
 #include <algorithm>
 #include <array>
 // ============================================================================
diff --git a/GaudiKernel/include/GaudiKernel/StreamBuffer.h b/GaudiKernel/include/GaudiKernel/StreamBuffer.h
index babfaf7183..5c7f58aeed 100644
--- a/GaudiKernel/include/GaudiKernel/StreamBuffer.h
+++ b/GaudiKernel/include/GaudiKernel/StreamBuffer.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -21,8 +21,8 @@
 #include <typeinfo>
 #include <vector>
 
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/swab.h"
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/swab.h>
 
 // forward declarations
 class StreamBuffer;
diff --git a/GaudiKernel/include/GaudiKernel/StringKey.h b/GaudiKernel/include/GaudiKernel/StringKey.h
index c5061808a8..71db1555dc 100644
--- a/GaudiKernel/include/GaudiKernel/StringKey.h
+++ b/GaudiKernel/include/GaudiKernel/StringKey.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,8 +23,8 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/StatusCode.h>
 // ============================================================================
 namespace Gaudi {
   // ==========================================================================
diff --git a/GaudiKernel/include/GaudiKernel/SymmetricMatrixTypes.h b/GaudiKernel/include/GaudiKernel/SymmetricMatrixTypes.h
index 9753d7b439..33f34deadb 100644
--- a/GaudiKernel/include/GaudiKernel/SymmetricMatrixTypes.h
+++ b/GaudiKernel/include/GaudiKernel/SymmetricMatrixTypes.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,7 +23,7 @@
 #define GAUDIKERNEL_SYMMETRICMATRIXTYPES_H 1
 
 // Include files
-#include "Math/SMatrix.h"
+#include <Math/SMatrix.h>
 
 /** @namespace Gaudi
  *
diff --git a/GaudiKernel/include/GaudiKernel/System.h b/GaudiKernel/include/GaudiKernel/System.h
index 9fb7aaf808..6ecd3a8028 100644
--- a/GaudiKernel/include/GaudiKernel/System.h
+++ b/GaudiKernel/include/GaudiKernel/System.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,14 +12,14 @@
 #define GAUDIKERNEL_SYSTEM_H
 
 // Framework include files
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 // STL include files
 #include <string>
 #include <typeinfo>
 #include <vector>
 
-#include "GaudiKernel/ModuleInfo.h"
-#include "GaudiKernel/Timing.h"
+#include <GaudiKernel/ModuleInfo.h>
+#include <GaudiKernel/Timing.h>
 
 #ifdef __linux
 #  include <pthread.h>
diff --git a/GaudiKernel/include/GaudiKernel/ThreadLocalContext.h b/GaudiKernel/include/GaudiKernel/ThreadLocalContext.h
index d634b35689..19d98eb730 100644
--- a/GaudiKernel/include/GaudiKernel/ThreadLocalContext.h
+++ b/GaudiKernel/include/GaudiKernel/ThreadLocalContext.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -13,7 +13,7 @@
 
 #include <cstddef>
 
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 
 class EventContext;
 
diff --git a/GaudiKernel/include/GaudiKernel/Time.h b/GaudiKernel/include/GaudiKernel/Time.h
index e1c72bb37d..d2ff925420 100644
--- a/GaudiKernel/include/GaudiKernel/Time.h
+++ b/GaudiKernel/include/GaudiKernel/Time.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -13,9 +13,9 @@
 
 // Include files
 //   for the architecture independent int64 definition (long long)
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/StreamBuffer.h"
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/StreamBuffer.h>
 
 /** @class TimeException Time.h GaudiKernel/Time.h
  *
@@ -344,6 +344,6 @@ namespace Gaudi {
   };
 } // namespace Gaudi
 
-#include "GaudiKernel/Time.icpp"
+#include <GaudiKernel/Time.icpp>
 
 #endif // GAUDIKERNEL_TIME_H
diff --git a/GaudiKernel/include/GaudiKernel/Timing.h b/GaudiKernel/include/GaudiKernel/Timing.h
index 0c17de555c..715ca32443 100644
--- a/GaudiKernel/include/GaudiKernel/Timing.h
+++ b/GaudiKernel/include/GaudiKernel/Timing.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,8 +23,8 @@
 #define GAUDIKERNEL_TIMING_H
 
 // Framework include files
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/SystemBase.h"
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/SystemBase.h>
 
 #ifdef _WIN32
 #  include <windows.h>
diff --git a/GaudiKernel/include/GaudiKernel/ToStream.h b/GaudiKernel/include/GaudiKernel/ToStream.h
index 5c01e71dd7..90d8f740fb 100644
--- a/GaudiKernel/include/GaudiKernel/ToStream.h
+++ b/GaudiKernel/include/GaudiKernel/ToStream.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2023 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -30,10 +30,10 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/HashMap.h"
-#include "GaudiKernel/Map.h"
-#include "GaudiKernel/SerializeSTL.h"
-#include "GaudiKernel/VectorMap.h"
+#include <GaudiKernel/HashMap.h>
+#include <GaudiKernel/Map.h>
+#include <GaudiKernel/SerializeSTL.h>
+#include <GaudiKernel/VectorMap.h>
 // ============================================================================
 /** @file GaudiKernel/ToStream.h
  *  implementation of various functions for streaming.
diff --git a/GaudiKernel/include/GaudiKernel/ToolHandle.h b/GaudiKernel/include/GaudiKernel/ToolHandle.h
index 84d7b3acf5..829f9c5c3b 100644
--- a/GaudiKernel/include/GaudiKernel/ToolHandle.h
+++ b/GaudiKernel/include/GaudiKernel/ToolHandle.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,13 +12,13 @@
 #define GAUDIKERNEL_TOOLHANDLE_H
 
 // Includes
-#include "GaudiKernel/GaudiHandle.h"
-#include "GaudiKernel/IAlgTool.h"
-#include "GaudiKernel/IBinder.h"
-#include "GaudiKernel/INamedInterface.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/TaggedBool.h"
+#include <GaudiKernel/GaudiHandle.h>
+#include <GaudiKernel/IAlgTool.h>
+#include <GaudiKernel/IBinder.h>
+#include <GaudiKernel/INamedInterface.h>
+#include <GaudiKernel/IToolSvc.h>
+#include <GaudiKernel/ServiceHandle.h>
+#include <GaudiKernel/TaggedBool.h>
 
 #include <stdexcept>
 #include <string>
diff --git a/GaudiKernel/include/GaudiKernel/ToolVisitor.h b/GaudiKernel/include/GaudiKernel/ToolVisitor.h
index b2abbe3508..beca5e6a66 100644
--- a/GaudiKernel/include/GaudiKernel/ToolVisitor.h
+++ b/GaudiKernel/include/GaudiKernel/ToolVisitor.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,7 +10,7 @@
 \***********************************************************************************/
 #pragma once
 
-#include "GaudiKernel/IAlgTool.h"
+#include <GaudiKernel/IAlgTool.h>
 #include <functional>
 #include <regex>
 #include <type_traits>
diff --git a/GaudiKernel/include/GaudiKernel/Transform3DTypes.h b/GaudiKernel/include/GaudiKernel/Transform3DTypes.h
index c9829284df..4d8a983eb2 100644
--- a/GaudiKernel/include/GaudiKernel/Transform3DTypes.h
+++ b/GaudiKernel/include/GaudiKernel/Transform3DTypes.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,15 +11,15 @@
 #pragma once
 
 // Include files
-#include "Math/AxisAngle.h"
-#include "Math/EulerAngles.h"
-#include "Math/Quaternion.h"
-#include "Math/Rotation3D.h"
-#include "Math/RotationX.h"
-#include "Math/RotationY.h"
-#include "Math/RotationZ.h"
-#include "Math/Transform3D.h"
-#include "Math/Vector3D.h"
+#include <Math/AxisAngle.h>
+#include <Math/EulerAngles.h>
+#include <Math/Quaternion.h>
+#include <Math/Rotation3D.h>
+#include <Math/RotationX.h>
+#include <Math/RotationY.h>
+#include <Math/RotationZ.h>
+#include <Math/Transform3D.h>
+#include <Math/Vector3D.h>
 
 /** @namespace Gaudi
  *
diff --git a/GaudiKernel/include/GaudiKernel/Transform4DTypes.h b/GaudiKernel/include/GaudiKernel/Transform4DTypes.h
index 757d7c98f9..83d399c887 100644
--- a/GaudiKernel/include/GaudiKernel/Transform4DTypes.h
+++ b/GaudiKernel/include/GaudiKernel/Transform4DTypes.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -22,7 +22,7 @@
 #define GAUDIKERNEL_TRANSFORM4DTYPES_H 1
 
 // Include files
-#include "Math/LorentzRotation.h"
+#include <Math/LorentzRotation.h>
 
 /** @namespace Gaudi
  *
diff --git a/GaudiKernel/include/GaudiKernel/TsDataSvc.h b/GaudiKernel/include/GaudiKernel/TsDataSvc.h
index 6a7d707d23..f84cf009da 100644
--- a/GaudiKernel/include/GaudiKernel/TsDataSvc.h
+++ b/GaudiKernel/include/GaudiKernel/TsDataSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,11 +12,11 @@
 #define GAUDIKERNEL_TSDATASVC_H
 
 // Include files
-#include "GaudiKernel/DataStoreItem.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/RegistryEntry.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/DataStoreItem.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/RegistryEntry.h>
+#include <GaudiKernel/Service.h>
 
 // System libraries
 #include <mutex>
diff --git a/GaudiKernel/include/GaudiKernel/UpdateManagerException.h b/GaudiKernel/include/GaudiKernel/UpdateManagerException.h
index 0a7a0316de..49acd497ac 100644
--- a/GaudiKernel/include/GaudiKernel/UpdateManagerException.h
+++ b/GaudiKernel/include/GaudiKernel/UpdateManagerException.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIKERNEL_UPDATEMANAGEREXCEPTION_H 1
 
 // Include files
-#include "GaudiKernel/GaudiException.h"
+#include <GaudiKernel/GaudiException.h>
 
 /** @class UpdateManagerException UpdateManagerException.h GaudiKernel/UpdateManagerException.h
  *
diff --git a/GaudiKernel/include/GaudiKernel/Vector3DTypes.h b/GaudiKernel/include/GaudiKernel/Vector3DTypes.h
index 00b67999ec..f772a2bd8a 100644
--- a/GaudiKernel/include/GaudiKernel/Vector3DTypes.h
+++ b/GaudiKernel/include/GaudiKernel/Vector3DTypes.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,7 +23,7 @@
 #define GAUDIKERNEL_VECTOR3DTYPES_H 1
 
 // Include files
-#include "Math/Vector3D.h"
+#include <Math/Vector3D.h>
 
 /** @namespace Gaudi
  *
diff --git a/GaudiKernel/include/GaudiKernel/Vector4DTypes.h b/GaudiKernel/include/GaudiKernel/Vector4DTypes.h
index ad4a9f68ce..3812c220e4 100644
--- a/GaudiKernel/include/GaudiKernel/Vector4DTypes.h
+++ b/GaudiKernel/include/GaudiKernel/Vector4DTypes.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,7 +23,7 @@
 #define GAUDIKERNEL_VECTOR4DTYPES_H 1
 
 // Include files
-#include "Math/Vector4D.h"
+#include <Math/Vector4D.h>
 
 /** @namespace Gaudi
  *
diff --git a/GaudiKernel/include/GaudiKernel/VectorMap.h b/GaudiKernel/include/GaudiKernel/VectorMap.h
index b38f96f743..92bc33c9e1 100644
--- a/GaudiKernel/include/GaudiKernel/VectorMap.h
+++ b/GaudiKernel/include/GaudiKernel/VectorMap.h
@@ -25,11 +25,11 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/MapBase.h"
+#include <GaudiKernel/MapBase.h>
 
 // For parsers
-#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/StringKey.h"
+#include <GaudiKernel/StatusCode.h>
+#include <GaudiKernel/StringKey.h>
 // ============================================================================
 namespace GaudiUtils {
   // ==========================================================================
diff --git a/GaudiKernel/include/GaudiKernel/VectorsAsProperty.h b/GaudiKernel/include/GaudiKernel/VectorsAsProperty.h
index 70e1e0fa36..a27ce08126 100644
--- a/GaudiKernel/include/GaudiKernel/VectorsAsProperty.h
+++ b/GaudiKernel/include/GaudiKernel/VectorsAsProperty.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -19,11 +19,11 @@
 #include <string>
 #include <vector>
 // ============================================================================
-#include "GaudiKernel/Point3DTypes.h"
-#include "GaudiKernel/Point4DTypes.h"
-#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/Vector3DTypes.h"
-#include "GaudiKernel/Vector4DTypes.h"
+#include <GaudiKernel/Point3DTypes.h>
+#include <GaudiKernel/Point4DTypes.h>
+#include <GaudiKernel/StatusCode.h>
+#include <GaudiKernel/Vector3DTypes.h>
+#include <GaudiKernel/Vector4DTypes.h>
 // ============================================================================
 /** @file
  *  Declaration of parsing functions for various ROOT::Math objects to allow
diff --git a/GaudiKernel/include/GaudiKernel/extend_interfaces.h b/GaudiKernel/include/GaudiKernel/extend_interfaces.h
index c1ce063207..ad9a3e852d 100644
--- a/GaudiKernel/include/GaudiKernel/extend_interfaces.h
+++ b/GaudiKernel/include/GaudiKernel/extend_interfaces.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -14,7 +14,7 @@
 template <typename... Interfaces>
 struct extend_interfaces;
 
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 
 // -----------------------------------------------------------------------------
 // Interface extension classes
diff --git a/GaudiKernel/include/GaudiKernel/extends.h b/GaudiKernel/include/GaudiKernel/extends.h
index d90238e9c3..673f8817e6 100644
--- a/GaudiKernel/include/GaudiKernel/extends.h
+++ b/GaudiKernel/include/GaudiKernel/extends.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef GAUDIKERNEL_EXTENDS_H
 #define GAUDIKERNEL_EXTENDS_H
 
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 
 /// Base class used to extend a class implementing other interfaces.
 /// Version for one interface.
diff --git a/GaudiKernel/include/GaudiKernel/implements.h b/GaudiKernel/include/GaudiKernel/implements.h
index 2692fd2091..e88424d72e 100644
--- a/GaudiKernel/include/GaudiKernel/implements.h
+++ b/GaudiKernel/include/GaudiKernel/implements.h
@@ -11,7 +11,7 @@
 #ifndef GAUDIKERNEL_IMPLEMENTS_H
 #define GAUDIKERNEL_IMPLEMENTS_H
 
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 #include <atomic>
 
 /// Base class used to implement the interfaces.
diff --git a/GaudiKernel/src/Lib/AlgTool.cpp b/GaudiKernel/src/Lib/AlgTool.cpp
index 54346d3e2c..a4976f61b2 100644
--- a/GaudiKernel/src/Lib/AlgTool.cpp
+++ b/GaudiKernel/src/Lib/AlgTool.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,20 +9,20 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Include files
-#include "GaudiKernel/AlgTool.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/ISvcLocator.h"
-
-#include "GaudiKernel/Auditor.h"
-#include "GaudiKernel/DataHandleHolderVisitor.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Guards.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/ServiceLocatorHelper.h"
-#include "GaudiKernel/System.h"
-#include "GaudiKernel/ToolHandle.h"
+#include <GaudiKernel/AlgTool.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/ISvcLocator.h>
+
 #include <Gaudi/Algorithm.h>
+#include <GaudiKernel/Auditor.h>
+#include <GaudiKernel/DataHandleHolderVisitor.h>
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/Guards.h>
+#include <GaudiKernel/Service.h>
+#include <GaudiKernel/ServiceLocatorHelper.h>
+#include <GaudiKernel/System.h>
+#include <GaudiKernel/ToolHandle.h>
 
 //------------------------------------------------------------------------------
 namespace {
diff --git a/GaudiKernel/src/Lib/AlgToolHistory.cpp b/GaudiKernel/src/Lib/AlgToolHistory.cpp
index 92869da0fe..a44b48f17b 100644
--- a/GaudiKernel/src/Lib/AlgToolHistory.cpp
+++ b/GaudiKernel/src/Lib/AlgToolHistory.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -19,9 +19,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
-#include "GaudiKernel/AlgToolHistory.h"
-#include "GaudiKernel/AlgTool.h"
-#include "GaudiKernel/JobHistory.h"
+#include <GaudiKernel/AlgTool.h>
+#include <GaudiKernel/AlgToolHistory.h>
+#include <GaudiKernel/JobHistory.h>
 
 #include <iostream>
 
diff --git a/GaudiKernel/src/Lib/Algorithm.cpp b/GaudiKernel/src/Lib/Algorithm.cpp
index bc2f8490cb..f4f10e012c 100644
--- a/GaudiKernel/src/Lib/Algorithm.cpp
+++ b/GaudiKernel/src/Lib/Algorithm.cpp
@@ -14,32 +14,32 @@
 #include <numeric>
 #include <set>
 
-#include "GaudiKernel/FunctionalFilterDecision.h"
-#include "GaudiKernel/IAlgContextSvc.h"
-#include "GaudiKernel/IAlgManager.h"
-#include "GaudiKernel/IAuditorSvc.h"
-#include "GaudiKernel/IConversionSvc.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IExceptionSvc.h"
-#include "GaudiKernel/IHistogramSvc.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/INTupleSvc.h"
-#include "GaudiKernel/IRndmGenSvc.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/Kernel.h"
-
-#include "GaudiKernel/AlgTool.h"
-#include "GaudiKernel/Chrono.h"
-#include "GaudiKernel/DataHandleHolderVisitor.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Guards.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/ServiceLocatorHelper.h"
-#include "GaudiKernel/Stat.h"
-#include "GaudiKernel/StringKey.h"
-#include "GaudiKernel/ToolHandle.h"
+#include <GaudiKernel/FunctionalFilterDecision.h>
+#include <GaudiKernel/IAlgContextSvc.h>
+#include <GaudiKernel/IAlgManager.h>
+#include <GaudiKernel/IAuditorSvc.h>
+#include <GaudiKernel/IConversionSvc.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IExceptionSvc.h>
+#include <GaudiKernel/IHistogramSvc.h>
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/INTupleSvc.h>
+#include <GaudiKernel/IRndmGenSvc.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/IToolSvc.h>
+#include <GaudiKernel/Kernel.h>
+
+#include <GaudiKernel/AlgTool.h>
+#include <GaudiKernel/Chrono.h>
+#include <GaudiKernel/DataHandleHolderVisitor.h>
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/Guards.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/ServiceLocatorHelper.h>
+#include <GaudiKernel/Stat.h>
+#include <GaudiKernel/StringKey.h>
+#include <GaudiKernel/ToolHandle.h>
 
 namespace Gaudi {
   namespace Details {
diff --git a/GaudiKernel/src/Lib/AlgorithmHistory.cpp b/GaudiKernel/src/Lib/AlgorithmHistory.cpp
index d060c3007b..f80645b635 100644
--- a/GaudiKernel/src/Lib/AlgorithmHistory.cpp
+++ b/GaudiKernel/src/Lib/AlgorithmHistory.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -19,9 +19,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
-#include "GaudiKernel/AlgorithmHistory.h"
-#include "GaudiKernel/JobHistory.h"
 #include <Gaudi/Algorithm.h>
+#include <GaudiKernel/AlgorithmHistory.h>
+#include <GaudiKernel/JobHistory.h>
 #include <assert.h>
 #include <iostream>
 
diff --git a/GaudiKernel/src/Lib/AllocatorPool.cpp b/GaudiKernel/src/Lib/AllocatorPool.cpp
index a0c22e202c..f86da2f920 100644
--- a/GaudiKernel/src/Lib/AllocatorPool.cpp
+++ b/GaudiKernel/src/Lib/AllocatorPool.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -49,7 +49,7 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/AllocatorPool.h"
+#include <GaudiKernel/AllocatorPool.h>
 // ============================================================================
 
 // ************************************************************
diff --git a/GaudiKernel/src/Lib/AsynchronousAlgorithm.cu b/GaudiKernel/src/Lib/AsynchronousAlgorithm.cu
index 418009dd74..5ee37cf23b 100644
--- a/GaudiKernel/src/Lib/AsynchronousAlgorithm.cu
+++ b/GaudiKernel/src/Lib/AsynchronousAlgorithm.cu
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "Gaudi/CUDAAsynchronousAlgHelper.cuh"
+#include <Gaudi/CUDAAsynchronousAlgHelper.cuh>
 #include <boost/fiber/cuda/waitfor.hpp>
 
 #include <cstdio>
diff --git a/GaudiKernel/src/Lib/Auditor.cpp b/GaudiKernel/src/Lib/Auditor.cpp
index c38fd71cda..393a8a2841 100644
--- a/GaudiKernel/src/Lib/Auditor.cpp
+++ b/GaudiKernel/src/Lib/Auditor.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,14 +8,14 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/Kernel.h>
 
-#include "GaudiKernel/Auditor.h"
+#include <GaudiKernel/Auditor.h>
 
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/MsgStream.h>
 
 // Constructor
 Auditor::Auditor( std::string name, ISvcLocator* pSvcLocator )
diff --git a/GaudiKernel/src/Lib/Bootstrap.cpp b/GaudiKernel/src/Lib/Bootstrap.cpp
index 85d28c1ba6..529907c30c 100644
--- a/GaudiKernel/src/Lib/Bootstrap.cpp
+++ b/GaudiKernel/src/Lib/Bootstrap.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,25 +10,25 @@
 \***********************************************************************************/
 #include <iostream>
 
-#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/Bootstrap.h>
+#include <GaudiKernel/System.h>
 
-#include "GaudiKernel/IAlgorithm.h"
-#include "GaudiKernel/IAppMgrUI.h"
-#include "GaudiKernel/IClassManager.h"
-#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/ISvcLocator.h"
+#include <GaudiKernel/IAlgorithm.h>
+#include <GaudiKernel/IAppMgrUI.h>
+#include <GaudiKernel/IClassManager.h>
+#include <GaudiKernel/IInterface.h>
+#include <GaudiKernel/IService.h>
+#include <GaudiKernel/ISvcLocator.h>
 
-#include "GaudiKernel/ObjectFactory.h"
-#include "GaudiKernel/Service.h"
 #include <Gaudi/Algorithm.h>
+#include <GaudiKernel/ObjectFactory.h>
+#include <GaudiKernel/Service.h>
 
-#include "GaudiKernel/IEventProcessor.h"
+#include <GaudiKernel/IEventProcessor.h>
 
-#include "RVersion.h"
+#include <RVersion.h>
 
-#include "Python.h"
+#include <Python.h>
 
 namespace Gaudi {
 
diff --git a/GaudiKernel/src/Lib/ChronoEntity.cpp b/GaudiKernel/src/Lib/ChronoEntity.cpp
index ff4295349e..e9651921d8 100644
--- a/GaudiKernel/src/Lib/ChronoEntity.cpp
+++ b/GaudiKernel/src/Lib/ChronoEntity.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,9 +8,9 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/ChronoEntity.h"
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/ChronoEntity.h>
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/System.h>
 #include <algorithm>
 #include <boost/format.hpp>
 #include <cmath>
diff --git a/GaudiKernel/src/Lib/ComponentManager.cpp b/GaudiKernel/src/Lib/ComponentManager.cpp
index 84d6b60690..618968051f 100644
--- a/GaudiKernel/src/Lib/ComponentManager.cpp
+++ b/GaudiKernel/src/Lib/ComponentManager.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,7 +15,7 @@
  *      Author: Marco Clemencic
  */
 
-#include "GaudiKernel/ComponentManager.h"
+#include <GaudiKernel/ComponentManager.h>
 
 //------------------------------------------------------------------------------
 // Constructor
diff --git a/GaudiKernel/src/Lib/ConcurrencyFlags.cpp b/GaudiKernel/src/Lib/ConcurrencyFlags.cpp
index 9ecabcf3c2..e56ac7a237 100644
--- a/GaudiKernel/src/Lib/ConcurrencyFlags.cpp
+++ b/GaudiKernel/src/Lib/ConcurrencyFlags.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/ConcurrencyFlags.h"
+#include <GaudiKernel/ConcurrencyFlags.h>
 
 namespace Gaudi {
   namespace Concurrency {
diff --git a/GaudiKernel/src/Lib/ContainedObject.cpp b/GaudiKernel/src/Lib/ContainedObject.cpp
index 796eb4a872..e5f5171850 100644
--- a/GaudiKernel/src/Lib/ContainedObject.cpp
+++ b/GaudiKernel/src/Lib/ContainedObject.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/ContainedObject.h"
+#include <GaudiKernel/ContainedObject.h>
 
 ContainedObject::~ContainedObject() {
   // If the object is contained in a container, remove it from there
diff --git a/GaudiKernel/src/Lib/ConversionSvc.cpp b/GaudiKernel/src/Lib/ConversionSvc.cpp
index 5e0391cc83..1e553b2e59 100644
--- a/GaudiKernel/src/Lib/ConversionSvc.cpp
+++ b/GaudiKernel/src/Lib/ConversionSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,14 +10,14 @@
 \***********************************************************************************/
 #define GAUDIKERNEL_CONVERSIONSVC_CPP
 
-#include "GaudiKernel/ConversionSvc.h"
-#include "GaudiKernel/Converter.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IConverter.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/ConversionSvc.h>
+#include <GaudiKernel/Converter.h>
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IConverter.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/System.h>
 
 namespace {
 
diff --git a/GaudiKernel/src/Lib/Converter.cpp b/GaudiKernel/src/Lib/Converter.cpp
index efa6f6d8c8..76152c4050 100644
--- a/GaudiKernel/src/Lib/Converter.cpp
+++ b/GaudiKernel/src/Lib/Converter.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,15 +9,15 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Include Files
-#include "GaudiKernel/Converter.h"
-#include "GaudiKernel/ConversionSvc.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/INamedInterface.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/ServiceLocatorHelper.h"
+#include <GaudiKernel/ConversionSvc.h>
+#include <GaudiKernel/Converter.h>
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/INamedInterface.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/ServiceLocatorHelper.h>
 
 /// Retrieve the class type of objects the converter produces.
 const CLID& Converter::objType() const { return m_classType; }
diff --git a/GaudiKernel/src/Lib/DataHandle.cpp b/GaudiKernel/src/Lib/DataHandle.cpp
index 8472b66c12..a0bdaeefb1 100644
--- a/GaudiKernel/src/Lib/DataHandle.cpp
+++ b/GaudiKernel/src/Lib/DataHandle.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2020 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,8 +8,8 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/DataHandle.h"
-#include "GaudiKernel/IDataHandleHolder.h"
+#include <GaudiKernel/DataHandle.h>
+#include <GaudiKernel/IDataHandleHolder.h>
 
 #include <sstream>
 
diff --git a/GaudiKernel/src/Lib/DataHandleFinder.cpp b/GaudiKernel/src/Lib/DataHandleFinder.cpp
index 46d529263b..3e54828766 100644
--- a/GaudiKernel/src/Lib/DataHandleFinder.cpp
+++ b/GaudiKernel/src/Lib/DataHandleFinder.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/DataHandleFinder.h"
+#include <GaudiKernel/DataHandleFinder.h>
 
 DataHandleFinder::DataHandleFinder( DataObjID const& target ) : m_target( target ) {}
 
diff --git a/GaudiKernel/src/Lib/DataHandleHolderVisitor.cpp b/GaudiKernel/src/Lib/DataHandleHolderVisitor.cpp
index 0d067d45c6..00035ad4a7 100644
--- a/GaudiKernel/src/Lib/DataHandleHolderVisitor.cpp
+++ b/GaudiKernel/src/Lib/DataHandleHolderVisitor.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,11 +8,11 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/DataHandleHolderVisitor.h"
-#include "GaudiKernel/DataHandle.h"
-#include "GaudiKernel/DataObjID.h"
-#include "GaudiKernel/IDataHandleHolder.h"
-#include "GaudiKernel/SerializeSTL.h"
+#include <GaudiKernel/DataHandle.h>
+#include <GaudiKernel/DataHandleHolderVisitor.h>
+#include <GaudiKernel/DataObjID.h>
+#include <GaudiKernel/IDataHandleHolder.h>
+#include <GaudiKernel/SerializeSTL.h>
 #include <functional>
 #include <tuple>
 #include <typeinfo>
diff --git a/GaudiKernel/src/Lib/DataHandleProperty.cpp b/GaudiKernel/src/Lib/DataHandleProperty.cpp
index 5e701c2859..1eacc0217a 100644
--- a/GaudiKernel/src/Lib/DataHandleProperty.cpp
+++ b/GaudiKernel/src/Lib/DataHandleProperty.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2020 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,11 +8,11 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/DataHandleProperty.h"
+#include <GaudiKernel/DataHandleProperty.h>
 
-#include "GaudiKernel/DataHandle.h"
-#include "GaudiKernel/System.h"
 #include <Gaudi/Parsers/CommonParsers.h>
+#include <GaudiKernel/DataHandle.h>
+#include <GaudiKernel/System.h>
 
 #include <sstream>
 
diff --git a/GaudiKernel/src/Lib/DataHistory.cpp b/GaudiKernel/src/Lib/DataHistory.cpp
index e73f057c68..c8ae264b7c 100644
--- a/GaudiKernel/src/Lib/DataHistory.cpp
+++ b/GaudiKernel/src/Lib/DataHistory.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -19,8 +19,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
-#include "GaudiKernel/DataHistory.h"
-#include "GaudiKernel/AlgorithmHistory.h"
+#include <GaudiKernel/AlgorithmHistory.h>
+#include <GaudiKernel/DataHistory.h>
 #include <iostream>
 
 using std::endl;
diff --git a/GaudiKernel/src/Lib/DataObjID.cpp b/GaudiKernel/src/Lib/DataObjID.cpp
index 1b0fa68e79..8c8189c559 100644
--- a/GaudiKernel/src/Lib/DataObjID.cpp
+++ b/GaudiKernel/src/Lib/DataObjID.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,11 +8,11 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/DataObjID.h"
-#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/IClassIDSvc.h"
-#include "GaudiKernel/ISvcLocator.h"
 #include <Gaudi/Parsers/Factory.h>
+#include <GaudiKernel/Bootstrap.h>
+#include <GaudiKernel/DataObjID.h>
+#include <GaudiKernel/IClassIDSvc.h>
+#include <GaudiKernel/ISvcLocator.h>
 #include <functional>
 #include <iomanip>
 #include <iostream>
@@ -89,7 +89,7 @@ void DataObjID::hashGen() {
   }
 }
 
-#include "GaudiKernel/ToStream.h"
+#include <GaudiKernel/ToStream.h>
 std::ostream& toStream( const DataObjID& d, std::ostream& os ) {
   using Gaudi::Utils::toStream;
   return ( d.m_clid != 0 || !d.m_className.empty() ) ? toStream( std::tie( d.m_className, d.m_key ), os )
diff --git a/GaudiKernel/src/Lib/DataObjectHandleBase.cpp b/GaudiKernel/src/Lib/DataObjectHandleBase.cpp
index 40f7cbdf22..5628846da8 100644
--- a/GaudiKernel/src/Lib/DataObjectHandleBase.cpp
+++ b/GaudiKernel/src/Lib/DataObjectHandleBase.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2020 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,12 +8,12 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/DataObjectHandleBase.h"
-#include "GaudiKernel/AlgTool.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/SerializeSTL.h"
-#include "GaudiKernel/ServiceLocatorHelper.h"
 #include <Gaudi/Algorithm.h>
+#include <GaudiKernel/AlgTool.h>
+#include <GaudiKernel/DataObjectHandleBase.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/SerializeSTL.h>
+#include <GaudiKernel/ServiceLocatorHelper.h>
 
 #include <boost/tokenizer.hpp>
 #include <ostream>
diff --git a/GaudiKernel/src/Lib/DataStreamTool.cpp b/GaudiKernel/src/Lib/DataStreamTool.cpp
index 8a7897b2fc..5d06325562 100644
--- a/GaudiKernel/src/Lib/DataStreamTool.cpp
+++ b/GaudiKernel/src/Lib/DataStreamTool.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,16 +11,16 @@
 // Include files
 
 // from Gaudi
-#include "GaudiKernel/DataStreamTool.h"
-#include "GaudiKernel/EventSelectorDataStream.h"
-#include "GaudiKernel/IAddressCreator.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/ISvcManager.h"
-#include "GaudiKernel/Incident.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/PropertyHolder.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/DataStreamTool.h>
+#include <GaudiKernel/EventSelectorDataStream.h>
+#include <GaudiKernel/IAddressCreator.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/ISvcManager.h>
+#include <GaudiKernel/Incident.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/PropertyHolder.h>
+#include <GaudiKernel/Service.h>
+#include <GaudiKernel/SmartIF.h>
 
 //-----------------------------------------------------------------------------
 // Implementation file for class : DataStreamTool
diff --git a/GaudiKernel/src/Lib/DataSvc.cpp b/GaudiKernel/src/Lib/DataSvc.cpp
index 918dd30abe..3a2952355d 100644
--- a/GaudiKernel/src/Lib/DataSvc.cpp
+++ b/GaudiKernel/src/Lib/DataSvc.cpp
@@ -29,17 +29,17 @@
 #define DATASVC_DATASVC_CPP
 
 // Framework include files
-#include "GaudiKernel/IConversionSvc.h"
-#include "GaudiKernel/IConverter.h"
-#include "GaudiKernel/IOpaqueAddress.h"
+#include <GaudiKernel/IConversionSvc.h>
+#include <GaudiKernel/IConverter.h>
+#include <GaudiKernel/IOpaqueAddress.h>
 
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/GaudiException.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/GaudiException.h>
 
-#include "GaudiKernel/DataIncident.h"
-#include "GaudiKernel/DataSvc.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/RegistryEntry.h"
+#include <GaudiKernel/DataIncident.h>
+#include <GaudiKernel/DataSvc.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/RegistryEntry.h>
 
 // Include files
 #include <algorithm>
diff --git a/GaudiKernel/src/Lib/DataTypeInfo.cpp b/GaudiKernel/src/Lib/DataTypeInfo.cpp
index 280dc2c569..1d9cab3544 100644
--- a/GaudiKernel/src/Lib/DataTypeInfo.cpp
+++ b/GaudiKernel/src/Lib/DataTypeInfo.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -26,9 +26,9 @@
 //	====================================================================
 #define GAUDI_KERNEL_DATATYPEINFO_CPP 1
 
-#include "GaudiKernel/DataTypeInfo.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/DataTypeInfo.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/System.h>
 
 // Access to type information
 DataTypeInfo::Type DataTypeInfo::idByName( const std::string& typ ) {
diff --git a/GaudiKernel/src/Lib/Debugger.cpp b/GaudiKernel/src/Lib/Debugger.cpp
index cafb67bc4c..98f1ab3ba1 100644
--- a/GaudiKernel/src/Lib/Debugger.cpp
+++ b/GaudiKernel/src/Lib/Debugger.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -39,8 +39,8 @@ namespace Win {
 #      define NOGDI
 #    endif
 #  endif
-#  include "process.h"
-#  include "windows.h"
+#  include <process.h>
+#  include <windows.h>
 
 #  if _MSC_VER < 1500
 }; // namespace Win
@@ -51,7 +51,7 @@ namespace Win {
 #endif
 
 // Framework include files
-#include "GaudiKernel/Debugger.h"
+#include <GaudiKernel/Debugger.h>
 
 /// Break the execution of the application and invoke the debugger
 long System::breakExecution() {
diff --git a/GaudiKernel/src/Lib/Dictionary.cpp b/GaudiKernel/src/Lib/Dictionary.cpp
index e8fed6c68b..6f57f23b1e 100644
--- a/GaudiKernel/src/Lib/Dictionary.cpp
+++ b/GaudiKernel/src/Lib/Dictionary.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/System.h>
 namespace GaudiDict {
   std::string typeName( const std::type_info& typ );
   std::string vectorName( const std::type_info& typ );
diff --git a/GaudiKernel/src/Lib/DirSearchPath.cpp b/GaudiKernel/src/Lib/DirSearchPath.cpp
index cfc39eece0..e7a118d5d0 100644
--- a/GaudiKernel/src/Lib/DirSearchPath.cpp
+++ b/GaudiKernel/src/Lib/DirSearchPath.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,9 +23,9 @@
 // ... a lot of noise produced by the boost/filesystem/operations.hpp
 #  pragma warning( disable : 279 )
 #endif
-#include "GaudiKernel/DirSearchPath.h"
-#include "boost/filesystem/operations.hpp"
-#include "boost/tokenizer.hpp"
+#include <GaudiKernel/DirSearchPath.h>
+#include <boost/filesystem/operations.hpp>
+#include <boost/tokenizer.hpp>
 
 using namespace std;
 
diff --git a/GaudiKernel/src/Lib/Environment.cpp b/GaudiKernel/src/Lib/Environment.cpp
index 9b77d312fc..3463ffd588 100644
--- a/GaudiKernel/src/Lib/Environment.cpp
+++ b/GaudiKernel/src/Lib/Environment.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,8 +8,8 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/Environment.h"
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/Environment.h>
+#include <GaudiKernel/System.h>
 #include <cstdlib>
 
 namespace {
diff --git a/GaudiKernel/src/Lib/EventIDBase.cpp b/GaudiKernel/src/Lib/EventIDBase.cpp
index 0d18773ff8..5a9e5eb53e 100644
--- a/GaudiKernel/src/Lib/EventIDBase.cpp
+++ b/GaudiKernel/src/Lib/EventIDBase.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -17,7 +17,7 @@
  *
  */
 
-#include "GaudiKernel/EventIDBase.h"
+#include <GaudiKernel/EventIDBase.h>
 
 #include <limits>
 
diff --git a/GaudiKernel/src/Lib/EventIDRange.cpp b/GaudiKernel/src/Lib/EventIDRange.cpp
index e2b4ef8b24..65f08a94f4 100644
--- a/GaudiKernel/src/Lib/EventIDRange.cpp
+++ b/GaudiKernel/src/Lib/EventIDRange.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/EventIDRange.h"
+#include <GaudiKernel/EventIDRange.h>
 
 /*****************************************************************************
  *
diff --git a/GaudiKernel/src/Lib/EventSelectorDataStream.cpp b/GaudiKernel/src/Lib/EventSelectorDataStream.cpp
index 6852647fcc..414451cad8 100644
--- a/GaudiKernel/src/Lib/EventSelectorDataStream.cpp
+++ b/GaudiKernel/src/Lib/EventSelectorDataStream.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -22,14 +22,14 @@
 //====================================================================
 #define GAUDISVC_EVENTSELECTOR_EVENTSELECTORDATASTREAM_CPP 1
 // Include files
-#include "GaudiKernel/EventSelectorDataStream.h"
-#include "GaudiKernel/AttribStringParser.h"
-#include "GaudiKernel/IConversionSvc.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IPersistencySvc.h"
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/AttribStringParser.h>
+#include <GaudiKernel/EventSelectorDataStream.h>
+#include <GaudiKernel/IConversionSvc.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IPersistencySvc.h>
+#include <GaudiKernel/IService.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/MsgStream.h>
 
 // Output friend
 MsgStream& operator<<( MsgStream& s, const EventSelectorDataStream& obj ) {
diff --git a/GaudiKernel/src/Lib/FunctionalFilterDecision.cpp b/GaudiKernel/src/Lib/FunctionalFilterDecision.cpp
index 9f970e2d04..042ed981df 100644
--- a/GaudiKernel/src/Lib/FunctionalFilterDecision.cpp
+++ b/GaudiKernel/src/Lib/FunctionalFilterDecision.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/FunctionalFilterDecision.h"
+#include <GaudiKernel/FunctionalFilterDecision.h>
 
 namespace Gaudi::Functional {
 
diff --git a/GaudiKernel/src/Lib/GaudiException.cpp b/GaudiKernel/src/Lib/GaudiException.cpp
index 3f62fabbc1..5f716e2b2b 100644
--- a/GaudiKernel/src/Lib/GaudiException.cpp
+++ b/GaudiKernel/src/Lib/GaudiException.cpp
@@ -8,9 +8,9 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/GaudiException.h"
+#include <GaudiKernel/GaudiException.h>
 
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/System.h>
 
 bool              GaudiException::s_proc( false );
 static const bool enableBacktrace = System::isEnvSet( "ENABLE_BACKTRACE" );
diff --git a/GaudiKernel/src/Lib/GaudiHandle.cpp b/GaudiKernel/src/Lib/GaudiHandle.cpp
index 33442aca8c..9bf7aed8bc 100644
--- a/GaudiKernel/src/Lib/GaudiHandle.cpp
+++ b/GaudiKernel/src/Lib/GaudiHandle.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/GaudiHandle.h"
+#include <GaudiKernel/GaudiHandle.h>
 #include <iostream>
 #include <string>
 
diff --git a/GaudiKernel/src/Lib/Guards.cpp b/GaudiKernel/src/Lib/Guards.cpp
index 49ff010eb7..2fa9ef98c9 100644
--- a/GaudiKernel/src/Lib/Guards.cpp
+++ b/GaudiKernel/src/Lib/Guards.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -17,10 +17,10 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Guards.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/Guards.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/System.h>
 // ============================================================================
 /** @file
  *  Implementation file for class Gaudi::Guards::ExceptionGuard
diff --git a/GaudiKernel/src/Lib/HistoDef.cpp b/GaudiKernel/src/Lib/HistoDef.cpp
index 09106c18c2..bc17acaf7b 100644
--- a/GaudiKernel/src/Lib/HistoDef.cpp
+++ b/GaudiKernel/src/Lib/HistoDef.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -17,9 +17,9 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/HistoDef.h"
-#include "GaudiKernel/IHistogramSvc.h"
-#include "GaudiKernel/ToStream.h"
+#include <GaudiKernel/HistoDef.h>
+#include <GaudiKernel/IHistogramSvc.h>
+#include <GaudiKernel/ToStream.h>
 // ============================================================================
 /** @file
  *  The implementation file for class Gaudi::Histo1DDef and related functions
diff --git a/GaudiKernel/src/Lib/HistoryObj.cpp b/GaudiKernel/src/Lib/HistoryObj.cpp
index 167e5a1258..2bd58974cd 100644
--- a/GaudiKernel/src/Lib/HistoryObj.cpp
+++ b/GaudiKernel/src/Lib/HistoryObj.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -19,8 +19,8 @@
 
 #define GAUDIKERNEL_HISTORYOBJ_CPP
 
-#include "GaudiKernel/HistoryObj.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/HistoryObj.h>
 
 using namespace std;
 
diff --git a/GaudiKernel/src/Lib/IConversionSvc.cpp b/GaudiKernel/src/Lib/IConversionSvc.cpp
index 6b1cf57297..7bc345b97a 100644
--- a/GaudiKernel/src/Lib/IConversionSvc.cpp
+++ b/GaudiKernel/src/Lib/IConversionSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,8 +8,8 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/IConversionSvc.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/IConversionSvc.h>
+#include <GaudiKernel/StatusCode.h>
 
 namespace {
   struct IConvSvcCategory : StatusCode::Category {
diff --git a/GaudiKernel/src/Lib/IDataProviderSvc.cpp b/GaudiKernel/src/Lib/IDataProviderSvc.cpp
index 0b6c2fada0..9fa0b02098 100644
--- a/GaudiKernel/src/Lib/IDataProviderSvc.cpp
+++ b/GaudiKernel/src/Lib/IDataProviderSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,8 +8,8 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/StatusCode.h>
 
 namespace {
   struct IDataProviderSvcCategory : StatusCode::Category {
diff --git a/GaudiKernel/src/Lib/IInterface.cpp b/GaudiKernel/src/Lib/IInterface.cpp
index b30d0c4f91..5b501f77ca 100644
--- a/GaudiKernel/src/Lib/IInterface.cpp
+++ b/GaudiKernel/src/Lib/IInterface.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,8 +8,8 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/IInterface.h>
+#include <GaudiKernel/StatusCode.h>
 
 namespace {
   struct IInterfaceCategory : StatusCode::Category {
diff --git a/GaudiKernel/src/Lib/IPartitionControl.cpp b/GaudiKernel/src/Lib/IPartitionControl.cpp
index 48f268ae4f..f2b485816e 100644
--- a/GaudiKernel/src/Lib/IPartitionControl.cpp
+++ b/GaudiKernel/src/Lib/IPartitionControl.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,8 +8,8 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/IPartitionControl.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/IPartitionControl.h>
+#include <GaudiKernel/StatusCode.h>
 
 namespace {
   struct IPartitionControlCategory : StatusCode::Category {
diff --git a/GaudiKernel/src/Lib/ISvcLocator.cpp b/GaudiKernel/src/Lib/ISvcLocator.cpp
index af28268f6a..d760e322ed 100644
--- a/GaudiKernel/src/Lib/ISvcLocator.cpp
+++ b/GaudiKernel/src/Lib/ISvcLocator.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "COPYING".                                            *
@@ -8,11 +8,10 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/ISvcLocator.h"
 #include <GaudiKernel/IAppMgrUI.h>
 #include <GaudiKernel/ISvcLocator.h>
 
-#include "Gaudi/Interfaces/IOptionsSvc.h"
+#include <Gaudi/Interfaces/IOptionsSvc.h>
 
 #include <stdexcept>
 
diff --git a/GaudiKernel/src/Lib/ITimelineSvc.cpp b/GaudiKernel/src/Lib/ITimelineSvc.cpp
index 31231fe633..0ffe381e9f 100644
--- a/GaudiKernel/src/Lib/ITimelineSvc.cpp
+++ b/GaudiKernel/src/Lib/ITimelineSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,8 +8,8 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/ITimelineSvc.h"
-#include "GaudiKernel/EventContext.h"
+#include <GaudiKernel/EventContext.h>
+#include <GaudiKernel/ITimelineSvc.h>
 
 ITimelineSvc::TimelineRecorder::TimelineRecorder( TimelineEvent& record, std::string alg, const EventContext& ctx )
     : m_record{ &record } {
diff --git a/GaudiKernel/src/Lib/Incident.cpp b/GaudiKernel/src/Lib/Incident.cpp
index fc1a0b1a7c..943b7709a0 100644
--- a/GaudiKernel/src/Lib/Incident.cpp
+++ b/GaudiKernel/src/Lib/Incident.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,8 +9,8 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 #define _inc_types_impl_
-#include "GaudiKernel/Incident.h"
-#include "GaudiKernel/ThreadLocalContext.h"
+#include <GaudiKernel/Incident.h>
+#include <GaudiKernel/ThreadLocalContext.h>
 
 Incident::Incident( const std::string& source, const std::string& type ) : m_source( source ), m_type( type ) {
   m_ctx = Gaudi::Hive::currentContext();
diff --git a/GaudiKernel/src/Lib/JobHistory.cpp b/GaudiKernel/src/Lib/JobHistory.cpp
index 185ba13f1d..a6d73e6a64 100644
--- a/GaudiKernel/src/Lib/JobHistory.cpp
+++ b/GaudiKernel/src/Lib/JobHistory.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2022 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,9 +20,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
-#include "GaudiKernel/JobHistory.h"
-#include "GaudiKernel/System.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/JobHistory.h>
+#include <GaudiKernel/System.h>
 
 #include <cstdlib>
 #include <iostream>
diff --git a/GaudiKernel/src/Lib/KeyedObjectManager.cpp b/GaudiKernel/src/Lib/KeyedObjectManager.cpp
index 5338dfc774..4883a8bf29 100644
--- a/GaudiKernel/src/Lib/KeyedObjectManager.cpp
+++ b/GaudiKernel/src/Lib/KeyedObjectManager.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,11 +9,11 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Include files
-#include "GaudiKernel/KeyedObjectManager.h"
-#include "GaudiKernel/ContainedObject.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/HashMap.h"
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/ContainedObject.h>
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/HashMap.h>
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/KeyedObjectManager.h>
 #include <algorithm>
 #include <map>
 
diff --git a/GaudiKernel/src/Lib/LegacyAlgorithm.cpp b/GaudiKernel/src/Lib/LegacyAlgorithm.cpp
index 8fa9e613bd..3985acfaaf 100644
--- a/GaudiKernel/src/Lib/LegacyAlgorithm.cpp
+++ b/GaudiKernel/src/Lib/LegacyAlgorithm.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,7 +10,7 @@
 \***********************************************************************************/
 #include <GaudiKernel/Algorithm.h>
 
-#include "GaudiKernel/ThreadLocalContext.h"
+#include <GaudiKernel/ThreadLocalContext.h>
 
 namespace Gaudi {
   namespace details {
diff --git a/GaudiKernel/src/Lib/LinkManager.cpp b/GaudiKernel/src/Lib/LinkManager.cpp
index bd9cb12b02..faba91a5c3 100644
--- a/GaudiKernel/src/Lib/LinkManager.cpp
+++ b/GaudiKernel/src/Lib/LinkManager.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,9 +9,9 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Experiment specific include files
-#include "GaudiKernel/LinkManager.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IRegistry.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/LinkManager.h>
 #include <algorithm>
 
 namespace {
diff --git a/GaudiKernel/src/Lib/MapBase.cpp b/GaudiKernel/src/Lib/MapBase.cpp
index 32e1e8c692..03ed173a6b 100644
--- a/GaudiKernel/src/Lib/MapBase.cpp
+++ b/GaudiKernel/src/Lib/MapBase.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -17,8 +17,8 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/MapBase.h"
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/MapBase.h>
+#include <GaudiKernel/System.h>
 // ============================================================================
 /** @file
  *  Implementation file for class Gaudi::Utils::MapBase
diff --git a/GaudiKernel/src/Lib/Memory.cpp b/GaudiKernel/src/Lib/Memory.cpp
index 5105e5f9ed..14679dfa83 100644
--- a/GaudiKernel/src/Lib/Memory.cpp
+++ b/GaudiKernel/src/Lib/Memory.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -24,20 +24,20 @@
 #define GAUDIKERNEL_MEMORY_CPP
 
 #ifdef _WIN32
-#  include "process.h"
+#  include <process.h>
 #  define getpid _getpid
 #else
-#  include "libgen.h"
-#  include "sys/times.h"
-#  include "unistd.h"
 #  include <cstdio>
 #  include <errno.h>
+#  include <libgen.h>
 #  include <string.h>
+#  include <sys/times.h>
+#  include <unistd.h>
 #endif
 
 // Framework include files
-#include "GaudiKernel/Memory.h"
 #include "ProcessDescriptor.h"
+#include <GaudiKernel/Memory.h>
 #include <limits.h>
 
 /// Convert requested memory value from kByte to requested value
diff --git a/GaudiKernel/src/Lib/Message.cpp b/GaudiKernel/src/Lib/Message.cpp
index 249d8f11c9..decea8973f 100644
--- a/GaudiKernel/src/Lib/Message.cpp
+++ b/GaudiKernel/src/Lib/Message.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2022 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,11 +8,11 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/Message.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/ThreadLocalContext.h"
-#include "GaudiKernel/Time.h"
-#include "GaudiKernel/Timing.h"
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/Message.h>
+#include <GaudiKernel/ThreadLocalContext.h>
+#include <GaudiKernel/Time.h>
+#include <GaudiKernel/Timing.h>
 #include <algorithm>
 #include <cctype>
 #include <cstdio>
diff --git a/GaudiKernel/src/Lib/MinimalEventLoopMgr.cpp b/GaudiKernel/src/Lib/MinimalEventLoopMgr.cpp
index 202baf5200..6be64f70db 100644
--- a/GaudiKernel/src/Lib/MinimalEventLoopMgr.cpp
+++ b/GaudiKernel/src/Lib/MinimalEventLoopMgr.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2023 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,19 +10,19 @@
 \***********************************************************************************/
 #define GAUDIKERNEL_MINIMALEVENTLOOPMGR_CPP
 
-#include "GaudiKernel/AppReturnCode.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IAlgManager.h"
-#include "GaudiKernel/IAlgorithm.h"
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/Incident.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/SmartIF.h"
-#include "GaudiKernel/ThreadLocalContext.h"
-#include "GaudiKernel/TypeNameString.h"
-
-#include "GaudiKernel/MinimalEventLoopMgr.h"
+#include <GaudiKernel/AppReturnCode.h>
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IAlgManager.h>
+#include <GaudiKernel/IAlgorithm.h>
+#include <GaudiKernel/IIncidentListener.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/Incident.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/SmartIF.h>
+#include <GaudiKernel/ThreadLocalContext.h>
+#include <GaudiKernel/TypeNameString.h>
+
+#include <GaudiKernel/MinimalEventLoopMgr.h>
 
 #include <algorithm>
 
diff --git a/GaudiKernel/src/Lib/ModuleInfo.cpp b/GaudiKernel/src/Lib/ModuleInfo.cpp
index c35f51f435..e645a93ad1 100644
--- a/GaudiKernel/src/Lib/ModuleInfo.cpp
+++ b/GaudiKernel/src/Lib/ModuleInfo.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -28,8 +28,8 @@
 // #include <iostream>
 // #include <typeinfo>
 
-#include "GaudiKernel/ModuleInfo.h"
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/ModuleInfo.h>
+#include <GaudiKernel/System.h>
 
 #ifdef _WIN32
 #  define NOMSG
@@ -37,8 +37,8 @@
 #  define strcasecmp _stricmp
 #  define strncasecmp _strnicmp
 #  include "Win32PsApi.h"
-#  include "process.h"
-#  include "windows.h"
+#  include <process.h>
+#  include <windows.h>
 static PsApiFunctions _psApi;
 #  define getpid _getpid
 #  undef NOMSG
@@ -47,14 +47,14 @@ static PsApiFunctions _psApi;
 #    define PATH_MAX 1024
 #  endif
 #else // UNIX...: first the EGCS stuff, then the OS dependent includes
-#  include "libgen.h"
-#  include "sys/param.h"
-#  include "sys/times.h"
-#  include "unistd.h"
 #  include <cstdio>
 #  include <dlfcn.h>
 #  include <errno.h>
+#  include <libgen.h>
 #  include <string.h>
+#  include <sys/param.h>
+#  include <sys/times.h>
+#  include <unistd.h>
 #endif
 
 static System::ImageHandle      ModuleHandle = nullptr;
diff --git a/GaudiKernel/src/Lib/MsgStream.cpp b/GaudiKernel/src/Lib/MsgStream.cpp
index 4bcea775fc..faef891c7d 100644
--- a/GaudiKernel/src/Lib/MsgStream.cpp
+++ b/GaudiKernel/src/Lib/MsgStream.cpp
@@ -27,10 +27,10 @@
 //====================================================================
 #define KERNEL_MSGSTREAM_CPP
 
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/Message.h"
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/Message.h>
+#include <GaudiKernel/MsgStream.h>
 
 #include <cstdarg>
 #include <cstdio>
diff --git a/GaudiKernel/src/Lib/NTupleImplementation.cpp b/GaudiKernel/src/Lib/NTupleImplementation.cpp
index 1cf0aae091..86c014b900 100644
--- a/GaudiKernel/src/Lib/NTupleImplementation.cpp
+++ b/GaudiKernel/src/Lib/NTupleImplementation.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -24,10 +24,10 @@
 #define GAUDI_NTUPLEIMP_CPP 1
 
 // Framework include files
-#include "GaudiKernel/NTupleImplementation.h"
-#include "GaudiKernel/IDataSelector.h"
-#include "GaudiKernel/INTupleSvc.h"
-#include "GaudiKernel/ISelectStatement.h"
+#include <GaudiKernel/IDataSelector.h>
+#include <GaudiKernel/INTupleSvc.h>
+#include <GaudiKernel/ISelectStatement.h>
+#include <GaudiKernel/NTupleImplementation.h>
 
 /*
  */
diff --git a/GaudiKernel/src/Lib/NTupleItems.cpp b/GaudiKernel/src/Lib/NTupleItems.cpp
index c9641e8770..90b1df32a7 100644
--- a/GaudiKernel/src/Lib/NTupleItems.cpp
+++ b/GaudiKernel/src/Lib/NTupleItems.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -24,9 +24,9 @@
 #define GAUDI_NTUPLEITEMS_CPP 1
 
 // Framework include files
-#include "GaudiKernel/NTupleItems.h"
-#include "GaudiKernel/ContainedObject.h"
-#include "GaudiKernel/DataObject.h"
+#include <GaudiKernel/ContainedObject.h>
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/NTupleItems.h>
 
 typedef const std::string&    CSTR;
 typedef const std::type_info& CTYPE;
diff --git a/GaudiKernel/src/Lib/ParsersCollections.cpp b/GaudiKernel/src/Lib/ParsersCollections.cpp
index b50fa7b28d..4bea114064 100644
--- a/GaudiKernel/src/Lib/ParsersCollections.cpp
+++ b/GaudiKernel/src/Lib/ParsersCollections.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 // ============================================================================
 // Include files
 // ============================================================================
-#include "GaudiKernel/VectorMap.h"
+#include <GaudiKernel/VectorMap.h>
 // ============================================================================
 #include <Gaudi/Parsers/Factory.h>
 // ============================================================================
diff --git a/GaudiKernel/src/Lib/ParsersStandardMiscCommon.h b/GaudiKernel/src/Lib/ParsersStandardMiscCommon.h
index 038a999a8e..8256294b5c 100644
--- a/GaudiKernel/src/Lib/ParsersStandardMiscCommon.h
+++ b/GaudiKernel/src/Lib/ParsersStandardMiscCommon.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,7 +23,7 @@
 #include <string>
 #include <vector>
 // ============================================================================
-#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/StringKey.h"
+#include <GaudiKernel/StatusCode.h>
+#include <GaudiKernel/StringKey.h>
 // ============================================================================
 #endif /* PARSERS_STANDARD_MISC_COMMON_H */
diff --git a/GaudiKernel/src/Lib/ParsersVct.cpp b/GaudiKernel/src/Lib/ParsersVct.cpp
index 2004bc3148..393775328e 100644
--- a/GaudiKernel/src/Lib/ParsersVct.cpp
+++ b/GaudiKernel/src/Lib/ParsersVct.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,10 +11,10 @@
 // ============================================================================
 // Include files
 // ============================================================================
-#include "GaudiKernel/VectorsAsProperty.h"
+#include <GaudiKernel/VectorsAsProperty.h>
 // ============================================================================
-#include "GaudiKernel/ToStream.h"
 #include <Gaudi/Parsers/Factory.h>
+#include <GaudiKernel/ToStream.h>
 // ============================================================================
 namespace {
   // ==========================================================================
diff --git a/GaudiKernel/src/Lib/PathResolver.cpp b/GaudiKernel/src/Lib/PathResolver.cpp
index 29268502af..a3ce73ba24 100644
--- a/GaudiKernel/src/Lib/PathResolver.cpp
+++ b/GaudiKernel/src/Lib/PathResolver.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,8 +8,8 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/PathResolver.h"
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/PathResolver.h>
+#include <GaudiKernel/System.h>
 
 #ifdef WIN32
 // Disable warning
diff --git a/GaudiKernel/src/Lib/PrintAlgsSequences.cpp b/GaudiKernel/src/Lib/PrintAlgsSequences.cpp
index b260e9c942..e3d5e42942 100644
--- a/GaudiKernel/src/Lib/PrintAlgsSequences.cpp
+++ b/GaudiKernel/src/Lib/PrintAlgsSequences.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,12 +8,12 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "Gaudi/Property.h"
-#include "GaudiKernel/IAlgManager.h"
-#include "GaudiKernel/IAlgorithm.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/MsgStream.h"
+#include <Gaudi/Property.h>
+#include <GaudiKernel/IAlgManager.h>
+#include <GaudiKernel/IAlgorithm.h>
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/IProperty.h>
+#include <GaudiKernel/MsgStream.h>
 
 namespace {
   /// Recursive function to print the algorithm name and its sub algorithms
diff --git a/GaudiKernel/src/Lib/ProcessDescriptor.cpp b/GaudiKernel/src/Lib/ProcessDescriptor.cpp
index 0168a3aeea..2808518487 100644
--- a/GaudiKernel/src/Lib/ProcessDescriptor.cpp
+++ b/GaudiKernel/src/Lib/ProcessDescriptor.cpp
@@ -62,8 +62,8 @@ namespace System {
 #  define strncasecmp _strnicmp
 #  define NOMSG
 #  define NOGDI
-#  include "process.h"
-#  include "windows.h"
+#  include <process.h>
+#  include <windows.h>
 #  define getpid _getpid
 namespace NtApi {
   //__declspec(dllimport) long __stdcall NtQueryInformationProcess(
@@ -78,17 +78,16 @@ namespace NtApi {
 };    // namespace NtApi
 #else // UNIX...: first the EGCS stuff, then the OS dependent includes
 #  define WINVER 0
-#  include "libgen.h"
-#  include "sys/times.h"
-#  include "unistd.h"
 #  include <cstdio>
 #  include <errno.h>
 #  include <fcntl.h>
 #  include <iostream>
+#  include <libgen.h>
 #  include <sstream>
 #  include <string>
 #  include <sys/signal.h>
 #  include <sys/syscall.h>
+#  include <sys/times.h>
 #  include <sys/types.h>
 #  include <unistd.h>
 #  ifndef __APPLE__
@@ -357,9 +356,9 @@ static inline long processID( long pid ) { return ( pid > 0 ) ? pid : ( ::getpid
 #endif // not __APPLE__
 
 // Framework include files
-#include "GaudiKernel/ModuleInfo.h"
-#include "GaudiKernel/System.h"
 #include "ProcessDescriptor.h"
+#include <GaudiKernel/ModuleInfo.h>
+#include <GaudiKernel/System.h>
 
 System::ProcessDescriptor::ProcessHandle::ProcessHandle( long pid ) {
   if ( pid > 0 ) {
diff --git a/GaudiKernel/src/Lib/ProcessDescriptor.h b/GaudiKernel/src/Lib/ProcessDescriptor.h
index e812cc9641..2d98e62e71 100644
--- a/GaudiKernel/src/Lib/ProcessDescriptor.h
+++ b/GaudiKernel/src/Lib/ProcessDescriptor.h
@@ -12,8 +12,8 @@
 #define GAUDIKERNEL_PROCESS_H
 
 // Framework include files
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/SystemBase.h"
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/SystemBase.h>
 
 namespace System {
   // Forward declarations
diff --git a/GaudiKernel/src/Lib/Property.cpp b/GaudiKernel/src/Lib/Property.cpp
index e2c473e877..44be9eed1c 100644
--- a/GaudiKernel/src/Lib/Property.cpp
+++ b/GaudiKernel/src/Lib/Property.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,11 +23,11 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/GaudiHandle.h"
-#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/PropertyHolder.h"
-#include "GaudiKernel/SmartIF.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/GaudiHandle.h>
+#include <GaudiKernel/IProperty.h>
+#include <GaudiKernel/PropertyHolder.h>
+#include <GaudiKernel/SmartIF.h>
 #include <GaudiKernel/ToStream.h>
 // ============================================================================
 // Boost
diff --git a/GaudiKernel/src/Lib/PropertyMgr.cpp b/GaudiKernel/src/Lib/PropertyMgr.cpp
index d52d402f28..13a813038a 100644
--- a/GaudiKernel/src/Lib/PropertyMgr.cpp
+++ b/GaudiKernel/src/Lib/PropertyMgr.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2020 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -24,12 +24,12 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/INamedInterface.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/PropertyMgr.h"
+#include <GaudiKernel/Bootstrap.h>
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/INamedInterface.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/PropertyMgr.h>
 // ============================================================================
 
 using Gaudi::Details::PropertyBase;
diff --git a/GaudiKernel/src/Lib/Range.cpp b/GaudiKernel/src/Lib/Range.cpp
index d366efd12e..eed0c1ea00 100644
--- a/GaudiKernel/src/Lib/Range.cpp
+++ b/GaudiKernel/src/Lib/Range.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -13,8 +13,8 @@
 // ============================================================================
 // GauduKernel
 // ============================================================================
-#include "GaudiKernel/Range.h"
-#include "GaudiKernel/GaudiException.h"
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/Range.h>
 // ============================================================================
 /** @file
  *
diff --git a/GaudiKernel/src/Lib/RegistryEntry.cpp b/GaudiKernel/src/Lib/RegistryEntry.cpp
index 7f641ee4c5..3558347975 100644
--- a/GaudiKernel/src/Lib/RegistryEntry.cpp
+++ b/GaudiKernel/src/Lib/RegistryEntry.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -32,12 +32,12 @@
 #include <algorithm>
 
 // Interfaces
-#include "GaudiKernel/IDataStoreAgent.h"
-#include "GaudiKernel/IOpaqueAddress.h"
+#include <GaudiKernel/IDataStoreAgent.h>
+#include <GaudiKernel/IOpaqueAddress.h>
 
 // Framework include files
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/RegistryEntry.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/RegistryEntry.h>
 
 // If you absolutely need optimization: switch off dynamic_cast.
 // This improves access to the data store roughly by more than 10 %
diff --git a/GaudiKernel/src/Lib/RenounceToolInputsVisitor.cpp b/GaudiKernel/src/Lib/RenounceToolInputsVisitor.cpp
index f0b99cb648..b52f3e6900 100644
--- a/GaudiKernel/src/Lib/RenounceToolInputsVisitor.cpp
+++ b/GaudiKernel/src/Lib/RenounceToolInputsVisitor.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,9 +8,9 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/RenounceToolInputsVisitor.h"
-#include "GaudiKernel/IAlgTool.h"
-#include "GaudiKernel/IDataHandleHolder.h"
+#include <GaudiKernel/IAlgTool.h>
+#include <GaudiKernel/IDataHandleHolder.h>
+#include <GaudiKernel/RenounceToolInputsVisitor.h>
 
 void RenounceToolInputsVisitor::operator()( IAlgTool* alg_tool ) {
   IDataHandleHolder* dh_holder = dynamic_cast<IDataHandleHolder*>( alg_tool );
diff --git a/GaudiKernel/src/Lib/RndmGenerators.cpp b/GaudiKernel/src/Lib/RndmGenerators.cpp
index 39674b76ea..4d22ff4fb0 100644
--- a/GaudiKernel/src/Lib/RndmGenerators.cpp
+++ b/GaudiKernel/src/Lib/RndmGenerators.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,11 +11,11 @@
 #define GAUDI_RNDMGENSVC_RNDMGENGENERATORS_CPP
 
 // Framework include files
-#include "GaudiKernel/RndmGenerators.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IRndmGen.h"
-#include "GaudiKernel/IRndmGenSvc.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IRndmGen.h>
+#include <GaudiKernel/IRndmGenSvc.h>
+#include <GaudiKernel/RndmGenerators.h>
+#include <GaudiKernel/SmartIF.h>
 
 // Construct and initialize the generator
 Rndm::Numbers::Numbers( const SmartIF<IRndmGenSvc>& svc, const IRndmGen::Param& par ) {
diff --git a/GaudiKernel/src/Lib/RndmTypeInfos.cpp b/GaudiKernel/src/Lib/RndmTypeInfos.cpp
index b143caa544..4681bf8b1b 100644
--- a/GaudiKernel/src/Lib/RndmTypeInfos.cpp
+++ b/GaudiKernel/src/Lib/RndmTypeInfos.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #include <typeinfo>
 
 // Local include files
-#include "GaudiKernel/IRndmGen.h"
-#include "GaudiKernel/RndmGenerators.h"
+#include <GaudiKernel/IRndmGen.h>
+#include <GaudiKernel/RndmGenerators.h>
 
 #ifdef __ICC
 // disable icc remark #177: declared but never referenced
diff --git a/GaudiKernel/src/Lib/Selector.cpp b/GaudiKernel/src/Lib/Selector.cpp
index de8b2e1b35..3c2f4508ee 100644
--- a/GaudiKernel/src/Lib/Selector.cpp
+++ b/GaudiKernel/src/Lib/Selector.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,8 +23,8 @@
 //====================================================================
 #define GAUDI_NTUPLEITEMS_CPP 1
 
-#include "GaudiKernel/Selector.h"
-#include "GaudiKernel/NTuple.h"
+#include <GaudiKernel/NTuple.h>
+#include <GaudiKernel/Selector.h>
 
 /// Selector Initialisation
 StatusCode NTuple::Selector::initialize( NTuple::Tuple* /* nt */ ) { return StatusCode::SUCCESS; }
diff --git a/GaudiKernel/src/Lib/Sequence.cpp b/GaudiKernel/src/Lib/Sequence.cpp
index ace014a2d7..6857c61d5a 100644
--- a/GaudiKernel/src/Lib/Sequence.cpp
+++ b/GaudiKernel/src/Lib/Sequence.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,8 +8,8 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/IAlgManager.h"
 #include <Gaudi/Sequence.h>
+#include <GaudiKernel/IAlgManager.h>
 
 using Gaudi::Sequence;
 
diff --git a/GaudiKernel/src/Lib/Service.cpp b/GaudiKernel/src/Lib/Service.cpp
index 780cb31ef9..a72398b73e 100644
--- a/GaudiKernel/src/Lib/Service.cpp
+++ b/GaudiKernel/src/Lib/Service.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,17 +9,17 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Include Files
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Guards.h"
-#include "GaudiKernel/IAuditorSvc.h"
-#include "GaudiKernel/IDataHandleHolder.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/ISvcManager.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/PropertyHolder.h"
-#include "GaudiKernel/ServiceLocatorHelper.h"
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/Guards.h>
+#include <GaudiKernel/IAuditorSvc.h>
+#include <GaudiKernel/IDataHandleHolder.h>
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/ISvcManager.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/PropertyHolder.h>
+#include <GaudiKernel/Service.h>
+#include <GaudiKernel/ServiceLocatorHelper.h>
 
 using std::string;
 
diff --git a/GaudiKernel/src/Lib/ServiceHistory.cpp b/GaudiKernel/src/Lib/ServiceHistory.cpp
index 5a9fec759f..8ca99b26ba 100644
--- a/GaudiKernel/src/Lib/ServiceHistory.cpp
+++ b/GaudiKernel/src/Lib/ServiceHistory.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -19,10 +19,10 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
-#include "GaudiKernel/ServiceHistory.h"
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/JobHistory.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/IService.h>
+#include <GaudiKernel/JobHistory.h>
+#include <GaudiKernel/Service.h>
+#include <GaudiKernel/ServiceHistory.h>
 #include <iostream>
 
 using namespace std;
diff --git a/GaudiKernel/src/Lib/ServiceLocatorHelper.cpp b/GaudiKernel/src/Lib/ServiceLocatorHelper.cpp
index 335bbb467e..9c49dc6e0a 100644
--- a/GaudiKernel/src/Lib/ServiceLocatorHelper.cpp
+++ b/GaudiKernel/src/Lib/ServiceLocatorHelper.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2020 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,11 +8,11 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/ServiceLocatorHelper.h"
+#include <GaudiKernel/ServiceLocatorHelper.h>
 
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/IService.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/MsgStream.h>
 
 #include <fmt/format.h>
 
diff --git a/GaudiKernel/src/Lib/Sleep.cpp b/GaudiKernel/src/Lib/Sleep.cpp
index 0829f12b4f..44d8ae1587 100644
--- a/GaudiKernel/src/Lib/Sleep.cpp
+++ b/GaudiKernel/src/Lib/Sleep.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/Sleep.h"
+#include <GaudiKernel/Sleep.h>
 #include <chrono>
 #include <thread>
 
diff --git a/GaudiKernel/src/Lib/SmartDataObjectPtr.cpp b/GaudiKernel/src/Lib/SmartDataObjectPtr.cpp
index ebef7244e8..e9a8342a25 100644
--- a/GaudiKernel/src/Lib/SmartDataObjectPtr.cpp
+++ b/GaudiKernel/src/Lib/SmartDataObjectPtr.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,9 +20,9 @@
 #define GAUDIKERNEL_SMARTDATAOBJECTPTR_CPP 1
 
 // Framework include files
-#include "GaudiKernel/SmartDataObjectPtr.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IDataProviderSvc.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/SmartDataObjectPtr.h>
 
 SmartDataObjectPtr::AccessFunction SmartDataObjectPtr::ObjectLoader::access() { return &SmartDataObjectPtr::retrieve; }
 
diff --git a/GaudiKernel/src/Lib/SmartRefBase.cpp b/GaudiKernel/src/Lib/SmartRefBase.cpp
index 795d567d17..6beb0d4001 100644
--- a/GaudiKernel/src/Lib/SmartRefBase.cpp
+++ b/GaudiKernel/src/Lib/SmartRefBase.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,15 +20,15 @@
 #define KERNEL_SMARTREFBASE_CPP 1
 
 // Framework include files
-#include "GaudiKernel/SmartRefBase.h"
-#include "GaudiKernel/ContainedObject.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/LinkManager.h"
-#include "GaudiKernel/ObjectContainerBase.h"
-#include "GaudiKernel/StreamBuffer.h"
+#include <GaudiKernel/ContainedObject.h>
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/LinkManager.h>
+#include <GaudiKernel/ObjectContainerBase.h>
+#include <GaudiKernel/SmartRefBase.h>
+#include <GaudiKernel/StreamBuffer.h>
 
 typedef ObjectContainerBase _Container;
 
diff --git a/GaudiKernel/src/Lib/SmartRefVector.cpp b/GaudiKernel/src/Lib/SmartRefVector.cpp
index 9186d28a36..91d4adf17f 100644
--- a/GaudiKernel/src/Lib/SmartRefVector.cpp
+++ b/GaudiKernel/src/Lib/SmartRefVector.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,9 +8,9 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/SmartRefVector.h"
-#include "Python.h"
-#include "RVersion.h"
+#include <GaudiKernel/SmartRefVector.h>
+#include <Python.h>
+#include <RVersion.h>
 
 void SmartRefVectorImpl::SmartRefVectorPythonizer::__cppyy_pythonize__( PyObject* klass, const std::string& name ) {
   if ( name.substr( 0, 15 ) == "SmartRefVector<" ) {
diff --git a/GaudiKernel/src/Lib/Stat.cpp b/GaudiKernel/src/Lib/Stat.cpp
index fd7976350e..70a490ef9a 100644
--- a/GaudiKernel/src/Lib/Stat.cpp
+++ b/GaudiKernel/src/Lib/Stat.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,9 +8,9 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/Stat.h"
-#include "GaudiKernel/IStatSvc.h"
-#include "GaudiKernel/StatEntity.h"
+#include <GaudiKernel/IStatSvc.h>
+#include <GaudiKernel/Stat.h>
+#include <GaudiKernel/StatEntity.h>
 #include <fmt/format.h>
 #include <fmt/ostream.h>
 #include <sstream>
diff --git a/GaudiKernel/src/Lib/StateMachine.cpp b/GaudiKernel/src/Lib/StateMachine.cpp
index d2f2a541ec..22931f99f5 100644
--- a/GaudiKernel/src/Lib/StateMachine.cpp
+++ b/GaudiKernel/src/Lib/StateMachine.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/StateMachine.h"
+#include <GaudiKernel/StateMachine.h>
 
 namespace Gaudi {
   namespace StateMachine {
diff --git a/GaudiKernel/src/Lib/StatusCode.cpp b/GaudiKernel/src/Lib/StatusCode.cpp
index c2071afc60..d76049480b 100644
--- a/GaudiKernel/src/Lib/StatusCode.cpp
+++ b/GaudiKernel/src/Lib/StatusCode.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2022 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,13 +10,13 @@
 \***********************************************************************************/
 #define GAUDIKERNEL_STATUSCODE_CPP 1
 
-#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/Bootstrap.h>
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/StatusCode.h>
+#include <GaudiKernel/System.h>
 #include <exception>
 
 constexpr const StatusCode::ErrorCode StatusCode::SUCCESS;
diff --git a/GaudiKernel/src/Lib/StringKey.cpp b/GaudiKernel/src/Lib/StringKey.cpp
index c0da3d1f2f..acf9349c21 100644
--- a/GaudiKernel/src/Lib/StringKey.cpp
+++ b/GaudiKernel/src/Lib/StringKey.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -13,9 +13,9 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/StringKey.h"
-#include "GaudiKernel/ToStream.h"
 #include <Gaudi/Parsers/CommonParsers.h>
+#include <GaudiKernel/StringKey.h>
+#include <GaudiKernel/ToStream.h>
 // ============================================================================
 /** @file
  *  Implementation file for class Gaudi::StringKey
diff --git a/GaudiKernel/src/Lib/System.cpp b/GaudiKernel/src/Lib/System.cpp
index 9c30119c7f..31f38bdb50 100644
--- a/GaudiKernel/src/Lib/System.cpp
+++ b/GaudiKernel/src/Lib/System.cpp
@@ -33,7 +33,7 @@
 #include <sstream>
 #include <typeinfo>
 
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/System.h>
 
 // Platform specific include(s):
 #ifdef __linux__
@@ -46,7 +46,7 @@
 
 #ifdef __x86_64
 #  define VCL_NAMESPACE Gaudi
-#  include "instrset_detect.cpp"
+#  include <instrset_detect.cpp>
 #  undef VCL_NAMESPACE
 #endif
 
@@ -56,25 +56,25 @@
 #  define getpid _getpid
 #  define NOMSG
 #  define NOGDI
-#  include "process.h"
-#  include "windows.h"
+#  include <process.h>
+#  include <windows.h>
 #  undef NOMSG
 #  undef NOGDI
 static const std::array<const char*, 1> SHLIB_SUFFIXES = { ".dll" };
 #else // UNIX...: first the EGCS stuff, then the OS dependent includes
-#  include "libgen.h"
-#  include "sys/times.h"
-#  include "unistd.h"
 #  include <cstdio>
 #  include <cxxabi.h>
 #  include <errno.h>
+#  include <libgen.h>
 #  include <string.h>
+#  include <sys/times.h>
+#  include <unistd.h>
 #  if defined( __linux ) || defined( __APPLE__ )
-#    include "dlfcn.h"
+#    include <dlfcn.h>
 #    include <sys/utsname.h>
 #    include <unistd.h>
 #  elif __hpux
-#    include "dl.h"
+#    include <dl.h>
 struct HMODULE {
   shl_descriptor dsc;
   long           numSym;
@@ -412,7 +412,7 @@ bool System::isEnvSet( const char* var ) { return getenv( var ) != nullptr; }
 /// get all defined environment vars
 #if defined( __APPLE__ )
 // Needed for _NSGetEnviron(void)
-#  include "crt_externs.h"
+#  include <crt_externs.h>
 #endif
 std::vector<std::string> System::getEnv() {
 #if defined( _WIN32 )
diff --git a/GaudiKernel/src/Lib/ThreadLocalContext.cpp b/GaudiKernel/src/Lib/ThreadLocalContext.cpp
index 18b47ee011..31e1513bd1 100644
--- a/GaudiKernel/src/Lib/ThreadLocalContext.cpp
+++ b/GaudiKernel/src/Lib/ThreadLocalContext.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,11 +8,11 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/ThreadLocalContext.h"
-#include "GaudiKernel/EventContext.h"
+#include <GaudiKernel/EventContext.h>
+#include <GaudiKernel/ThreadLocalContext.h>
 
-#include "Rtypes.h"
-#include "ThreadLocalStorage.h"
+#include <Rtypes.h>
+#include <ThreadLocalStorage.h>
 
 namespace {
   // MacOS X's clang doesn't provide thread_local. So we need to use ROOT's
diff --git a/GaudiKernel/src/Lib/Time.cpp b/GaudiKernel/src/Lib/Time.cpp
index 59a8f78cc7..304a9353dd 100644
--- a/GaudiKernel/src/Lib/Time.cpp
+++ b/GaudiKernel/src/Lib/Time.cpp
@@ -9,9 +9,9 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Include files
-#include "GaudiKernel/Time.h"
+#include <GaudiKernel/Time.h>
 
-#include "GaudiKernel/time_r.h"
+#include <GaudiKernel/time_r.h>
 
 #include <cerrno>
 #include <cstdio>
diff --git a/GaudiKernel/src/Lib/Timing.cpp b/GaudiKernel/src/Lib/Timing.cpp
index afcc70184d..1b82041523 100644
--- a/GaudiKernel/src/Lib/Timing.cpp
+++ b/GaudiKernel/src/Lib/Timing.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -22,8 +22,8 @@
 //====================================================================
 #define GAUDIKERNEL_TIMING_CPP
 
-#include "GaudiKernel/Timing.h"
 #include "ProcessDescriptor.h"
+#include <GaudiKernel/Timing.h>
 
 #include <climits>
 #include <ctime>
diff --git a/GaudiKernel/src/Lib/ToolVisitor.cpp b/GaudiKernel/src/Lib/ToolVisitor.cpp
index 87bd1e9e62..4fa57dc70a 100644
--- a/GaudiKernel/src/Lib/ToolVisitor.cpp
+++ b/GaudiKernel/src/Lib/ToolVisitor.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,8 +8,8 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/ToolVisitor.h"
-#include "GaudiKernel/AlgTool.h"
+#include <GaudiKernel/AlgTool.h>
+#include <GaudiKernel/ToolVisitor.h>
 
 namespace {
   void reverseAppend( const std::vector<IAlgTool*>& src, std::vector<IAlgTool*>& dest, const std::regex& reject_filter,
diff --git a/GaudiKernel/src/Lib/TsDataSvc.cpp b/GaudiKernel/src/Lib/TsDataSvc.cpp
index 6bb84d2dc1..8a7355e915 100644
--- a/GaudiKernel/src/Lib/TsDataSvc.cpp
+++ b/GaudiKernel/src/Lib/TsDataSvc.cpp
@@ -30,17 +30,17 @@
 #define TSDATASVC_DATASVC_CPP
 
 // Framework include files
-#include "GaudiKernel/IConversionSvc.h"
-#include "GaudiKernel/IConverter.h"
-#include "GaudiKernel/IOpaqueAddress.h"
+#include <GaudiKernel/IConversionSvc.h>
+#include <GaudiKernel/IConverter.h>
+#include <GaudiKernel/IOpaqueAddress.h>
 
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/GaudiException.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/GaudiException.h>
 
-#include "GaudiKernel/DataIncident.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/RegistryEntry.h"
-#include "GaudiKernel/TsDataSvc.h"
+#include <GaudiKernel/DataIncident.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/RegistryEntry.h>
+#include <GaudiKernel/TsDataSvc.h>
 
 // Include files
 #include <algorithm>
diff --git a/GaudiKernel/tests/src/CountersUnitTest.cpp b/GaudiKernel/tests/src/CountersUnitTest.cpp
index 89a0683cae..3e2994de52 100644
--- a/GaudiKernel/tests/src/CountersUnitTest.cpp
+++ b/GaudiKernel/tests/src/CountersUnitTest.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,9 +12,9 @@
 #define BOOST_TEST_MODULE test_Counters
 #include <boost/test/unit_test.hpp>
 
-#include "Gaudi/Accumulators.h"
-#include "Gaudi/Chrono/Counters.h"
-#include "GaudiKernel/StatEntity.h"
+#include <Gaudi/Accumulators.h>
+#include <Gaudi/Chrono/Counters.h>
+#include <GaudiKernel/StatEntity.h>
 
 #include <chrono>
 
diff --git a/GaudiKernel/tests/src/DirSearchPath_test.cpp b/GaudiKernel/tests/src/DirSearchPath_test.cpp
index 8adae8bea3..4738a7ec9b 100644
--- a/GaudiKernel/tests/src/DirSearchPath_test.cpp
+++ b/GaudiKernel/tests/src/DirSearchPath_test.cpp
@@ -24,8 +24,8 @@
 // ... a lot of noise produced by the boost/filesystem/operations.hpp
 #  pragma warning( disable : 279 )
 #endif
-#include "GaudiKernel/DirSearchPath.h"
-#include "boost/filesystem/operations.hpp"
+#include <GaudiKernel/DirSearchPath.h>
+#include <boost/filesystem/operations.hpp>
 
 using namespace std;
 using namespace boost::filesystem;
diff --git a/GaudiKernel/tests/src/GenericSinkUnitTest.cpp b/GaudiKernel/tests/src/GenericSinkUnitTest.cpp
index a7e9b8e9df..4668842ea9 100644
--- a/GaudiKernel/tests/src/GenericSinkUnitTest.cpp
+++ b/GaudiKernel/tests/src/GenericSinkUnitTest.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE test_GenericSink
 
-#include "Gaudi/MonitoringHub.h"
+#include <Gaudi/MonitoringHub.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/GaudiKernel/tests/src/Memory_test.cpp b/GaudiKernel/tests/src/Memory_test.cpp
index d1b43d9f79..52e5e6bb6a 100644
--- a/GaudiKernel/tests/src/Memory_test.cpp
+++ b/GaudiKernel/tests/src/Memory_test.cpp
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/Memory.h"
+#include <GaudiKernel/Memory.h>
 #include <cstdlib>
 #include <iomanip>
 #include <iostream>
diff --git a/GaudiKernel/tests/src/PathResolver_test.cpp b/GaudiKernel/tests/src/PathResolver_test.cpp
index 53e08205d0..67f8bcefd9 100644
--- a/GaudiKernel/tests/src/PathResolver_test.cpp
+++ b/GaudiKernel/tests/src/PathResolver_test.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,8 +8,8 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/PathResolver.h"
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/PathResolver.h>
+#include <GaudiKernel/System.h>
 
 #include <boost/filesystem.hpp>
 #include <iostream>
diff --git a/GaudiKernel/tests/src/custom_factory.cpp b/GaudiKernel/tests/src/custom_factory.cpp
index 15ed6e6887..682fa6a56a 100644
--- a/GaudiKernel/tests/src/custom_factory.cpp
+++ b/GaudiKernel/tests/src/custom_factory.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -16,7 +16,7 @@
  *
  */
 
-#include "Gaudi/PluginService.h"
+#include <Gaudi/PluginService.h>
 
 struct IMyInterface {
   using Factory = Gaudi::PluginService::Factory<IMyInterface*()>;
diff --git a/GaudiKernel/tests/src/parsers.cpp b/GaudiKernel/tests/src/parsers.cpp
index 98a61cddeb..9ba9d44f20 100644
--- a/GaudiKernel/tests/src/parsers.cpp
+++ b/GaudiKernel/tests/src/parsers.cpp
@@ -8,16 +8,16 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/StdArrayAsProperty.h"
-#include "GaudiKernel/StringKey.h"
-#include "GaudiKernel/VectorMap.h"
-#include "GaudiKernel/VectorsAsProperty.h"
+#include <GaudiKernel/StdArrayAsProperty.h>
+#include <GaudiKernel/StringKey.h>
+#include <GaudiKernel/VectorMap.h>
+#include <GaudiKernel/VectorsAsProperty.h>
 
 #define BOOST_TEST_MODULE Parsers_test
 #include <boost/test/included/unit_test.hpp>
 
-#include "GaudiKernel/ToStream.h"
 #include <Gaudi/Parsers/Factory.h>
+#include <GaudiKernel/ToStream.h>
 
 using namespace Gaudi::Parsers;
 
diff --git a/GaudiKernel/tests/src/test_AnyDataObject.cpp b/GaudiKernel/tests/src/test_AnyDataObject.cpp
index d1c8a8aec6..3f37eb0379 100644
--- a/GaudiKernel/tests/src/test_AnyDataObject.cpp
+++ b/GaudiKernel/tests/src/test_AnyDataObject.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/AnyDataWrapper.h"
+#include <GaudiKernel/AnyDataWrapper.h>
 
 // from SPI version of the testdriver
 #include <cppunit/CompilerOutputter.h>
diff --git a/GaudiKernel/tests/src/test_AttribStringParser.cpp b/GaudiKernel/tests/src/test_AttribStringParser.cpp
index 9632db62fe..cf9476bd97 100644
--- a/GaudiKernel/tests/src/test_AttribStringParser.cpp
+++ b/GaudiKernel/tests/src/test_AttribStringParser.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2023 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/AttribStringParser.h"
+#include <GaudiKernel/AttribStringParser.h>
 #include <iostream>
 #include <map>
 #include <string>
diff --git a/GaudiKernel/tests/src/test_ContextSpecificPtr.cpp b/GaudiKernel/tests/src/test_ContextSpecificPtr.cpp
index 660b93fea7..631a6f1033 100644
--- a/GaudiKernel/tests/src/test_ContextSpecificPtr.cpp
+++ b/GaudiKernel/tests/src/test_ContextSpecificPtr.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/ContextSpecificPtr.h"
+#include <GaudiKernel/ContextSpecificPtr.h>
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
diff --git a/GaudiKernel/tests/src/test_DataHandleVector.cpp b/GaudiKernel/tests/src/test_DataHandleVector.cpp
index 2d479def83..74aedf02f9 100644
--- a/GaudiKernel/tests/src/test_DataHandleVector.cpp
+++ b/GaudiKernel/tests/src/test_DataHandleVector.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/AnyDataWrapper.h"
+#include <GaudiKernel/AnyDataWrapper.h>
 
 // from SPI version of the testdriver
 #include <cppunit/CompilerOutputter.h>
diff --git a/GaudiKernel/tests/src/test_EventIDBase.cpp b/GaudiKernel/tests/src/test_EventIDBase.cpp
index 5aff87c9b0..cd57c75eee 100644
--- a/GaudiKernel/tests/src/test_EventIDBase.cpp
+++ b/GaudiKernel/tests/src/test_EventIDBase.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define BOOST_TEST_MODULE test_EventIDBase
 #include <boost/test/unit_test.hpp>
 
-#include "GaudiKernel/EventIDBase.h"
+#include <GaudiKernel/EventIDBase.h>
 #include <algorithm>
 #include <array>
 
diff --git a/GaudiKernel/tests/src/test_EventIDRange.cpp b/GaudiKernel/tests/src/test_EventIDRange.cpp
index 0b2a1864b3..5ebd4a2200 100644
--- a/GaudiKernel/tests/src/test_EventIDRange.cpp
+++ b/GaudiKernel/tests/src/test_EventIDRange.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define BOOST_TEST_MODULE test_EventIDRange
 #include <boost/test/unit_test.hpp>
 
-#include "GaudiKernel/EventIDRange.h"
+#include <GaudiKernel/EventIDRange.h>
 
 BOOST_AUTO_TEST_CASE( comparison ) {
   {
diff --git a/GaudiKernel/tests/src/test_GaudiTime.cpp b/GaudiKernel/tests/src/test_GaudiTime.cpp
index 74e397257b..1092605f30 100644
--- a/GaudiKernel/tests/src/test_GaudiTime.cpp
+++ b/GaudiKernel/tests/src/test_GaudiTime.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,7 +15,7 @@
  *      Author: Marco Clemencic
  */
 
-#include "GaudiKernel/Time.h"
+#include <GaudiKernel/Time.h>
 
 // from SPI version of the testdriver
 #include <cppunit/CompilerOutputter.h>
diff --git a/GaudiKernel/tests/src/test_GaudiTimer.cpp b/GaudiKernel/tests/src/test_GaudiTimer.cpp
index 20a87a2939..8c3966b5ff 100644
--- a/GaudiKernel/tests/src/test_GaudiTimer.cpp
+++ b/GaudiKernel/tests/src/test_GaudiTimer.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -16,7 +16,7 @@
 #include <string>
 #include <thread>
 
-#include "Gaudi/Timers.h"
+#include <Gaudi/Timers.h>
 
 // Measure same time interval with different clocks
 BOOST_AUTO_TEST_CASE( timer ) {
diff --git a/GaudiKernel/tests/src/test_GaudiTiming.cpp b/GaudiKernel/tests/src/test_GaudiTiming.cpp
index 45edf58ec9..c3e1b08998 100644
--- a/GaudiKernel/tests/src/test_GaudiTiming.cpp
+++ b/GaudiKernel/tests/src/test_GaudiTiming.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,10 +15,10 @@
  *      Author: Marco Clemencic
  */
 
-#include "GaudiKernel/ChronoEntity.h"
-#include "GaudiKernel/Memory.h"
-#include "GaudiKernel/Sleep.h"
-#include "GaudiKernel/Timing.h"
+#include <GaudiKernel/ChronoEntity.h>
+#include <GaudiKernel/Memory.h>
+#include <GaudiKernel/Sleep.h>
+#include <GaudiKernel/Timing.h>
 #include <cmath>
 
 // from SPI version of the testdriver
diff --git a/GaudiKernel/tests/src/test_LockedHandle.cpp b/GaudiKernel/tests/src/test_LockedHandle.cpp
index a9577fbdcd..79554d4f07 100644
--- a/GaudiKernel/tests/src/test_LockedHandle.cpp
+++ b/GaudiKernel/tests/src/test_LockedHandle.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,10 +15,10 @@
  *      Author: Charles Leggett (copied from test_GaudiTiming.cpp)
  */
 
-#include "GaudiKernel/LockedHandle.h"
-#include "GaudiKernel/Timing.h"
+#include <GaudiKernel/LockedHandle.h>
+#include <GaudiKernel/Timing.h>
 
-#include "boost/thread/mutex.hpp"
+#include <boost/thread/mutex.hpp>
 #include <chrono>
 #include <memory>
 #include <mutex>
diff --git a/GaudiKernel/tests/src/test_MonotonicArena.cpp b/GaudiKernel/tests/src/test_MonotonicArena.cpp
index 66cc1b6bdb..412a51beed 100644
--- a/GaudiKernel/tests/src/test_MonotonicArena.cpp
+++ b/GaudiKernel/tests/src/test_MonotonicArena.cpp
@@ -10,7 +10,7 @@
 \***********************************************************************************/
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE test_MonotonicArena
-#include "Gaudi/Arena/Monotonic.h"
+#include <Gaudi/Arena/Monotonic.h>
 #include <boost/align/align_up.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/GaudiKernel/tests/src/test_PropertyHolder.cpp b/GaudiKernel/tests/src/test_PropertyHolder.cpp
index fc5cad246f..bd249812da 100644
--- a/GaudiKernel/tests/src/test_PropertyHolder.cpp
+++ b/GaudiKernel/tests/src/test_PropertyHolder.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2020 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define BOOST_TEST_MODULE test_PropertyHolder
 #include <boost/test/unit_test.hpp>
 
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/PropertyHolder.h"
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/PropertyHolder.h>
 
 namespace {
   const std::string emptyName{};
diff --git a/GaudiKernel/tests/src/test_SerializeSTL.cpp b/GaudiKernel/tests/src/test_SerializeSTL.cpp
index 4d228268a7..d80ba74c28 100644
--- a/GaudiKernel/tests/src/test_SerializeSTL.cpp
+++ b/GaudiKernel/tests/src/test_SerializeSTL.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/SerializeSTL.h"
+#include <GaudiKernel/SerializeSTL.h>
 
 // from SPI version of the testdriver
 #include <cppunit/CompilerOutputter.h>
diff --git a/GaudiKernel/tests/src/test_StatusCode.cpp b/GaudiKernel/tests/src/test_StatusCode.cpp
index ae7eaea7d0..97b48412d0 100644
--- a/GaudiKernel/tests/src/test_StatusCode.cpp
+++ b/GaudiKernel/tests/src/test_StatusCode.cpp
@@ -15,8 +15,8 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/StatusCode.h>
 
 // Define my own error enum/category
 enum class MyErr : StatusCode::code_t {
diff --git a/GaudiKernel/tests/src/test_StatusCode_fail.cxx b/GaudiKernel/tests/src/test_StatusCode_fail.cxx
index 291ec67fc0..910a366551 100644
--- a/GaudiKernel/tests/src/test_StatusCode_fail.cxx
+++ b/GaudiKernel/tests/src/test_StatusCode_fail.cxx
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/StatusCode.h>
 
 int main() {
 #ifdef CASE01
diff --git a/GaudiKernel/tests/src/test_SystemCmdLineArgs.cpp b/GaudiKernel/tests/src/test_SystemCmdLineArgs.cpp
index 56a53c6117..9cc837c122 100644
--- a/GaudiKernel/tests/src/test_SystemCmdLineArgs.cpp
+++ b/GaudiKernel/tests/src/test_SystemCmdLineArgs.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,7 +15,7 @@
 #include <boost/test/unit_test.hpp>
 
 // GaudiKernel include(s):
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/System.h>
 
 /// Macro stringifying its argument
 #define STRINGIFY( s ) #s
diff --git a/GaudiKernel/tests/src/test_SystemTypeinfoName.cpp b/GaudiKernel/tests/src/test_SystemTypeinfoName.cpp
index d306c9eff8..f01940fb37 100644
--- a/GaudiKernel/tests/src/test_SystemTypeinfoName.cpp
+++ b/GaudiKernel/tests/src/test_SystemTypeinfoName.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -18,7 +18,7 @@
 #include <string>
 
 // GaudiKernel include(s):
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/System.h>
 
 /// Primitive test class used in the tests
 class TestClass {};
diff --git a/GaudiKernel/tests/src/test_compose.cpp b/GaudiKernel/tests/src/test_compose.cpp
index e7b0a42cdc..da2d62a023 100644
--- a/GaudiKernel/tests/src/test_compose.cpp
+++ b/GaudiKernel/tests/src/test_compose.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -14,7 +14,7 @@
 
 #include <string>
 
-#include "GaudiKernel/compose.h"
+#include <GaudiKernel/compose.h>
 
 const auto f = compose( []( int ) { return 0; }, []( double ) { return 1; }, []( float ) { return 2; },
                         []( const char* ) { return 3; }, []( void* ) { return 4; } );
diff --git a/GaudiKernel/tests/src/test_reverse.cpp b/GaudiKernel/tests/src/test_reverse.cpp
index 027ea5e8e1..5eef81695e 100644
--- a/GaudiKernel/tests/src/test_reverse.cpp
+++ b/GaudiKernel/tests/src/test_reverse.cpp
@@ -15,7 +15,7 @@
 #include <algorithm>
 #include <array>
 
-#include "GaudiKernel/reverse.h"
+#include <GaudiKernel/reverse.h>
 
 template <typename R1, typename R2>
 void copy( R1&& r1, R2& r2 ) {
diff --git a/GaudiMP/dict/gaudimp_dict.h b/GaudiMP/dict/gaudimp_dict.h
index 6f37abae9b..9a6f6a7edc 100644
--- a/GaudiMP/dict/gaudimp_dict.h
+++ b/GaudiMP/dict/gaudimp_dict.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -18,18 +18,18 @@
 #  include <Python.h>
 #endif // not __APPLE__
 
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/Chrono.h"
-#include "GaudiKernel/ChronoEntity.h"
-#include "GaudiKernel/Range.h"
-#include "GaudiKernel/SerializeSTL.h"
-#include "GaudiKernel/Stat.h"
-#include "GaudiKernel/StatEntity.h"
-#include "GaudiKernel/StringKey.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiKernel/Chrono.h>
+#include <GaudiKernel/ChronoEntity.h>
+#include <GaudiKernel/Range.h>
+#include <GaudiKernel/SerializeSTL.h>
+#include <GaudiKernel/Stat.h>
+#include <GaudiKernel/StatEntity.h>
+#include <GaudiKernel/StringKey.h>
 
 #ifdef _WIN32
-#  include "GaudiKernel/GaudiHandle.h"
+#  include <GaudiKernel/GaudiHandle.h>
 #endif
 
 #ifdef __ICC
@@ -39,8 +39,8 @@
 #  pragma warning( disable : 1125 )
 #endif
 
-#include "GaudiMP/PyROOTPickle.h"
-#include "GaudiMP/TESSerializer.h"
+#include <GaudiMP/PyROOTPickle.h>
+#include <GaudiMP/TESSerializer.h>
 
 #ifdef _WIN32
 #  pragma warning( disable : 4345 )
diff --git a/GaudiMP/include/GaudiMP/PyROOTPickle.h b/GaudiMP/include/GaudiMP/PyROOTPickle.h
index 5c5c2b5b5c..754775bb1b 100644
--- a/GaudiMP/include/GaudiMP/PyROOTPickle.h
+++ b/GaudiMP/include/GaudiMP/PyROOTPickle.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -34,9 +34,9 @@
 #ifndef GAUDIMP_PYROOTPICKLE_H
 #define GAUDIMP_PYROOTPICKLE_H
 
-#include "Python.h"
+#include <Python.h>
 
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 
 namespace GaudiMP {
 
diff --git a/GaudiMP/include/GaudiMP/TESSerializer.h b/GaudiMP/include/GaudiMP/TESSerializer.h
index 290b75064d..11a0dcc661 100644
--- a/GaudiMP/include/GaudiMP/TESSerializer.h
+++ b/GaudiMP/include/GaudiMP/TESSerializer.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,12 +11,12 @@
 #ifndef GAUDIMP_TESSERIALIZER_H
 #define GAUDIMP_TESSERIALIZER_H
 
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IAddressCreator.h"
-#include "GaudiKernel/IDataStoreAgent.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IAddressCreator.h>
+#include <GaudiKernel/IDataStoreAgent.h>
 
 // ROOT includes
-#include "TClass.h"
+#include <TClass.h>
 
 // vector and string
 #include <map>
diff --git a/GaudiMP/src/Lib/PyROOTPickle.cpp b/GaudiMP/src/Lib/PyROOTPickle.cpp
index 7a4a9ee943..28a6f99afc 100644
--- a/GaudiMP/src/Lib/PyROOTPickle.cpp
+++ b/GaudiMP/src/Lib/PyROOTPickle.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -21,12 +21,12 @@
 #  pragma warning( disable : 2259 )
 #endif
 
-#include "GaudiMP/PyROOTPickle.h"
-#include "RVersion.h"
-#include "TBufferFile.h"
-#include "TClass.h"
-#include "TClassRef.h"
-#include "TPython.h"
+#include <GaudiMP/PyROOTPickle.h>
+#include <RVersion.h>
+#include <TBufferFile.h>
+#include <TClass.h>
+#include <TClassRef.h>
+#include <TPython.h>
 
 //- data _______________________________________________________________________
 #if ROOT_VERSION_CODE < ROOT_VERSION( 5, 19, 0 )
diff --git a/GaudiMP/src/Lib/TESSerializer.cpp b/GaudiMP/src/Lib/TESSerializer.cpp
index b6372508ce..406f57a756 100644
--- a/GaudiMP/src/Lib/TESSerializer.cpp
+++ b/GaudiMP/src/Lib/TESSerializer.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,30 +8,30 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiMP/TESSerializer.h"
+#include <GaudiMP/TESSerializer.h>
 
 // Framework include files
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/DataStoreItem.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/LinkManager.h"
-#include "GaudiKernel/System.h"
-
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/GenericAddress.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/KeyedContainer.h"
-
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/DataStoreItem.h>
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/LinkManager.h>
+#include <GaudiKernel/System.h>
+
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/GenericAddress.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/KeyedContainer.h>
+
+#include <GaudiKernel/MsgStream.h>
 
 // ROOT include files
-#include "TBufferFile.h"
-#include "TClass.h"
-#include "TInterpreter.h"
-#include "TROOT.h"
+#include <TBufferFile.h>
+#include <TClass.h>
+#include <TInterpreter.h>
+#include <TROOT.h>
 
 #include <map>
 
diff --git a/GaudiMP/src/component/IoComponentMgr.cpp b/GaudiMP/src/component/IoComponentMgr.cpp
index dd779d3552..aa651d45d5 100644
--- a/GaudiMP/src/component/IoComponentMgr.cpp
+++ b/GaudiMP/src/component/IoComponentMgr.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -17,11 +17,11 @@
 // GaudiMP includes
 #include "IoComponentMgr.h"
 // FrameWork includes
-#include "GaudiKernel/FileIncident.h"
-#include "GaudiKernel/IFileMgr.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/ServiceHandle.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/FileIncident.h>
+#include <GaudiKernel/IFileMgr.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/ServiceHandle.h>
 // BOOST includes
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
diff --git a/GaudiMP/src/component/IoComponentMgr.h b/GaudiMP/src/component/IoComponentMgr.h
index f129f4ede3..8dfd8f2165 100644
--- a/GaudiMP/src/component/IoComponentMgr.h
+++ b/GaudiMP/src/component/IoComponentMgr.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -26,12 +26,12 @@
 #include <vector>
 
 // FrameWork includes
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/Service.h>
 
 // GaudiKernel
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/IIoComponent.h"
-#include "GaudiKernel/IIoComponentMgr.h"
+#include <GaudiKernel/IIncidentListener.h>
+#include <GaudiKernel/IIoComponent.h>
+#include <GaudiKernel/IIoComponentMgr.h>
 
 // Forward declaration
 class ISvcLocator;
diff --git a/GaudiMonitor/src/ExceptionSvc.cpp b/GaudiMonitor/src/ExceptionSvc.cpp
index 4220df1b81..6736abcf42 100644
--- a/GaudiMonitor/src/ExceptionSvc.cpp
+++ b/GaudiMonitor/src/ExceptionSvc.cpp
@@ -18,7 +18,7 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/ISvcLocator.h"
+#include <GaudiKernel/ISvcLocator.h>
 // ============================================================================
 // Local
 // ============================================================================
diff --git a/GaudiMonitor/src/ExceptionSvc.h b/GaudiMonitor/src/ExceptionSvc.h
index 220cd9a3cb..45e09d68b8 100644
--- a/GaudiMonitor/src/ExceptionSvc.h
+++ b/GaudiMonitor/src/ExceptionSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,9 +15,9 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/IExceptionSvc.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/IExceptionSvc.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/Service.h>
 // ============================================================================
 /** @class ExceptionSvc
  *  Simple implementation of IExceptionSvc abstract interface
diff --git a/GaudiMonitor/src/HistorySvc.cpp b/GaudiMonitor/src/HistorySvc.cpp
index 937ba41cca..ba67df4a71 100644
--- a/GaudiMonitor/src/HistorySvc.cpp
+++ b/GaudiMonitor/src/HistorySvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,33 +12,33 @@
 
 #include <functional>
 
-#include "GaudiKernel/HistoryObj.h"
-#include "GaudiKernel/IVersHistoryObj.h"
-
-#include "GaudiKernel/AlgToolHistory.h"
-#include "GaudiKernel/AlgorithmHistory.h"
-#include "GaudiKernel/DataHistory.h"
-#include "GaudiKernel/JobHistory.h"
-#include "GaudiKernel/ServiceHistory.h"
-
-#include "GaudiKernel/ISvcLocator.h"
-
-#include "GaudiKernel/AlgTool.h"
-#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/IAlgManager.h"
-#include "GaudiKernel/IAlgTool.h"
-#include "GaudiKernel/IAlgorithm.h"
-#include "GaudiKernel/IAppMgrUI.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/System.h"
-#include <Gaudi/Algorithm.h>
+#include <GaudiKernel/HistoryObj.h>
+#include <GaudiKernel/IVersHistoryObj.h>
+
+#include <GaudiKernel/AlgToolHistory.h>
+#include <GaudiKernel/AlgorithmHistory.h>
+#include <GaudiKernel/DataHistory.h>
+#include <GaudiKernel/JobHistory.h>
+#include <GaudiKernel/ServiceHistory.h>
 
-#include "GaudiKernel/IAlgContextSvc.h"
+#include <GaudiKernel/ISvcLocator.h>
 
-#include "boost/algorithm/string/predicate.hpp"
+#include <Gaudi/Algorithm.h>
+#include <GaudiKernel/AlgTool.h>
+#include <GaudiKernel/Bootstrap.h>
+#include <GaudiKernel/IAlgManager.h>
+#include <GaudiKernel/IAlgTool.h>
+#include <GaudiKernel/IAlgorithm.h>
+#include <GaudiKernel/IAppMgrUI.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/IService.h>
+#include <GaudiKernel/IToolSvc.h>
+#include <GaudiKernel/ServiceHandle.h>
+#include <GaudiKernel/System.h>
+
+#include <GaudiKernel/IAlgContextSvc.h>
+
+#include <boost/algorithm/string/predicate.hpp>
 namespace ba = boost::algorithm;
 
 #include <fstream>
diff --git a/GaudiMonitor/src/HistorySvc.h b/GaudiMonitor/src/HistorySvc.h
index 030787585b..160224cdb3 100644
--- a/GaudiMonitor/src/HistorySvc.h
+++ b/GaudiMonitor/src/HistorySvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,17 +11,17 @@
 #ifndef GAUDISVC_FASTHISTORYSVC_H
 #define GAUDISVC_FASTHISTORYSVC_H
 
-#include "GaudiKernel/IHistorySvc.h"
+#include <GaudiKernel/IHistorySvc.h>
 
-#include "GaudiKernel/AlgTool.h"
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/IVersHistoryObj.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/StatusCode.h"
 #include <Gaudi/Algorithm.h>
-
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/AlgTool.h>
+#include <GaudiKernel/IIncidentListener.h>
+#include <GaudiKernel/IVersHistoryObj.h>
+#include <GaudiKernel/Service.h>
+#include <GaudiKernel/StatusCode.h>
+
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/MsgStream.h>
 #include <fstream>
 #include <map>
 #include <set>
diff --git a/GaudiPluginService/include/Gaudi/Details/PluginServiceDetailsV1.h b/GaudiPluginService/include/Gaudi/Details/PluginServiceDetailsV1.h
index b0fa6568a9..e522832dee 100644
--- a/GaudiPluginService/include/Gaudi/Details/PluginServiceDetailsV1.h
+++ b/GaudiPluginService/include/Gaudi/Details/PluginServiceDetailsV1.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 2013-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 2013-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -13,7 +13,7 @@
 
 /// @author Marco Clemencic <marco.clemencic@cern.ch>
 
-#include "Gaudi/Details/PluginServiceCommon.h"
+#include <Gaudi/Details/PluginServiceCommon.h>
 
 #include <map>
 #include <set>
diff --git a/GaudiPluginService/include/Gaudi/Details/PluginServiceDetailsV2.h b/GaudiPluginService/include/Gaudi/Details/PluginServiceDetailsV2.h
index 378ace27a9..76ced7b3cd 100644
--- a/GaudiPluginService/include/Gaudi/Details/PluginServiceDetailsV2.h
+++ b/GaudiPluginService/include/Gaudi/Details/PluginServiceDetailsV2.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 2013-2022 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 2013-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -13,7 +13,7 @@
 
 /// @author Marco Clemencic <marco.clemencic@cern.ch>
 
-#include "Gaudi/Details/PluginServiceCommon.h"
+#include <Gaudi/Details/PluginServiceCommon.h>
 
 #include <any>
 #include <functional>
diff --git a/GaudiPluginService/include/Gaudi/PluginService.h b/GaudiPluginService/include/Gaudi/PluginService.h
index 67136765a2..3c32d4fcb1 100644
--- a/GaudiPluginService/include/Gaudi/PluginService.h
+++ b/GaudiPluginService/include/Gaudi/PluginService.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 2013-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 2013-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -14,12 +14,12 @@
 /// @author Marco Clemencic <marco.clemencic@cern.ch>
 /// See @ref GaudiPluginService-readme
 
-#include "Gaudi/Details/PluginServiceCommon.h"
+#include <Gaudi/Details/PluginServiceCommon.h>
 
 #if GAUDI_PLUGIN_SERVICE_USE_V2
-#  include "Gaudi/PluginServiceV2.h"
+#  include <Gaudi/PluginServiceV2.h>
 #else
-#  include "Gaudi/PluginServiceV1.h"
+#  include <Gaudi/PluginServiceV1.h>
 #endif
 
 #endif
diff --git a/GaudiProfiling/src/component/PerfMonAuditor.cpp b/GaudiProfiling/src/component/PerfMonAuditor.cpp
index 9f0fafa343..7f2b956851 100644
--- a/GaudiProfiling/src/component/PerfMonAuditor.cpp
+++ b/GaudiProfiling/src/component/PerfMonAuditor.cpp
@@ -8,13 +8,13 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/Auditor.h"
-#include "GaudiKernel/HashMap.h"
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/VectorMap.h"
+#include <GaudiKernel/Auditor.h>
+#include <GaudiKernel/HashMap.h>
+#include <GaudiKernel/IIncidentListener.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/IToolSvc.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/VectorMap.h>
 
 /*BEGIN: perfmon*/
 #include <cstring>
diff --git a/GaudiProfiling/src/component/intel/IntelProfilerAuditor.cpp b/GaudiProfiling/src/component/intel/IntelProfilerAuditor.cpp
index dc0a4a3a2f..1a3a5c98fe 100644
--- a/GaudiProfiling/src/component/intel/IntelProfilerAuditor.cpp
+++ b/GaudiProfiling/src/component/intel/IntelProfilerAuditor.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,18 +20,18 @@
 #include <vector>
 
 // * Gaudi libraries.
-#include "GaudiKernel/Auditor.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IAuditorSvc.h"
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/Auditor.h>
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IAuditorSvc.h>
+#include <GaudiKernel/IIncidentListener.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/MsgStream.h>
 
 // * Intel User API
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wunused-function"
 #endif
-#include "ittnotify.h"
+#include <ittnotify.h>
 
 typedef std::map<std::string, __itt_event> TaskTypes;
 
diff --git a/GaudiProfiling/src/component/jemalloc/JemallocProfileSvc.cpp b/GaudiProfiling/src/component/jemalloc/JemallocProfileSvc.cpp
index b8fa48ba74..4aed4637fe 100644
--- a/GaudiProfiling/src/component/jemalloc/JemallocProfileSvc.cpp
+++ b/GaudiProfiling/src/component/jemalloc/JemallocProfileSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,9 +9,9 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Include files
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/IIncidentListener.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/Service.h>
 #include <climits>
 #include <iostream>
 
diff --git a/GaudiProfiling/src/component/jemalloc/JemallocProfileSvc.h b/GaudiProfiling/src/component/jemalloc/JemallocProfileSvc.h
index 2e0b4d1024..c402184994 100644
--- a/GaudiProfiling/src/component/jemalloc/JemallocProfileSvc.h
+++ b/GaudiProfiling/src/component/jemalloc/JemallocProfileSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define JEMALLOC_JEMALLOCPROFILESVC_H 1
 
 // Include files
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/IIncidentListener.h>
+#include <GaudiKernel/Service.h>
 
 /** @class JemallocProfileSvc JemallocProfileSvc.h jemalloc/JemallocProfileSvc.h
  *
diff --git a/GaudiProfiling/src/component/valgrind/CallgrindProfile.h b/GaudiProfiling/src/component/valgrind/CallgrindProfile.h
index 4d74f1cf28..2f5752a3d0 100644
--- a/GaudiProfiling/src/component/valgrind/CallgrindProfile.h
+++ b/GaudiProfiling/src/component/valgrind/CallgrindProfile.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -13,7 +13,7 @@
 
 // Include files
 // from Gaudi
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 
 /** @class CallgrindProfile CallgrindProfile.h valgrind/CallgrindProfile.h
  *
diff --git a/GaudiPython/dict/kernel.h b/GaudiPython/dict/kernel.h
index 26f6562a07..b4bb39724b 100644
--- a/GaudiPython/dict/kernel.h
+++ b/GaudiPython/dict/kernel.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2023 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,26 +15,26 @@
 // ============================================================================
 // Python must always be the first.
 #ifndef __APPLE__
-#  include "Python.h"
+#  include <Python.h>
 #endif // not __APPLE__
 
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/Chrono.h"
-#include "GaudiKernel/ChronoEntity.h"
-#include "GaudiKernel/HashMap.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/Map.h"
-#include "GaudiKernel/MapBase.h"
-#include "GaudiKernel/Range.h"
-#include "GaudiKernel/SerializeSTL.h"
-#include "GaudiKernel/Stat.h"
-#include "GaudiKernel/StatEntity.h"
-#include "GaudiKernel/StringKey.h"
-#include "GaudiKernel/VectorMap.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiKernel/Chrono.h>
+#include <GaudiKernel/ChronoEntity.h>
+#include <GaudiKernel/HashMap.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/Map.h>
+#include <GaudiKernel/MapBase.h>
+#include <GaudiKernel/Range.h>
+#include <GaudiKernel/SerializeSTL.h>
+#include <GaudiKernel/Stat.h>
+#include <GaudiKernel/StatEntity.h>
+#include <GaudiKernel/StringKey.h>
+#include <GaudiKernel/VectorMap.h>
 
 #ifdef _WIN32
-#  include "GaudiKernel/GaudiHandle.h"
+#  include <GaudiKernel/GaudiHandle.h>
 #endif
 
 #ifdef __ICC
@@ -55,38 +55,38 @@
 #endif
 #ifdef AIDA_FOUND
 #  ifdef _WIN32
-#    include "AIDA/IAnnotation.h"
+#    include <AIDA/IAnnotation.h>
 #  endif // _WIN32
-#  include "AIDA/IAxis.h"
-#  include "AIDA/IHistogram.h"
-#  include "AIDA/IHistogram1D.h"
-#  include "AIDA/IHistogram2D.h"
-#  include "AIDA/IHistogram3D.h"
-#  include "AIDA/IProfile1D.h"
-#  include "AIDA/IProfile2D.h"
+#  include <AIDA/IAxis.h>
+#  include <AIDA/IHistogram.h>
+#  include <AIDA/IHistogram1D.h>
+#  include <AIDA/IHistogram2D.h>
+#  include <AIDA/IHistogram3D.h>
+#  include <AIDA/IProfile1D.h>
+#  include <AIDA/IProfile2D.h>
 #endif // AIDA_FOUND
 #undef class
 
-#include "GaudiPython/Helpers.h"
+#include <GaudiPython/Helpers.h>
 
-#include "GaudiPython/Algorithm.h"
-#include "GaudiPython/CallbackStreamBuf.h"
-#include "GaudiPython/GaudiPython.h"
-#include "GaudiPython/Interface.h"
-#include "GaudiPython/Printer.h"
-#include "GaudiPython/Vector.h"
+#include <GaudiPython/Algorithm.h>
+#include <GaudiPython/CallbackStreamBuf.h>
+#include <GaudiPython/GaudiPython.h>
+#include <GaudiPython/Interface.h>
+#include <GaudiPython/Printer.h>
+#include <GaudiPython/Vector.h>
 
 #ifdef AIDA_FOUND
-#  include "GaudiUtils/Aida2ROOT.h"
-#  include "GaudiUtils/HistoDump.h"
-#  include "GaudiUtils/HistoStats.h"
-#  include "GaudiUtils/HistoStrings.h"
-#  include "GaudiUtils/HistoTableFormat.h"
+#  include <GaudiUtils/Aida2ROOT.h>
+#  include <GaudiUtils/HistoDump.h>
+#  include <GaudiUtils/HistoStats.h>
+#  include <GaudiUtils/HistoStrings.h>
+#  include <GaudiUtils/HistoTableFormat.h>
 #endif // AIDA_FOUND
-#include "GaudiUtils/IFileCatalog.h"
-#include "GaudiUtils/IFileCatalogMgr.h"
-#include "GaudiUtils/IIODataManager.h"
-#include "GaudiUtils/QuasiRandom.h"
+#include <GaudiUtils/IFileCatalog.h>
+#include <GaudiUtils/IFileCatalogMgr.h>
+#include <GaudiUtils/IIODataManager.h>
+#include <GaudiUtils/QuasiRandom.h>
 
 #include <iostream>
 #include <istream>
diff --git a/GaudiPython/include/GaudiPython/Algorithm.h b/GaudiPython/include/GaudiPython/Algorithm.h
index 84928af89b..0afabba01c 100644
--- a/GaudiPython/include/GaudiPython/Algorithm.h
+++ b/GaudiPython/include/GaudiPython/Algorithm.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,16 +15,16 @@
 // ============================================================================
 // Python
 // ============================================================================
-#include "Python.h"
+#include <Python.h>
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/Bootstrap.h"
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiKernel/Bootstrap.h>
 // ============================================================================
 // GaudiPython
 // ============================================================================
-#include "GaudiPython/GaudiPython.h"
+#include <GaudiPython/GaudiPython.h>
 // ============================================================================
 
 namespace GaudiPython {
diff --git a/GaudiPython/include/GaudiPython/CallbackStreamBuf.h b/GaudiPython/include/GaudiPython/CallbackStreamBuf.h
index d7932b4afb..fcea157da4 100644
--- a/GaudiPython/include/GaudiPython/CallbackStreamBuf.h
+++ b/GaudiPython/include/GaudiPython/CallbackStreamBuf.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,13 +11,13 @@
 #ifndef GAUDIPYTHON_CALLBACKSTREAMBUF_H
 #define GAUDIPYTHON_CALLBACKSTREAMBUF_H
 // ============================================================================
-#include "Python.h" //included for the python API
+#include <Python.h> //included for the python API
 // ============================================================================
 #include <array>
 #include <sstream> //included for stringbuf
 // ============================================================================
-#include "GaudiKernel/Kernel.h"
-#include "GaudiPython/GaudiPython.h"
+#include <GaudiKernel/Kernel.h>
+#include <GaudiPython/GaudiPython.h>
 // ============================================================================
 
 namespace GaudiPython {
diff --git a/GaudiPython/include/GaudiPython/Helpers.h b/GaudiPython/include/GaudiPython/Helpers.h
index c226d7d7f5..84d41ff6dc 100644
--- a/GaudiPython/include/GaudiPython/Helpers.h
+++ b/GaudiPython/include/GaudiPython/Helpers.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef GAUDIPYTHON_HELPERS_H
 #define GAUDIPYTHON_HELPERS_H
 
-#include "Python.h"
+#include <Python.h>
 
 // Python 3 compatibility
 #if PY_MAJOR_VERSION >= 3
@@ -22,15 +22,15 @@
 
 #endif
 
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IAlgManager.h"
-#include "GaudiKernel/IAlgTool.h"
-#include "GaudiKernel/IAlgorithm.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IHistogramSvc.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/IToolSvc.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IAlgManager.h>
+#include <GaudiKernel/IAlgTool.h>
+#include <GaudiKernel/IAlgorithm.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IHistogramSvc.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/IToolSvc.h>
 
 // FIXME: (MCl) workaround for ROOT-5850
 namespace AIDA {
diff --git a/GaudiPython/include/GaudiPython/Interface.h b/GaudiPython/include/GaudiPython/Interface.h
index a284e42fd5..af8ad15482 100644
--- a/GaudiPython/include/GaudiPython/Interface.h
+++ b/GaudiPython/include/GaudiPython/Interface.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,12 +20,12 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/IInterface.h>
+#include <GaudiKernel/SmartIF.h>
 // ============================================================================
 // GaudiPython
 // ============================================================================
-#include "GaudiPython/GaudiPython.h"
+#include <GaudiPython/GaudiPython.h>
 // ============================================================================
 
 namespace GaudiPython {
diff --git a/GaudiPython/include/GaudiPython/Printer.h b/GaudiPython/include/GaudiPython/Printer.h
index 427129d8a3..97ecfa8108 100644
--- a/GaudiPython/include/GaudiPython/Printer.h
+++ b/GaudiPython/include/GaudiPython/Printer.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,8 +20,8 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/ContainedObject.h"
-#include "GaudiKernel/DataObject.h"
+#include <GaudiKernel/ContainedObject.h>
+#include <GaudiKernel/DataObject.h>
 // ============================================================================
 
 namespace GaudiPython {
diff --git a/GaudiPython/include/GaudiPython/Vector.h b/GaudiPython/include/GaudiPython/Vector.h
index f407c3aa2c..1937e9d78b 100644
--- a/GaudiPython/include/GaudiPython/Vector.h
+++ b/GaudiPython/include/GaudiPython/Vector.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,7 +20,7 @@
 // ============================================================================
 // GaudiPython
 // ============================================================================
-#include "GaudiPython/GaudiPython.h"
+#include <GaudiPython/GaudiPython.h>
 // ============================================================================
 
 namespace GaudiPython {
diff --git a/GaudiPython/src/Lib/Algorithm.cpp b/GaudiPython/src/Lib/Algorithm.cpp
index 633605b1b8..123f12fce5 100644
--- a/GaudiPython/src/Lib/Algorithm.cpp
+++ b/GaudiPython/src/Lib/Algorithm.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 // ============================================================================
 // Include files
 // ============================================================================
-#include "Python.h"
+#include <Python.h>
 
 // Python 3 compatibility
 #if PY_MAJOR_VERSION >= 3
@@ -25,11 +25,11 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/Bootstrap.h"
+#include <GaudiKernel/Bootstrap.h>
 // ============================================================================
 // GaudiPython
 // ============================================================================
-#include "GaudiPython/Algorithm.h"
+#include <GaudiPython/Algorithm.h>
 // ============================================================================
 
 namespace {
diff --git a/GaudiPython/src/Lib/CallbackStreamBuf.cpp b/GaudiPython/src/Lib/CallbackStreamBuf.cpp
index 1a805c25a0..cab1be0997 100644
--- a/GaudiPython/src/Lib/CallbackStreamBuf.cpp
+++ b/GaudiPython/src/Lib/CallbackStreamBuf.cpp
@@ -9,9 +9,9 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // ============================================================================
-#include "GaudiPython/CallbackStreamBuf.h" // this one first, so Python.h is first
+#include <GaudiPython/CallbackStreamBuf.h> // this one first, so Python.h is first
 // ============================================================================
-#include "GaudiKernel/Bootstrap.h"
+#include <GaudiKernel/Bootstrap.h>
 // ============================================================================
 #include <algorithm>
 // ============================================================================
diff --git a/GaudiPython/src/Lib/Helpers.cpp b/GaudiPython/src/Lib/Helpers.cpp
index 620433d949..c07de1a6d0 100644
--- a/GaudiPython/src/Lib/Helpers.cpp
+++ b/GaudiPython/src/Lib/Helpers.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,23 +9,23 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Python must always be the first.
-#include "Python.h"
+#include <Python.h>
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IAlgTool.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IHistogramSvc.h"
-#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/SmartIF.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IAlgTool.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IHistogramSvc.h>
+#include <GaudiKernel/IProperty.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/IToolSvc.h>
+#include <GaudiKernel/SmartIF.h>
 // ============================================================================
 // GaudiPython
 // ============================================================================
-#include "GaudiPython/Helpers.h"
+#include <GaudiPython/Helpers.h>
 // ============================================================================
 /** @file
  *  Implementation file for some functions from class GaudiPython::Helpers
diff --git a/GaudiPython/src/Services/PythonScriptingSvc.cpp b/GaudiPython/src/Services/PythonScriptingSvc.cpp
index 504e84b276..c37ae6fdc8 100644
--- a/GaudiPython/src/Services/PythonScriptingSvc.cpp
+++ b/GaudiPython/src/Services/PythonScriptingSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,13 +8,13 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "Python.h"
+#include <Python.h>
 #include <cpython/initconfig.h>
 
 // Include Files
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/SmartIF.h>
 
 #include "PythonScriptingSvc.h"
 
@@ -23,7 +23,7 @@
 
 // Special for Unixes
 #if defined( __linux )
-#  include "dlfcn.h"
+#  include <dlfcn.h>
 #endif
 
 // Instantiation of a static factory class used by clients to create
diff --git a/GaudiPython/src/Services/PythonScriptingSvc.h b/GaudiPython/src/Services/PythonScriptingSvc.h
index 9987a63383..55f557638f 100644
--- a/GaudiPython/src/Services/PythonScriptingSvc.h
+++ b/GaudiPython/src/Services/PythonScriptingSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDIPYTHON_PYTHONSCRIPTINGSVC_H
 
 // Include Files
-#include "GaudiKernel/IRunable.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/IRunable.h>
+#include <GaudiKernel/Service.h>
 
 /** @class PythonScriptingSvc PythonScriptingSvc.h GaudiPython/PythonScriptingSvc.h
     This service handles scripting implemented using Python.
diff --git a/GaudiSvc/doc/readMetaData.C b/GaudiSvc/doc/readMetaData.C
index 7d3e1b5868..890bc06422 100644
--- a/GaudiSvc/doc/readMetaData.C
+++ b/GaudiSvc/doc/readMetaData.C
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,22 +8,22 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "TFile.h"
-#include "TTree.h"
+#include <TFile.h>
+#include <TTree.h>
 #include <map>
 #include <stdio.h>
 #include <string>
 
-#include "TApplication.h"
-#include "TColor.h"
-#include "TDatime.h"
-#include "TGColorSelect.h"
-#include "TGComboBox.h"
-#include "TGHtml.h"
-#include "TGLabel.h"
-#include "TGNumberEntry.h"
-#include "TROOT.h"
-#include "TTimeStamp.h"
+#include <TApplication.h>
+#include <TColor.h>
+#include <TDatime.h>
+#include <TGColorSelect.h>
+#include <TGComboBox.h>
+#include <TGHtml.h>
+#include <TGLabel.h>
+#include <TGNumberEntry.h>
+#include <TROOT.h>
+#include <TTimeStamp.h>
 
 using namespace std;
 
diff --git a/GaudiSvc/src/CPUCrunchSvc/CPUCrunchSvc.cpp b/GaudiSvc/src/CPUCrunchSvc/CPUCrunchSvc.cpp
index 6012aa7a70..1ffd40b8fb 100644
--- a/GaudiSvc/src/CPUCrunchSvc/CPUCrunchSvc.cpp
+++ b/GaudiSvc/src/CPUCrunchSvc/CPUCrunchSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,7 +10,7 @@
 \***********************************************************************************/
 #include "CPUCrunchSvc.h"
 
-#include "GaudiKernel/ISvcLocator.h"
+#include <GaudiKernel/ISvcLocator.h>
 
 #include <sys/times.h>
 #include <tbb/tick_count.h>
diff --git a/GaudiSvc/src/CPUCrunchSvc/CPUCrunchSvc.h b/GaudiSvc/src/CPUCrunchSvc/CPUCrunchSvc.h
index 1d51f59647..d6700ec7fd 100644
--- a/GaudiSvc/src/CPUCrunchSvc/CPUCrunchSvc.h
+++ b/GaudiSvc/src/CPUCrunchSvc/CPUCrunchSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,11 +11,11 @@
 #ifndef GAUDISVC_CPUCRUNCHSVC_H
 #define GAUDISVC_CPUCRUNCHSVC_H 1
 
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/Service.h>
+#include <GaudiKernel/StatusCode.h>
 
-#include "GaudiKernel/ICPUCrunchSvc.h"
+#include <GaudiKernel/ICPUCrunchSvc.h>
 #include <chrono>
 #include <string>
 #include <vector>
diff --git a/GaudiSvc/src/DetectorDataSvc/DetDataSvc.cpp b/GaudiSvc/src/DetectorDataSvc/DetDataSvc.cpp
index 5d44b15c37..0d796b5c57 100644
--- a/GaudiSvc/src/DetectorDataSvc/DetDataSvc.cpp
+++ b/GaudiSvc/src/DetectorDataSvc/DetDataSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,14 +12,14 @@
 
 // Include files
 #include "DetDataSvc.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IAddressCreator.h"
-#include "GaudiKernel/IConversionSvc.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/IValidity.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IAddressCreator.h>
+#include <GaudiKernel/IConversionSvc.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/IValidity.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/System.h>
 using System::getEnv;
 using System::isEnvSet;
 
diff --git a/GaudiSvc/src/DetectorDataSvc/DetDataSvc.h b/GaudiSvc/src/DetectorDataSvc/DetDataSvc.h
index 92ff9a4199..0664a171e4 100644
--- a/GaudiSvc/src/DetectorDataSvc/DetDataSvc.h
+++ b/GaudiSvc/src/DetectorDataSvc/DetDataSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -14,11 +14,11 @@
 // Base classes
 // #include "GaudiKernel/DataSvc.h"
 // D. Piparo: Change to the new thread safe version
-#include "GaudiKernel/IDetDataSvc.h"
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/Time.h"
-#include "GaudiKernel/TsDataSvc.h"
+#include <GaudiKernel/IDetDataSvc.h>
+#include <GaudiKernel/IIncidentListener.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/Time.h>
+#include <GaudiKernel/TsDataSvc.h>
 
 // Forward declarations
 class StatusCode;
diff --git a/GaudiSvc/src/FileMgr/FileMgr.cpp b/GaudiSvc/src/FileMgr/FileMgr.cpp
index f85a02b6e7..ae86eadf9a 100644
--- a/GaudiSvc/src/FileMgr/FileMgr.cpp
+++ b/GaudiSvc/src/FileMgr/FileMgr.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 
 #include <fstream>
 
-#include "GaudiKernel/ISvcLocator.h"
+#include <GaudiKernel/ISvcLocator.h>
 
 #define ON_DEBUG if ( msgLevel( MSG::DEBUG ) )
 #define ON_VERBOSE if ( msgLevel( MSG::VERBOSE ) )
diff --git a/GaudiSvc/src/FileMgr/FileMgr.h b/GaudiSvc/src/FileMgr/FileMgr.h
index 385613a12a..75011904d5 100644
--- a/GaudiSvc/src/FileMgr/FileMgr.h
+++ b/GaudiSvc/src/FileMgr/FileMgr.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -18,11 +18,11 @@
 #ifndef GAUDISVC_FILEMGR_H
 #define GAUDISVC_FILEMGR_H 1
 
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/IFileMgr.h"
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/IFileMgr.h>
+#include <GaudiKernel/IIncidentListener.h>
+#include <GaudiKernel/Service.h>
+#include <GaudiKernel/StatusCode.h>
 
 #include "POSIXFileHandler.h"
 #include "RootFileHandler.h"
diff --git a/GaudiSvc/src/FileMgr/POSIXFileHandler.cpp b/GaudiSvc/src/FileMgr/POSIXFileHandler.cpp
index 1f82d26706..706700738d 100644
--- a/GaudiSvc/src/FileMgr/POSIXFileHandler.cpp
+++ b/GaudiSvc/src/FileMgr/POSIXFileHandler.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/IFileMgr.h"
+#include <GaudiKernel/IFileMgr.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -17,8 +17,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "GaudiKernel/MsgStream.h"
 #include "POSIXFileHandler.h"
+#include <GaudiKernel/MsgStream.h>
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
diff --git a/GaudiSvc/src/FileMgr/POSIXFileHandler.h b/GaudiSvc/src/FileMgr/POSIXFileHandler.h
index 033dccc466..ed352c28a0 100644
--- a/GaudiSvc/src/FileMgr/POSIXFileHandler.h
+++ b/GaudiSvc/src/FileMgr/POSIXFileHandler.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -18,9 +18,9 @@
 #ifndef GAUDISVC_POSIXFILEHANDLER_H
 #define GAUDISVC_POSIXFILEHANDLER_H 1
 
-#include "GaudiKernel/IFileMgr.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/IFileMgr.h>
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/MsgStream.h>
 
 #include <string>
 
diff --git a/GaudiSvc/src/FileMgr/RootFileHandler.cpp b/GaudiSvc/src/FileMgr/RootFileHandler.cpp
index e8fe069292..a2d90869b8 100644
--- a/GaudiSvc/src/FileMgr/RootFileHandler.cpp
+++ b/GaudiSvc/src/FileMgr/RootFileHandler.cpp
@@ -8,15 +8,15 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/IFileMgr.h"
-#include "TFile.h"
-#include "TROOT.h"
-#include "TSSLSocket.h"
-#include "TWebFile.h"
+#include <GaudiKernel/IFileMgr.h>
+#include <TFile.h>
+#include <TROOT.h>
+#include <TSSLSocket.h>
+#include <TWebFile.h>
 
-#include "GaudiKernel/MsgStream.h"
 #include "RootFileHandler.h"
-#include "boost/algorithm/string.hpp"
+#include <GaudiKernel/MsgStream.h>
+#include <boost/algorithm/string.hpp>
 
 namespace ba = boost::algorithm;
 
diff --git a/GaudiSvc/src/FileMgr/RootFileHandler.h b/GaudiSvc/src/FileMgr/RootFileHandler.h
index 0e4f4c4115..6e211fb427 100644
--- a/GaudiSvc/src/FileMgr/RootFileHandler.h
+++ b/GaudiSvc/src/FileMgr/RootFileHandler.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -18,9 +18,9 @@
 #ifndef GAUDISVC_ROOTFILEHANDLER_H
 #define GAUDISVC_ROOTFILEHANDLER_H 1
 
-#include "GaudiKernel/IFileMgr.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/IFileMgr.h>
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/MsgStream.h>
 
 #include <string>
 
diff --git a/GaudiSvc/src/MetaDataSvc/MetaDataSvc.cpp b/GaudiSvc/src/MetaDataSvc/MetaDataSvc.cpp
index ead1a50568..8fb3a5d8ba 100644
--- a/GaudiSvc/src/MetaDataSvc/MetaDataSvc.cpp
+++ b/GaudiSvc/src/MetaDataSvc/MetaDataSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2020 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -16,13 +16,13 @@
  */
 
 // Framework include files
-#include "Gaudi/Interfaces/IOptionsSvc.h"
-#include "GaudiKernel/IAlgManager.h"
-#include "GaudiKernel/IAlgorithm.h"
-#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/IToolSvc.h"
+#include <Gaudi/Interfaces/IOptionsSvc.h>
+#include <GaudiKernel/IAlgManager.h>
+#include <GaudiKernel/IAlgorithm.h>
+#include <GaudiKernel/IProperty.h>
+#include <GaudiKernel/IService.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/IToolSvc.h>
 
 #include "MetaDataSvc.h"
 
diff --git a/GaudiSvc/src/MetaDataSvc/MetaDataSvc.h b/GaudiSvc/src/MetaDataSvc/MetaDataSvc.h
index 2cbe37bc3c..a41ccbd6b6 100644
--- a/GaudiSvc/src/MetaDataSvc/MetaDataSvc.h
+++ b/GaudiSvc/src/MetaDataSvc/MetaDataSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -18,8 +18,8 @@
 #ifndef GAUDISVC_SRC_METADATASVC_METADATASVC_H_
 #define GAUDISVC_SRC_METADATASVC_METADATASVC_H_
 
-#include "GaudiKernel/IMetaDataSvc.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/IMetaDataSvc.h>
+#include <GaudiKernel/Service.h>
 
 namespace Gaudi {
   class MetaDataSvc : public extends<Service, IMetaDataSvc> {
diff --git a/GaudiSvc/src/NTupleSvc/CollectionCloneAlg.cpp b/GaudiSvc/src/NTupleSvc/CollectionCloneAlg.cpp
index a3b2f61067..f90f2254aa 100644
--- a/GaudiSvc/src/NTupleSvc/CollectionCloneAlg.cpp
+++ b/GaudiSvc/src/NTupleSvc/CollectionCloneAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,18 +15,18 @@
 //	Author    : Markus Frank
 //
 //	====================================================================
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/AttribStringParser.h"
-#include "GaudiKernel/GenericAddress.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/ISelectStatement.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/NTuple.h"
-#include "GaudiKernel/ObjectFactory.h"
-#include "GaudiKernel/SmartDataPtr.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiKernel/AttribStringParser.h>
+#include <GaudiKernel/GenericAddress.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/ISelectStatement.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/NTuple.h>
+#include <GaudiKernel/ObjectFactory.h>
+#include <GaudiKernel/SmartDataPtr.h>
+#include <GaudiKernel/SmartIF.h>
 #include <vector>
 
 namespace {
diff --git a/GaudiSvc/src/NTupleSvc/NTupleSvc.cpp b/GaudiSvc/src/NTupleSvc/NTupleSvc.cpp
index 523152c023..7ba490a55f 100644
--- a/GaudiSvc/src/NTupleSvc/NTupleSvc.cpp
+++ b/GaudiSvc/src/NTupleSvc/NTupleSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -32,22 +32,22 @@
 #define GAUDISVC_NTUPLESVC_CPP
 
 // Framework include files
-#include "GaudiKernel/AttribStringParser.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/GenericAddress.h"
-#include "GaudiKernel/ObjectFactory.h"
-#include "GaudiKernel/SmartIF.h"
-
-#include "GaudiKernel/IDataSelector.h"
-#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/ISvcLocator.h"
-
-#include "GaudiKernel/ConversionSvc.h"
-#include "GaudiKernel/NTupleImplementation.h"
-#include "GaudiKernel/Selector.h"
-#include "GaudiKernel/reverse.h"
+#include <GaudiKernel/AttribStringParser.h>
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/GenericAddress.h>
+#include <GaudiKernel/ObjectFactory.h>
+#include <GaudiKernel/SmartIF.h>
+
+#include <GaudiKernel/IDataSelector.h>
+#include <GaudiKernel/IProperty.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/ISvcLocator.h>
+
 #include <Gaudi/Property.h>
+#include <GaudiKernel/ConversionSvc.h>
+#include <GaudiKernel/NTupleImplementation.h>
+#include <GaudiKernel/Selector.h>
+#include <GaudiKernel/reverse.h>
 
 #include "NTupleSvc.h"
 
diff --git a/GaudiSvc/src/NTupleSvc/NTupleSvc.h b/GaudiSvc/src/NTupleSvc/NTupleSvc.h
index 3d82e87b5d..a4fe13b612 100644
--- a/GaudiSvc/src/NTupleSvc/NTupleSvc.h
+++ b/GaudiSvc/src/NTupleSvc/NTupleSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,9 +12,9 @@
 #define GAUDI_NTUPLESVC_H 1
 
 // Framework include files
-#include "GaudiKernel/DataSvc.h"
-#include "GaudiKernel/IDataSourceMgr.h"
-#include "GaudiKernel/INTupleSvc.h"
+#include <GaudiKernel/DataSvc.h>
+#include <GaudiKernel/IDataSourceMgr.h>
+#include <GaudiKernel/INTupleSvc.h>
 
 // STL include files
 #include <map>
diff --git a/GaudiSvc/src/NTupleSvc/TagCollectionSvc.cpp b/GaudiSvc/src/NTupleSvc/TagCollectionSvc.cpp
index f69e47eb70..697d051576 100644
--- a/GaudiSvc/src/NTupleSvc/TagCollectionSvc.cpp
+++ b/GaudiSvc/src/NTupleSvc/TagCollectionSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -32,19 +32,19 @@
 #define GAUDISVC_TAGCOLLECTIONSVC_CPP
 
 // Framework include files
-#include "GaudiKernel/AttribStringParser.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/GenericAddress.h"
-#include "GaudiKernel/ObjectFactory.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/AttribStringParser.h>
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/GenericAddress.h>
+#include <GaudiKernel/ObjectFactory.h>
+#include <GaudiKernel/SmartIF.h>
 
-#include "GaudiKernel/IConversionSvc.h"
-#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/ISvcManager.h"
+#include <GaudiKernel/IConversionSvc.h>
+#include <GaudiKernel/IProperty.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/ISvcManager.h>
 
-#include "GaudiKernel/MsgStream.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/MsgStream.h>
 
 #include "TagCollectionSvc.h"
 
diff --git a/GaudiSvc/src/RndmGenSvc/HepRndmBaseEngine.h b/GaudiSvc/src/RndmGenSvc/HepRndmBaseEngine.h
index 69faa6af64..d5e0a44e46 100644
--- a/GaudiSvc/src/RndmGenSvc/HepRndmBaseEngine.h
+++ b/GaudiSvc/src/RndmGenSvc/HepRndmBaseEngine.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -26,8 +26,8 @@
 #define HEPRNDM_HEPRNDMBASEENGINE_H 1
 
 // Framework include files
-#include "CLHEP/Random/Random.h"
 #include "RndmEngine.h"
+#include <CLHEP/Random/Random.h>
 
 // Forward declarations
 namespace CLHEP {
diff --git a/GaudiSvc/src/RndmGenSvc/HepRndmEngines.cpp b/GaudiSvc/src/RndmGenSvc/HepRndmEngines.cpp
index eb428f653a..caf86ba43c 100644
--- a/GaudiSvc/src/RndmGenSvc/HepRndmEngines.cpp
+++ b/GaudiSvc/src/RndmGenSvc/HepRndmEngines.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -37,24 +37,24 @@
 #include <iostream>
 
 // Framework include files
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/System.h>
 
 #include "HepRndmEngine.h"
 #include "RndmGenSvc.h"
 
-#include "CLHEP/Random/DRand48Engine.h"
-#include "CLHEP/Random/DualRand.h"
-#include "CLHEP/Random/Hurd160Engine.h"
-#include "CLHEP/Random/Hurd288Engine.h"
-#include "CLHEP/Random/JamesRandom.h"
-#include "CLHEP/Random/MTwistEngine.h"
-#include "CLHEP/Random/RanecuEngine.h"
-#include "CLHEP/Random/Ranlux64Engine.h"
-#include "CLHEP/Random/RanluxEngine.h"
-#include "CLHEP/Random/RanshiEngine.h"
-#include "CLHEP/Random/TripleRand.h"
+#include <CLHEP/Random/DRand48Engine.h>
+#include <CLHEP/Random/DualRand.h>
+#include <CLHEP/Random/Hurd160Engine.h>
+#include <CLHEP/Random/Hurd288Engine.h>
+#include <CLHEP/Random/JamesRandom.h>
+#include <CLHEP/Random/MTwistEngine.h>
+#include <CLHEP/Random/RanecuEngine.h>
+#include <CLHEP/Random/Ranlux64Engine.h>
+#include <CLHEP/Random/RanluxEngine.h>
+#include <CLHEP/Random/RanshiEngine.h>
+#include <CLHEP/Random/TripleRand.h>
 
 // Handle CLHEP 2.0.x move to CLHEP namespace
 namespace CLHEP {}
diff --git a/GaudiSvc/src/RndmGenSvc/HepRndmGenerators.cpp b/GaudiSvc/src/RndmGenSvc/HepRndmGenerators.cpp
index 807fd6c342..89cea605c7 100644
--- a/GaudiSvc/src/RndmGenSvc/HepRndmGenerators.cpp
+++ b/GaudiSvc/src/RndmGenSvc/HepRndmGenerators.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -25,7 +25,7 @@
 #define HEPRNDM_HEPRNDMGENSVC_CPP
 
 // Framework include files
-#include "GaudiKernel/ObjectFactory.h"
+#include <GaudiKernel/ObjectFactory.h>
 
 // STL include files
 #include <cfloat>
@@ -34,23 +34,23 @@
 #include <memory>
 
 // The order of the following two include files is significant due to template specialisation
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/RndmGenerators.h"
 #include "HepRndmGenerator.h"
 #include "RndmGen.h"
 #include "RndmGenSvc.h"
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/RndmGenerators.h>
 
-#include "CLHEP/Random/RandBinomial.h"
-#include "CLHEP/Random/RandBreitWigner.h"
-#include "CLHEP/Random/RandChiSquare.h"
-#include "CLHEP/Random/RandExponential.h"
-#include "CLHEP/Random/RandFlat.h"
-#include "CLHEP/Random/RandGamma.h"
-#include "CLHEP/Random/RandGaussQ.h"
-#include "CLHEP/Random/RandGeneral.h"
-#include "CLHEP/Random/RandPoisson.h"
-#include "CLHEP/Random/RandStudentT.h"
-#include "CLHEP/Random/RandomEngine.h"
+#include <CLHEP/Random/RandBinomial.h>
+#include <CLHEP/Random/RandBreitWigner.h>
+#include <CLHEP/Random/RandChiSquare.h>
+#include <CLHEP/Random/RandExponential.h>
+#include <CLHEP/Random/RandFlat.h>
+#include <CLHEP/Random/RandGamma.h>
+#include <CLHEP/Random/RandGaussQ.h>
+#include <CLHEP/Random/RandGeneral.h>
+#include <CLHEP/Random/RandPoisson.h>
+#include <CLHEP/Random/RandStudentT.h>
+#include <CLHEP/Random/RandomEngine.h>
 
 // Handle CLHEP 2.0.x move to CLHEP namespace
 namespace CLHEP {}
diff --git a/GaudiSvc/src/RndmGenSvc/RndmEngine.cpp b/GaudiSvc/src/RndmGenSvc/RndmEngine.cpp
index b872a88b9a..a2bbd0cf0b 100644
--- a/GaudiSvc/src/RndmGenSvc/RndmEngine.cpp
+++ b/GaudiSvc/src/RndmGenSvc/RndmEngine.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -28,14 +28,14 @@
 #include <cfloat>
 
 // Framework include files
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
 #include "RndmEngine.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/MsgStream.h>
 
 /** IRndmEngine interface implementation  */
 /// Input serialization from stream buffer. Restores the status of the generator engine.
diff --git a/GaudiSvc/src/RndmGenSvc/RndmEngine.h b/GaudiSvc/src/RndmGenSvc/RndmEngine.h
index ce03a74d84..eb2104e2b7 100644
--- a/GaudiSvc/src/RndmGenSvc/RndmEngine.h
+++ b/GaudiSvc/src/RndmGenSvc/RndmEngine.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -22,9 +22,9 @@
 #include <vector>
 
 // Framework include files
-#include "GaudiKernel/IRndmEngine.h"
-#include "GaudiKernel/ISerialize.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/IRndmEngine.h>
+#include <GaudiKernel/ISerialize.h>
+#include <GaudiKernel/Service.h>
 
 /** Random Generator engine definition
 
diff --git a/GaudiSvc/src/RndmGenSvc/RndmGen.cpp b/GaudiSvc/src/RndmGenSvc/RndmGen.cpp
index ba1ddcf03a..1a5741b9a4 100644
--- a/GaudiSvc/src/RndmGenSvc/RndmGen.cpp
+++ b/GaudiSvc/src/RndmGenSvc/RndmGen.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -24,8 +24,8 @@
 #define GAUDI_RANDOMGENSVC_RNDMGEN_CPP
 
 #include "RndmGen.h"
-#include "GaudiKernel/IRndmEngine.h"
-#include "GaudiKernel/ISvcLocator.h"
+#include <GaudiKernel/IRndmEngine.h>
+#include <GaudiKernel/ISvcLocator.h>
 #include <algorithm>
 #include <cfloat>
 
diff --git a/GaudiSvc/src/RndmGenSvc/RndmGen.h b/GaudiSvc/src/RndmGenSvc/RndmGen.h
index d237c34b83..02f83ea38d 100644
--- a/GaudiSvc/src/RndmGenSvc/RndmGen.h
+++ b/GaudiSvc/src/RndmGenSvc/RndmGen.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,8 +20,8 @@
 
 #include <memory>
 // Framework include files
-#include "GaudiKernel/IRndmGen.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/IRndmGen.h>
+#include <GaudiKernel/SmartIF.h>
 
 // Forward declarations
 class IRndmEngine;
diff --git a/GaudiSvc/src/RndmGenSvc/RndmGenSvc.cpp b/GaudiSvc/src/RndmGenSvc/RndmGenSvc.cpp
index 78892ac184..3213bf26a7 100644
--- a/GaudiSvc/src/RndmGenSvc/RndmGenSvc.cpp
+++ b/GaudiSvc/src/RndmGenSvc/RndmGenSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -28,10 +28,10 @@
 #include <cfloat>
 
 // Framework include files
-#include "GaudiKernel/IRndmEngine.h"
-#include "GaudiKernel/ISvcManager.h"
-#include "GaudiKernel/ObjectFactory.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/IRndmEngine.h>
+#include <GaudiKernel/ISvcManager.h>
+#include <GaudiKernel/ObjectFactory.h>
+#include <GaudiKernel/SmartIF.h>
 
 #include "RndmGen.h"
 #include "RndmGenSvc.h"
diff --git a/GaudiSvc/src/RndmGenSvc/RndmGenSvc.h b/GaudiSvc/src/RndmGenSvc/RndmGenSvc.h
index c763ba3470..5fcab1e8c5 100644
--- a/GaudiSvc/src/RndmGenSvc/RndmGenSvc.h
+++ b/GaudiSvc/src/RndmGenSvc/RndmGenSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -22,11 +22,11 @@
 #include <vector>
 
 // Framework include files
-#include "GaudiKernel/IRndmEngine.h"
-#include "GaudiKernel/IRndmGen.h"
-#include "GaudiKernel/IRndmGenSvc.h"
-#include "GaudiKernel/ISerialize.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/IRndmEngine.h>
+#include <GaudiKernel/IRndmGen.h>
+#include <GaudiKernel/IRndmGenSvc.h>
+#include <GaudiKernel/ISerialize.h>
+#include <GaudiKernel/Service.h>
 
 // Forward declarations
 class IRndmGenFactory;
diff --git a/GaudiSvc/src/THistSvc/THistSvc.cpp b/GaudiSvc/src/THistSvc/THistSvc.cpp
index 655ad6fb7d..5d1f01a0bc 100644
--- a/GaudiSvc/src/THistSvc/THistSvc.cpp
+++ b/GaudiSvc/src/THistSvc/THistSvc.cpp
@@ -15,27 +15,27 @@
 #include <streambuf>
 
 // boost headers
-#include "boost/algorithm/string/case_conv.hpp"
+#include <boost/algorithm/string/case_conv.hpp>
 
 // ROOT headers
-#include "TClass.h"
-#include "TDirectory.h"
-#include "TError.h"
-#include "TFile.h"
-#include "TGraph.h"
-#include "TKey.h"
-#include "TROOT.h"
+#include <TClass.h>
+#include <TDirectory.h>
+#include <TError.h>
+#include <TFile.h>
+#include <TGraph.h>
+#include <TKey.h>
+#include <TROOT.h>
 
 // Gaudi headers
-#include "GaudiKernel/AttribStringParser.h"
-#include "GaudiKernel/FileIncident.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IEventProcessor.h"
-#include "GaudiKernel/IFileMgr.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/IIoComponentMgr.h"
-#include "GaudiKernel/ISvcLocator.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/AttribStringParser.h>
+#include <GaudiKernel/FileIncident.h>
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IEventProcessor.h>
+#include <GaudiKernel/IFileMgr.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/IIoComponentMgr.h>
+#include <GaudiKernel/ISvcLocator.h>
 
 // local headers
 #include "THistSvc.h"
diff --git a/GaudiSvc/src/THistSvc/THistSvc.h b/GaudiSvc/src/THistSvc/THistSvc.h
index f8a58fa746..0e5679c5b3 100644
--- a/GaudiSvc/src/THistSvc/THistSvc.h
+++ b/GaudiSvc/src/THistSvc/THistSvc.h
@@ -18,22 +18,22 @@
 #include <vector>
 
 // Gaudi includes:
-#include "GaudiKernel/IFileMgr.h"
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/IIoComponent.h"
-#include "GaudiKernel/ITHistSvc.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/IFileMgr.h>
+#include <GaudiKernel/IIncidentListener.h>
+#include <GaudiKernel/IIoComponent.h>
+#include <GaudiKernel/ITHistSvc.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/Service.h>
 
 //  ROOT includes:
-#include "TEfficiency.h"
-#include "TGraph.h"
-#include "TH1.h"
-#include "TH2.h"
-#include "TH3.h"
-#include "TList.h"
-#include "TObject.h"
-#include "TTree.h"
+#include <TEfficiency.h>
+#include <TGraph.h>
+#include <TH1.h>
+#include <TH2.h>
+#include <TH3.h>
+#include <TList.h>
+#include <TObject.h>
+#include <TTree.h>
 
 class IIncidentSvc;
 class TClass;
diff --git a/GaudiTestSuite/include/Gaudi/TestSuite/Conditions/CondSvc.h b/GaudiTestSuite/include/Gaudi/TestSuite/Conditions/CondSvc.h
index 8f77e1a016..1c844c6d16 100644
--- a/GaudiTestSuite/include/Gaudi/TestSuite/Conditions/CondSvc.h
+++ b/GaudiTestSuite/include/Gaudi/TestSuite/Conditions/CondSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2020 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,11 +10,11 @@
 \***********************************************************************************/
 #pragma once
 
-#include "Gaudi/Property.h"
-#include "GaudiKernel/IAlgResourcePool.h"
-#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/SmartIF.h"
+#include <Gaudi/Property.h>
+#include <GaudiKernel/IAlgResourcePool.h>
+#include <GaudiKernel/ICondSvc.h>
+#include <GaudiKernel/Service.h>
+#include <GaudiKernel/SmartIF.h>
 
 namespace Gaudi::TestSuite::Conditions {
 
diff --git a/GaudiTestSuite/include/GaudiExamples/Collision.h b/GaudiTestSuite/include/GaudiExamples/Collision.h
index 9d37000e9d..c33ff0758f 100644
--- a/GaudiTestSuite/include/GaudiExamples/Collision.h
+++ b/GaudiTestSuite/include/GaudiExamples/Collision.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,9 +12,9 @@
 #define GAUDIEXAMPLES_COLLISION_H 1
 
 // Include files
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/StreamBuffer.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/StreamBuffer.h>
 
 namespace Gaudi {
   namespace Examples {
diff --git a/GaudiTestSuite/include/GaudiExamples/Counter.h b/GaudiTestSuite/include/GaudiExamples/Counter.h
index 2e8ba65306..4e2b45e1c4 100644
--- a/GaudiTestSuite/include/GaudiExamples/Counter.h
+++ b/GaudiTestSuite/include/GaudiExamples/Counter.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIEXAMPLES_COUNTER_H 1
 
 // Include files
-#include "GaudiKernel/DataObject.h"
+#include <GaudiKernel/DataObject.h>
 #include <iostream>
 
 namespace Gaudi {
diff --git a/GaudiTestSuite/include/GaudiExamples/Event.h b/GaudiTestSuite/include/GaudiExamples/Event.h
index 7d19c3002c..9e1ed3416c 100644
--- a/GaudiTestSuite/include/GaudiExamples/Event.h
+++ b/GaudiTestSuite/include/GaudiExamples/Event.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,11 +12,11 @@
 #define GAUDIEXAMPLES_EVENT_H 1
 
 // Include files
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/Kernel.h"
-#include "GaudiKernel/SmartRefVector.h"
-#include "GaudiKernel/StreamBuffer.h"
-#include "GaudiKernel/Time.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/Kernel.h>
+#include <GaudiKernel/SmartRefVector.h>
+#include <GaudiKernel/StreamBuffer.h>
+#include <GaudiKernel/Time.h>
 #include <iostream>
 
 namespace Gaudi {
diff --git a/GaudiTestSuite/include/GaudiExamples/MyTrack.h b/GaudiTestSuite/include/GaudiExamples/MyTrack.h
index 55b588a946..578847b16e 100644
--- a/GaudiTestSuite/include/GaudiExamples/MyTrack.h
+++ b/GaudiTestSuite/include/GaudiExamples/MyTrack.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -16,13 +16,13 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/ContainedObject.h"
-#include "GaudiKernel/KeyedContainer.h"
-#include "GaudiKernel/ObjectVector.h"
-#include "GaudiKernel/SharedObjectsContainer.h"
-#include "GaudiKernel/SmartRefVector.h"
+#include <GaudiKernel/ContainedObject.h>
+#include <GaudiKernel/KeyedContainer.h>
+#include <GaudiKernel/ObjectVector.h>
+#include <GaudiKernel/SharedObjectsContainer.h>
+#include <GaudiKernel/SmartRefVector.h>
 // =============================================================================
-#include "GaudiExamples/Event.h"
+#include <GaudiExamples/Event.h>
 // ============================================================================
 
 namespace Gaudi {
diff --git a/GaudiTestSuite/include/GaudiExamples/MyVertex.h b/GaudiTestSuite/include/GaudiExamples/MyVertex.h
index 25156a1374..8c189e58a4 100644
--- a/GaudiTestSuite/include/GaudiExamples/MyVertex.h
+++ b/GaudiTestSuite/include/GaudiExamples/MyVertex.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,12 +12,12 @@
 #define GAUDIPOOLDB_TEST_MYVERTEX_H
 
 // Include files
-#include "GaudiKernel/KeyedContainer.h"
-#include "GaudiKernel/KeyedObject.h"
-#include "GaudiKernel/SmartRefVector.h"
+#include <GaudiKernel/KeyedContainer.h>
+#include <GaudiKernel/KeyedObject.h>
+#include <GaudiKernel/SmartRefVector.h>
 
-#include "GaudiExamples/Event.h"
-#include "GaudiExamples/MyTrack.h"
+#include <GaudiExamples/Event.h>
+#include <GaudiExamples/MyTrack.h>
 
 namespace Gaudi {
   namespace Examples {
diff --git a/GaudiTestSuite/src/AIDATuples/AIDATupleAlgorithmRead.h b/GaudiTestSuite/src/AIDATuples/AIDATupleAlgorithmRead.h
index f4e53daf0a..bbdd17e9da 100644
--- a/GaudiTestSuite/src/AIDATuples/AIDATupleAlgorithmRead.h
+++ b/GaudiTestSuite/src/AIDATuples/AIDATupleAlgorithmRead.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define AIDATUPLES_AIDATupleAlgorithmRead_H 1
 
 // Include files
-#include "AIDA/ITuple.h"
-#include "GaudiKernel/Algorithm.h"
+#include <AIDA/ITuple.h>
+#include <GaudiKernel/Algorithm.h>
 
 using namespace AIDA;
 
diff --git a/GaudiTestSuite/src/AIDATuples/AIDATupleAlgorithmWrite.h b/GaudiTestSuite/src/AIDATuples/AIDATupleAlgorithmWrite.h
index 6b3063f525..86bd0f865e 100644
--- a/GaudiTestSuite/src/AIDATuples/AIDATupleAlgorithmWrite.h
+++ b/GaudiTestSuite/src/AIDATuples/AIDATupleAlgorithmWrite.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define AIDATUPLES_AIDATupleAlgorithmWrite_H 1
 
 // Include files
-#include "AIDA/ITuple.h"
-#include "GaudiKernel/Algorithm.h"
+#include <AIDA/ITuple.h>
+#include <GaudiKernel/Algorithm.h>
 
 using namespace AIDA;
 
diff --git a/GaudiTestSuite/src/AbortEvent/AbortEventAlg.cpp b/GaudiTestSuite/src/AbortEvent/AbortEventAlg.cpp
index 91202571c5..3a2d6fc3be 100644
--- a/GaudiTestSuite/src/AbortEvent/AbortEventAlg.cpp
+++ b/GaudiTestSuite/src/AbortEvent/AbortEventAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,8 +11,8 @@
 // Include files
 
 // from Gaudi
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/Incident.h"
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/Incident.h>
 
 // local
 #include "AbortEventAlg.h"
diff --git a/GaudiTestSuite/src/AbortEvent/AbortEventAlg.h b/GaudiTestSuite/src/AbortEvent/AbortEventAlg.h
index aade83cafe..3fb7db4504 100644
--- a/GaudiTestSuite/src/AbortEvent/AbortEventAlg.h
+++ b/GaudiTestSuite/src/AbortEvent/AbortEventAlg.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define ABORTEVENTALG_H_
 // Include files
 // from Gaudi
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 
 class IIncidentSvc;
 
diff --git a/GaudiTestSuite/src/AlgSequencer/HelloWorld.cpp b/GaudiTestSuite/src/AlgSequencer/HelloWorld.cpp
index f4efc705d2..2ccaed3079 100644
--- a/GaudiTestSuite/src/AlgSequencer/HelloWorld.cpp
+++ b/GaudiTestSuite/src/AlgSequencer/HelloWorld.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,8 +10,8 @@
 \***********************************************************************************/
 // Include files
 #include "HelloWorld.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IDataProviderSvc.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IDataProviderSvc.h>
 
 // Static Factory declaration
 
diff --git a/GaudiTestSuite/src/AlgSequencer/HelloWorld.h b/GaudiTestSuite/src/AlgSequencer/HelloWorld.h
index 727b0fd494..b634531cd7 100644
--- a/GaudiTestSuite/src/AlgSequencer/HelloWorld.h
+++ b/GaudiTestSuite/src/AlgSequencer/HelloWorld.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,9 +12,9 @@
 #define GAUDIEXAMPLE_HELLOWORLD_H 1
 
 // Include files
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/MsgStream.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiKernel/MsgStream.h>
 
 /** @class HelloWorld
     Trivial Algorithm for tutotial purposes
diff --git a/GaudiTestSuite/src/AlgSequencer/ParentAlg.cpp b/GaudiTestSuite/src/AlgSequencer/ParentAlg.cpp
index 4f5d29d838..f92b2ef372 100644
--- a/GaudiTestSuite/src/AlgSequencer/ParentAlg.cpp
+++ b/GaudiTestSuite/src/AlgSequencer/ParentAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,10 +10,10 @@
 \***********************************************************************************/
 // Include files
 #include "ParentAlg.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/ThreadLocalContext.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/ThreadLocalContext.h>
 
 DECLARE_COMPONENT( ParentAlg )
 
diff --git a/GaudiTestSuite/src/AlgSequencer/SubAlg.cpp b/GaudiTestSuite/src/AlgSequencer/SubAlg.cpp
index 665acb488b..8d4aee379c 100644
--- a/GaudiTestSuite/src/AlgSequencer/SubAlg.cpp
+++ b/GaudiTestSuite/src/AlgSequencer/SubAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,9 +10,9 @@
 \***********************************************************************************/
 // Include files
 #include "SubAlg.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/MsgStream.h>
 
 // Static Factory declaration
 
diff --git a/GaudiTestSuite/src/AlgSequencer/SubAlg.h b/GaudiTestSuite/src/AlgSequencer/SubAlg.h
index 172d973ab4..9395657034 100644
--- a/GaudiTestSuite/src/AlgSequencer/SubAlg.h
+++ b/GaudiTestSuite/src/AlgSequencer/SubAlg.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,9 +12,9 @@
 #define GAUDIEXAMPLE_SUBALG_H 1
 
 // Include files
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/MsgStream.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiKernel/MsgStream.h>
 
 /** @class SubAlg
     Trivial Algorithm for tutotial purposes
diff --git a/GaudiTestSuite/src/AlgTools/IMyTool.h b/GaudiTestSuite/src/AlgTools/IMyTool.h
index 119de4fe0a..18bd0603a2 100644
--- a/GaudiTestSuite/src/AlgTools/IMyTool.h
+++ b/GaudiTestSuite/src/AlgTools/IMyTool.h
@@ -12,7 +12,7 @@
 #define GAUDIEXAMPLE_IMYTOOL_H 1
 
 // Include files
-#include "GaudiKernel/IAlgTool.h"
+#include <GaudiKernel/IAlgTool.h>
 
 /** @class IMyTool IMyTool.h
  *  Example of an Interface of a Algorithm Tool
diff --git a/GaudiTestSuite/src/AlgTools/ITestTool.h b/GaudiTestSuite/src/AlgTools/ITestTool.h
index 806222f3a2..cbf1c78571 100644
--- a/GaudiTestSuite/src/AlgTools/ITestTool.h
+++ b/GaudiTestSuite/src/AlgTools/ITestTool.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -16,7 +16,7 @@
 #include <string>
 
 // from Gaudi
-#include "GaudiKernel/IAlgTool.h"
+#include <GaudiKernel/IAlgTool.h>
 
 /** @class ITestTool ITestTool.h
  *
diff --git a/GaudiTestSuite/src/AlgTools/MyServiceWithTool.cpp b/GaudiTestSuite/src/AlgTools/MyServiceWithTool.cpp
index fc156e9843..3839f5e625 100644
--- a/GaudiTestSuite/src/AlgTools/MyServiceWithTool.cpp
+++ b/GaudiTestSuite/src/AlgTools/MyServiceWithTool.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/Service.h>
 
 #include "MyTool.h"
 
diff --git a/GaudiTestSuite/src/AlgTools/MyTool.cpp b/GaudiTestSuite/src/AlgTools/MyTool.cpp
index edcd9bee9d..0fb736ee26 100644
--- a/GaudiTestSuite/src/AlgTools/MyTool.cpp
+++ b/GaudiTestSuite/src/AlgTools/MyTool.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,10 +9,10 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Framework include files
-#include "GaudiKernel/GaudiException.h"
+#include <GaudiKernel/GaudiException.h>
 
 // Accessing data:
-#include "GaudiKernel/PhysicalConstants.h"
+#include <GaudiKernel/PhysicalConstants.h>
 
 // Tool example
 #include "MyTool.h"
diff --git a/GaudiTestSuite/src/AlgTools/MyTool.h b/GaudiTestSuite/src/AlgTools/MyTool.h
index 53cf9772d7..f91d3275a2 100644
--- a/GaudiTestSuite/src/AlgTools/MyTool.h
+++ b/GaudiTestSuite/src/AlgTools/MyTool.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDIEXANMPLES_MYTOOL_H 1
 
 // Include files
-#include "GaudiKernel/AlgTool.h"
 #include "IMyTool.h"
+#include <GaudiKernel/AlgTool.h>
 
 /** @class MyTool MyTool.h
  *  This is an interface class for a example tool
diff --git a/GaudiTestSuite/src/AlgTools/TestToolAlg.cpp b/GaudiTestSuite/src/AlgTools/TestToolAlg.cpp
index 2578ddff79..400de713e0 100644
--- a/GaudiTestSuite/src/AlgTools/TestToolAlg.cpp
+++ b/GaudiTestSuite/src/AlgTools/TestToolAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 // Include files
 
 // from Gaudi
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/MsgStream.h>
 
 // local
 #include "TestToolAlg.h"
diff --git a/GaudiTestSuite/src/AlgTools/TestToolAlg.h b/GaudiTestSuite/src/AlgTools/TestToolAlg.h
index 1803d61214..b15102164d 100644
--- a/GaudiTestSuite/src/AlgTools/TestToolAlg.h
+++ b/GaudiTestSuite/src/AlgTools/TestToolAlg.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,7 +15,7 @@
 #include <string>
 
 // base class
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 
 /** @class RichToolTest RichToolTest.h component/RichToolTest.h
  *
diff --git a/GaudiTestSuite/src/AlgTools/TestToolAlgFailure.cpp b/GaudiTestSuite/src/AlgTools/TestToolAlgFailure.cpp
index 05cf5c07da..6fa60495ff 100644
--- a/GaudiTestSuite/src/AlgTools/TestToolAlgFailure.cpp
+++ b/GaudiTestSuite/src/AlgTools/TestToolAlgFailure.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 // Include files
 
 // from Gaudi
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/MsgStream.h>
 
 // local
 #include "TestToolAlgFailure.h"
diff --git a/GaudiTestSuite/src/AlgTools/TestToolAlgFailure.h b/GaudiTestSuite/src/AlgTools/TestToolAlgFailure.h
index 0bcd05d38d..93bdafae1d 100644
--- a/GaudiTestSuite/src/AlgTools/TestToolAlgFailure.h
+++ b/GaudiTestSuite/src/AlgTools/TestToolAlgFailure.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,7 +15,7 @@
 #include <string>
 
 // base class
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 
 /** @class TestToolAlgFailure
  *
diff --git a/GaudiTestSuite/src/AlgTools/TestToolFailing.cpp b/GaudiTestSuite/src/AlgTools/TestToolFailing.cpp
index add73da711..6dfb84822d 100644
--- a/GaudiTestSuite/src/AlgTools/TestToolFailing.cpp
+++ b/GaudiTestSuite/src/AlgTools/TestToolFailing.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -16,7 +16,7 @@
  */
 
 // from Gaudi
-#include "GaudiKernel/AlgTool.h"
+#include <GaudiKernel/AlgTool.h>
 
 #include "ITestTool.h"
 
diff --git a/GaudiTestSuite/src/Allocator/Allocator.cpp b/GaudiTestSuite/src/Allocator/Allocator.cpp
index 00a9dc2ea9..c40000072c 100644
--- a/GaudiTestSuite/src/Allocator/Allocator.cpp
+++ b/GaudiTestSuite/src/Allocator/Allocator.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -23,12 +23,12 @@
 // ============================================================================
 // Boost
 // ============================================================================
-#include "boost/format.hpp"
+#include <boost/format.hpp>
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/ChronoEntity.h"
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/ChronoEntity.h>
+#include <GaudiKernel/System.h>
 // ============================================================================
 // Local
 // ============================================================================
diff --git a/GaudiTestSuite/src/Allocator/MyClass1A.cpp b/GaudiTestSuite/src/Allocator/MyClass1A.cpp
index 98da21a489..0b3426868e 100644
--- a/GaudiTestSuite/src/Allocator/MyClass1A.cpp
+++ b/GaudiTestSuite/src/Allocator/MyClass1A.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -17,7 +17,7 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/Allocator.h"
+#include <GaudiKernel/Allocator.h>
 // ============================================================================
 // Local
 // ============================================================================
diff --git a/GaudiTestSuite/src/AnyData/AnyDataAlgorithm.cpp b/GaudiTestSuite/src/AnyData/AnyDataAlgorithm.cpp
index 6b2c87110b..53462b873b 100644
--- a/GaudiTestSuite/src/AnyData/AnyDataAlgorithm.cpp
+++ b/GaudiTestSuite/src/AnyData/AnyDataAlgorithm.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,9 +8,9 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/AnyDataWrapper.h"
-#include "GaudiKernel/DataObjectHandle.h"
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiKernel/AnyDataWrapper.h>
+#include <GaudiKernel/DataObjectHandle.h>
 #include <string>
 #include <vector>
 //-----------------------------------------------------------------------------
diff --git a/GaudiTestSuite/src/Auditors/AuditorTestAlg.cpp b/GaudiTestSuite/src/Auditors/AuditorTestAlg.cpp
index 36c1ec9b0d..4578d10ccb 100644
--- a/GaudiTestSuite/src/Auditors/AuditorTestAlg.cpp
+++ b/GaudiTestSuite/src/Auditors/AuditorTestAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,7 +10,7 @@
 \***********************************************************************************/
 // Include files
 // from Gaudi
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 
 /** @class AuditorTestAlg AuditorTestAlg.cpp
  *
diff --git a/GaudiTestSuite/src/Auditors/LoggingAuditor.cpp b/GaudiTestSuite/src/Auditors/LoggingAuditor.cpp
index bbea69957d..4ca65f39e7 100644
--- a/GaudiTestSuite/src/Auditors/LoggingAuditor.cpp
+++ b/GaudiTestSuite/src/Auditors/LoggingAuditor.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,8 +8,8 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/Auditor.h"
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/Auditor.h>
+#include <GaudiKernel/MsgStream.h>
 
 // ============================================================================
 /** @class LoggingAuditor
diff --git a/GaudiTestSuite/src/ColorMsg/ColorMsgAlg.cpp b/GaudiTestSuite/src/ColorMsg/ColorMsgAlg.cpp
index 079862231a..21d3056415 100644
--- a/GaudiTestSuite/src/ColorMsg/ColorMsgAlg.cpp
+++ b/GaudiTestSuite/src/ColorMsg/ColorMsgAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,8 +9,8 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 #include "ColorMsgAlg.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/MsgStream.h>
 
 // Static Factory declaration
 
diff --git a/GaudiTestSuite/src/ColorMsg/ColorMsgAlg.h b/GaudiTestSuite/src/ColorMsg/ColorMsgAlg.h
index d06e665418..fb91b8c099 100644
--- a/GaudiTestSuite/src/ColorMsg/ColorMsgAlg.h
+++ b/GaudiTestSuite/src/ColorMsg/ColorMsgAlg.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define COLORMSG_COLORMSGALG_H
 
 //<<<<<< INCLUDES                                                       >>>>>>
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 //<<<<<< CLASS DECLARATIONS                                             >>>>>>
 /** @class ColorMgs
  * @brief  an algorithm to test the color setting options of MsgService
diff --git a/GaudiTestSuite/src/CounterEx/CounterSvcAlg.cpp b/GaudiTestSuite/src/CounterEx/CounterSvcAlg.cpp
index 7685f1e72b..91c15c075c 100644
--- a/GaudiTestSuite/src/CounterEx/CounterSvcAlg.cpp
+++ b/GaudiTestSuite/src/CounterEx/CounterSvcAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -13,7 +13,7 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 
 // ============================================================================
 namespace GaudiTestSuite {
diff --git a/GaudiTestSuite/src/CounterEx/StatSvcAlg.cpp b/GaudiTestSuite/src/CounterEx/StatSvcAlg.cpp
index 6c6e725b9a..99450848bd 100644
--- a/GaudiTestSuite/src/CounterEx/StatSvcAlg.cpp
+++ b/GaudiTestSuite/src/CounterEx/StatSvcAlg.cpp
@@ -17,10 +17,10 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/IStatSvc.h"
-#include "GaudiKernel/Stat.h"
+#include <GaudiKernel/IStatSvc.h>
+#include <GaudiKernel/Stat.h>
 
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 // ============================================================================
 /** @file
  *  Simple example to illustrate the statistical abilities of
diff --git a/GaudiTestSuite/src/DataOnDemand/DataCreator.cpp b/GaudiTestSuite/src/DataOnDemand/DataCreator.cpp
index 55080fe1fc..3aa324aa1d 100644
--- a/GaudiTestSuite/src/DataOnDemand/DataCreator.cpp
+++ b/GaudiTestSuite/src/DataOnDemand/DataCreator.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,7 +9,7 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 #include "DataCreator.h"
-#include "GaudiKernel/DataObject.h"
+#include <GaudiKernel/DataObject.h>
 
 // Static Factory declaration
 DECLARE_COMPONENT( DataCreator )
diff --git a/GaudiTestSuite/src/DataOnDemand/DataCreator.h b/GaudiTestSuite/src/DataOnDemand/DataCreator.h
index e32a0b2260..14b0aaf21b 100644
--- a/GaudiTestSuite/src/DataOnDemand/DataCreator.h
+++ b/GaudiTestSuite/src/DataOnDemand/DataCreator.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIEXAMPLE_DATACREATOR_H 1
 
 // Include files
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 
 /** @class DataCreator
     Trivial Algorithm for test purposes
diff --git a/GaudiTestSuite/src/DataOnDemand/MyDataAlgorithm.cpp b/GaudiTestSuite/src/DataOnDemand/MyDataAlgorithm.cpp
index 54074d06f4..063273e82d 100644
--- a/GaudiTestSuite/src/DataOnDemand/MyDataAlgorithm.cpp
+++ b/GaudiTestSuite/src/DataOnDemand/MyDataAlgorithm.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,7 +10,7 @@
 \***********************************************************************************/
 // Include files
 #include "MyDataAlgorithm.h"
-#include "GaudiKernel/DataObject.h"
+#include <GaudiKernel/DataObject.h>
 
 // Static Factory declaration
 
diff --git a/GaudiTestSuite/src/DataOnDemand/MyDataAlgorithm.h b/GaudiTestSuite/src/DataOnDemand/MyDataAlgorithm.h
index 9392f1994b..6177db9259 100644
--- a/GaudiTestSuite/src/DataOnDemand/MyDataAlgorithm.h
+++ b/GaudiTestSuite/src/DataOnDemand/MyDataAlgorithm.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIEXAMPLE_MyDataAlgorithm_H 1
 
 // Include files
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 
 /** @class MyDataAlgorithm
     Trivial Algorithm for tutotial purposes
diff --git a/GaudiTestSuite/src/ExtendedProperties/BoostArrayProperties.cpp b/GaudiTestSuite/src/ExtendedProperties/BoostArrayProperties.cpp
index 8da47daf6d..d23348aa64 100644
--- a/GaudiTestSuite/src/ExtendedProperties/BoostArrayProperties.cpp
+++ b/GaudiTestSuite/src/ExtendedProperties/BoostArrayProperties.cpp
@@ -13,13 +13,13 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/BoostArrayAsProperty.h"
+#include <GaudiKernel/BoostArrayAsProperty.h>
 // ============================================================================
 #include <Gaudi/TestSuite/TestAlg.h>
 // ============================================================================
 // Boots
 // ============================================================================
-#include "boost/array.hpp"
+#include <boost/array.hpp>
 // ============================================================================
 /** @file
  *  Simple example/test for "array"-properties
diff --git a/GaudiTestSuite/src/ExtendedProperties/ExtendedProperties.cpp b/GaudiTestSuite/src/ExtendedProperties/ExtendedProperties.cpp
index b22112bfe7..7bfe394b12 100644
--- a/GaudiTestSuite/src/ExtendedProperties/ExtendedProperties.cpp
+++ b/GaudiTestSuite/src/ExtendedProperties/ExtendedProperties.cpp
@@ -21,15 +21,15 @@
 #include <utility>
 #include <vector>
 
-#include "GaudiKernel/Map.h"
+#include <GaudiKernel/Map.h>
 
 // ============================================================================
 // Include parsers for creating parser that handles tuple
 // ============================================================================
-#include "GaudiKernel/StdArrayAsProperty.h"
 #include <Gaudi/Parsers/Factory.h>
+#include <GaudiKernel/StdArrayAsProperty.h>
 
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 // ============================================================================
 
 #ifdef __ICC
diff --git a/GaudiTestSuite/src/ExtendedProperties/ExtendedProperties2.cpp b/GaudiTestSuite/src/ExtendedProperties/ExtendedProperties2.cpp
index 83726e88f9..6171b72964 100644
--- a/GaudiTestSuite/src/ExtendedProperties/ExtendedProperties2.cpp
+++ b/GaudiTestSuite/src/ExtendedProperties/ExtendedProperties2.cpp
@@ -20,14 +20,14 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/GenericVectorTypes.h"
-#include "GaudiKernel/Point3DTypes.h"
-#include "GaudiKernel/Point4DTypes.h"
-#include "GaudiKernel/Vector3DTypes.h"
-#include "GaudiKernel/Vector4DTypes.h"
+#include <GaudiKernel/GenericVectorTypes.h>
+#include <GaudiKernel/Point3DTypes.h>
+#include <GaudiKernel/Point4DTypes.h>
+#include <GaudiKernel/Vector3DTypes.h>
+#include <GaudiKernel/Vector4DTypes.h>
 // ============================================================================
-#include "GaudiKernel/SVectorAsProperty.h"
-#include "GaudiKernel/VectorsAsProperty.h"
+#include <GaudiKernel/SVectorAsProperty.h>
+#include <GaudiKernel/VectorsAsProperty.h>
 // ============================================================================
 #include <Gaudi/TestSuite/TestAlg.h>
 // ============================================================================
diff --git a/GaudiTestSuite/src/FileMgr/FileMgrTest.cpp b/GaudiTestSuite/src/FileMgr/FileMgrTest.cpp
index 20dd0e9481..c8777cab8b 100644
--- a/GaudiTestSuite/src/FileMgr/FileMgrTest.cpp
+++ b/GaudiTestSuite/src/FileMgr/FileMgrTest.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,11 +9,11 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 #include "FileMgrTest.h"
-#include "GaudiKernel/IFileMgr.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
-#include "TFile.h"
-#include "TSSLSocket.h"
+#include <GaudiKernel/IFileMgr.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/MsgStream.h>
+#include <TFile.h>
+#include <TSSLSocket.h>
 
 #include <fstream>
 #include <stdio.h>
diff --git a/GaudiTestSuite/src/FileMgr/FileMgrTest.h b/GaudiTestSuite/src/FileMgr/FileMgrTest.h
index 1579c0a4fb..727ff12b81 100644
--- a/GaudiTestSuite/src/FileMgr/FileMgrTest.h
+++ b/GaudiTestSuite/src/FileMgr/FileMgrTest.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,13 +12,13 @@
 #define GAUDIEXAMPLES_FILEMGRTEST_H
 
 //<<<<<< INCLUDES                                                       >>>>>>
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 //<<<<<< CLASS DECLARATIONS                                             >>>>>>
 /** @class FileMgrTest
  * @brief  an algorithm to test the FileMgr
  */
 
-#include "GaudiKernel/IFileMgr.h"
+#include <GaudiKernel/IFileMgr.h>
 #include <stdio.h>
 #include <string>
 
diff --git a/GaudiTestSuite/src/FileSvc/HistogramWriterAlg.cpp b/GaudiTestSuite/src/FileSvc/HistogramWriterAlg.cpp
index d64c6c9f45..0f3c135c88 100644
--- a/GaudiTestSuite/src/FileSvc/HistogramWriterAlg.cpp
+++ b/GaudiTestSuite/src/FileSvc/HistogramWriterAlg.cpp
@@ -8,8 +8,8 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "Gaudi/Interfaces/IFileSvc.h"
 #include <Gaudi/Algorithm.h>
+#include <Gaudi/Interfaces/IFileSvc.h>
 #include <TH1F.h>
 
 namespace Gaudi::TestSuite::FileSvc {
diff --git a/GaudiTestSuite/src/Histograms/HistoAlgorithm.cpp b/GaudiTestSuite/src/Histograms/HistoAlgorithm.cpp
index 0e3977a58d..3004bd6e49 100644
--- a/GaudiTestSuite/src/Histograms/HistoAlgorithm.cpp
+++ b/GaudiTestSuite/src/Histograms/HistoAlgorithm.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,10 +11,10 @@
 // Include files
 #include "HistoAlgorithm.h"
 
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IHistogramSvc.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/SmartDataPtr.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IHistogramSvc.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/SmartDataPtr.h>
 
 #include <math.h>
 
diff --git a/GaudiTestSuite/src/Histograms/HistoAlgorithm.h b/GaudiTestSuite/src/Histograms/HistoAlgorithm.h
index 0a1a6d4084..4e4cf6ec17 100644
--- a/GaudiTestSuite/src/Histograms/HistoAlgorithm.h
+++ b/GaudiTestSuite/src/Histograms/HistoAlgorithm.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,15 +12,15 @@
 #define HISTOGRAMS_HISTOALGORITHM_H 1
 
 // Include files
-#include "GaudiKernel/Algorithm.h"
-
-#include "AIDA/IAxis.h"
-#include "AIDA/IHistogram1D.h"
-#include "AIDA/IHistogram2D.h"
-#include "AIDA/IHistogram3D.h"
-#include "AIDA/IHistogramFactory.h"
-#include "AIDA/IProfile1D.h"
-#include "AIDA/IProfile2D.h"
+#include <GaudiKernel/Algorithm.h>
+
+#include <AIDA/IAxis.h>
+#include <AIDA/IHistogram1D.h>
+#include <AIDA/IHistogram2D.h>
+#include <AIDA/IHistogram3D.h>
+#include <AIDA/IHistogramFactory.h>
+#include <AIDA/IProfile1D.h>
+#include <AIDA/IProfile2D.h>
 
 using namespace AIDA;
 // Forward declarations
diff --git a/GaudiTestSuite/src/Histograms/HistoProps.cpp b/GaudiTestSuite/src/Histograms/HistoProps.cpp
index 4762c9ed57..b1267c33e4 100644
--- a/GaudiTestSuite/src/Histograms/HistoProps.cpp
+++ b/GaudiTestSuite/src/Histograms/HistoProps.cpp
@@ -13,11 +13,11 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/IRndmGenSvc.h"
-#include "GaudiKernel/RndmGenerators.h"
+#include <GaudiKernel/IRndmGenSvc.h>
+#include <GaudiKernel/RndmGenerators.h>
 // ============================================================================
-#include "Gaudi/Accumulators/StaticHistogram.h"
-#include "GaudiKernel/Algorithm.h"
+#include <Gaudi/Accumulators/StaticHistogram.h>
+#include <GaudiKernel/Algorithm.h>
 #include <fmt/format.h>
 // ============================================================================
 /** @file
diff --git a/GaudiTestSuite/src/History/History.h b/GaudiTestSuite/src/History/History.h
index 168a1f3c68..46b9ca38d3 100644
--- a/GaudiTestSuite/src/History/History.h
+++ b/GaudiTestSuite/src/History/History.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,8 +11,8 @@
 #ifndef GAUDIEXAMPLES_HISTORY_H
 #define GAUDIEXAMPLES_HISTORY_H
 
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/IHistorySvc.h"
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiKernel/IHistorySvc.h>
 
 class History : public Algorithm {
   SmartIF<IHistorySvc> m_histSvc;
diff --git a/GaudiTestSuite/src/IO/EvtCollectionWrite.cpp b/GaudiTestSuite/src/IO/EvtCollectionWrite.cpp
index 3bf5cf3ae4..0648faf8fd 100644
--- a/GaudiTestSuite/src/IO/EvtCollectionWrite.cpp
+++ b/GaudiTestSuite/src/IO/EvtCollectionWrite.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -18,15 +18,15 @@
 #define EVTCOLLECTION_WRITE_CPP
 
 // Framework include files
-#include "GaudiKernel/INTupleSvc.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/SmartDataPtr.h"
+#include <GaudiKernel/INTupleSvc.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/SmartDataPtr.h>
 
 // Example related include files
 #include "EvtCollectionWrite.h"
-#include "GaudiTestSuite/Event.h"
-#include "GaudiTestSuite/MyTrack.h"
+#include <GaudiTestSuite/Event.h>
+#include <GaudiTestSuite/MyTrack.h>
 
 #include <cmath>
 
diff --git a/GaudiTestSuite/src/IO/EvtCollectionWrite.h b/GaudiTestSuite/src/IO/EvtCollectionWrite.h
index a465b7fe07..000fe62f07 100644
--- a/GaudiTestSuite/src/IO/EvtCollectionWrite.h
+++ b/GaudiTestSuite/src/IO/EvtCollectionWrite.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -21,8 +21,8 @@
 #define EVTCOLLECTION_WRITE_H
 
 // Framework include files
-#include "GaudiKernel/Algorithm.h" // Required for inheritance
-#include "GaudiKernel/NTuple.h"
+#include <GaudiKernel/Algorithm.h> // Required for inheritance
+#include <GaudiKernel/NTuple.h>
 
 // Forward declarations
 class INtupleSvc;
diff --git a/GaudiTestSuite/src/IO/ReadAlg.cpp b/GaudiTestSuite/src/IO/ReadAlg.cpp
index 18a3cfc68f..69e39a05a4 100644
--- a/GaudiTestSuite/src/IO/ReadAlg.cpp
+++ b/GaudiTestSuite/src/IO/ReadAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -19,24 +19,24 @@
 //      ====================================================================
 
 // Framework include files
-#include "GaudiKernel/DataStoreItem.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/LinkManager.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/SmartDataPtr.h"
+#include <GaudiKernel/DataStoreItem.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/LinkManager.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/SmartDataPtr.h>
 
 // Example related include files
 #include "ReadAlg.h"
 
 // Event Model related classes
-#include "GaudiTestSuite/Counter.h"
-#include "GaudiTestSuite/Event.h"
-#include "GaudiTestSuite/MyTrack.h"
+#include <GaudiTestSuite/Counter.h>
+#include <GaudiTestSuite/Event.h>
+#include <GaudiTestSuite/MyTrack.h>
 
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/System.h>
 
 using namespace Gaudi::TestSuite;
 
diff --git a/GaudiTestSuite/src/IO/ReadAlg.h b/GaudiTestSuite/src/IO/ReadAlg.h
index d40a0f3954..9f5bfd696b 100644
--- a/GaudiTestSuite/src/IO/ReadAlg.h
+++ b/GaudiTestSuite/src/IO/ReadAlg.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDIEXAMPLES_READALG_H
 
 // Framework include files
-#include "GaudiKernel/Algorithm.h"         // Required for inheritance
-#include "GaudiKernel/IIncidentListener.h" // Required for inheritance
+#include <GaudiKernel/Algorithm.h>         // Required for inheritance
+#include <GaudiKernel/IIncidentListener.h> // Required for inheritance
 
 // Forward declarations
 class IIncidentSvc;
diff --git a/GaudiTestSuite/src/IO/ReadTES.h b/GaudiTestSuite/src/IO/ReadTES.h
index 12c5d6f27d..3e8312306d 100644
--- a/GaudiTestSuite/src/IO/ReadTES.h
+++ b/GaudiTestSuite/src/IO/ReadTES.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -17,7 +17,7 @@
 #include <vector>
 
 // from Gaudi
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 
 /** @class ReadTES ReadTES.h
  *
diff --git a/GaudiTestSuite/src/IO/WriteAlg.cpp b/GaudiTestSuite/src/IO/WriteAlg.cpp
index 6e8c47c2bd..751e99c017 100644
--- a/GaudiTestSuite/src/IO/WriteAlg.cpp
+++ b/GaudiTestSuite/src/IO/WriteAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -18,19 +18,19 @@
 //
 //      ====================================================================
 // Framework include files
-#include "GaudiKernel/RndmGenerators.h"
-#include "GaudiKernel/SmartDataPtr.h"
+#include <GaudiKernel/RndmGenerators.h>
+#include <GaudiKernel/SmartDataPtr.h>
 
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
 
 // Example related include files
 #include "WriteAlg.h"
 
 // Event Model related classes
-#include "GaudiTestSuite/Counter.h"
-#include "GaudiTestSuite/Event.h"
-#include "GaudiTestSuite/MyTrack.h"
+#include <GaudiTestSuite/Counter.h>
+#include <GaudiTestSuite/Event.h>
+#include <GaudiTestSuite/MyTrack.h>
 
 using namespace Gaudi::TestSuite;
 
diff --git a/GaudiTestSuite/src/IO/WriteAlg.h b/GaudiTestSuite/src/IO/WriteAlg.h
index ddf92b8c18..d09917b3d9 100644
--- a/GaudiTestSuite/src/IO/WriteAlg.h
+++ b/GaudiTestSuite/src/IO/WriteAlg.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define GAUDIEXAMPLE_WRITEALG_H
 
 // Framework include files
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiTestSuite/Counter.h"
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiTestSuite/Counter.h>
 
 /** @class WriteAlg WriteAlg.h
 
diff --git a/GaudiTestSuite/src/IO/dict.h b/GaudiTestSuite/src/IO/dict.h
index 0028b94559..66b3811166 100644
--- a/GaudiTestSuite/src/IO/dict.h
+++ b/GaudiTestSuite/src/IO/dict.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,24 +8,24 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/ContainedObject.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/ObjectVector.h"
-#include "GaudiKernel/SmartRef.h"
+#include <GaudiKernel/ContainedObject.h>
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/ObjectVector.h>
+#include <GaudiKernel/SmartRef.h>
 
-#include "GaudiTestSuite/Collision.h"
-#include "GaudiTestSuite/Counter.h"
-#include "GaudiTestSuite/Event.h"
-#include "GaudiTestSuite/MyTrack.h"
-#include "GaudiTestSuite/MyVertex.h"
+#include <GaudiTestSuite/Collision.h>
+#include <GaudiTestSuite/Counter.h>
+#include <GaudiTestSuite/Event.h>
+#include <GaudiTestSuite/MyTrack.h>
+#include <GaudiTestSuite/MyVertex.h>
 
 #include <Gaudi/TestSuite/NTuple/MyStruct.h>
 
-#include "GaudiExamples/Collision.h"
-#include "GaudiExamples/Counter.h"
-#include "GaudiExamples/Event.h"
-#include "GaudiExamples/MyTrack.h"
-#include "GaudiExamples/MyVertex.h"
+#include <GaudiExamples/Collision.h>
+#include <GaudiExamples/Counter.h>
+#include <GaudiExamples/Event.h>
+#include <GaudiExamples/MyTrack.h>
+#include <GaudiExamples/MyVertex.h>
 
 // template ObjectVector<MyTrack>;
 // template ObjectVector<MyVertex>;
diff --git a/GaudiTestSuite/src/IncidentSvc/IIncidentAsyncTestSvc.h b/GaudiTestSuite/src/IncidentSvc/IIncidentAsyncTestSvc.h
index affa6b223d..4d55f8eebb 100644
--- a/GaudiTestSuite/src/IncidentSvc/IIncidentAsyncTestSvc.h
+++ b/GaudiTestSuite/src/IncidentSvc/IIncidentAsyncTestSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef GAUDIEXAMPLES_IINCIDENTASYNCTESTSVC_H_
 #define GAUDIEXAMPLES_IINCIDENTASYNCTESTSVC_H_
 
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 #include <mutex>
 
 class EventContext;
diff --git a/GaudiTestSuite/src/IncidentSvc/IncidentAsyncTestAlg.cpp b/GaudiTestSuite/src/IncidentSvc/IncidentAsyncTestAlg.cpp
index ea8023e930..9ad532a7f6 100644
--- a/GaudiTestSuite/src/IncidentSvc/IncidentAsyncTestAlg.cpp
+++ b/GaudiTestSuite/src/IncidentSvc/IncidentAsyncTestAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,10 +12,10 @@
 
 #include "IIncidentAsyncTestSvc.h"
 
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/DataObjectHandle.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/Incident.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/DataObjectHandle.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/Incident.h>
 
 // Static Factory declaration
 DECLARE_COMPONENT( IncidentAsyncTestAlg )
diff --git a/GaudiTestSuite/src/IncidentSvc/IncidentAsyncTestAlg.h b/GaudiTestSuite/src/IncidentSvc/IncidentAsyncTestAlg.h
index 10d79145e8..f9360983cb 100644
--- a/GaudiTestSuite/src/IncidentSvc/IncidentAsyncTestAlg.h
+++ b/GaudiTestSuite/src/IncidentSvc/IncidentAsyncTestAlg.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,8 +11,8 @@
 #ifndef GAUDIEXAMPLES_INCIDENTASYNCTESTALG_H_
 #define GAUDIEXAMPLES_INCIDENTASYNCTESTALG_H_
 
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/DataObjectHandle.h"
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiKernel/DataObjectHandle.h>
 #include <memory>
 
 class IIncidentSvc;
diff --git a/GaudiTestSuite/src/IncidentSvc/IncidentAsyncTestSvc.cpp b/GaudiTestSuite/src/IncidentSvc/IncidentAsyncTestSvc.cpp
index 7e669ccad0..267f7ff0b3 100644
--- a/GaudiTestSuite/src/IncidentSvc/IncidentAsyncTestSvc.cpp
+++ b/GaudiTestSuite/src/IncidentSvc/IncidentAsyncTestSvc.cpp
@@ -10,17 +10,17 @@
 \***********************************************************************************/
 #include "IncidentAsyncTestSvc.h"
 
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/ISvcLocator.h"
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/IService.h>
+#include <GaudiKernel/ISvcLocator.h>
 
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/MsgStream.h>
 
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/ThreadLocalContext.h"
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/ThreadLocalContext.h>
 
 DECLARE_COMPONENT( IncidentAsyncTestSvc )
 
diff --git a/GaudiTestSuite/src/IncidentSvc/IncidentAsyncTestSvc.h b/GaudiTestSuite/src/IncidentSvc/IncidentAsyncTestSvc.h
index ea3868e043..08aaa182d4 100644
--- a/GaudiTestSuite/src/IncidentSvc/IncidentAsyncTestSvc.h
+++ b/GaudiTestSuite/src/IncidentSvc/IncidentAsyncTestSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,14 +11,14 @@
 #ifndef GAUDIEXAMPLES_INCIDENTASYNCTESTSVC_H_
 #define GAUDIEXAMPLES_INCIDENTASYNCTESTSVC_H_
 
-#include "GaudiKernel/EventContextHash.h"
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/SmartIF.h"
 #include "IIncidentAsyncTestSvc.h"
-#include "tbb/concurrent_unordered_map.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/EventContextHash.h>
+#include <GaudiKernel/IIncidentListener.h>
+#include <GaudiKernel/Service.h>
+#include <GaudiKernel/SmartIF.h>
 #include <mutex>
+#include <tbb/concurrent_unordered_map.h>
 class ISvcLocator;
 class IMessageSvc;
 class IIncidentSvc;
diff --git a/GaudiTestSuite/src/IncidentSvc/IncidentListenerTest.cpp b/GaudiTestSuite/src/IncidentSvc/IncidentListenerTest.cpp
index 236fc78cf7..f29bd71b10 100644
--- a/GaudiTestSuite/src/IncidentSvc/IncidentListenerTest.cpp
+++ b/GaudiTestSuite/src/IncidentSvc/IncidentListenerTest.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,14 +10,14 @@
 \***********************************************************************************/
 #include "IncidentListenerTest.h"
 
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/IMessageSvc.h"
-#include "GaudiKernel/IService.h"
-#include "GaudiKernel/ISvcLocator.h"
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/IMessageSvc.h>
+#include <GaudiKernel/IService.h>
+#include <GaudiKernel/ISvcLocator.h>
 
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/MsgStream.h>
 
-#include "GaudiKernel/GaudiException.h"
+#include <GaudiKernel/GaudiException.h>
 
 //=============================================================================
 IncidentListenerTest::IncidentListenerTest( const std::string& name, ISvcLocator* svcloc, long shots )
diff --git a/GaudiTestSuite/src/IncidentSvc/IncidentListenerTest.h b/GaudiTestSuite/src/IncidentSvc/IncidentListenerTest.h
index 6fa75e0eb9..61ec30a570 100644
--- a/GaudiTestSuite/src/IncidentSvc/IncidentListenerTest.h
+++ b/GaudiTestSuite/src/IncidentSvc/IncidentListenerTest.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,8 +11,8 @@
 #ifndef GAUDIEXAMPLES_INCIDENTLISTENERTEST_H_
 #define GAUDIEXAMPLES_INCIDENTLISTENERTEST_H_
 
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/IIncidentListener.h>
+#include <GaudiKernel/SmartIF.h>
 
 class ISvcLocator;
 class IMessageSvc;
diff --git a/GaudiTestSuite/src/IncidentSvc/IncidentListenerTestAlg.cpp b/GaudiTestSuite/src/IncidentSvc/IncidentListenerTestAlg.cpp
index 5c9e67678e..0aee75dd9f 100644
--- a/GaudiTestSuite/src/IncidentSvc/IncidentListenerTestAlg.cpp
+++ b/GaudiTestSuite/src/IncidentSvc/IncidentListenerTestAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 
 #include "IncidentListenerTest.h"
 
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/Incident.h"
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/Incident.h>
 
 // Static Factory declaration
 DECLARE_COMPONENT( IncidentListenerTestAlg )
diff --git a/GaudiTestSuite/src/IncidentSvc/IncidentListenerTestAlg.h b/GaudiTestSuite/src/IncidentSvc/IncidentListenerTestAlg.h
index aa63daf4d1..61ff7ab883 100644
--- a/GaudiTestSuite/src/IncidentSvc/IncidentListenerTestAlg.h
+++ b/GaudiTestSuite/src/IncidentSvc/IncidentListenerTestAlg.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef GAUDIEXAMPLES_INCIDENTLISTENERTESTALG_H_
 #define GAUDIEXAMPLES_INCIDENTLISTENERTESTALG_H_
 
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 
 #include <memory>
 
diff --git a/GaudiTestSuite/src/IntelProfiler/CpuHungryAlg.cpp b/GaudiTestSuite/src/IntelProfiler/CpuHungryAlg.cpp
index 9c03a52c2a..b65ed2815d 100644
--- a/GaudiTestSuite/src/IntelProfiler/CpuHungryAlg.cpp
+++ b/GaudiTestSuite/src/IntelProfiler/CpuHungryAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -13,7 +13,7 @@
 #include <math.h>
 #include <unistd.h>
 // Gaudi:
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 
 /// Algorithm which consume a lot of CPU.
 ///
diff --git a/GaudiTestSuite/src/Lib/Counter.cpp b/GaudiTestSuite/src/Lib/Counter.cpp
index b3abe60a22..5a020fbaf2 100644
--- a/GaudiTestSuite/src/Lib/Counter.cpp
+++ b/GaudiTestSuite/src/Lib/Counter.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiTestSuite/Counter.h"
+#include <GaudiTestSuite/Counter.h>
 
 using namespace Gaudi::TestSuite;
 
diff --git a/GaudiTestSuite/src/Lib/Event.cpp b/GaudiTestSuite/src/Lib/Event.cpp
index e652dcacc1..3f7abc58a2 100644
--- a/GaudiTestSuite/src/Lib/Event.cpp
+++ b/GaudiTestSuite/src/Lib/Event.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiTestSuite/Event.h"
+#include <GaudiTestSuite/Event.h>
 
 using namespace Gaudi::TestSuite;
 
diff --git a/GaudiTestSuite/src/Lib/MyTrack.cpp b/GaudiTestSuite/src/Lib/MyTrack.cpp
index aeef299ee0..1de8705c56 100644
--- a/GaudiTestSuite/src/Lib/MyTrack.cpp
+++ b/GaudiTestSuite/src/Lib/MyTrack.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiTestSuite/MyTrack.h"
+#include <GaudiTestSuite/MyTrack.h>
 
 using namespace Gaudi::TestSuite;
 
diff --git a/GaudiTestSuite/src/Lib/MyVertex.cpp b/GaudiTestSuite/src/Lib/MyVertex.cpp
index 0fb541d9c7..160b0add8e 100644
--- a/GaudiTestSuite/src/Lib/MyVertex.cpp
+++ b/GaudiTestSuite/src/Lib/MyVertex.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiTestSuite/MyVertex.h"
+#include <GaudiTestSuite/MyVertex.h>
 
 using namespace Gaudi::TestSuite;
 
diff --git a/GaudiTestSuite/src/Lib/legacy_examples.cpp b/GaudiTestSuite/src/Lib/legacy_examples.cpp
index ac9b9c5edb..149df8c477 100644
--- a/GaudiTestSuite/src/Lib/legacy_examples.cpp
+++ b/GaudiTestSuite/src/Lib/legacy_examples.cpp
@@ -8,10 +8,10 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiExamples/Counter.h"
-#include "GaudiExamples/Event.h"
-#include "GaudiExamples/MyTrack.h"
-#include "GaudiExamples/MyVertex.h"
+#include <GaudiExamples/Counter.h>
+#include <GaudiExamples/Event.h>
+#include <GaudiExamples/MyTrack.h>
+#include <GaudiExamples/MyVertex.h>
 
 using namespace Gaudi::Examples;
 
diff --git a/GaudiTestSuite/src/Maps/MapAlg.cpp b/GaudiTestSuite/src/Maps/MapAlg.cpp
index f82f30500c..2de87beacd 100644
--- a/GaudiTestSuite/src/Maps/MapAlg.cpp
+++ b/GaudiTestSuite/src/Maps/MapAlg.cpp
@@ -13,15 +13,15 @@
 // ============================================================================
 // from GaudiKernel
 // ============================================================================
-#include "GaudiKernel/HashMap.h"
-#include "GaudiKernel/IRndmGenSvc.h"
-#include "GaudiKernel/Map.h"
-#include "GaudiKernel/RndmGenerators.h"
-#include "GaudiKernel/System.h"
-#include "GaudiKernel/ToStream.h"
-#include "GaudiKernel/VectorMap.h"
+#include <GaudiKernel/HashMap.h>
+#include <GaudiKernel/IRndmGenSvc.h>
+#include <GaudiKernel/Map.h>
+#include <GaudiKernel/RndmGenerators.h>
+#include <GaudiKernel/System.h>
+#include <GaudiKernel/ToStream.h>
+#include <GaudiKernel/VectorMap.h>
 // ============================================================================
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 // ============================================================================
 /** @file
  *
diff --git a/GaudiTestSuite/src/MultiInput/DumpAddress.cpp b/GaudiTestSuite/src/MultiInput/DumpAddress.cpp
index ce5247be9a..be007cf8f3 100644
--- a/GaudiTestSuite/src/MultiInput/DumpAddress.cpp
+++ b/GaudiTestSuite/src/MultiInput/DumpAddress.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,13 +8,13 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/SmartDataPtr.h"
-#include "RootCnv/RootAddress.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/SmartDataPtr.h>
+#include <RootCnv/RootAddress.h>
 
 #include <fstream>
 #include <memory>
diff --git a/GaudiTestSuite/src/MultiInput/MIHelpers.h b/GaudiTestSuite/src/MultiInput/MIHelpers.h
index 6ca83966a1..b08f478a88 100644
--- a/GaudiTestSuite/src/MultiInput/MIHelpers.h
+++ b/GaudiTestSuite/src/MultiInput/MIHelpers.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef GAUDIEXAMPLES_MULTIINPUT_COMMON
 #define GAUDIEXAMPLES_MULTIINPUT_COMMON
 
-#include "RootCnv/RootAddress.h"
+#include <RootCnv/RootAddress.h>
 #include <istream>
 #include <ostream>
 #include <tuple>
diff --git a/GaudiTestSuite/src/MultiInput/MIReadAlg.cpp b/GaudiTestSuite/src/MultiInput/MIReadAlg.cpp
index 7caae998f9..135b0211e6 100644
--- a/GaudiTestSuite/src/MultiInput/MIReadAlg.cpp
+++ b/GaudiTestSuite/src/MultiInput/MIReadAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,19 +9,19 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Framework include files
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/SmartDataPtr.h"
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/SmartDataPtr.h>
 
 // Example related include files
 #include "MIHelpers.h"
 #include "MIReadAlg.h"
 
 // Event Model related classes
-#include "GaudiTestSuite/Event.h"
-#include "GaudiTestSuite/MyTrack.h"
+#include <GaudiTestSuite/Event.h>
+#include <GaudiTestSuite/MyTrack.h>
 
-#include "GaudiKernel/System.h"
+#include <GaudiKernel/System.h>
 
 #include <fstream>
 
diff --git a/GaudiTestSuite/src/MultiInput/MIReadAlg.h b/GaudiTestSuite/src/MultiInput/MIReadAlg.h
index 26d7029d48..ca8ace8ff3 100644
--- a/GaudiTestSuite/src/MultiInput/MIReadAlg.h
+++ b/GaudiTestSuite/src/MultiInput/MIReadAlg.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,9 +12,9 @@
 #define GAUDIEXAMPLES_MULTIINPUT_READALG_H
 
 // Framework include files
-#include "GaudiKernel/Algorithm.h"
 #include "MIHelpers.h"
-#include "RootCnv/RootAddress.h"
+#include <GaudiKernel/Algorithm.h>
+#include <RootCnv/RootAddress.h>
 
 #include <vector>
 
diff --git a/GaudiTestSuite/src/MultiInput/MIWriteAlg.cpp b/GaudiTestSuite/src/MultiInput/MIWriteAlg.cpp
index c781349c99..548b7c3ece 100644
--- a/GaudiTestSuite/src/MultiInput/MIWriteAlg.cpp
+++ b/GaudiTestSuite/src/MultiInput/MIWriteAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,20 +9,20 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Framework include files
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/RndmGenerators.h"
-#include "GaudiKernel/SmartDataPtr.h"
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/RndmGenerators.h>
+#include <GaudiKernel/SmartDataPtr.h>
 
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IRndmEngine.h"
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IRndmEngine.h>
 
 // Example related include files
 #include "MIWriteAlg.h"
 
 // Event Model related classes
-#include "GaudiTestSuite/Event.h"
-#include "GaudiTestSuite/MyTrack.h"
+#include <GaudiTestSuite/Event.h>
+#include <GaudiTestSuite/MyTrack.h>
 
 using namespace Gaudi::TestSuite::MultiInput;
 
diff --git a/GaudiTestSuite/src/MultiInput/MIWriteAlg.h b/GaudiTestSuite/src/MultiInput/MIWriteAlg.h
index 29a659f8c5..5b38eac8a2 100644
--- a/GaudiTestSuite/src/MultiInput/MIWriteAlg.h
+++ b/GaudiTestSuite/src/MultiInput/MIWriteAlg.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIEXAMPLE_MULTIINPUT_WRITEALG_H
 
 // Framework include files
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 
 namespace Gaudi {
   namespace TestSuite {
diff --git a/GaudiTestSuite/src/MultipleLogStreams/QotdAlg.cpp b/GaudiTestSuite/src/MultipleLogStreams/QotdAlg.cpp
index 448fb4ec3e..f9c813f66a 100644
--- a/GaudiTestSuite/src/MultipleLogStreams/QotdAlg.cpp
+++ b/GaudiTestSuite/src/MultipleLogStreams/QotdAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 // Include files
 #include "QotdAlg.h"
 
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/MsgStream.h>
 
 using namespace GaudiEx;
 
diff --git a/GaudiTestSuite/src/MultipleLogStreams/QotdAlg.h b/GaudiTestSuite/src/MultipleLogStreams/QotdAlg.h
index d134939291..976f9d012d 100644
--- a/GaudiTestSuite/src/MultipleLogStreams/QotdAlg.h
+++ b/GaudiTestSuite/src/MultipleLogStreams/QotdAlg.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -19,8 +19,8 @@
  */
 
 // Include files
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiKernel/MsgStream.h>
 
 namespace GaudiEx {
 
diff --git a/GaudiTestSuite/src/NTuples/NTupleAlgorithm.cpp b/GaudiTestSuite/src/NTuples/NTupleAlgorithm.cpp
index a0ccf64728..3b6538142e 100644
--- a/GaudiTestSuite/src/NTuples/NTupleAlgorithm.cpp
+++ b/GaudiTestSuite/src/NTuples/NTupleAlgorithm.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,11 +11,11 @@
 // Include files
 #include "NTupleAlgorithm.h"
 
-#include "GaudiKernel/IHistogramSvc.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/SmartDataPtr.h"
+#include <GaudiKernel/IHistogramSvc.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/SmartDataPtr.h>
 
-#include "GaudiKernel/INTupleSvc.h"
+#include <GaudiKernel/INTupleSvc.h>
 
 #include <math.h>
 
diff --git a/GaudiTestSuite/src/NTuples/NTupleAlgorithm.h b/GaudiTestSuite/src/NTuples/NTupleAlgorithm.h
index b95d4e65ac..7ec009008f 100644
--- a/GaudiTestSuite/src/NTuples/NTupleAlgorithm.h
+++ b/GaudiTestSuite/src/NTuples/NTupleAlgorithm.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define HISTOGRAMS_NTupleAlgorithm_H 1
 
 // Include files
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/NTuple.h"
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiKernel/NTuple.h>
 
 // Forward declarations
 
diff --git a/GaudiTestSuite/src/PartProp/PartPropAlg.h b/GaudiTestSuite/src/PartProp/PartPropAlg.h
index edca38f7f5..a46bd1f66d 100644
--- a/GaudiTestSuite/src/PartProp/PartPropAlg.h
+++ b/GaudiTestSuite/src/PartProp/PartPropAlg.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 2023 CERN for the benefit of the LHCb and ATLAS collaborations      *
+* (c) Copyright 2023-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -13,9 +13,9 @@
 
 #include <Gaudi/Algorithm.h>
 
-#include "Gaudi/ParticleID.h"
-#include "Gaudi/ParticleProperty.h"
 #include <Gaudi/Interfaces/IParticlePropertySvc.h>
+#include <Gaudi/ParticleID.h>
+#include <Gaudi/ParticleProperty.h>
 
 namespace Gaudi {
   namespace TestSuite {
diff --git a/GaudiTestSuite/src/PartProp/PartPropExa.cpp b/GaudiTestSuite/src/PartProp/PartPropExa.cpp
index 0ba9a19391..47be43abae 100644
--- a/GaudiTestSuite/src/PartProp/PartPropExa.cpp
+++ b/GaudiTestSuite/src/PartProp/PartPropExa.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,11 +9,11 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 #include "PartPropExa.h"
-#include "GaudiKernel/IPartPropSvc.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/IPartPropSvc.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/MsgStream.h>
 
-#include "HepPDT/ParticleDataTable.hh"
+#include <HepPDT/ParticleDataTable.hh>
 
 #include <sstream>
 
diff --git a/GaudiTestSuite/src/PartProp/PartPropExa.h b/GaudiTestSuite/src/PartProp/PartPropExa.h
index 18fbd9b687..1d1f049678 100644
--- a/GaudiTestSuite/src/PartProp/PartPropExa.h
+++ b/GaudiTestSuite/src/PartProp/PartPropExa.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,17 +11,17 @@
 #ifndef GAUDIEXAMPLES_PARTPROPEXA_H
 #define GAUDIEXAMPLES_PARTPROPEXA_H 1
 
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 #if HEPPDT_VERSION_MAJOR == 2
-#  include "HepPDT/CommonParticleData.hh"
+#  include <HepPDT/CommonParticleData.hh>
 #endif
 #if HEPPDT_VERSION_MAJOR == 3
-#  include "HepPDT/ParticleData.hh"
+#  include <HepPDT/ParticleData.hh>
 namespace HepPDT {
   using CommonParticleData = ParticleData;
 }
 #endif
-#include "HepPDT/ProcessUnknownID.hh"
+#include <HepPDT/ProcessUnknownID.hh>
 
 class IPartPropSvc;
 
diff --git a/GaudiTestSuite/src/PluginService/BackwardCompatibleAliases.cpp b/GaudiTestSuite/src/PluginService/BackwardCompatibleAliases.cpp
index a9652d7901..bf4a65fd95 100644
--- a/GaudiTestSuite/src/PluginService/BackwardCompatibleAliases.cpp
+++ b/GaudiTestSuite/src/PluginService/BackwardCompatibleAliases.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -13,7 +13,7 @@
 /// For example the class PluginServiceTest::MyAlg was identified by the string
 /// "PluginServiceTest__MyAlg".
 
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 
 #include <string>
 #include <vector>
diff --git a/GaudiTestSuite/src/PluginService/SpecialCustomFactory.cpp b/GaudiTestSuite/src/PluginService/SpecialCustomFactory.cpp
index 22972c6a94..0fd731d2cf 100644
--- a/GaudiTestSuite/src/PluginService/SpecialCustomFactory.cpp
+++ b/GaudiTestSuite/src/PluginService/SpecialCustomFactory.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,8 +8,8 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "Gaudi/PluginService.h"
-#include "GaudiKernel/Algorithm.h"
+#include <Gaudi/PluginService.h>
+#include <GaudiKernel/Algorithm.h>
 
 #include <iostream>
 
diff --git a/GaudiTestSuite/src/Properties/CustomPropertiesAlg.cpp b/GaudiTestSuite/src/Properties/CustomPropertiesAlg.cpp
index 31e99cf651..9008835a99 100644
--- a/GaudiTestSuite/src/Properties/CustomPropertiesAlg.cpp
+++ b/GaudiTestSuite/src/Properties/CustomPropertiesAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -40,7 +40,7 @@ namespace Gaudi {
 
 // We also need to be able to print an object of our type as a string that both
 // Python and our parser can understand,
-#include "GaudiKernel/ToStream.h"
+#include <GaudiKernel/ToStream.h>
 #include <map>
 namespace std {
   // This is an example valid for any mapping type.
diff --git a/GaudiTestSuite/src/Properties/PropertyAlg.cpp b/GaudiTestSuite/src/Properties/PropertyAlg.cpp
index b5f12f1dab..8d53d621ba 100644
--- a/GaudiTestSuite/src/Properties/PropertyAlg.cpp
+++ b/GaudiTestSuite/src/Properties/PropertyAlg.cpp
@@ -9,14 +9,14 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Include files
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IChronoStatSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IChronoStatSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/SmartIF.h>
 #include <sstream>
 
-#include "GaudiKernel/SerializeSTL.h"
+#include <GaudiKernel/SerializeSTL.h>
 
 #include "PropertyAlg.h"
 
diff --git a/GaudiTestSuite/src/Properties/PropertyAlg.h b/GaudiTestSuite/src/Properties/PropertyAlg.h
index bc6b3e36e8..db0b9ef501 100644
--- a/GaudiTestSuite/src/Properties/PropertyAlg.h
+++ b/GaudiTestSuite/src/Properties/PropertyAlg.h
@@ -12,9 +12,9 @@
 #define GAUDIEXAMPLE_PROPERTYALG_H
 
 // Include files
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/MsgStream.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiKernel/MsgStream.h>
 
 #include <map>
 #include <set>
diff --git a/GaudiTestSuite/src/Properties/PropertyProxy.cpp b/GaudiTestSuite/src/Properties/PropertyProxy.cpp
index 69344f82b4..45449f5a27 100644
--- a/GaudiTestSuite/src/Properties/PropertyProxy.cpp
+++ b/GaudiTestSuite/src/Properties/PropertyProxy.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,12 +10,12 @@
 \***********************************************************************************/
 #include "PropertyProxy.h"
 
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IAlgManager.h"
-#include "GaudiKernel/IChronoStatSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IAlgManager.h>
+#include <GaudiKernel/IChronoStatSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/SmartIF.h>
 
 DECLARE_COMPONENT( PropertyProxy )
 
diff --git a/GaudiTestSuite/src/Properties/PropertyProxy.h b/GaudiTestSuite/src/Properties/PropertyProxy.h
index bf1e5e98ab..ded4637b7e 100644
--- a/GaudiTestSuite/src/Properties/PropertyProxy.h
+++ b/GaudiTestSuite/src/Properties/PropertyProxy.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,9 +12,9 @@
 #define GAUDIEXAMPLE_PropertyProxy_H
 
 // Include files
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/MsgStream.h"
 #include <Gaudi/Property.h>
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiKernel/MsgStream.h>
 
 /** @class PropertyProxy
     Trivial Algorithm for tutotial purposes
diff --git a/GaudiTestSuite/src/RandomNumber/RandomNumberAlg.cpp b/GaudiTestSuite/src/RandomNumber/RandomNumberAlg.cpp
index 5bcf60c3fd..41c947b53d 100644
--- a/GaudiTestSuite/src/RandomNumber/RandomNumberAlg.cpp
+++ b/GaudiTestSuite/src/RandomNumber/RandomNumberAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,20 +9,20 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Framework include files
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IHistogramSvc.h"
-#include "GaudiKernel/INTupleSvc.h"
-#include "GaudiKernel/IRndmGen.h"
-#include "GaudiKernel/IRndmGenSvc.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/SmartDataPtr.h"
-#include "GaudiKernel/SmartIF.h"
-
-#include "GaudiUtils/QuasiRandom.h"
-
-#include "AIDA/IHistogram1D.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IHistogramSvc.h>
+#include <GaudiKernel/INTupleSvc.h>
+#include <GaudiKernel/IRndmGen.h>
+#include <GaudiKernel/IRndmGenSvc.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/SmartDataPtr.h>
+#include <GaudiKernel/SmartIF.h>
+
+#include <GaudiUtils/QuasiRandom.h>
+
+#include <AIDA/IHistogram1D.h>
 using AIDA::IHistogram1D;
 
 // Example related include files
diff --git a/GaudiTestSuite/src/RandomNumber/RandomNumberAlg.h b/GaudiTestSuite/src/RandomNumber/RandomNumberAlg.h
index 2d7029947e..126cf65c6c 100644
--- a/GaudiTestSuite/src/RandomNumber/RandomNumberAlg.h
+++ b/GaudiTestSuite/src/RandomNumber/RandomNumberAlg.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,9 +12,9 @@
 #define GAUDIEXAMPLES_RANDOMNUMBERALG_H
 
 // Framework include files
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/NTuple.h"
-#include "GaudiKernel/RndmGenerators.h"
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiKernel/NTuple.h>
+#include <GaudiKernel/RndmGenerators.h>
 
 /** @class RandomNumberAlg
     A small algorithm class using the random number service
diff --git a/GaudiTestSuite/src/ReEntAlg/ReEntAlg.cpp b/GaudiTestSuite/src/ReEntAlg/ReEntAlg.cpp
index 94bb4f9e0c..66eecd924c 100644
--- a/GaudiTestSuite/src/ReEntAlg/ReEntAlg.cpp
+++ b/GaudiTestSuite/src/ReEntAlg/ReEntAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,8 +9,8 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 #include "ReEntAlg.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/MsgStream.h>
 
 #include <chrono>
 #include <thread>
diff --git a/GaudiTestSuite/src/StringKeys/StringKeyEx.cpp b/GaudiTestSuite/src/StringKeys/StringKeyEx.cpp
index 31a2330a97..69dd4b55aa 100644
--- a/GaudiTestSuite/src/StringKeys/StringKeyEx.cpp
+++ b/GaudiTestSuite/src/StringKeys/StringKeyEx.cpp
@@ -17,10 +17,10 @@
 // ===========================================================================
 // GaudiKernel
 // ===========================================================================
-#include "GaudiKernel/HashMap.h"
-#include "GaudiKernel/Map.h"
-#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/StringKey.h"
+#include <GaudiKernel/HashMap.h>
+#include <GaudiKernel/Map.h>
+#include <GaudiKernel/StatusCode.h>
+#include <GaudiKernel/StringKey.h>
 // ===========================================================================
 #include <Gaudi/TestSuite/TestAlg.h>
 // ===========================================================================
diff --git a/GaudiTestSuite/src/SvcInitLoop/LoopAlg.cpp b/GaudiTestSuite/src/SvcInitLoop/LoopAlg.cpp
index e5e406201c..efa4b7d58d 100644
--- a/GaudiTestSuite/src/SvcInitLoop/LoopAlg.cpp
+++ b/GaudiTestSuite/src/SvcInitLoop/LoopAlg.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 // Include files
 #include "LoopAlg.h"
 
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/MsgStream.h>
 
 DECLARE_COMPONENT( LoopAlg )
 
diff --git a/GaudiTestSuite/src/SvcInitLoop/LoopAlg.h b/GaudiTestSuite/src/SvcInitLoop/LoopAlg.h
index 07d2c0a048..2c27a0fe6b 100644
--- a/GaudiTestSuite/src/SvcInitLoop/LoopAlg.h
+++ b/GaudiTestSuite/src/SvcInitLoop/LoopAlg.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define LOOPALG_H 1
 
 // Include files
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 class LoopAlg : public Algorithm {
 public:
   // Constructor of this form must be provided
diff --git a/GaudiTestSuite/src/SvcInitLoop/ServiceA.h b/GaudiTestSuite/src/SvcInitLoop/ServiceA.h
index a40c22a039..6ef20c4339 100644
--- a/GaudiTestSuite/src/SvcInitLoop/ServiceA.h
+++ b/GaudiTestSuite/src/SvcInitLoop/ServiceA.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef SERVICEA_H
 #define SERVICEA_H 1
 
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/Service.h>
 
 struct ServiceA : Service {
   using Service::Service;
diff --git a/GaudiTestSuite/src/SvcInitLoop/ServiceB.h b/GaudiTestSuite/src/SvcInitLoop/ServiceB.h
index 5e1667bafa..9937094b2a 100644
--- a/GaudiTestSuite/src/SvcInitLoop/ServiceB.h
+++ b/GaudiTestSuite/src/SvcInitLoop/ServiceB.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef SERVICEB_H
 #define SERVICEB_H 1
 
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/Service.h>
 
 struct ServiceB : Service {
   using Service::Service;
diff --git a/GaudiTestSuite/src/THist/THistRead.cpp b/GaudiTestSuite/src/THist/THistRead.cpp
index 3f862f0ddb..768f5377ed 100644
--- a/GaudiTestSuite/src/THist/THistRead.cpp
+++ b/GaudiTestSuite/src/THist/THistRead.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,19 +11,19 @@
 // Include files
 #include "THistRead.h"
 
-#include "GaudiKernel/ITHistSvc.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/RndmGenerators.h"
+#include <GaudiKernel/ITHistSvc.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/RndmGenerators.h>
 #include <math.h>
 
-#include "TDirectory.h"
-#include "TError.h"
-#include "TFile.h"
-#include "TH1F.h"
-#include "TH2F.h"
-#include "TH3F.h"
-#include "TKey.h"
-#include "TTree.h"
+#include <TDirectory.h>
+#include <TError.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <TH3F.h>
+#include <TKey.h>
+#include <TTree.h>
 
 DECLARE_COMPONENT( THistRead )
 
diff --git a/GaudiTestSuite/src/THist/THistRead.h b/GaudiTestSuite/src/THist/THistRead.h
index 87e4c1ac29..528d82e55f 100644
--- a/GaudiTestSuite/src/THist/THistRead.h
+++ b/GaudiTestSuite/src/THist/THistRead.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define THIST_THISTREAD_H 1
 
 // Include files
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 
 class TH1F;
 class ITHistSvc;
diff --git a/GaudiTestSuite/src/THist/THistWrite.cpp b/GaudiTestSuite/src/THist/THistWrite.cpp
index aebdf026f2..01d07deb8f 100644
--- a/GaudiTestSuite/src/THist/THistWrite.cpp
+++ b/GaudiTestSuite/src/THist/THistWrite.cpp
@@ -11,20 +11,20 @@
 // Include files
 #include "THistWrite.h"
 
-#include "GaudiKernel/ITHistSvc.h"
-#include "GaudiKernel/LockedHandle.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/RndmGenerators.h"
+#include <GaudiKernel/ITHistSvc.h>
+#include <GaudiKernel/LockedHandle.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/RndmGenerators.h>
 #include <math.h>
 
-#include "TDirectory.h"
-#include "TError.h"
-#include "TH1F.h"
-#include "TH2F.h"
-#include "TH3F.h"
-#include "TKey.h"
-#include "TProfile.h"
-#include "TTree.h"
+#include <TDirectory.h>
+#include <TError.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <TH3F.h>
+#include <TKey.h>
+#include <TProfile.h>
+#include <TTree.h>
 
 DECLARE_COMPONENT( THistWrite )
 
diff --git a/GaudiTestSuite/src/THist/THistWrite.h b/GaudiTestSuite/src/THist/THistWrite.h
index 92c2f756dc..570ade88e7 100644
--- a/GaudiTestSuite/src/THist/THistWrite.h
+++ b/GaudiTestSuite/src/THist/THistWrite.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define THIST_THISTWRITE_H 1
 
 // Include files
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 
 class TH1F;
 class ITHistSvc;
diff --git a/GaudiTestSuite/src/ToolHandles/FloatTool.h b/GaudiTestSuite/src/ToolHandles/FloatTool.h
index 0e01a56f38..3d34a72fb4 100644
--- a/GaudiTestSuite/src/ToolHandles/FloatTool.h
+++ b/GaudiTestSuite/src/ToolHandles/FloatTool.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,8 +10,8 @@
 \***********************************************************************************/
 #pragma once
 
-#include "GaudiKernel/AlgTool.h"
-#include "GaudiKernel/DataObjectHandle.h"
+#include <GaudiKernel/AlgTool.h>
+#include <GaudiKernel/DataObjectHandle.h>
 
 namespace Gaudi {
   namespace TestSuite {
diff --git a/GaudiTestSuite/src/ToolVisitorTest/GaudiEnv.h b/GaudiTestSuite/src/ToolVisitorTest/GaudiEnv.h
index 0ef7b1ddd2..7b378f9b64 100644
--- a/GaudiTestSuite/src/ToolVisitorTest/GaudiEnv.h
+++ b/GaudiTestSuite/src/ToolVisitorTest/GaudiEnv.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,13 +9,13 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 #pragma once
-#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/IAppMgrUI.h"
-#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/ISvcManager.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/Bootstrap.h>
+#include <GaudiKernel/IAppMgrUI.h>
+#include <GaudiKernel/IProperty.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/ISvcManager.h>
+#include <GaudiKernel/IToolSvc.h>
+#include <GaudiKernel/SmartIF.h>
 #include <sstream>
 #include <stdexcept>
 namespace GaudiTesting {
diff --git a/GaudiTestSuite/src/ToolVisitorTest/ITestTool.h b/GaudiTestSuite/src/ToolVisitorTest/ITestTool.h
index 2304ec8496..fbc62a7f34 100644
--- a/GaudiTestSuite/src/ToolVisitorTest/ITestTool.h
+++ b/GaudiTestSuite/src/ToolVisitorTest/ITestTool.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,7 +10,7 @@
 \***********************************************************************************/
 #ifndef GAUDITESTING_ITESTTOOL
 #define GAUDITESTING_ITESTTOOL 1
-#include "GaudiKernel/IAlgTool.h"
+#include <GaudiKernel/IAlgTool.h>
 
 namespace GaudiTesting {
   class ITestTool : virtual public IAlgTool {
diff --git a/GaudiTestSuite/src/ToolVisitorTest/ToolVisitorTestLib.cpp b/GaudiTestSuite/src/ToolVisitorTest/ToolVisitorTestLib.cpp
index d382904268..5a3992d3f1 100644
--- a/GaudiTestSuite/src/ToolVisitorTest/ToolVisitorTestLib.cpp
+++ b/GaudiTestSuite/src/ToolVisitorTest/ToolVisitorTestLib.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,11 +9,11 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 #include "GaudiEnv.h"
-#include "GaudiKernel/AlgTool.h"
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/RenounceToolInputsVisitor.h"
-#include "GaudiKernel/ToolVisitor.h"
 #include "ITestTool.h"
+#include <GaudiKernel/AlgTool.h>
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiKernel/RenounceToolInputsVisitor.h>
+#include <GaudiKernel/ToolVisitor.h>
 #include <deque>
 #include <sstream>
 
diff --git a/GaudiTestSuite/src/ToolVisitorTest/ToolVisitorTest_test.cpp b/GaudiTestSuite/src/ToolVisitorTest/ToolVisitorTest_test.cpp
index 76a55ed832..b42b7810f8 100644
--- a/GaudiTestSuite/src/ToolVisitorTest/ToolVisitorTest_test.cpp
+++ b/GaudiTestSuite/src/ToolVisitorTest/ToolVisitorTest_test.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,11 +8,11 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "Gaudi/Algorithm.h"
 #include "GaudiEnv.h"
-#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/IAlgorithm.h"
+#include <Gaudi/Algorithm.h>
 #include <Gaudi/PluginService.h>
+#include <GaudiKernel/Bootstrap.h>
+#include <GaudiKernel/IAlgorithm.h>
 
 #include <regex>
 #include <typeinfo>
diff --git a/GaudiTestSuite/src/bug_34121/bug34121_MyAlgorithm.cpp b/GaudiTestSuite/src/bug_34121/bug34121_MyAlgorithm.cpp
index 485801dfed..823e4ab92e 100644
--- a/GaudiTestSuite/src/bug_34121/bug34121_MyAlgorithm.cpp
+++ b/GaudiTestSuite/src/bug_34121/bug34121_MyAlgorithm.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,11 +9,11 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Include files
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/Algorithm.h>
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IToolSvc.h>
+#include <GaudiKernel/MsgStream.h>
 
 #include "../AlgTools/IMyTool.h"
 
diff --git a/GaudiTestSuite/src/bug_34121/bug34121_Tool.cpp b/GaudiTestSuite/src/bug_34121/bug34121_Tool.cpp
index 82d7884ef0..80006e0a04 100644
--- a/GaudiTestSuite/src/bug_34121/bug34121_Tool.cpp
+++ b/GaudiTestSuite/src/bug_34121/bug34121_Tool.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,14 +9,14 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Framework include files
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/MsgStream.h>
 
 #include "../AlgTools/IMyTool.h"
-#include "GaudiKernel/AlgTool.h"
+#include <GaudiKernel/AlgTool.h>
 
 // Accessing data:
-#include "GaudiKernel/PhysicalConstants.h"
+#include <GaudiKernel/PhysicalConstants.h>
 
 namespace bug_34121 { // see https://its.cern.ch/jira/browse/GAUDI-200
 
diff --git a/GaudiTestSuite/src/testing/GAUDI-1185.cpp b/GaudiTestSuite/src/testing/GAUDI-1185.cpp
index f160929b65..f697415bc2 100644
--- a/GaudiTestSuite/src/testing/GAUDI-1185.cpp
+++ b/GaudiTestSuite/src/testing/GAUDI-1185.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/Algorithm.h"
+#include <GaudiKernel/Algorithm.h>
 
 namespace GaudiTesting {
   namespace JIRA {
diff --git a/GaudiTestSuite/src/testing/TestAppMgrStateMachine.cpp b/GaudiTestSuite/src/testing/TestAppMgrStateMachine.cpp
index 9baeb16759..7e8403c7df 100644
--- a/GaudiTestSuite/src/testing/TestAppMgrStateMachine.cpp
+++ b/GaudiTestSuite/src/testing/TestAppMgrStateMachine.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,11 +10,11 @@
 \***********************************************************************************/
 // Executable to check some state transitions of the ApplicationMgr
 
-#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/IAppMgrUI.h"
-#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/SmartIF.h"
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/Bootstrap.h>
+#include <GaudiKernel/IAppMgrUI.h>
+#include <GaudiKernel/IProperty.h>
+#include <GaudiKernel/SmartIF.h>
+#include <GaudiKernel/StatusCode.h>
 #include <iostream>
 
 #define CHECK( SC )                                                                                                    \
diff --git a/GaudiTestSuite/src/testing/TestingSvcs.cpp b/GaudiTestSuite/src/testing/TestingSvcs.cpp
index 55f51d7cd6..e1755eb6e4 100644
--- a/GaudiTestSuite/src/testing/TestingSvcs.cpp
+++ b/GaudiTestSuite/src/testing/TestingSvcs.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,7 +8,7 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/Service.h>
 
 namespace GaudiTesting {
 
diff --git a/GaudiUtils/include/GaudiUtils/Aida2ROOT.h b/GaudiUtils/include/GaudiUtils/Aida2ROOT.h
index a22ebfcbdb..3a797161f0 100644
--- a/GaudiUtils/include/GaudiUtils/Aida2ROOT.h
+++ b/GaudiUtils/include/GaudiUtils/Aida2ROOT.h
@@ -12,7 +12,7 @@
 // ============================================================================
 // Include files
 // ============================================================================
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 // ============================================================================
 // Forward declarations
 // ============================================================================
diff --git a/GaudiUtils/include/GaudiUtils/Histo2String.h b/GaudiUtils/include/GaudiUtils/Histo2String.h
index 5d3560bd56..46532ca5ce 100644
--- a/GaudiUtils/include/GaudiUtils/Histo2String.h
+++ b/GaudiUtils/include/GaudiUtils/Histo2String.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,7 +20,7 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/StatusCode.h>
 // ============================================================================
 // forward declarations
 // ============================================================================
diff --git a/GaudiUtils/include/GaudiUtils/HistoDump.h b/GaudiUtils/include/GaudiUtils/HistoDump.h
index bdf82b2d16..9c869f533f 100644
--- a/GaudiUtils/include/GaudiUtils/HistoDump.h
+++ b/GaudiUtils/include/GaudiUtils/HistoDump.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,7 +10,7 @@
 \***********************************************************************************/
 #pragma once
 
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 
 #include <string>
 
diff --git a/GaudiUtils/include/GaudiUtils/HistoLabels.h b/GaudiUtils/include/GaudiUtils/HistoLabels.h
index 337fb5fd69..a29fd0d0e7 100644
--- a/GaudiUtils/include/GaudiUtils/HistoLabels.h
+++ b/GaudiUtils/include/GaudiUtils/HistoLabels.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,7 +15,7 @@
 #include <utility>
 #include <vector>
 
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 
 namespace AIDA {
   class IHistogram1D;
diff --git a/GaudiUtils/include/GaudiUtils/HistoParsers.h b/GaudiUtils/include/GaudiUtils/HistoParsers.h
index 4c75bfd2fa..561b1a403a 100644
--- a/GaudiUtils/include/GaudiUtils/HistoParsers.h
+++ b/GaudiUtils/include/GaudiUtils/HistoParsers.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,7 +15,7 @@
 // =============================================================================
 // GaudiKernel
 // =============================================================================
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/StatusCode.h>
 // =============================================================================
 // forward declarations
 // =============================================================================
diff --git a/GaudiUtils/include/GaudiUtils/HistoStats.h b/GaudiUtils/include/GaudiUtils/HistoStats.h
index 7458a6931e..b6a6fab59b 100644
--- a/GaudiUtils/include/GaudiUtils/HistoStats.h
+++ b/GaudiUtils/include/GaudiUtils/HistoStats.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -19,7 +19,7 @@
 // ============================================================================
 // Gaudi
 // ============================================================================
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 // ============================================================================
 // forward declarations
 // ============================================================================
diff --git a/GaudiUtils/include/GaudiUtils/HistoStrings.h b/GaudiUtils/include/GaudiUtils/HistoStrings.h
index caf3147be7..18331b6bca 100644
--- a/GaudiUtils/include/GaudiUtils/HistoStrings.h
+++ b/GaudiUtils/include/GaudiUtils/HistoStrings.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,7 +20,7 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/StatusCode.h>
 // ============================================================================
 // forward declarations
 // ============================================================================
diff --git a/GaudiUtils/include/GaudiUtils/HistoTableFormat.h b/GaudiUtils/include/GaudiUtils/HistoTableFormat.h
index 0233cfc0d1..2ac43fafba 100644
--- a/GaudiUtils/include/GaudiUtils/HistoTableFormat.h
+++ b/GaudiUtils/include/GaudiUtils/HistoTableFormat.h
@@ -13,7 +13,7 @@
 // ============================================================================
 // Include files
 // ============================================================================
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 #include <string>
 // ============================================================================
 // forward declarations
diff --git a/GaudiUtils/include/GaudiUtils/HistoXML.h b/GaudiUtils/include/GaudiUtils/HistoXML.h
index f7c8a6b19e..9aec278f7a 100644
--- a/GaudiUtils/include/GaudiUtils/HistoXML.h
+++ b/GaudiUtils/include/GaudiUtils/HistoXML.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,7 +20,7 @@
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/StatusCode.h>
 // ============================================================================
 // Forward declarations
 // ============================================================================
diff --git a/GaudiUtils/include/GaudiUtils/IFileCatalog.h b/GaudiUtils/include/GaudiUtils/IFileCatalog.h
index 0cd6238c62..e883529fb3 100644
--- a/GaudiUtils/include/GaudiUtils/IFileCatalog.h
+++ b/GaudiUtils/include/GaudiUtils/IFileCatalog.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,8 +11,8 @@
 #ifndef GAUDIFILECATALOG_IFILECATALOG_H
 #define GAUDIFILECATALOG_IFILECATALOG_H
 
-#include "GaudiKernel/IInterface.h"
 #include <Gaudi/PluginService.h>
+#include <GaudiKernel/IInterface.h>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/GaudiUtils/include/GaudiUtils/IFileCatalogMgr.h b/GaudiUtils/include/GaudiUtils/IFileCatalogMgr.h
index c3043911e1..b187420e17 100644
--- a/GaudiUtils/include/GaudiUtils/IFileCatalogMgr.h
+++ b/GaudiUtils/include/GaudiUtils/IFileCatalogMgr.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef GAUDIFILECATALOG_IFILECATALOGMGR_H
 #define GAUDIFILECATALOG_IFILECATALOGMGR_H
 
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 #include <string>
 #include <vector>
 
diff --git a/GaudiUtils/include/GaudiUtils/IIODataManager.h b/GaudiUtils/include/GaudiUtils/IIODataManager.h
index ec907a4a89..3d2db3cb29 100644
--- a/GaudiUtils/include/GaudiUtils/IIODataManager.h
+++ b/GaudiUtils/include/GaudiUtils/IIODataManager.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define GAUDIUTILS_IIODATAMANAGER_H
 
 // Framework include files
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 
 // C++ include files
 #include <string>
diff --git a/GaudiUtils/include/GaudiUtils/ISignalMonitor.h b/GaudiUtils/include/GaudiUtils/ISignalMonitor.h
index e73cea713c..95dd8283ca 100644
--- a/GaudiUtils/include/GaudiUtils/ISignalMonitor.h
+++ b/GaudiUtils/include/GaudiUtils/ISignalMonitor.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef GAUDIUTILS_ISIGNALMONITOR_H
 #define GAUDIUTILS_ISIGNALMONITOR_H
 
-#include "GaudiKernel/IInterface.h"
+#include <GaudiKernel/IInterface.h>
 
 namespace Gaudi {
 
diff --git a/GaudiUtils/src/Lib/Aida2ROOT.cpp b/GaudiUtils/src/Lib/Aida2ROOT.cpp
index 37d330f8db..0d076c4353 100644
--- a/GaudiUtils/src/Lib/Aida2ROOT.cpp
+++ b/GaudiUtils/src/Lib/Aida2ROOT.cpp
@@ -26,25 +26,25 @@
 // ============================================================================
 // AIDA
 // ============================================================================
-#include "AIDA/IHistogram1D.h"
-#include "AIDA/IHistogram2D.h"
-#include "AIDA/IHistogram3D.h"
-#include "AIDA/IProfile1D.h"
-#include "AIDA/IProfile2D.h"
+#include <AIDA/IHistogram1D.h>
+#include <AIDA/IHistogram2D.h>
+#include <AIDA/IHistogram3D.h>
+#include <AIDA/IProfile1D.h>
+#include <AIDA/IProfile2D.h>
 // ============================================================================
 // ROOT
 // ============================================================================
-#include "TH1D.h"
-#include "TH2D.h"
-#include "TH3D.h"
-#include "TProfile.h"
-#include "TProfile2D.h"
+#include <TH1D.h>
+#include <TH2D.h>
+#include <TH3D.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/HistogramBase.h"
+#include <GaudiKernel/HistogramBase.h>
 // ============================================================================
-#include "GaudiUtils/Aida2ROOT.h"
+#include <GaudiUtils/Aida2ROOT.h>
 // ============================================================================
 /** @file
  *  Implementation file for class Gaudi::Utils::Aida2ROOT
diff --git a/GaudiUtils/src/Lib/Histo2String.cpp b/GaudiUtils/src/Lib/Histo2String.cpp
index 8e8af0d393..9e8a60f249 100644
--- a/GaudiUtils/src/Lib/Histo2String.cpp
+++ b/GaudiUtils/src/Lib/Histo2String.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -13,28 +13,28 @@
 // ============================================================================
 // ROOT
 // ============================================================================
-#include "TH1D.h"
-#include "TH1F.h"
-#include "TH2D.h"
-#include "TH2F.h"
-#include "TH3D.h"
-#include "TH3F.h"
+#include <TH1D.h>
+#include <TH1F.h>
+#include <TH2D.h>
+#include <TH2F.h>
+#include <TH3D.h>
+#include <TH3F.h>
 // ============================================================================
 // AIDA
 // ============================================================================
-#include "AIDA/IHistogram1D.h"
-#include "AIDA/IHistogram2D.h"
-#include "AIDA/IHistogram3D.h"
+#include <AIDA/IHistogram1D.h>
+#include <AIDA/IHistogram2D.h>
+#include <AIDA/IHistogram3D.h>
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/ToStream.h"
+#include <GaudiKernel/ToStream.h>
 // ============================================================================
 // local
 // ============================================================================
-#include "GaudiUtils/Aida2ROOT.h"
-#include "GaudiUtils/Histo2String.h"
-#include "GaudiUtils/HistoXML.h"
+#include <GaudiUtils/Aida2ROOT.h>
+#include <GaudiUtils/Histo2String.h>
+#include <GaudiUtils/HistoXML.h>
 // ============================================================================
 /** @file
  *  Implementation file for utilities Histo -> string
diff --git a/GaudiUtils/src/Lib/HistoDump.cpp b/GaudiUtils/src/Lib/HistoDump.cpp
index 2cee6ebd72..a9e8ab7ecc 100644
--- a/GaudiUtils/src/Lib/HistoDump.cpp
+++ b/GaudiUtils/src/Lib/HistoDump.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,17 +20,17 @@
 #  pragma warning( disable : 4996 )
 #endif
 
-#include "GaudiUtils/HistoDump.h"
-#include "AIDA/IAnnotation.h"
-#include "AIDA/IAxis.h"
-#include "AIDA/IHistogram1D.h"
-#include "AIDA/IProfile1D.h"
-#include "GaudiKernel/StatusCode.h"
-#include "GaudiUtils/HistoStats.h"
-#include "GaudiUtils/HistoTableFormat.h"
-#include "TAxis.h"
-#include "TH1.h"
-#include "TProfile.h"
+#include <AIDA/IAnnotation.h>
+#include <AIDA/IAxis.h>
+#include <AIDA/IHistogram1D.h>
+#include <AIDA/IProfile1D.h>
+#include <GaudiKernel/StatusCode.h>
+#include <GaudiUtils/HistoDump.h>
+#include <GaudiUtils/HistoStats.h>
+#include <GaudiUtils/HistoTableFormat.h>
+#include <TAxis.h>
+#include <TH1.h>
+#include <TProfile.h>
 #include <cmath>
 #include <fmt/format.h>
 #include <iostream>
diff --git a/GaudiUtils/src/Lib/HistoLabels.cpp b/GaudiUtils/src/Lib/HistoLabels.cpp
index 0383c72314..569aacf757 100644
--- a/GaudiUtils/src/Lib/HistoLabels.cpp
+++ b/GaudiUtils/src/Lib/HistoLabels.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -21,16 +21,16 @@
 #endif
 
 // local
-#include "GaudiUtils/HistoLabels.h"
-#include "GaudiUtils/Aida2ROOT.h"
+#include <GaudiUtils/Aida2ROOT.h>
+#include <GaudiUtils/HistoLabels.h>
 
 // ============================================================================
 // ROOT
 // ============================================================================
-#include "TH1D.h"
-#include "TH2D.h"
-#include "TProfile.h"
-#include "TProfile2D.h"
+#include <TH1D.h>
+#include <TH2D.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
 
 // Private namespace
 namespace {
diff --git a/GaudiUtils/src/Lib/HistoParsers.cpp b/GaudiUtils/src/Lib/HistoParsers.cpp
index f6134e2e7e..6a5faea759 100644
--- a/GaudiUtils/src/Lib/HistoParsers.cpp
+++ b/GaudiUtils/src/Lib/HistoParsers.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -18,18 +18,18 @@
 // =============================================================================
 // AIDA
 // ============================================================================
-#include "AIDA/IHistogram1D.h"
-#include "AIDA/IHistogram2D.h"
-#include "AIDA/IHistogram3D.h"
+#include <AIDA/IHistogram1D.h>
+#include <AIDA/IHistogram2D.h>
+#include <AIDA/IHistogram3D.h>
 // ============================================================================
 // ROOT
 // ============================================================================
-#include "TAxis.h"
-#include "TH1D.h"
-#include "TH1F.h"
-#include "TH2D.h"
-#include "TH2F.h"
-#include "TH3D.h"
+#include <TAxis.h>
+#include <TH1D.h>
+#include <TH1F.h>
+#include <TH2D.h>
+#include <TH2F.h>
+#include <TH3D.h>
 // ============================================================================
 // GaudiKernel
 // ============================================================================
@@ -37,9 +37,9 @@
 // ============================================================================
 // local
 // ============================================================================
-#include "GaudiUtils/Aida2ROOT.h"
-#include "GaudiUtils/HistoParsers.h"
-#include "GaudiUtils/HistoXML.h"
+#include <GaudiUtils/Aida2ROOT.h>
+#include <GaudiUtils/HistoParsers.h>
+#include <GaudiUtils/HistoXML.h>
 // ============================================================================
 // Local
 // ============================================================================
diff --git a/GaudiUtils/src/Lib/HistoStats.cpp b/GaudiUtils/src/Lib/HistoStats.cpp
index c88e6cd45a..aa3be98e13 100644
--- a/GaudiUtils/src/Lib/HistoStats.cpp
+++ b/GaudiUtils/src/Lib/HistoStats.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -17,13 +17,13 @@
 // ============================================================================
 // AIDA
 // ============================================================================
-#include "AIDA/IAxis.h"
-#include "AIDA/IHistogram1D.h"
-#include "AIDA/IProfile1D.h"
+#include <AIDA/IAxis.h>
+#include <AIDA/IHistogram1D.h>
+#include <AIDA/IProfile1D.h>
 // ============================================================================
 // GaudiUtils
 // ============================================================================
-#include "GaudiUtils/HistoStats.h"
+#include <GaudiUtils/HistoStats.h>
 // ============================================================================
 /** @file
  *  Implementation file for class Gaudi::Utils::HistoStats
diff --git a/GaudiUtils/src/Lib/HistoStrings.cpp b/GaudiUtils/src/Lib/HistoStrings.cpp
index 459a5917f8..92f86899ce 100644
--- a/GaudiUtils/src/Lib/HistoStrings.cpp
+++ b/GaudiUtils/src/Lib/HistoStrings.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -17,10 +17,10 @@
 // ============================================================================
 // local
 // ============================================================================
-#include "GaudiUtils/Histo2String.h"
-#include "GaudiUtils/HistoParsers.h"
-#include "GaudiUtils/HistoStrings.h"
-#include "GaudiUtils/HistoXML.h"
+#include <GaudiUtils/Histo2String.h>
+#include <GaudiUtils/HistoParsers.h>
+#include <GaudiUtils/HistoStrings.h>
+#include <GaudiUtils/HistoXML.h>
 // ============================================================================
 /** @file
  *  Implementation file for utilities Histo -> string
diff --git a/GaudiUtils/src/Lib/HistoTableFormat.cpp b/GaudiUtils/src/Lib/HistoTableFormat.cpp
index b92f6bf7d7..d6c19bc422 100644
--- a/GaudiUtils/src/Lib/HistoTableFormat.cpp
+++ b/GaudiUtils/src/Lib/HistoTableFormat.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -19,24 +19,24 @@
 // ============================================================================
 // AIDA
 // ============================================================================
-#include "AIDA/IAxis.h"
-#include "AIDA/IHistogram1D.h"
-#include "AIDA/IProfile1D.h"
+#include <AIDA/IAxis.h>
+#include <AIDA/IHistogram1D.h>
+#include <AIDA/IProfile1D.h>
 // ============================================================================
 // GaudiKernel
 // ============================================================================
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IRegistry.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IRegistry.h>
 // ============================================================================
 // Local
 // ============================================================================
-#include "GaudiUtils/HistoStats.h"
-#include "GaudiUtils/HistoTableFormat.h"
+#include <GaudiUtils/HistoStats.h>
+#include <GaudiUtils/HistoTableFormat.h>
 // ============================================================================
 // Boost
 // ============================================================================
-#include "boost/algorithm/string/erase.hpp"
-#include "boost/format.hpp"
+#include <boost/algorithm/string/erase.hpp>
+#include <boost/format.hpp>
 // ============================================================================
 /** @file
  *  Implementation file for class Gaudi::Utils::HistoTableFormat
diff --git a/GaudiUtils/src/Lib/HistoXML.cpp b/GaudiUtils/src/Lib/HistoXML.cpp
index c2cd863eb1..3d989969a2 100644
--- a/GaudiUtils/src/Lib/HistoXML.cpp
+++ b/GaudiUtils/src/Lib/HistoXML.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -17,29 +17,29 @@
 // ============================================================================
 // ROOT
 // ============================================================================
-#include "TBufferXML.h"
-#include "TH1.h"
-#include "TH1D.h"
-#include "TH1F.h"
-#include "TH2D.h"
-#include "TH2F.h"
-#include "TH3D.h"
-#include "TH3F.h"
-#include "TProfile.h"
-#include "TProfile2D.h"
+#include <TBufferXML.h>
+#include <TH1.h>
+#include <TH1D.h>
+#include <TH1F.h>
+#include <TH2D.h>
+#include <TH2F.h>
+#include <TH3D.h>
+#include <TH3F.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
 // ============================================================================
 // AIDA
 // ============================================================================
-#include "AIDA/IHistogram1D.h"
-#include "AIDA/IHistogram2D.h"
-#include "AIDA/IHistogram3D.h"
-#include "AIDA/IProfile1D.h"
-#include "AIDA/IProfile2D.h"
+#include <AIDA/IHistogram1D.h>
+#include <AIDA/IHistogram2D.h>
+#include <AIDA/IHistogram3D.h>
+#include <AIDA/IProfile1D.h>
+#include <AIDA/IProfile2D.h>
 // ============================================================================
 // local
 // ============================================================================
-#include "GaudiUtils/Aida2ROOT.h"
-#include "GaudiUtils/HistoXML.h"
+#include <GaudiUtils/Aida2ROOT.h>
+#include <GaudiUtils/HistoXML.h>
 // ============================================================================
 /** @file
  *  Implementation file for histogram --> XML conversion functions
diff --git a/GaudiUtils/src/Lib/QuasiRandom.cpp b/GaudiUtils/src/Lib/QuasiRandom.cpp
index 09a82661e1..ebceb328ae 100644
--- a/GaudiUtils/src/Lib/QuasiRandom.cpp
+++ b/GaudiUtils/src/Lib/QuasiRandom.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #include <string>
 
 // local
-#include "GaudiUtils/QuasiRandom.h"
+#include <GaudiUtils/QuasiRandom.h>
 
 namespace Gaudi {
   namespace Utils {
diff --git a/GaudiUtils/src/component/FileReadTool.cpp b/GaudiUtils/src/component/FileReadTool.cpp
index 573d6d1286..636f6433f4 100644
--- a/GaudiUtils/src/component/FileReadTool.cpp
+++ b/GaudiUtils/src/component/FileReadTool.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,8 +8,8 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/AlgTool.h"
-#include "GaudiKernel/IFileAccess.h"
+#include <GaudiKernel/AlgTool.h>
+#include <GaudiKernel/IFileAccess.h>
 #include <fstream>
 
 /** @class FileReadTool FileReadTool.h
diff --git a/GaudiUtils/src/component/IODataManager.cpp b/GaudiUtils/src/component/IODataManager.cpp
index 11382c9889..fb3210f217 100644
--- a/GaudiUtils/src/component/IODataManager.cpp
+++ b/GaudiUtils/src/component/IODataManager.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,14 +10,14 @@
 \***********************************************************************************/
 // Framework include files
 #include "IODataManager.h"
-#include "GaudiKernel/AppReturnCode.h"
-#include "GaudiKernel/Debugger.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/Incident.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/SmartIF.h"
-#include "GaudiKernel/strcasecmp.h"
-#include "GaudiUtils/IFileCatalog.h"
+#include <GaudiKernel/AppReturnCode.h>
+#include <GaudiKernel/Debugger.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/Incident.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/SmartIF.h>
+#include <GaudiKernel/strcasecmp.h>
+#include <GaudiUtils/IFileCatalog.h>
 
 #include <set>
 
diff --git a/GaudiUtils/src/component/IODataManager.h b/GaudiUtils/src/component/IODataManager.h
index 4cdf80cf9e..c7f38a4976 100644
--- a/GaudiUtils/src/component/IODataManager.h
+++ b/GaudiUtils/src/component/IODataManager.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -14,8 +14,8 @@
 // C++ include files
 #include <map>
 // Framework include files
-#include "GaudiKernel/Service.h"
-#include "GaudiUtils/IIODataManager.h"
+#include <GaudiKernel/Service.h>
+#include <GaudiUtils/IIODataManager.h>
 
 class IIncidentSvc;
 
diff --git a/GaudiUtils/src/component/MultiFileCatalog.cpp b/GaudiUtils/src/component/MultiFileCatalog.cpp
index de06b5667a..c030f6c538 100644
--- a/GaudiUtils/src/component/MultiFileCatalog.cpp
+++ b/GaudiUtils/src/component/MultiFileCatalog.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,10 +9,10 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 #include "MultiFileCatalog.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/strcasecmp.h"
 #include "createGuidAsString.h"
 #include <Gaudi/PluginService.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/strcasecmp.h>
 #include <algorithm>
 #include <functional>
 #include <stdexcept>
diff --git a/GaudiUtils/src/component/MultiFileCatalog.h b/GaudiUtils/src/component/MultiFileCatalog.h
index b23e228d4c..04dfe193a7 100644
--- a/GaudiUtils/src/component/MultiFileCatalog.h
+++ b/GaudiUtils/src/component/MultiFileCatalog.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,9 +11,9 @@
 #ifndef GAUDIUTILS_MULTIFILECATALOG_H
 #define GAUDIUTILS_MULTIFILECATALOG_H
 
-#include "GaudiKernel/Service.h"
-#include "GaudiUtils/IFileCatalog.h"
-#include "GaudiUtils/IFileCatalogMgr.h"
+#include <GaudiKernel/Service.h>
+#include <GaudiUtils/IFileCatalog.h>
+#include <GaudiUtils/IFileCatalogMgr.h>
 
 /*
  *   Gaudi namespace declaration
diff --git a/GaudiUtils/src/component/SignalMonitorSvc.cpp b/GaudiUtils/src/component/SignalMonitorSvc.cpp
index abfcf7189e..c33afa7391 100644
--- a/GaudiUtils/src/component/SignalMonitorSvc.cpp
+++ b/GaudiUtils/src/component/SignalMonitorSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -14,8 +14,8 @@
  *  Created on: Apr 14, 2010
  *      Author: Marco Clemencic
  */
-#include "GaudiKernel/Service.h"
-#include "GaudiUtils/ISignalMonitor.h"
+#include <GaudiKernel/Service.h>
+#include <GaudiUtils/ISignalMonitor.h>
 
 #include <csignal>
 #include <cstring>
@@ -171,12 +171,12 @@ namespace Gaudi {
 
 #include <map>
 
-#include "GaudiKernel/HashMap.h"
+#include <GaudiKernel/HashMap.h>
 
-#include "GaudiKernel/AppReturnCode.h"
-#include "GaudiKernel/IEventProcessor.h"
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/IIncidentSvc.h"
+#include <GaudiKernel/AppReturnCode.h>
+#include <GaudiKernel/IEventProcessor.h>
+#include <GaudiKernel/IIncidentListener.h>
+#include <GaudiKernel/IIncidentSvc.h>
 
 namespace {
   // hack because windows doesn't provide sys_siglist
diff --git a/GaudiUtils/src/component/VFSSvc.cpp b/GaudiUtils/src/component/VFSSvc.cpp
index 85b29db6e7..b6d52794f6 100644
--- a/GaudiUtils/src/component/VFSSvc.cpp
+++ b/GaudiUtils/src/component/VFSSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,12 +8,12 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "GaudiKernel/HashMap.h"
-#include "GaudiKernel/IAlgTool.h"
-#include "GaudiKernel/IFileAccess.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/HashMap.h>
+#include <GaudiKernel/IAlgTool.h>
+#include <GaudiKernel/IFileAccess.h>
+#include <GaudiKernel/IToolSvc.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/Service.h>
 #include <list>
 
 /** @class VFSSvc VFSSvc.h
diff --git a/GaudiUtils/src/component/XMLFileCatalog.cpp b/GaudiUtils/src/component/XMLFileCatalog.cpp
index d2ef262eac..2dea528ba3 100644
--- a/GaudiUtils/src/component/XMLFileCatalog.cpp
+++ b/GaudiUtils/src/component/XMLFileCatalog.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,22 +8,22 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "xercesc/dom/DOM.hpp"
-#include "xercesc/framework/LocalFileFormatTarget.hpp"
-#include "xercesc/framework/MemBufInputSource.hpp"
-#include "xercesc/parsers/XercesDOMParser.hpp"
-#include "xercesc/sax/EntityResolver.hpp"
-#include "xercesc/sax/InputSource.hpp"
-#include "xercesc/sax/SAXParseException.hpp"
-#include "xercesc/util/PlatformUtils.hpp"
-#include "xercesc/util/XMLString.hpp"
-#include "xercesc/util/XMLURL.hpp"
-#include "xercesc/util/XMLUni.hpp"
-#include "xercesc/util/XercesDefs.hpp"
+#include <xercesc/dom/DOM.hpp>
+#include <xercesc/framework/LocalFileFormatTarget.hpp>
+#include <xercesc/framework/MemBufInputSource.hpp>
+#include <xercesc/parsers/XercesDOMParser.hpp>
+#include <xercesc/sax/EntityResolver.hpp>
+#include <xercesc/sax/InputSource.hpp>
+#include <xercesc/sax/SAXParseException.hpp>
+#include <xercesc/util/PlatformUtils.hpp>
+#include <xercesc/util/XMLString.hpp>
+#include <xercesc/util/XMLURL.hpp>
+#include <xercesc/util/XMLUni.hpp>
+#include <xercesc/util/XercesDefs.hpp>
 
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Service.h"
 #include <Gaudi/PluginService.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/Service.h>
 
 #include "XMLFileCatalog.h"
 #include "createGuidAsString.h"
diff --git a/GaudiUtils/src/component/XMLFileCatalog.h b/GaudiUtils/src/component/XMLFileCatalog.h
index a2ea4102a8..ccb20cb49c 100644
--- a/GaudiUtils/src/component/XMLFileCatalog.h
+++ b/GaudiUtils/src/component/XMLFileCatalog.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,11 +11,11 @@
 #ifndef GAUDIUTILS_XMLFILECATALOG_H
 #define GAUDIUTILS_XMLFILECATALOG_H
 
-#include "GaudiUtils/IFileCatalog.h"
-#include "xercesc/dom/DOMDocument.hpp"
-#include "xercesc/dom/DOMElement.hpp"
-#include "xercesc/parsers/XercesDOMParser.hpp"
-#include "xercesc/sax/ErrorHandler.hpp"
+#include <GaudiUtils/IFileCatalog.h>
+#include <xercesc/dom/DOMDocument.hpp>
+#include <xercesc/dom/DOMElement.hpp>
+#include <xercesc/parsers/XercesDOMParser.hpp>
+#include <xercesc/sax/ErrorHandler.hpp>
 
 #include <memory>
 
diff --git a/PartPropSvc/src/PartPropSvc.cpp b/PartPropSvc/src/PartPropSvc.cpp
index 9d32155726..c4f02aa759 100644
--- a/PartPropSvc/src/PartPropSvc.cpp
+++ b/PartPropSvc/src/PartPropSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,13 +9,13 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Include files
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/PathResolver.h"
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/PathResolver.h>
 
 #include "PartPropSvc.h"
 
-#include "HepPDT/HeavyIonUnknownID.hh"
+#include <HepPDT/HeavyIonUnknownID.hh>
 
 #include <fstream>
 
diff --git a/PartPropSvc/src/PartPropSvc.h b/PartPropSvc/src/PartPropSvc.h
index 9a270f935e..b450e21100 100644
--- a/PartPropSvc/src/PartPropSvc.h
+++ b/PartPropSvc/src/PartPropSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,10 +11,10 @@
 #ifndef __PARTPROPSVC_H__
 #define __PARTPROPSVC_H__
 
-#include "GaudiKernel/IPartPropSvc.h"
-#include "GaudiKernel/Service.h"
-#include "HepPDT/ParticleDataTable.hh"
-#include "HepPDT/TableBuilder.hh"
+#include <GaudiKernel/IPartPropSvc.h>
+#include <GaudiKernel/Service.h>
+#include <HepPDT/ParticleDataTable.hh>
+#include <HepPDT/TableBuilder.hh>
 
 #include <iostream>
 #include <optional>
diff --git a/RootCnv/components/Components.cpp b/RootCnv/components/Components.cpp
index 37d5367c8c..f06f88b6bf 100644
--- a/RootCnv/components/Components.cpp
+++ b/RootCnv/components/Components.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,9 +8,9 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "RootCnv/RootCnvSvc.h"
-#include "RootCnv/RootEvtSelector.h"
-#include "RootCnv/RootPerfMonSvc.h"
+#include <RootCnv/RootCnvSvc.h>
+#include <RootCnv/RootEvtSelector.h>
+#include <RootCnv/RootPerfMonSvc.h>
 
 DECLARE_COMPONENT( Gaudi::RootCnvSvc )
 DECLARE_COMPONENT( Gaudi::RootEvtSelector )
diff --git a/RootCnv/dict/RootCnv_dict.h b/RootCnv/dict/RootCnv_dict.h
index c99087ef9f..e256841b8e 100644
--- a/RootCnv/dict/RootCnv_dict.h
+++ b/RootCnv/dict/RootCnv_dict.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,10 +8,10 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "RootCnv/RootRefs.h"
+#include <RootCnv/RootRefs.h>
 
 #ifdef __POOL_COMPATIBILITY
-#  include "RootCnv/PoolClasses.h"
+#  include <RootCnv/PoolClasses.h>
 #  if 0
 //typedef Gaudi::RootNTupleDescriptor PoolDbNTupleDescriptor;
 class PoolDbNTupleDescriptor {
diff --git a/RootCnv/include/RootCnv/PoolClasses.h b/RootCnv/include/RootCnv/PoolClasses.h
index 9ad860a9df..0b5ce8803e 100644
--- a/RootCnv/include/RootCnv/PoolClasses.h
+++ b/RootCnv/include/RootCnv/PoolClasses.h
@@ -10,7 +10,7 @@
 \***********************************************************************************/
 
 // The following two classes are the interfaces to facilitate reading POOL formatted ROOT files:
-#include "GaudiKernel/Kernel.h" // GAUDI_API
+#include <GaudiKernel/Kernel.h> // GAUDI_API
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/RootCnv/include/RootCnv/RootAddress.h b/RootCnv/include/RootCnv/RootAddress.h
index fba1309856..b0cbffc7cd 100644
--- a/RootCnv/include/RootCnv/RootAddress.h
+++ b/RootCnv/include/RootCnv/RootAddress.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -18,8 +18,8 @@
 #define GAUDIROOTCNV_ROOTADDRESS_H
 
 // Framework include files
-#include "GaudiKernel/GenericAddress.h"
-#include "TTreeFormula.h"
+#include <GaudiKernel/GenericAddress.h>
+#include <TTreeFormula.h>
 
 // Forward declaration
 class TTree;
diff --git a/RootCnv/include/RootCnv/RootCnvSvc.h b/RootCnv/include/RootCnv/RootCnvSvc.h
index 93ee1e833d..67f32def28 100644
--- a/RootCnv/include/RootCnv/RootCnvSvc.h
+++ b/RootCnv/include/RootCnv/RootCnvSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -18,10 +18,10 @@
 #define GAUDIROOTCNV_GAUDIROOTCNVSVC_H
 
 // Framework include files
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/ConversionSvc.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiUtils/IIODataManager.h"
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/ConversionSvc.h>
+#include <GaudiKernel/DataObject.h>
+#include <GaudiUtils/IIODataManager.h>
 
 // C++ include files
 #include <set>
@@ -32,10 +32,10 @@ class IIncidentSvc;
 class TClass;
 
 // ROOT include files
-#include "TBranch.h"
-#include "TClass.h"
-#include "TROOT.h"
-#include "TTree.h"
+#include <TBranch.h>
+#include <TClass.h>
+#include <TROOT.h>
+#include <TTree.h>
 
 // #include "RootCnv/RootPerfMonSvc.h"
 
diff --git a/RootCnv/include/RootCnv/RootConverter.h b/RootCnv/include/RootCnv/RootConverter.h
index 85be01b829..9dd5a534d0 100644
--- a/RootCnv/include/RootCnv/RootConverter.h
+++ b/RootCnv/include/RootCnv/RootConverter.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -17,8 +17,8 @@
 #define GAUDIROOTCNV_ROOTCONVERTER_H
 
 // Framework include files
-#include "GaudiKernel/Converter.h"
-#include "RootCnv/RootCnvSvc.h"
+#include <GaudiKernel/Converter.h>
+#include <RootCnv/RootCnvSvc.h>
 
 /*
  * Gaudi namespace declaration
diff --git a/RootCnv/include/RootCnv/RootDataConnection.h b/RootCnv/include/RootCnv/RootDataConnection.h
index 420684a745..1c987c5c6a 100644
--- a/RootCnv/include/RootCnv/RootDataConnection.h
+++ b/RootCnv/include/RootCnv/RootDataConnection.h
@@ -11,20 +11,20 @@
 #pragma once
 
 // Framework include files
-#include "Gaudi/Property.h"
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/SmartIF.h"
-#include "GaudiUtils/IIODataManager.h"
+#include <Gaudi/Property.h>
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/SmartIF.h>
+#include <GaudiUtils/IIODataManager.h>
 #include <map>
 #include <set>
 #include <string>
 #include <string_view>
 #include <vector>
 
-#include "RootCnv/RootRefs.h"
-#include "TFile.h"
-#include "TTreePerfStats.h"
+#include <RootCnv/RootRefs.h>
+#include <TFile.h>
+#include <TTreePerfStats.h>
 
 // Forward declarations
 class TTree;
diff --git a/RootCnv/include/RootCnv/RootDatabaseCnv.h b/RootCnv/include/RootCnv/RootDatabaseCnv.h
index 086120e2e8..de38a81e72 100644
--- a/RootCnv/include/RootCnv/RootDatabaseCnv.h
+++ b/RootCnv/include/RootCnv/RootDatabaseCnv.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -18,7 +18,7 @@
 #define GAUDIROOTCNV_ROOTDATABASECNV_H 1
 
 // Framework include files
-#include "RootCnv/RootDirectoryCnv.h"
+#include <RootCnv/RootDirectoryCnv.h>
 
 /*
  *   Gaudi namespace declaration
diff --git a/RootCnv/include/RootCnv/RootDirectoryCnv.h b/RootCnv/include/RootCnv/RootDirectoryCnv.h
index 93fc0a5e87..51ccb6cfbf 100644
--- a/RootCnv/include/RootCnv/RootDirectoryCnv.h
+++ b/RootCnv/include/RootCnv/RootDirectoryCnv.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,7 +20,7 @@
 #define POOLDB_POOLDBDIRECTORYCNV_H 1
 
 // Include files
-#include "RootCnv/RootStatCnv.h"
+#include <RootCnv/RootStatCnv.h>
 
 /*
  *  Gaudi namespace declaration
diff --git a/RootCnv/include/RootCnv/RootEvtSelector.h b/RootCnv/include/RootCnv/RootEvtSelector.h
index c3a4d2cdd6..8991a2e9d3 100644
--- a/RootCnv/include/RootCnv/RootEvtSelector.h
+++ b/RootCnv/include/RootCnv/RootEvtSelector.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -27,8 +27,8 @@
 #define GAUDIROOTCNV_ROOTEVTSELECTOR_H 1
 
 // Framework include files
-#include "GaudiKernel/IEvtSelector.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/IEvtSelector.h>
+#include <GaudiKernel/Service.h>
 
 /*
  *  Gaudi namespace declaration
diff --git a/RootCnv/include/RootCnv/RootNTupleCnv.h b/RootCnv/include/RootCnv/RootNTupleCnv.h
index 0f5ce46424..f7ecada37c 100644
--- a/RootCnv/include/RootCnv/RootNTupleCnv.h
+++ b/RootCnv/include/RootCnv/RootNTupleCnv.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -19,8 +19,8 @@
 #define GAUDIROOTCNV_ROOTNTUPLECNV_H 1
 
 // Include files
-#include "RootCnv/RootAddress.h"
-#include "RootCnv/RootStatCnv.h"
+#include <RootCnv/RootAddress.h>
+#include <RootCnv/RootStatCnv.h>
 
 // Forward declarations
 class INTuple;
diff --git a/RootCnv/include/RootCnv/RootPerfMonSvc.h b/RootCnv/include/RootCnv/RootPerfMonSvc.h
index 2237bfa695..bb16d10b3a 100644
--- a/RootCnv/include/RootCnv/RootPerfMonSvc.h
+++ b/RootCnv/include/RootCnv/RootPerfMonSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -19,14 +19,14 @@
 
 #include <memory>
 // Framework include files
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/Service.h"
+#include <GaudiKernel/IIncidentListener.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/Service.h>
 
-#include "TFile.h"
-#include "TTree.h"
+#include <TFile.h>
+#include <TTree.h>
 
-#include "RootCnv/SysProcStat.h"
+#include <RootCnv/SysProcStat.h>
 
 // C/C++ include files
 #include <set>
diff --git a/RootCnv/include/RootCnv/RootRefs.h b/RootCnv/include/RootCnv/RootRefs.h
index 4be60c2f8b..de1a4157e6 100644
--- a/RootCnv/include/RootCnv/RootRefs.h
+++ b/RootCnv/include/RootCnv/RootRefs.h
@@ -19,7 +19,7 @@
 #define GAUDIROOTCNV_ROOTREFS_H
 
 // Framework include files
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 
 // C++ include files
 #include <string>
diff --git a/RootCnv/include/RootCnv/RootStatCnv.h b/RootCnv/include/RootCnv/RootStatCnv.h
index bc7074fe32..de8fb350c8 100644
--- a/RootCnv/include/RootCnv/RootStatCnv.h
+++ b/RootCnv/include/RootCnv/RootStatCnv.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -18,8 +18,8 @@
 #define ROOT_ROOTSTATCNV_H 1
 
 // Include files
-#include "GaudiKernel/MsgStream.h"
-#include "RootCnv/RootConverter.h"
+#include <GaudiKernel/MsgStream.h>
+#include <RootCnv/RootConverter.h>
 
 // Forward declarations
 struct IDataManagerSvc;
diff --git a/RootCnv/merge/extractEvt.C b/RootCnv/merge/extractEvt.C
index 5b083055af..92b6be8436 100644
--- a/RootCnv/merge/extractEvt.C
+++ b/RootCnv/merge/extractEvt.C
@@ -14,14 +14,14 @@
 //
 //====================================================================
 // ROOT include files
-#include "TBranch.h"
-#include "TClass.h"
-#include "TFile.h"
-#include "TInterpreter.h"
-#include "TROOT.h"
-#include "TSystem.h"
-#include "TTree.h"
-#include "TUUID.h"
+#include <TBranch.h>
+#include <TClass.h>
+#include <TFile.h>
+#include <TInterpreter.h>
+#include <TROOT.h>
+#include <TSystem.h>
+#include <TTree.h>
+#include <TUUID.h>
 
 // Standad C/C++ include files
 #include <memory>
diff --git a/RootCnv/merge/merge.C b/RootCnv/merge/merge.C
index 063edbb25c..fa8d036ba1 100644
--- a/RootCnv/merge/merge.C
+++ b/RootCnv/merge/merge.C
@@ -93,18 +93,18 @@ namespace Gaudi {
 #endif // GAUDIROOTCNV_ROOTDATABASEMERGER_H
 
 #ifndef GAUDIROOTCNV_ROOTDATABASEMERGER_H
-#  include "RootDatabaseMerger.h"
+#  include <RootDatabaseMerger.h>
 #endif // GAUDIROOTCNV_ROOTDATABASEMERGER_H
-#include "TBranch.h"
-#include "TFile.h"
-#include "TInterpreter.h"
-#include "TKey.h"
-#include "TLeaf.h"
-#include "TROOT.h"
-#include "TSystem.h"
-#include "TTree.h"
-#include "TTreeCloner.h"
-#include "TUUID.h"
+#include <TBranch.h>
+#include <TFile.h>
+#include <TInterpreter.h>
+#include <TKey.h>
+#include <TLeaf.h>
+#include <TROOT.h>
+#include <TSystem.h>
+#include <TTree.h>
+#include <TTreeCloner.h>
+#include <TUUID.h>
 #ifdef _WIN32
 #else
 #  include <libgen.h>
diff --git a/RootCnv/merge/merge.cpp b/RootCnv/merge/merge.cpp
index f3d9b7d3c5..e4b8c6c8cc 100644
--- a/RootCnv/merge/merge.cpp
+++ b/RootCnv/merge/merge.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,7 +9,7 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 #include "merge.C"
-#include "TError.h"
+#include <TError.h>
 #include <cstdlib>
 
 static int usage() {
diff --git a/RootCnv/src/PoolTool.h b/RootCnv/src/PoolTool.h
index c34ba72173..7cd8a11371 100644
--- a/RootCnv/src/PoolTool.h
+++ b/RootCnv/src/PoolTool.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -8,8 +8,8 @@
 * granted to it by virtue of its status as an Intergovernmental Organization        *
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
-#include "RootCnv/PoolClasses.h"
 #include <GaudiKernel/Incident.h>
+#include <RootCnv/PoolClasses.h>
 #include <algorithm>
 /*
  *  Gaudi namespace declaration
diff --git a/RootCnv/src/RootCnvSvc.cpp b/RootCnv/src/RootCnvSvc.cpp
index 4bcd4822da..3f0c813669 100644
--- a/RootCnv/src/RootCnvSvc.cpp
+++ b/RootCnv/src/RootCnvSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -19,26 +19,26 @@
 //====================================================================
 
 // Framework include files
-#include "RootCnv/RootCnvSvc.h"
-#include "GaudiKernel/DataIncident.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/IUpdateable.h"
-#include "GaudiKernel/Incident.h"
-#include "GaudiKernel/KeyedContainer.h"
-#include "GaudiKernel/LinkManager.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/System.h"
-#include "RootCnv/RootAddress.h"
-#include "RootCnv/RootConverter.h"
-#include "RootCnv/RootDataConnection.h"
-#include "RootCnv/RootDatabaseCnv.h"
-#include "RootCnv/RootDirectoryCnv.h"
-#include "RootCnv/RootNTupleCnv.h"
-#include "RootCnv/RootRefs.h"
 #include "RootUtils.h"
+#include <GaudiKernel/DataIncident.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/IUpdateable.h>
+#include <GaudiKernel/Incident.h>
+#include <GaudiKernel/KeyedContainer.h>
+#include <GaudiKernel/LinkManager.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/System.h>
+#include <RootCnv/RootAddress.h>
+#include <RootCnv/RootCnvSvc.h>
+#include <RootCnv/RootConverter.h>
+#include <RootCnv/RootDataConnection.h>
+#include <RootCnv/RootDatabaseCnv.h>
+#include <RootCnv/RootDirectoryCnv.h>
+#include <RootCnv/RootNTupleCnv.h>
+#include <RootCnv/RootRefs.h>
 
 using namespace std;
 using namespace Gaudi;
diff --git a/RootCnv/src/RootDataConnection.cpp b/RootCnv/src/RootDataConnection.cpp
index e8a4b1c6f5..0ac0fedcb9 100644
--- a/RootCnv/src/RootDataConnection.cpp
+++ b/RootCnv/src/RootDataConnection.cpp
@@ -16,27 +16,27 @@
 //====================================================================
 
 // Framework include files
-#include "RootCnv/RootDataConnection.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/Incident.h"
-#include "GaudiKernel/LinkManager.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/strcasecmp.h"
 #include "RootUtils.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/GaudiException.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/Incident.h>
+#include <GaudiKernel/LinkManager.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/strcasecmp.h>
+#include <RootCnv/RootDataConnection.h>
 // ROOT include files
-#include "TBranch.h"
-#include "TClass.h"
-#include "TFile.h"
-#include "TLeaf.h"
-#include "TMemFile.h"
-#include "TROOT.h"
-#include "TTree.h"
+#include <TBranch.h>
+#include <TClass.h>
+#include <TFile.h>
+#include <TLeaf.h>
+#include <TMemFile.h>
+#include <TROOT.h>
+#include <TTree.h>
 #if ROOT_VERSION_CODE >= ROOT_VERSION( 5, 33, 0 )
-#  include "Compression.h"
+#  include <Compression.h>
 static int s_compressionLevel = ROOT::CompressionSettings( ROOT::kLZMA, 4 );
 #else
 static int s_compressionLevel = 1;
diff --git a/RootCnv/src/RootDatabaseCnv.cpp b/RootCnv/src/RootDatabaseCnv.cpp
index 72f2e3ab2e..14c7c94b75 100644
--- a/RootCnv/src/RootDatabaseCnv.cpp
+++ b/RootCnv/src/RootDatabaseCnv.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -16,12 +16,12 @@
 //
 //------------------------------------------------------------------------------
 // Framework include files
-#include "RootCnv/RootDatabaseCnv.h"
-#include "RootCnv/RootDataConnection.h"
+#include <RootCnv/RootDataConnection.h>
+#include <RootCnv/RootDatabaseCnv.h>
 
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/NTuple.h"
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/NTuple.h>
 
 #if 0
 DECLARE_COMPONENT_WITH_ID(RootDatabaseCnv,
diff --git a/RootCnv/src/RootDirectoryCnv.cpp b/RootCnv/src/RootDirectoryCnv.cpp
index e3263ef39b..92942ff063 100644
--- a/RootCnv/src/RootDirectoryCnv.cpp
+++ b/RootCnv/src/RootDirectoryCnv.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -20,12 +20,12 @@
 #include <memory>
 
 // Include files
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/NTuple.h"
-#include "RootCnv/RootCnvSvc.h"
-#include "RootCnv/RootDataConnection.h"
-#include "RootCnv/RootDirectoryCnv.h"
-#include "TBranch.h"
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/NTuple.h>
+#include <RootCnv/RootCnvSvc.h>
+#include <RootCnv/RootDataConnection.h>
+#include <RootCnv/RootDirectoryCnv.h>
+#include <TBranch.h>
 
 // Factory declaration
 using namespace Gaudi;
diff --git a/RootCnv/src/RootEvtSelector.cpp b/RootCnv/src/RootEvtSelector.cpp
index 169aa09966..e3547ec49f 100644
--- a/RootCnv/src/RootEvtSelector.cpp
+++ b/RootCnv/src/RootEvtSelector.cpp
@@ -20,7 +20,7 @@
 #  define GAUDIROOTCNV_ROOTEVTSELECTORCONTEXT_H
 
 // Include files
-#  include "RootCnv/RootEvtSelector.h"
+#  include <RootCnv/RootEvtSelector.h>
 #  include <vector>
 
 // Forward declarations
@@ -110,16 +110,16 @@ namespace Gaudi {
 #endif // GAUDIROOTCNV_ROOTEVTSELECTORCONTEXT_H
 
 // Include files
-#include "GaudiKernel/AttribStringParser.h"
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IPersistencySvc.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/TypeNameString.h"
-#include "RootCnv/RootCnvSvc.h"
-#include "RootCnv/RootDataConnection.h"
-#include "TBranch.h"
+#include <GaudiKernel/AttribStringParser.h>
+#include <GaudiKernel/ClassID.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IPersistencySvc.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/TypeNameString.h>
+#include <RootCnv/RootCnvSvc.h>
+#include <RootCnv/RootDataConnection.h>
+#include <TBranch.h>
 
 using namespace Gaudi;
 using namespace std;
diff --git a/RootCnv/src/RootIOHandler.cpp b/RootCnv/src/RootIOHandler.cpp
index 8d7bef8882..1e6acc2bb3 100644
--- a/RootCnv/src/RootIOHandler.cpp
+++ b/RootCnv/src/RootIOHandler.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,19 +15,19 @@
 //  Description: Generate TClassStreamers for special Gaudi classes
 //  @author      M.Frank
 //====================================================================
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/LinkManager.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/ObjectContainerBase.h"
-#include "GaudiKernel/SmartRef.h"
-#include "GaudiKernel/System.h"
-#include "RootCnv/PoolClasses.h"
-#include "RootCnv/RootRefs.h"
-#include "TClass.h"
-#include "TClassStreamer.h"
-#include "TInterpreter.h"
-#include "TROOT.h"
-#include "TSystem.h"
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/LinkManager.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/ObjectContainerBase.h>
+#include <GaudiKernel/SmartRef.h>
+#include <GaudiKernel/System.h>
+#include <RootCnv/PoolClasses.h>
+#include <RootCnv/RootRefs.h>
+#include <TClass.h>
+#include <TClassStreamer.h>
+#include <TInterpreter.h>
+#include <TROOT.h>
+#include <TSystem.h>
 #include <iostream>
 #include <memory>
 #include <stdexcept>
diff --git a/RootCnv/src/RootNTupleCnv.cpp b/RootCnv/src/RootNTupleCnv.cpp
index b473388535..eebd14cc57 100644
--- a/RootCnv/src/RootNTupleCnv.cpp
+++ b/RootCnv/src/RootNTupleCnv.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -18,24 +18,24 @@
 
 #define ALLOW_ALL_TYPES
 // Include files
-#include "RootCnv/RootNTupleCnv.h"
-#include "RootCnv/RootAddress.h"
-#include "RootCnv/RootDataConnection.h"
-#include "RootCnv/RootRefs.h"
+#include <RootCnv/RootAddress.h>
+#include <RootCnv/RootDataConnection.h>
+#include <RootCnv/RootNTupleCnv.h>
+#include <RootCnv/RootRefs.h>
 
-#include "GaudiKernel/ContainedObject.h"
-#include "GaudiKernel/INTupleSvc.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/ISelectStatement.h"
-#include "GaudiKernel/NTuple.h"
-#include "GaudiKernel/SmartIF.h"
-#include "GaudiKernel/SmartRef.h"
-#include "GaudiKernel/StreamBuffer.h"
+#include <GaudiKernel/ContainedObject.h>
+#include <GaudiKernel/INTupleSvc.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/ISelectStatement.h>
+#include <GaudiKernel/NTuple.h>
+#include <GaudiKernel/SmartIF.h>
+#include <GaudiKernel/SmartRef.h>
+#include <GaudiKernel/StreamBuffer.h>
 
 // ROOT include files
-#include "TBranch.h"
-#include "TROOT.h"
-#include "TTree.h"
+#include <TBranch.h>
+#include <TROOT.h>
+#include <TTree.h>
 
 #include <limits>
 #include <memory>
@@ -651,7 +651,7 @@ StatusCode RootNTupleCnv::fillRepRefs( IOpaqueAddress* pAddr, DataObject* pObj )
 }
 
 #ifdef __POOL_COMPATIBILITY
-#  include "RootCnv/PoolClasses.h"
+#  include <RootCnv/PoolClasses.h>
 
 // Compatibility code to access ETCs, which were written using POOL
 
diff --git a/RootCnv/src/RootPerfMonSvc.cpp b/RootCnv/src/RootPerfMonSvc.cpp
index 66de61aa2c..285ec3aa2c 100644
--- a/RootCnv/src/RootPerfMonSvc.cpp
+++ b/RootCnv/src/RootPerfMonSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -19,19 +19,19 @@
 //====================================================================
 
 // Framework include files
-#include "RootCnv/RootPerfMonSvc.h"
-#include "GaudiKernel/DataIncident.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/Incident.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/System.h"
 #include "RootUtils.h"
-
-#include "TBranch.h"
-#include "TDirectory.h"
-#include "TMap.h"
-#include "TObjString.h"
-#include "TSystem.h"
+#include <GaudiKernel/DataIncident.h>
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/Incident.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/System.h>
+#include <RootCnv/RootPerfMonSvc.h>
+
+#include <TBranch.h>
+#include <TDirectory.h>
+#include <TMap.h>
+#include <TObjString.h>
+#include <TSystem.h>
 
 using namespace std;
 using namespace Gaudi;
diff --git a/RootCnv/src/RootStatCnv.cpp b/RootCnv/src/RootStatCnv.cpp
index af1162b877..59e5ca0aee 100644
--- a/RootCnv/src/RootStatCnv.cpp
+++ b/RootCnv/src/RootStatCnv.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -17,14 +17,14 @@
 //------------------------------------------------------------------------------
 
 // Include files
-#include "RootCnv/RootStatCnv.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/NTuple.h"
-#include "RootCnv/RootDataConnection.h"
-#include "RootCnv/RootRefs.h"
-#include "TBranch.h"
-#include "TROOT.h"
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/NTuple.h>
+#include <RootCnv/RootDataConnection.h>
+#include <RootCnv/RootRefs.h>
+#include <RootCnv/RootStatCnv.h>
+#include <TBranch.h>
+#include <TROOT.h>
 #include <memory>
 
 using namespace std;
diff --git a/RootCnv/src/SysProcStat.cpp b/RootCnv/src/SysProcStat.cpp
index 07c7c98a97..820eabfb16 100644
--- a/RootCnv/src/SysProcStat.cpp
+++ b/RootCnv/src/SysProcStat.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,7 +15,7 @@
  *      Author: Ivan Valencik
  */
 
-#include "RootCnv/SysProcStat.h"
+#include <RootCnv/SysProcStat.h>
 
 #include <cstdio>
 #include <sys/time.h>
diff --git a/RootHistCnv/src/DirectoryCnv.h b/RootHistCnv/src/DirectoryCnv.h
index 6cb11c1236..f8b104d502 100644
--- a/RootHistCnv/src/DirectoryCnv.h
+++ b/RootHistCnv/src/DirectoryCnv.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define ROOTHISTCNV_DIRECTORYCNV_H 1
 
 // Include files
-#include "GaudiKernel/DataObject.h"
 #include "RConverter.h"
+#include <GaudiKernel/DataObject.h>
 
 //------------------------------------------------------------------------------
 //
diff --git a/RootHistCnv/src/PersSvc.cpp b/RootHistCnv/src/PersSvc.cpp
index 1b1fdc2f6d..c67862fcf6 100644
--- a/RootHistCnv/src/PersSvc.cpp
+++ b/RootHistCnv/src/PersSvc.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,14 +9,14 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Include files
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/SmartDataPtr.h"
 #include "RConverter.h"
 #include "RootObjAddress.h"
-#include "TFile.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/SmartDataPtr.h>
+#include <TFile.h>
 
 namespace RootHistCnv {
   static std::string stat_dir      = "/stat";
diff --git a/RootHistCnv/src/PersSvc.h b/RootHistCnv/src/PersSvc.h
index e9ac72e4bc..28e4b7a7ce 100644
--- a/RootHistCnv/src/PersSvc.h
+++ b/RootHistCnv/src/PersSvc.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,7 +12,7 @@
 #define ROOTHISTCNV_PERSSVC_H 1
 
 // Include files
-#include "GaudiKernel/ConversionSvc.h"
+#include <GaudiKernel/ConversionSvc.h>
 
 // Forward declarations
 class TFile;
diff --git a/RootHistCnv/src/RCWNTupleCnv.cpp b/RootHistCnv/src/RCWNTupleCnv.cpp
index 77e70dc2f0..dc391c1ec5 100644
--- a/RootHistCnv/src/RCWNTupleCnv.cpp
+++ b/RootHistCnv/src/RCWNTupleCnv.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2023 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,9 +11,9 @@
 #define ROOTHISTCNV_RCWNTUPLECNV_CPP
 
 // Include files
-#include "GaudiKernel/INTupleSvc.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/NTuple.h"
+#include <GaudiKernel/INTupleSvc.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/NTuple.h>
 
 // Compiler include files
 #include <cstdio>
@@ -25,10 +25,10 @@
 
 #include "RCWNTupleCnv.h"
 
-#include "TLeafD.h"
-#include "TLeafF.h"
-#include "TLeafI.h"
-#include "TTree.h"
+#include <TLeafD.h>
+#include <TLeafF.h>
+#include <TLeafI.h>
+#include <TTree.h>
 
 namespace {
   template <typename T>
diff --git a/RootHistCnv/src/RCWNTupleCnv.h b/RootHistCnv/src/RCWNTupleCnv.h
index 45e83b38f6..65517c2619 100644
--- a/RootHistCnv/src/RCWNTupleCnv.h
+++ b/RootHistCnv/src/RCWNTupleCnv.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,12 +12,12 @@
 #define ROOTHISTCNV_RCWNTCNV_H 1
 
 // Include files
-#include "GaudiKernel/Converter.h"
 #include "RNTupleCnv.h"
+#include <GaudiKernel/Converter.h>
 #include <string>
 
-#include "TFile.h"
-#include "TTree.h"
+#include <TFile.h>
+#include <TTree.h>
 
 namespace RootHistCnv {
 
diff --git a/RootHistCnv/src/RConverter.cpp b/RootHistCnv/src/RConverter.cpp
index d2e14688a6..d67bd47a2b 100644
--- a/RootHistCnv/src/RConverter.cpp
+++ b/RootHistCnv/src/RConverter.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,17 +12,17 @@
 
 // Include files
 #include "RConverter.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/SmartIF.h"
 #include "RootObjAddress.h"
-
-#include "TDirectory.h"
-#include "TFile.h"
-#include "TTree.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/SmartIF.h>
+
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TTree.h>
 #include <list>
 #include <string>
 
diff --git a/RootHistCnv/src/RConverter.h b/RootHistCnv/src/RConverter.h
index edef245815..8e4e466c94 100644
--- a/RootHistCnv/src/RConverter.h
+++ b/RootHistCnv/src/RConverter.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define ROOTHISTCNV_RCONVERTER_H 1
 
 // Include files
-#include "GaudiKernel/Converter.h"
-#include "TDirectory.h"
+#include <GaudiKernel/Converter.h>
+#include <TDirectory.h>
 #include <map>
 #include <string>
 
diff --git a/RootHistCnv/src/RDirectoryCnv.cpp b/RootHistCnv/src/RDirectoryCnv.cpp
index 699c803466..9ae7181ca2 100644
--- a/RootHistCnv/src/RDirectoryCnv.cpp
+++ b/RootHistCnv/src/RDirectoryCnv.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,28 +9,28 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Include files
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/NTuple.h"
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/NTuple.h>
 
 #include <optional>
 
 #include "RDirectoryCnv.h"
 
 // Root files
-#include "TDirectory.h"
-#include "TFile.h"
-#include "TH1.h"
-#include "TH2.h"
-#include "TH3.h"
-#include "TKey.h"
-#include "TObject.h"
-#include "TProfile.h"
-#include "TProfile2D.h"
-#include "TTree.h"
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1.h>
+#include <TH2.h>
+#include <TH3.h>
+#include <TKey.h>
+#include <TObject.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TTree.h>
 
 namespace {
   auto maybe_stol = []( const std::string& s ) -> std::optional<int> {
diff --git a/RootHistCnv/src/RDirectoryCnv.h b/RootHistCnv/src/RDirectoryCnv.h
index 352117899a..b30e7131ef 100644
--- a/RootHistCnv/src/RDirectoryCnv.h
+++ b/RootHistCnv/src/RDirectoryCnv.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,8 +12,8 @@
 #define ROOTHIST_RDIRECTORYCNV_H 1
 
 // Include files
-#include "GaudiKernel/NTuple.h"
 #include "RConverter.h"
+#include <GaudiKernel/NTuple.h>
 
 namespace RootHistCnv {
 
diff --git a/RootHistCnv/src/RFileCnv.cpp b/RootHistCnv/src/RFileCnv.cpp
index 3bc81fa779..f39d59ddc9 100644
--- a/RootHistCnv/src/RFileCnv.cpp
+++ b/RootHistCnv/src/RFileCnv.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -9,19 +9,19 @@
 * or submit itself to any jurisdiction.                                             *
 \***********************************************************************************/
 // Include files
-#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/DataIncident.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
+#include <GaudiKernel/Bootstrap.h>
+#include <GaudiKernel/DataIncident.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/ISvcLocator.h>
+#include <GaudiKernel/MsgStream.h>
 
-#include "Gaudi/Interfaces/IOptionsSvc.h"
+#include <Gaudi/Interfaces/IOptionsSvc.h>
 
 // ROOT
 #include "RFileCnv.h"
-#include "TFile.h"
-#include "TROOT.h"
+#include <TFile.h>
+#include <TROOT.h>
 
 // local
 #include "RootCompressionSettings.h"
diff --git a/RootHistCnv/src/RFileCnv.h b/RootHistCnv/src/RFileCnv.h
index 23305f5fc6..bcf864332e 100644
--- a/RootHistCnv/src/RFileCnv.h
+++ b/RootHistCnv/src/RFileCnv.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,9 +12,9 @@
 #define ROOTHISTCNV_RFILECNV_H 1
 
 // Include files
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/NTuple.h"
 #include "RDirectoryCnv.h"
+#include <GaudiKernel/IIncidentSvc.h>
+#include <GaudiKernel/NTuple.h>
 
 class TFile;
 
diff --git a/RootHistCnv/src/RHistogramCnv.cpp b/RootHistCnv/src/RHistogramCnv.cpp
index 4886d2035d..cc43b959b9 100644
--- a/RootHistCnv/src/RHistogramCnv.cpp
+++ b/RootHistCnv/src/RHistogramCnv.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -10,8 +10,8 @@
 \***********************************************************************************/
 #include "RHistogramCnv.h"
 
-#include "AIDA/IProfile1D.h"
-#include "TProfile.h"
+#include <AIDA/IProfile1D.h>
+#include <TProfile.h>
 namespace RootHistCnv {
   typedef RHistogramCnv<TProfile, TProfile, Gaudi::HistogramBase> RootHistCnvP1DCnv;
   template <>
@@ -21,8 +21,8 @@ namespace RootHistCnv {
   DECLARE_CONVERTER( RootHistCnvP1DCnv )
 } // namespace RootHistCnv
 
-#include "AIDA/IProfile2D.h"
-#include "TProfile2D.h"
+#include <AIDA/IProfile2D.h>
+#include <TProfile2D.h>
 namespace RootHistCnv {
   typedef RHistogramCnv<TProfile2D, TProfile2D, Gaudi::HistogramBase> RootHistCnvP2DCnv;
   template <>
@@ -32,8 +32,8 @@ namespace RootHistCnv {
   DECLARE_CONVERTER( RootHistCnvP2DCnv )
 } // namespace RootHistCnv
 
-#include "AIDA/IHistogram1D.h"
-#include "TH1D.h"
+#include <AIDA/IHistogram1D.h>
+#include <TH1D.h>
 namespace RootHistCnv {
   typedef RHistogramCnv<TH1D, TH1, Gaudi::HistogramBase> RootHistCnvH1DCnv;
   template <>
@@ -43,8 +43,8 @@ namespace RootHistCnv {
   DECLARE_CONVERTER( RootHistCnvH1DCnv )
 } // namespace RootHistCnv
 
-#include "AIDA/IHistogram2D.h"
-#include "TH2D.h"
+#include <AIDA/IHistogram2D.h>
+#include <TH2D.h>
 namespace RootHistCnv {
   typedef RHistogramCnv<TH2D, TH2, Gaudi::HistogramBase> RootHistCnvH2DCnv;
   template <>
@@ -54,8 +54,8 @@ namespace RootHistCnv {
   DECLARE_CONVERTER( RootHistCnvH2DCnv )
 } // namespace RootHistCnv
 
-#include "AIDA/IHistogram3D.h"
-#include "TH3D.h"
+#include <AIDA/IHistogram3D.h>
+#include <TH3D.h>
 namespace RootHistCnv {
   typedef RootHistCnv::RHistogramCnv<TH3D, TH3, Gaudi::HistogramBase> RootHistCnvH3DCnv;
   template <>
diff --git a/RootHistCnv/src/RHistogramCnv.h b/RootHistCnv/src/RHistogramCnv.h
index 83c740ebfb..bfbc765398 100644
--- a/RootHistCnv/src/RHistogramCnv.h
+++ b/RootHistCnv/src/RHistogramCnv.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -12,15 +12,15 @@
 #define ROOTHISTCNV_RHISTOGRAMCNV_H 1
 
 // Include files
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/HistogramBase.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/ObjectFactory.h"
-#include "GaudiKernel/SmartIF.h"
 #include "RConverter.h"
 #include "RootObjAddress.h"
-#include "TArray.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/HistogramBase.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/ObjectFactory.h>
+#include <GaudiKernel/SmartIF.h>
+#include <TArray.h>
 #include <memory>
 
 namespace RootHistCnv {
diff --git a/RootHistCnv/src/RNTupleCnv.cpp b/RootHistCnv/src/RNTupleCnv.cpp
index c28c52390f..0bcc069532 100644
--- a/RootHistCnv/src/RNTupleCnv.cpp
+++ b/RootHistCnv/src/RNTupleCnv.cpp
@@ -12,18 +12,18 @@
 #include "RNTupleCnv.h"
 #include "RootObjAddress.h"
 
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IDataManagerSvc.h"
-#include "GaudiKernel/IDataProviderSvc.h"
-#include "GaudiKernel/INTupleSvc.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/NTuple.h"
-#include "GaudiKernel/SmartIF.h"
+#include <GaudiKernel/DataObject.h>
+#include <GaudiKernel/IDataManagerSvc.h>
+#include <GaudiKernel/IDataProviderSvc.h>
+#include <GaudiKernel/INTupleSvc.h>
+#include <GaudiKernel/IOpaqueAddress.h>
+#include <GaudiKernel/IRegistry.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/NTuple.h>
+#include <GaudiKernel/SmartIF.h>
 
 // Root
-#include "TTree.h"
+#include <TTree.h>
 
 //-----------------------------------------------------------------------------
 //
diff --git a/RootHistCnv/src/RRWNTupleCnv.cpp b/RootHistCnv/src/RRWNTupleCnv.cpp
index 761b590e57..7c231d5016 100644
--- a/RootHistCnv/src/RRWNTupleCnv.cpp
+++ b/RootHistCnv/src/RRWNTupleCnv.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,12 +11,12 @@
 #define ALLOW_ALL_TYPES
 
 // Compiler include files
-#include "GaudiKernel/INTupleSvc.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/NTuple.h"
+#include <GaudiKernel/INTupleSvc.h>
+#include <GaudiKernel/MsgStream.h>
+#include <GaudiKernel/NTuple.h>
 
 #include "RRWNTupleCnv.h"
-#include "TTree.h"
+#include <TTree.h>
 
 // Instantiation of a static factory class used by clients to create
 // instances of this service
diff --git a/RootHistCnv/src/RootCompressionSettings.cpp b/RootHistCnv/src/RootCompressionSettings.cpp
index e00d38f76f..8b6e2bf95d 100644
--- a/RootHistCnv/src/RootCompressionSettings.cpp
+++ b/RootHistCnv/src/RootCompressionSettings.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -15,7 +15,7 @@
 #include "RootCompressionSettings.h"
 
 // ROOT
-#include "Compression.h"
+#include <Compression.h>
 
 //-----------------------------------------------------------------------------
 // Implementation file for class : RootCompressionSettings
diff --git a/RootHistCnv/src/RootDirFcn.cpp b/RootHistCnv/src/RootDirFcn.cpp
index 4fa89a1677..b3341149a4 100644
--- a/RootHistCnv/src/RootDirFcn.cpp
+++ b/RootHistCnv/src/RootDirFcn.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,10 +11,10 @@
 #define ROOTHISTCNV_ROOTDIRFCN_CPP
 
 #include "RootDirFcn.h"
-#include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Kernel.h>
 
-#include "TDirectory.h"
-#include "TFile.h"
+#include <TDirectory.h>
+#include <TFile.h>
 #include <list>
 #include <string>
 
diff --git a/RootHistCnv/src/RootObjAddress.h b/RootHistCnv/src/RootObjAddress.h
index 04bbcd8409..79ce8946c1 100644
--- a/RootHistCnv/src/RootObjAddress.h
+++ b/RootHistCnv/src/RootObjAddress.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2021 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -11,7 +11,7 @@
 #ifndef ROOTHISTCNV_ROOTOBJADDRESS_H
 #define ROOTHISTCNV_ROOTOBJADDRESS_H 1
 
-#include "GaudiKernel/IOpaqueAddress.h"
+#include <GaudiKernel/IOpaqueAddress.h>
 #include <string_view>
 
 class TObject;
-- 
GitLab