diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 767806a757e69f1830cb02d80efa1991d045df34..f12de898e7138634b0b5eda62c29f7969dfa366c 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:
diff --git a/Gaudi/src/main.cpp b/Gaudi/src/main.cpp
index e3578fbb4fb0365682b216b16756a6aca9b397ad..e84bd0e12cfa333b56c824484a8116e080c97451 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 429c750481ed1a3fc0ca6ed62ebfb98bb97606a7..4e7dcae1af2586126096c832ec1249ee96c7a9b0 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 1a087b7065a33769875f597c5605e319fb8de711..f67a054576f456b03f3fe599867fd70ec1d58efa 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 2d896a39a740a838cdc8c7b57d2f61d4d72ab8a2..4ebe4f00f06cc1f90f095b097762f1be4bc26d36 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 6c8500e26c8c9f589c18a9fb7d4157fdb79f657b..e07b050c62581e105008385af1407ba4e83b387e 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 6132a1399e78224707c8463f78646629c7dd6b94..6ec42f5b1cc5347d2d17a3d2c3f54a47426a5ff7 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 d3fbf7d69f0307c5c350eb54e83d5bd96ba0f5e0..54c4927be6581ed75db838da845b6aa38d0592c3 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 7d8468b4794b9efb038dc84c2fe369af8ecde5af..2fd331fdd68285cebb27fc625259e4fe4993bd3e 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 b26ecbfde22d2b4209a5d018a9927272f56cb2f2..cfaded9ba2821af3ff5f90a265ad0f9f34cc0798 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 31566f2c0d4d18db8166ecfeccc8ac8118d8d15f..8cb8c9837117d26bdfac661ee0331826ef6e6a1e 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 e8af116410d3b3f96d67cfaed6029d9508c759c9..0e281fff18401d7ad143d5ac08cbea66c602176f 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 0403cf7b44f2e0ba866bde165860bd53341e153c..e2ff6cb719fa4026c030b532bc56c4ab0685c16b 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 8a0e85e891c183ea74dcb1df005be986e6a36865..05705640e82f0dd85e8a67259d204f3d7f93096c 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 24b2725362725c0b4d1987ff95d41f3f8a8a1ada..bf7f8bcc3e849ae6a8204c002cad0a6d06ed3a1e 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 b5d5e651a19b8d7227969d9f6db5f8056882efed..9be943e06a95130ab03672e0b3f66633a40613e5 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 9a77f84b70c5171d2570a88d6397179e18fa918a..f5d31106b7b345b2aa1f00437a2cf537c6272b60 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 40b256c769859c463c231439afb4bbccb6ea70ea..82a52a3db3ad48e79f72a71ebecbff7abaae88a2 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 d385240f1cca1ea812ddefb8a0e1b54666d499b9..8446ec94d39c56796d95c1fc2db17dfb44f816db 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 d3bfe343a4185e60c96d1bde80eaf44b143bb3bd..516a1bf03e92aa79055308e24efc602c0860a3d1 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 a9424dde634a01e72e116fa9648682d2f33ade9f..1800bde4e996e8a925d98da82e28c27874131a93 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 329297c74539de8d690e758846d67ab299eb4685..3366612aa8ad25d75133b75c455cc40bc5321a49 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 2ba751c04094adf8866ae21eabfc658d81003859..c573b5bacaf0f1e73411a8419ac0acac3f8926c4 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 a1564a790f8948a9aaa31f2f1f7731e137733f16..7c3007b87e57a3a22e89bd926900ac73f06d1422 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 25e9c676f4622fad90a13d6a25d8f87d0e00c606..4a1932c6b1c0bee296fe7d5495b40e0fad5a7578 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 bfa07305989eb5e185f58d6367638abdfa854b83..471b44ba1c5b3f0595d03320acc633efbef3f726 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 233dd75bd114ed0fa87c25975b4f2afcdcafdbae..700a427c35208f9717a71265971810fdc264edd2 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 4363fca22d93ae9d5efd22341258474973947c62..76795bb731aa47b4f31defee7b0fced7b6d54389 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 a20f3a615777b9d7ab026264ed50b861f34184bf..d18ece7ebbf089ef77b09cb42a336ac8db7ec9e0 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 9e15c335e710c73ad184cb80ab4397f898f4cd7e..3a7515fa71fd66695160c9be1988c914ca7e58c0 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 a802c93618d92fc8fbc6a732e85f2bb73da50a69..e5b6277961c9c1abe16ee811cacbffa9eb6d5776 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 3294ed1885787d4fc35c162a1e3d6e587f4a7533..0274dcabc52d877f8d7718acdf986f357b4109f3 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 b4287ffc851477a9c8fe44a8cb0a8e13094451fe..1d2f6b56a61983ecec59e299aff08af7cf5f1c98 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 410fd7f2db1ded9bf98ddf109203c8ae85b1e8db..0c36ee7d735b2ce3760bfa0d83b5364de93fe043 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 9ddf8c1f11bbd0ea84083e79ce077d8b28353903..5fc2cb4948d88832ffd7e7f72082d197a62973cc 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 1055a107a7864ee8334b7a8d82c237656816a485..96e50635c17916f3e9195f5c31a9fd213f061d05 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 8f0a6125c38d07a8a84b3b5df5107561b2eaf804..18c2ca4835ceb3473b53f453bb5094c85fe64ee1 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 e87a07eb41e487b81b75eba1ad06433b3ef27617..bd3a6b153322fdaf46de7b801bc0bae6d6fceb64 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 5ed18b82210bce485d57d02c703334bd1e5c86fe..90128bc33b3a09dfb1e26e0d5f0c4b644624ed3d 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 3607d87328c28b51186faa6847cba654a4ecb562..a9a5ece6f3aaee4306048c0d3b71a2ca74ea25d2 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 53ae64b96246857ff77e1d8a908e7ed6a487b45f..df39e7d9372f7a045c7f529972a62d17f0571173 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 5ded9e2b9ae858e1e08d2b64a0bd947cd18f6c00..f7bba0a175667aaaf2a78c010939089d8c807e49 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 f194b0a6044cedf2ac9d17b5d259c986c98b4571..ca7a4b6953cfde4e00aa2af8b0d34d6d64ccebea 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 f131f5e70aac163d2ee548b453e0c374003da6a3..498cc86f83b900170449373e1055b59b0486916c 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 1af2f5f686cd38f0516589bd3a8503b458844e64..01fbcd21443205270d22ff46748e7f8861a793cc 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 f92cfca49c96d4c44bfa5b36cfeab5c2ff62fc93..0485e3aac6bd21bb6ff1abcf5b567cf8f138cb9e 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 0541bdd5cddbffdcde364ebbf806aa3b3455a257..4d9a030f031c5d9b2e9693e1de01e14d24783282 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 e62256c39ba5650c19ba711463019b4646c23600..685744ef071b7a5e82cc976138ade194af8f24c3 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 0a5171fd9e270d6b67b8df503954bb9cad4b5296..117dd04415470d042732efcedcc7ffbf42a21bcd 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 e724488403aafbfb023a20c48f4dada1a8eb89f7..775db8bd2f935197ea57e1494fdcd2799943966e 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 22dd573c8ddf9621c4cb33008557c4fdf1b7b30b..7166068e0fcb1bf1e59e26d0091bcd3c583a76de 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 a0f2b5eb4844c3cd5cae0a4fdbf83d999550a38c..de0762d1a4fd6cc1e644c3f650dd8fc74733cdb0 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 428481ba04303dedd4924301740e2ec4969bde7e..a10b7354dabfd61004175df4af0264293d391527 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 0a473e5ec2ad329166f021f01da8a19db1b235c5..f23e3bf9c4aaffc14da1216d194fff8f8c59baa0 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 7e2be02ecce1b81429a59f15fdf711eff4ed7b29..4d7586d794d51290bc3ba788305ef6368af620e0 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 e888e0ba56978d674f13830a2ea3b8090e944d6f..34e79262e55b9e76a7c5d4a7ca9856c419b77828 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 81830fbefbd1b69883bf0cf8235d9ce34462e643..2bb9c9c528cecf25545c077f16bc2811e40d035f 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 25c576bc8b89e6dd4578411c0babaf578e1ebcef..74b7fbdf2469c793c7b55aaf35573b042ebfc1ef 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 953cc798fd9032da821d31b23fec1ac23095bead..5947c214dd42485a2a08df7c9db3438bd193527d 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 3ac00b5a5d619657e166b38247e59681122933f8..948c286b7758ebd8348cb7e22babc076d7135d5e 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 e489b5d7d3b8086a01ef9f39fdaca05bdc231990..abe7f23f2347981cc92c94d4e8e32b0246565e09 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 5a8f8e2a5e6ead2a84ff2642b87dea037c15d46a..0e4bb461402874408a7221c052b5f50e0db9ab3f 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 ca22c3da23c4dda0ed526aaad0200545e55eb5da..6aee471f4c4e374cd779bf7b27c74eb7c5bb511e 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 ed9dc173a9b52228ae50ce7ab51f2a67cecf82c9..94fc4943462a1827e2c37d04e244c3fe2a2f409d 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 56d289d30885116262f2da0c46ce7f905fc978b1..2cbe0cbbdf4436654cfb65e4c15ff5cce18087e1 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 ebc9e5bee7e60d34dde16edae6f61dd9bf107854..6c31c524993d301e74072e31870c81b3fa41148e 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 021cc915bdeb4732241207019adfd46ffdd98296..3ba23a51910cd3be824b681df6d5b06b8e15db0c 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 2a36c1ad10d6c25ac729e999d3942e87c517419e..9b04839466782e551920591ec9fd6e00b1ce5fd9 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 9c51cbfe8d3de6a3750904da17501a37b18c123e..301ba76b63ee118811c09144a5d9135cf09ad23e 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 9299473be59fe2b33367b058ef93b721312742b0..53490179166a08cbdb19d9d991feda21c15e328c 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 59e3e074684c65f9300d6d76da552b7a781c7648..c7c6eb8f582cb5afc819a795083868f28f093a64 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 45010a4281d0b6304e245dd1d8f8531087a22696..59fd6db9d71cdb0ca121826bdb901bd501376d34 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 8d9a009b6f0149c4bafc44552b447f9327f51286..aaa9d7b616cb5a806f16f69c3348a2781002bc6f 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 54a5323f4673c31d5bfaa59cc6e5aab9084caa7e..0249942ab0accb4e68096f49378fcf2fc305bcc4 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 7ea43ab5587d9e8aca8ce57170ef9634088d8285..3a69f8e9996d06ffc71db06c85a0160beafb8899 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 8e7b82cf2ffa6ba5280e409336f5a08af4f9b2a3..32f68caf6128f7ad7ef907db31d68ce63e1bbbca 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 f10b20abd093e0f9b785a65ec8626a27b50a6643..29906c4c9bea4d8b121a759bdfd210c385f5adac 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 73ca2717f92a7dbabed5e19bc838882ef66026d2..966f3b7815b2ff901ffe1878dff19d5c02cbeebe 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 24c920f3f9a9d08fb8f4111d51ab8fd97a84fafd..1bd11afad54969a5085d61a4a9a062b7b3ff6f0a 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 179f1b5338efe6f6165a8c71e1350edfd6133839..8c111359bb968ce99fde51a0b4a9f6fad9369ac7 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 77bbfe636c735495c2cec4b9bf6f3f4b7c0e6999..e84ef8492fa7e49d5774b49c060c23ab08c16ff1 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 0c24807ddffad4312ba0bb8291cb0c292d0c466b..bec687c0a92e2fc4af825a6dcfd9c5db0528983b 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 7cc4b8c41a55ecb4b7e0e1da46ef724a1817c13f..594a1c6aa5b17557ae4c141c60deb896cc6e8155 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 471ce4412b9f57fc72641250a3b518ff012c4ff2..1054a3ff841b0a8cfc3d63a97fdf7d6217191817 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 d4e872276f23d476361388a6ab5f9877cedfa9c0..be9b65908eaf7debb28e748bc2484e1f17a762fc 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 1d302a2b46ccafece032923c998214f8b5ccdb86..1682a4e5ecedb2065726772e7e72ba380ab74b7f 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 12fb101dcc33be13caeea72247120622353a5f05..5ecdb0e7a0a6aa9ad0e575baaf091e8eef3a2ec6 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 1031488a2fed4d634f5a877ac738e6aa8d3117b4..b330641a9fbbd8b890ac6dd676d0493f348e1cb0 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 2273bcb8e0b1637252268170392f34ee6514f8b6..639169087c468aff830fa0054bd353be12199a52 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 1a3daee3fd43d9cb460f952e079d37e992400bb9..cc361aa7a264e61db4e4a40e3237f08788955b81 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 1395a2c7342df1badc1f6d1458cb505e48a1bea3..7162d6043186fa48c0ae5eb5eda8483291b0fe9c 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 4590356585cbd09f18eb624698251cdaa5acfa91..de60ef30f4df8084b24598d6b90238fe7cf78d82 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 9cb15e08bdcc33cf18cc8d62330766683defc3e8..d0a92d726482a6c3d808b8c58efbc5148e1013c1 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 8072797768382318dc5c86a6169f20dfb77d687f..405411df1878f062604888a42bf8a424d44e5137 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 3dd4dfbe8b6689358a210675a10f898e90e8662c..546685f99a6c12dbb781af604b8f35123ebc1c5f 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 37772566aef95f79a0766fc23c2302d114c306e8..a761a188f3c15dd5d357b8a1c4ff6bb4453fe95d 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 d2fea492ad479b1fb1e6890540bec889d27b3169..26967e0b52e1803cc890e83419004a917334c0f8 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 0407c4ff6647302ffc40d0da64ab4bc370699a90..906bd1edd0e69f0adbf071686f8aebc8e23bb912 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 d10a1dbaa35a22c099ffee89ce5cbcb5c92aea21..f2e22007b36e8959f89211ced1f50220b3c2c784 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 2e14a5977e534e304db1793b162e846fa46fda25..1e2386e3d8431caba46e8fb12a4bc53967058a61 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 aeea466c155346de5e8ac807b5f9863ce8366c20..c940858a9ddc06b33df6fed212740df7ce8485a7 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 c3bd940e9a9a1df7f3dfca925a3cd247cce25b87..fc309ce17169123ad26432c65e5a3777369a2b58 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 e9f5c84b7217ac214ad8e2b52ca6e8fe5c8c1fc0..04667a577f0fa15ff5042a674c67557b45e680a2 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 62b1a904a938d644ac05fd609cca8317f60674d9..996c1b6e83f198c835b4a346a5516253c171086f 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 bb22476d3b72b1dbdc17de69388be220567fb22a..87702e6115d12033628f4840f9a2d844a653fb03 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 f4cd650a39d35d39b1d8a52d3ee65cda12c0f40e..52c58d55bb02ffd5470a03905666aa9d8ec61d1c 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 6312a9d1bc18ee46e0236853bbccffe679b27d74..7d701099b55f85faf8eb956d598ed70757440fb5 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 2b1b7cfccf762d2a602e7b8945d1b9ca238d7efe..f6aaea11b163ca36241ac83f8e5bacdaf3df6ccf 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 5e8eeb6436148b8e02252890917e5401f844d827..a6d97c8f0a77a99e37fb09a85a7680bce4d4364b 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 020375c6a8e41a5fa7a55c82374d4102cf08dfa0..e0140de1caf6d49798c2fae2e410c07fe95cdb9a 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 c8a690908845a667db893f1a4e13c6828cfb0d11..d5722bd6b8483390e83c50d64cd73a5f804905b5 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 167fe30d3898c58920b31b33520310dbe03b344b..33cd10aa61e0cd2b974ffbd2d6842c8bfecbb5e5 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 033da9c95ffb691385bfc3beee6a3527576c4325..8e9fb4b6f8da2213a57790da1e0c1de9ca318382 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 3d770e129efda9918fb96c31ea8a0f8b8c6fb001..adf3a1ac24220b8c7f03dd8dc153286b8d768dc3 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 6c780b05eebf2fdc95d2208f5df362c71641ec4f..e55d99e5389a2a259089b61a6c52883b14375347 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 9273f0539262e8742ddd1fff4f49041bcfe02b81..73c999cb0c85d80776d10700811633e874c82edc 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 d9778bc142a36f6c49ecf2c0899c575fc9710a42..2c35b7c2b4270d6d11583d3f9967734ecc2736d5 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 8d9460e83ba0414bc0f762511eeb2b06f902fb03..3ac803f85ff89f1b890a33dc8124e46b3eee2c75 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 dc225cc211c38b870278aaeeb247f9f6a4a22469..40ea395af7dcdc1a011edad4c496bfd189f76553 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 6935b258955373eec04854e798dd09ea8d2ed744..1a0848ec89a1452882127926f68fdb631da769db 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 ea62bb0790fd313aa5fa91bc8c211f9df5770197..bbb1280740a0c26c3068507659e3dc0960436ff4 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 5d9e463e9fe856eca821986ec638ee98e7a0539c..a89cbe9e581da6afba650152f70acc94f9925ce1 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 62bd23e6dcb2e506222b6fd40ea120576a26e7a8..f9033572a35f0e3da6a70578f7432e4b8357ac43 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 6b1bcb5156b279fd9d0d22721e374480fac7c4fc..17abf3dd93d00158a50a6878467277f20c2476f1 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 f4a2919797bd2e1928cf2fa0d2c28f2368534976..e25f6f9f55a672c1fd43c657b89120ad345cf311 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 23a977c3a6c4d7d4d448ae06d8c436390a194be6..ef5927271f05a1ee4533c53555d3e4c3fbd2939f 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 415998e68c0a025cf02a7a63769995c0a07da103..030452a1f98a0a3e752be1c1a37231f7bfb0c743 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 80394124d225f4f0d090ff50ac8bf63ba11946c8..4b7b06ed6e309e6d4f1e5832593b622bc447d816 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 dcec6ba57cc276e0352739a1e93a1c82a70b0c7e..e468bf5f34ed3de71b15e66fe0bf6a3fe6bb457c 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 336411142949fc536512b911ac5af32bd7fff37a..508221e744a7c1f46288b1fc9c5e2dc9979a0ff8 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 55bd941ea0699da3f5f1a504c1e24691b057f36a..25f85d8a72da6af511f37e350d9940052da306dd 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 714ab1d7b412d4191a0645251e9800b5af8b62f2..6ca86fc3c78cc39646a4083241aa220af9dbeaf9 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 1473f57eda30f3dcdf4043791d65c31b3857e714..b7a8c45d322a460bec09d827a00ba85885e4c42d 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 0459cacff5f3c8755f2dab6bd0a0cd539fae54d5..19a413ab05678144d29ffc2d160d3cf953aa4676 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 5124300962a011523448dcb496947dbb921a3f19..faa1a7673b0ac9bdb576e346be72ef3d2846be63 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 df4efb6587dfa04c8534811faccd6b71ee3cc65a..34559c5cb8df1afbeda13003d0ff2b1787088de1 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 57c464da198f7f05dd33a1f2549e8d83ac472121..8ebbb027d3ba03140406c7f5756c3983361d450d 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 f591ac80eecd0349974a31d350e3b0efd3a9a50f..c8ae96e0cb75acc4c79f268e991457b6212091ba 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 6192e189674493288120bf199756b4b2725b86c2..a7a6ab8260b7fdfa3b204ad4a677beba04fcbd93 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 af2f60891e209b686637b77e1440e0320d2d6d7f..067b376749082fb64be8ce0f04fd4518b657ae49 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 42a3399f952416cf63c222337b00a981bed9a095..3844dfb5631956114ba633f895f776f8a5c7362b 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 07e4bb7c8692513c25c2d074e27ce260f7c31ce8..4a9c4342accabf388abfdbcf909611fd32dd2d1c 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 fe210deda61713b621a16fac23bd1322cbb35b7d..5419b8220ca87acf37a8c81c907cacd23ab20d3d 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 5c8107eb645dd9676ef17f102c2ad045b53db194..d76193e755dfd8e39680afaf13fa908cb8e28b03 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 31c8ba832192483c0cd96837153f27634f157b2d..a0c63358717f9ef97197f8b75565020c79178330 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 10caf35c4ad5aa6452f5a9f8f7deb47800a8c377..280471452b409d6362e212b603d302b084e385c6 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 0566299ddf5f9ff71ec7c6464e244a232642bec6..131d096fbb5c2c940d97fa031931b0871533f041 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 28311f968ecf338b2e5d9327f36090035c681d5b..f5f4215a2dd196220552eafb7075980ea176e448 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 66fcdac4948335f5cdf46ae7c2bcb592d91cd62d..d1c6af77bbb72439ab3acc16fa47481e451ce981 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 80e4ec56c3a544c10aad67a57e80cf65d3da50c7..938a0ca6f72529d3506356b79c0ca9d216425c37 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 38ee0403de240136b898bb19243ae5a4c76e9012..c91aafda0724cf606e66ce5efe10adeb532edb83 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 821d3d71ea4e5d135359eba409305444adc9ef94..6fc5bd5c3bab403376bfb78bb282096e092f4dd1 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 3c3042991fdca1970721a3a33efbbae86277c297..2f69066dd80d8aeb4eb98bdfb721ab145aa235a4 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 4cb1f6dec8206be29e12294fe2f778dcdf11e84e..8238cb577edb3d1fec39269ebb0001b3965959e3 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 fbef44243566c35402aacd7a86465c817bcf3449..2cc583f51e07c51a0ac054798cdfe850972bfea7 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 adefbac48527213d8ffec3d2cc1e74ecab3f1fdb..529d645f3a5f14c74f2502b86dfae646508fd554 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 3835a8588ab6fd17fdf14c7f40a4e9fead05a048..f37c39e767aa1f77ea024cf52e0c5cb5204de4e5 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 246422a4aaf98d8501ea25a2868fa699ba75a4cc..61087f54c8b6c5f00db56b1f5dbb1fc6cd3cf390 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 9db44e7ec020f4234260d2c4cbb3ab08f6dcc4cf..234f3932397b696be946018c3f98ee7a48e03b24 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 cc6228415c198abf55a3e092651a3077f5a10963..40ab5c8ab419d1eaf70a6d0385c7821442001975 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 ceee2c7d3574c5148b0ad32ea26d1f41be3edc18..d48ea8fca5b8114efec6a0bbd320e177bda0a340 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 a38459745be3fc488622f78f0ae88b87d38bf8d4..9427d3aa4f985c8193b7717ff92cdbd409b8eb4c 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 a56cab467c948ed2bc6b0e6bdc4d406a5490992e..22d8e6f2aeef82ea408d61f23373d2c541afeb37 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 dae7a9b0a1748f435e09bda22c273fd4e61abab5..252160a28a5f8f79455e1cdee8f066fdeef0d478 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 78cdfe96dd43a2330d04728d3ad9d57ed70ad07a..da2b6d7a2a63dd4058c4e83d2ed03830349adc16 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 462f93ce1e79a78a32e3a80f9eee773f823656ea..6e9d28dffdc3816cbc0a2f9901e731db4e2c50e9 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 d2e544d9aeab1079f069b0906b093f0f25c7296b..b84ef254d557ad1537f789484fdf2ee9b82db7ab 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 74ba7a144773f73e75af67c846a25dfaa2224938..9937ad8d49221752e9385156e8edc3cea344c56f 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 27e39d1ce8b9e0514c68daa476416ddd45decb03..767c08327a3f718302b656c781d67859d517e992 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 2e13fbbc55b97c383d877b051c3ff70b0103bda8..e2bf58bf7e7c31eb8f15c5dac673d62e141301ac 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 eafe95a56d026fa1736ebdc90f1a35ecef3afd3b..72645625a95085d069bf500bb1e6ff97cc542de7 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 35437e4daf48ed79b1ad90d475faeb3a5556247f..2222d659a72c85f4d8150d8dcb10f37437857fef 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 568ed7d4971586a7cd3738df79c86c0bf5b41706..9d7868e59c0455c0c8eaf062f22d9a53482055f2 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 fcfcf35266d8523123bad67bc2c720113defbc39..54fe9e07322d9a51c50e1a53e0c14e0461c8c3e5 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 2840f5333efcfaf692d26b76f6e3597912babfe1..f54f9a840075371fab041ccd52b89ef58195bbfc 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 83ae2483b42f07beebbf717a5fcee4533c0242bc..dd9a017ccdc024e9246c1ba0e029d8aa155a4e73 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 a7676863e92b85d8eebcc9110cc6696b6111f4e5..65723153531962dff2dbb03201ea428f7ef23680 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 961c9e5b8fde3aa2c84f2a09982c203b390bc42c..843cc1294659ea85f179e580594f346774ae5adc 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 ad0fc39cb68d2478280642737343676415b762aa..99f2ba40a428ee431bed9abd9ca3c2d47dd3d55b 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 38e8e26f88d4fd4b1045c6fe9751ed21f25f7de6..2c2434e3eb7e80da26e456e2e805dce1df65eed3 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 d41585f96076e7daf688acbc6829f6793ae01e39..637debb0dd538f6f5f6e1d523c3fa53671b7bce6 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 20f0127af883c8c4765d5641c5cb038bc4587da2..f65172a0322ba52cabb8b847f0224e234477bbcd 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 629deea151f4e119a972994ffed46c2fc93ddb38..5e70753a0512f3b5704bc6a318d179cb9660666e 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 15e0c728b07e67cc529dd3450e0b33e2916cb42e..f222cfef08a7f8d50c0c506dc3c866319785c722 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 302e4371b2cc05fe4bdc388496acdf68a2d76600..5f918eef2436b91105cf81b3d2d65b7c4fba7338 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 d05b5fcb04b480073c0c1192020ae77532b6bcf1..322fd8f41f0e8e91b4fb6205cc7662e383f4b726 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 922c4dce7f842a60700e63f94db8aa919889c8e7..cd45a23fb7b3fb946b4e3b137f8cc792a1b70c35 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 4590a53cc132ae8c4d827770f10a9e6ecbda83f0..e0ecce0bef8f87cf8573c5f918a69da9f9e3a91c 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 3e951803a301137168af4ec7dae69f529ef2870a..d0b4580d1f9cb247f1a98ae3b2feafb4aa2b9f8e 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 83832a8920748ec3140709de2a8323cf273cad30..caa1575e205f9e670f1f83bce70fa470afb111fe 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 7961f503fd0ed1e886f5bcb1a62dddf2b4679ee3..3414561d317b48c107970f8528b627b5cbc1a189 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 9bb94c70fb2d97857687e6596dffe53b59587c7e..f081604d4c6459f769e5177cc6066396237f7997 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 609ac3c33d8116500d4cb005ede38d5eb6285df7..a3b52ce2fc649c956866a101f446caf9df4c6ada 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 87960132de2537ad5a0627c4146d216638021a10..de6d10061387cc3ad8f2eb948bd8262efcc45272 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 16fd7b1bce5a2c1af257c9851e0958671a6720aa..34f5c8bc4f5c71f17358a8515111a049f1043421 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 98730ed53525527137fe91571705c6bffc0fb7d7..a21104c575b68dac309ff15743a8c33e4e38ef2d 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 c8307a894bbf97128e6d3dbfde9b715c6f3994e1..8a80740b858287faa486ebe7f173e62e8d2902c6 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 23184a2e326e3736c99e79376fa8320f52e0504b..bafbc14f162c6b9a558fb88b3e20e1cef17a0083 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 f7064f21881e1aabe9525593b2bce8b6fc5a935b..a7b4f6aa6d1457fbb5369eef63aaf6c35b0ea802 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 1e3f817da3ba211d582f0d627fe4b8cd525ec117..7f2e0ab3e76b5d17820cec53cf82834fa56a0af4 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 bc16dd4a51a5ee15097ed59bdfdb2b8dd65a6662..d0d0c8d18cdb3914698906812145c40a6ac00da7 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 9aed235aa0db37ab20b71a09477734e3dd2fa213..ed27f77d555f0a89e7881fd1ee39ddb44fe78521 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 cad73b864b38c9f1e12e9af02ca04855f875aa43..a068348c65d909f59894d83113cdd217721a1372 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 f88386161eab99edf6ab021c5b86537a4ef49978..758c79d63bf93e0d7877f4ec647cfe9e52f5325d 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 cf3cd906f247a439fe643a37bf4894a25f8c4348..40ee4f0e820ff97b79549da349d0154adcb747bd 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 7e966680ec3691315e8b17020cbb89cb8680dd0e..92f322632b112b8690604ee4c15b32e8425d849a 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 b3d68cbfff958ba8351a8518dd18eabaaf80dfae..a1ecd4949ba00b6ff3c7f2294cf37ce7ff17e552 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 cb024b292d0a7936a8696b3c6347731477288f0c..bde1dbb21257d831460233489f048adfc868b2d8 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 9d44b38e6333f4e4099c0965f9cdc9d6022616b4..258424d0e66e38932bd207e07dcf78e2a32114d1 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 6e8d71ab95e555a758bd8286db214d4240406b19..df09cfe95942367d97e817cf08bdba8fd8f57786 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 376cb6d837467f0df4cade18e8038c96d87291c6..5720dc402d58810d760c840d9828df53b5ab44dc 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 6021294b162aee647aad48e3007f89ea4cfdd12b..20c023ebc0de3851de8795edb1631dadd09d20e9 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 e0bd3ed080ba92b15f07bdcdb2ea933e426bdf2f..980ef786b154aaf2b908471089cdc7955cc4e95c 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 6ad25b9652eccdf6d657697746713eec3a0969f4..d996c21e9e7fae878d55a9170077a6d7615d5044 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 2743f0a3c8012639d9e7be110d7df1e946592ec2..e57a400cfcc1a0e4f4e946609b0bbbee94d3ee11 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 b8061a6d9bcd5e120ffe7e130891e882c3cd7c66..7c4c4e97f2b06a9c0e407787d09c69b870cef3ec 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 254d057df58d48d28eef59ef727276110b24306a..2857d86a2e95ee0e2542531785ee196b6e212ab9 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 12a69fabd87eb8d72f637b90b4e653e7ba308aee..f1b3d327b46f9621e30f76df3af79e692a7d9f13 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 e2e474bac728e21090d9090d0da5222ba2595440..8c086d1bc317776630f35917a2b579c63bf91b1c 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 d98dec0489a1b78ad69044ab8b78bb0722c6631f..7a6bfddd09855ca943750f5bd56d0b724aad3ad3 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 07e438c884e735e15d312f5f91970a82afab365d..acaabc7275b204f88024a3a958a608d41f9683fd 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 dfb65806be1fa489fd8e9b7f0b13de8dbb0f3dc4..b260b3730ec8c07170f25e789da87aca4441a06d 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 cf32911404300e35fb447296a0ecb3e21584b611..8e9797575aa76009eece8a1363697ddef343d884 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 4a52aed10f9aa8cf20d814cfda5b0f273f20e791..88c7e96cc6445035953c166d312bc43fd6d3e1cf 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 92ab15263f719fb826016e434041a2a935440c54..09fd74262dbee5e41e41f05afbf2eb1923cca6e3 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 398cb140400075591e2583ddf862972b560fd98e..00b5ccb4da06cf704c945a811571a7397bd41c81 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 a75646ac24f50187c3b78041f0f20b89f1eb4e63..acaef854dfa66828c13c5e5eb3f047dfca994199 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 5054a666dc1a87923bca7ae13bc35995a084c759..a2eab7fae3e035aabecddac80c136a2eca1666cb 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 b4e243c79486efde2240c5a4d6f82c2ce2490198..d1929b5f9283c6da5e331b103b015287ff52ea3f 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 e6bfbb53634d14345d885a6b2ac7fd78553e3773..8d5c8a799a06101e00f016f97fc59963b51574eb 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 1dbe4256c8b9b9a8e0a27c09e795d61fdd2f19a4..b2529c7bdcc3892af73605aed2d71740bba122da 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 ba3990ed0bbff3fcf76b6ad6a1a57f1b9cc7a7db..a02266fc115ae8cd4edcba3b058bfdc0d5750a1d 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 273eda3835bc02242faf8b439ccd9fc450527080..664af6789c143cb4d8bf170c2b0efd3cff7b0927 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 a9d57dc68043791e083da3e3b6649684782310cb..9af1facb47c6af102f90edcb1a16899603f33ee3 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 2ab450e7dc351da5b1648d4155078c80e4dc2333..ac852cab4a8e6e3f0eb921219362d058f5485be2 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 683b09f9cbd67c8a4b8b57651794aa6284d70f11..4bb062469d0370bbdc936de8bd0f3070416bf30b 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 09ad4b5917a4012a8f34c96d842621980af794d4..9a1ce4b3bd2b65ef6babcbd22f8f5fa2d9678fad 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 5b05d77586b11126279c3888fe644feff8df0557..a5d83051bd43470acb393a5d0fa9e795a8dab29e 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 ea254e1a675eae35f19ebab8d19b6871f5db34b5..7621bf50684986ed290499c948f12eda60c124ee 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 0cd09711071685a565b2c99bd3c7536eee52a1fb..d056a6cf5526b31f9fca224730a11a11ff5ee9b6 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 ed0403cff0a9a1da4614efe758e4ae9ffac60dbd..1a2dfb0a9b164f39fd0fddb7f71b0909b1bc11b2 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 1b7ff7c6ac97204e705c5582a0eb23cf48c6dbff..067c35fa49f5e19c680a1c25b3a1831686392327 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 f79231235ae69c4275233fc7604e34fb93811ca2..4a23d11440a3d9ff395b1c7577b7e7084866c075 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 14943fa37e1a45d023cb3419ed44ef13c077eeb1..74e834eb7ae160b57ce7e2f7d63cecfbe6d5c4f0 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 9c0c94bc6ce930db06fe56c7a1d469657949fd74..c894af98e437545f35f2ebcffdd9ee7218476f68 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 fcdb05bb82c45e5537e0b19107c4424c47644304..cc7b070d75039f80e765637e6a077a9c0fb1f96f 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 cd0b8b1ac44f8eae5d03891b2880b61ca2900009..5b37233a2898a12a8ff9f74bc499d109b0036a11 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 c0f873a1300347addc5f2745410128e9538d3da3..7bf9dd77e0f6300b4b99e06927ed0ae4124c760d 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 a179fe43fa8a15658f91e2c03466548ded35593d..3553e032c8f15dc94f744bbfc0ba50f475aa147a 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 0d0cfc51518a47b962001882505e87503f9b67d8..2adc1e9073a1c160421f024daedff8a153592431 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 94a6cd075559a5f4f4d1f53490b83c0d74793e42..f766b782e787dfa28f164c2b62bff6c1887209de 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 040db3c8aa9c4bd65457e167b12d775f74c29feb..47b79141ec6263d042973ac0178b82b8df81cbe3 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 91a5dd223bfb7ade872016a758bf1a87131463b1..d3c60c8da7019a005f617a4088d4696af53c2346 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 964d69cce001ce2e901a35fdddd98baf0ac35bff..8fd759a96821c5c926570ef9a5c14ad11bef4a93 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 c14d2fe7567d7836befb320f42bed7a098224779..55a8386873109e76fd2c5319a8c77cfdafe0fdbc 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 691e13f3a899041640342712ff32dde7406fa9cd..08bc5855c004e97d6ddd7d082e5eba0701efd519 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 3dd38efb1a1e854d55781a60d17b508486124de9..abe2369c213f9e936cb81ec9ad7994e636fe13e5 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 497e2086d81d318aa55c899906eb76eb5f327c1c..e90d9c173140cc9a844af52a9a722d472b990807 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 245bbe3a11f70f64ee91c9c84a5422b134627e58..5b3cdbdf94f05aeabd9b54a6e633acd224de5015 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 059d1e897c8169ff48fc463646fb2f611cd69cc8..a9fef1b2e349055973a07a92aaa6350889c68b2e 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 72d219aafc74cbc5acc185c67e336b237e93e832..51de04b62eb7f0822e9e4110f02089d2e11efd75 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 ff5236624ddcc85ce2609b34e483098dd56a9a95..e5986e5b83464b7c7a94c024f13aac913098937b 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 b4212b8c84f2af0dab2368b4c3b635692b3e3375..e8ce0f3c3b355afd8ae6822e06b6169e1fcbb091 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 de604afd48c3f4a9c490672f9fbf6965de3f1b90..d0fe8b6a5168c3335922f7d1aab77ab420b38ceb 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 de669997a5776d1b42bc7b5c122b15ac48e2bd88..5872e589d073c54b32beb820026755310d52bff2 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 2b112b1745984770c54ab19a2edfcd1e7287388c..0c66ba7016776ffc69ab22d25087cdbaac9181e8 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 3f8029f03a8662895cefb841aeda89ac07abc4f2..deb18b9cde1f169e284588a1f725925e11981453 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 4ca08a07de36fbd1774507e6b9b00c2e17af6e25..9db647fe9e3f61a91dc1c131b808d2060517df78 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 a48e8eba047b3166b026cbd6626d597cdc400fa2..876bdf74fceb594f83b6104767bd551216a45727 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 e5d9aa9048e1ec96937bce1b812b5b5529095e70..d8c1bd942cd08fca189252929f8816e453be2e99 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 7fc3b698010320e40f59ce77f6248e77ef7aee93..8625bb7a99eb4a2b5cb0b4e63195c3657ce4903c 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 6653099b00095866e80a9bd53cd41c0e4c00e9bb..bbacf9a5d1a583bd1325f4cbcee5cc1e83987d1b 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 c07b59792ce470189878294fefcc1c56cdb10bfe..b8d58a3a16e1c95cd65e5351783a2e16a3a6e6f0 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 08a0e7fb3a583724cf654e144dbb937886c1ec26..2cde07bf450123241158a7622f3bb495201c4ea5 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 1a4aa4cc19d423ddeb319e91e2c854b63fc1488f..4676bfc9b76698984ca7c5f83bc8decd4b6df0fe 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 6e9a18934e9c5e63f6afd3a0e144497bedecfb9f..299c2fffdd727fdac56002d6c18f946e5af47bdc 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 dc318ccb5cc81f04a2c439cef035d5a788405a80..081ceb216f71aafb8fda2978e7b5e5473b5960b8 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 684ed75ca26fa118cab21e76879a4cae846091fa..7fe66b06c4bae58f273e9eb22e1c7bd2e51492a8 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 17b35b5be0d1df9c3197e60d34d6a6394049ee88..07a0d834f243456fa801a6b3adbb72a34e4d2f86 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 05d54994ffa01284f332d5f47d70b7481f50383b..e0a0ff7a583a45568bab9f0b133cd66cb81b5fc1 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 5da9e1f2297b93111b6af6d6594444ddbe8818da..e56e3ac122d9aaf0842d43f97af9a1cc34291fd7 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 73d8c4fd59f94c2c1c390cec763e6e34c5f43358..1bf661e409669ad5e40c75f7ed2c472d33415963 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 f504c86064ae51e6722ccf75ee17340d9fae0ba2..dd3f9e65e2c93565de9a4e3a30a4b67e9fb9d50d 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 84fd24745bca827c656cfb85bfd1f19cb6258de7..75468a3de693aa7026a5e10d08e0baf06d98ae64 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 e243b349805b09fa14e093a1c7354181a80fd475..ca4cc9901d2050abd271e14767ed38dad88bd8ac 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 8f5f90eb7998e0359c9644339861c5431696b774..e05d3cb4ca3e7a34f388273c3b4b60c983e8fe52 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 f367765ca33094130a933a339b3df4e374d98582..b9733ae5215b2bb14036e44908d7e4092775de39 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 b76bfd6825206fbce85d84bc41446610b1d1a4f3..31149d59a592234fc6f7ef5404c78a050adf21a6 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 e94b803f412a8a8cc1744963e9d4dd3b7cd0a220..d0dbe526e55786730287dc7aabb75579bb9a073f 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 df2ebb0c1fa628a3c8f15922977cb552d02c703c..d31cac3030fba3105986eca752354038380d74bb 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 80d9dde73c4db66757d5841da82d0a4f4bcff77f..e4c5d2b5cdae05dcae4324d5160b82df70a2b2aa 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 04daf117cceaac3e855097e398fea8a8d0b3c76a..a1c6b124429921f46f545a1704eea3e443241107 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 5f1296fc987995c833bf078f407341eba8c7fad9..598c82448966406d5cb94da45bc831cae8b4c3f5 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 d657ca5c622121d1b3e52374640ef5aaa51336b5..d5f105f68be5659ca5c29441daf5b4597ce44d1e 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 c91d97f159b7ed2988f9a6479699190ebecdeedd..e2427a3565cc7a7523d63cec5c9b2dd9ce4cf4be 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 f797b3f77e48736108d41af7033672ebf6510107..16364264d51e389a89a804eb55ab5f0377eea223 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 e159907bb98d2b7aecd3b9d9c3ee859b0605e9cc..344c1d19346f9b1586e5ce03421df0e239ce3167 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 c3ec1ded30bb4c04f6517f0ea06b0f6ad1649869..a5d76ff930eea2bc347fa4df6ebd3487553f37d8 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 eb750211a5b8b438ee2ae304d79a5a4e2bc37665..728c8b1b3794935e96974193aa65a034f6c4826b 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 fdc4aaa8cf75b8ac37114da13f69da6230c53478..1f47a9712af23556a06b9dcaeea05d244ffb5aa0 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 6f3d9984aa937c77a64de9e2e4a6da025ee87120..6b0fd6f4637957e12e0f0a68853eb358aa715c5d 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 fc78d4221fdc02bd5c096a9e91da4f2ffaf8ea06..2dc6d8a8f74480e89c278c215d6012ea02ead01d 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 f46e2edbf8d950fb1563086eb589bed8c37d22aa..d4c77b2ee1e47b6dc5209c9ddd771bed20b53681 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 019d0285f55c1e09b6ab1fe01c0498c8398d9ad7..534e2598f5e53cee9ce6d65a122a71459eaa1fc8 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 99d5a092419a23068202736e3e15fba727aeda73..c7f2b9bbc0a09063ae9166d5f8b8882032502a0c 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 136aea4d4461cff66502f731e30f310db5aa4d46..f8471fc227a1ddf6cf3f512bffd53eef75c363c6 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 2d247490e01225f9c6fe2d9011b834d610c0bb30..6b7f234eb218c9e8d99b6ec40c39bb91c340324a 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 93af3f82b60761dd1b47bca56f55271dc8230d46..303583cae2e89d6adb8801f0da63026ff0efb12d 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 bd3e264fa032ca0c0fc6fe716c552ef419de0ae0..b17770d66015cf966fa07e82f96b859ce25db790 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 7ae5c5fb0f99fcf2c9f0caae771f6f8a95260029..e21d5b8e8c75cfee0154e567eb567b4e4aeb0d7b 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 ad7848d532e6c3dcd2227fdf6f7134fb0fe2dae8..e5fe92018e163d89c935e40f9b325a0406fe6fa8 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 55a3748619ac82f445132b6e4282f31d5ad1a0b9..15862ec353412d75c7d2ecff44099782dbccbdb3 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 75713f032ff52c5a16bbe0bc01bb93dde66527f1..c33c1ee0bd176e7dfaa864267526cf1c4ba76c72 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 6b322d8539eb323c09fe0ea0e0f18a530d4ff156..6c17739c70cda23d8df9e25d0350b2cc985246fc 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 35291ff7414f7f371007aa2663642b872dd0451d..db0ed8af3c4e0d1e95ea5915ff1c84e8b8d80c93 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 8bcb14cfcc10738dfbaeade4561bbf68d2a38965..02b4825245493e059719d6502dbb680e5d4e893c 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 c9e50de8a245428c5db1cc53ad7799dec479b2a4..1d97b10df7a2fe6ce588751fc60b331dff447d83 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 b1e97dc46aafc88cc2a9a5a0a96681ff13475476..b955d38a09a11f5069b14ef27bb7455c311964d7 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 55d3ceef986976ad261fe11c24b91b395c6f7ec3..c1698af134fe4c3c892e6775d0c08727e243dbe2 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 9ef21705f916ff372c7d13fdc3d7d180effedc3a..6cdc894f89721e08f49789f4454e3bd0ef2293ab 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 d51fef0360d64628af436bc9698a58dc206dd4d8..59374ddd76b23c676cf254e2bf1b50f44b7305e6 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 9121fd9023e6ad5417f8eeec6921165311f88983..d35678070a954d4b40be560d9ca3ba365fbaec60 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 dbf976092571a74beb7408aadaae07f237eb8631..538c167ce9f7478aecdfed376f63302258149af0 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 babfaf7183861c0bd596b3d7976443124ee42c79..5c7f58aeed3a27849eb5a5a8f8e3007342f4ad97 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 c5061808a881c858a1154cdb2bd412ca2c2bf919..71db1555dceb19af44875f477debfd717a365c68 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 9753d7b439444d71fd6ff4b30498b6e5ec280911..33f34deadb10d248f993d435201f5b18706f5c99 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 9fb7aaf8085ef79ce0854e3d49c4270bb939e4f7..6ecd3a802803349e46d8723a8660fa6178b1c6b0 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 d634b3568925b96f84a49c2d9527ab21af35de8d..19d98eb730d0908ffa5f232943ff4a73b32ee0b0 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 e1c72bb37d103a44e62dc82b173a338e2aac5b05..d2ff925420d7cdb5e5ec21039dc7a37801144112 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 0c17de555c0fa1d53152f002c0c541854ff78ae0..715ca324439553069b5fc5ee3ac9104a640d5116 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 5c01e71dd71dbe2ccd55f35cbfc6664b0def38f9..90d8f740fb6897f8b3b3060a939767a876e1991b 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 84d7b3acf5890fe40a292b3853dd253536a515d8..829f9c5c3b6dff2f3cf6583339c594dd21d920a0 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 b2abbe3508aab2d5c6afa1b209b39b6e2498adf1..beca5e6a665cb2d9f43cf51042cbaadb5a6764a4 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 c9829284dff4dca180e98981f2bae2427a86af6c..4d8a983eb2da292c5414e7538f5eb68f9a368b78 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 757d7c98f99c5e90f838ea9e84efdee50ae76e13..83d399c8878210dacf4db2dab23b2c9e340447f7 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 6a7d707d23e123f707690dd5a43559adc35f88f5..f84cf009da7c4b5ae987dfeb761d0d85e42becc2 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 0a7a0316dede37c5f8575ca008424679c4d6782e..49acd497aca0b58f8908b0700cff84d153aa9a13 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 00b67999ecc2380a91b113db7c8e1a491c40b17c..f772a2bd8a035a1fe6a1ef06e419fb854cb7daba 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 ad4a9f68ce1a8177226f62631db2b4ddc08bd7e8..3812c220e470a1e955b4d98755b5de5d57aa7daa 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 b38f96f743e54b6b89d6989db1635c4eba61f918..92bc33c9e1baf0c0f912be3b843542d781054471 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 70e1e0fa3602729de1d6834006f13d410a5a5764..a27ce081263c5e0ae415b79878a8272d231d1182 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 c1ce0632079829b28b1e4c98920b4f0d1433b5f4..ad9a3e852d4151f625c0d3de212dc0dd26fa4f00 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 d90238e9c348f0483e977c50e5c8e5a265f44bee..673f8817e6b16d0f00d7af8fef0b5f68a9e92d90 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 2692fd20910fd2af9a07c771c1a9acb7592be9c4..e88424d72e328e68f1ecff7109268236d89469c9 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 54346d3e2ccc09e69b350ca87ad58c96a75cb0b9..a4976f61b2eb8f4a1b37c1f5c1d5c441ff8f8bd8 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 92869da0fe503565f305fee05c769badd28c3d39..a44b48f17bc955d6fa099d1d3146bc90395da5e8 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 bc2f8490cb864c02867459c2e236054ee5b0a614..f4f10e012c782865cb7915fcd8fef5d584cf0def 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 d060c3007b05a4f4c14a9d505d29c16a4b9c9f21..f80645b635012e223423b5ff17a72ed6d34a0570 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 a0c22e202ccd88cd64e70e6f38cdf8dc4b221992..f86da2f920734c9f89befe74d77076c5b4f42ad3 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 418009dd7444e7861623c0ba69dcc5fad35be4aa..5ee37cf23b92e878f512cefec1d729fa1411f050 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 c38fd71cdad44ec716c329ff50b49c5431d74254..393a8a28417af20acd76392845a3204993b86fc5 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 85d28c1ba6274571e2409ef41c1240fa30d9f134..529907c30ca0c1284032929d979bb7ec3fe38833 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 ff4295349ed7f830afa4c8962a8143ea3db86d58..e9651921d8a0770c96420c64262e70061307c3c1 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 84d6b60690695c2384c46f9de6652a2eb090daf1..618968051fb171dd1fb493379710ec12622f5ca6 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 9ecabcf3c2c8bb609f657b7a3ec350a175db3c27..e56ac7a237b55456e86bf0ee460412946d3d42e5 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 796eb4a872b8a2e51d1621f605a21e83a1b68e06..e5f51718506bc5559b5a3b00907330c99bf55410 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 5e0391cc8399caf5e50ced6cf2ef62a0874b643b..1e553b2e59bf749f988b8a0326e4511de7babc72 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 efa6f6d8c8ded4ac11713e0492a072caf5b2babd..76152c4050140516d0972f2df88d26103d4e91f0 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 8472b66c12497572e2284fc043fff3ad425f0e31..a0bdaeefb15adde35015e2a32d1455b32e110ab6 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 46d529263b7066b5f1ee8f97f4c951682ffc8e86..3e5482876651a2124aeb71aec8f50145e917f4eb 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 0d067d45c6e48d4f538a8888ab5f607ae75cfce7..00035ad4a7e575aef2a35d5dbc201e388a32427e 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 5e701c2859cf9971eb99f94aaa60a10df35fb378..1eacc0217a1fef396cde5e8f946c18f4455d5079 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 e73f057c6841c5f8163cdbd9e3fae8012e65a9bf..c8ae264b7c89d3d5b6f58d31aee0baf63e0ba65e 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 1b0fa68e79877e46bff703ab939873d3300bf70b..8c8189c559c1d6ffe74a7916a834e48687774470 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 40f7cbdf221b796c0045f51c629c20187da4142f..5628846da89b4420ca41934529557aa0891634c6 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 8a7897b2fcc837ffb8bfa1c8dc67bf499a34cf47..5d0632556220cb274efee9d7794b57a607947c9c 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 918dd30abecff6180ff2ad70055f21b31d4184ea..3a2952355d5f77d7414565bc9bdd87c9b2fb7e0e 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 280dc2c569c4b4ed47bf021ef03a526a8f8e3cbb..1d9cab354407554390f4bdad323e0eaef9c3780f 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 cafb67bc4cacdbf4e185a47bc63da4ac884a3f13..98f1ab3ba1d6eb995bfa3a90ef8734f7dee8c3a9 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 e8fed6c68b3cfd7c3128c28c9f2094b6d165c2f8..6f57f23b1ed5e673e0d5835a0ec3c549441efb9f 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 cfc39eece038f5f84fbe6213fa33fb2b671fd5ee..e7a118d5d09d685a755c8744ac4d5f8badcac470 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 9b77d312fc3831a9ca4ef256d7af1c6bfe4f7d48..3463ffd588f9db98e953986f488ebf7f6d9c241d 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 0d18773ff8d72a9da2ae46716fd7360379e4676d..5a9e5eb53e0c8b3a615b10daab0c1332e04db3c9 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 e2b4ef8b24fcac6ce30c79936f9aa05f095795e2..65f08a94f45d38315cc2a2ebfb702d218e659904 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 6852647fcc64588d60686c950f8d14e6178982c4..414451cad8c8a9be79722ebc65d18126d4f9322c 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 9f970e2d04075874eda93bcdad231281f097aa56..042ed981df65bb5bc01d1f646d03ecb1db010b34 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 3f62fabbc17eda699abd66be4a77684828fd9039..5f716e2b2bd0800be8b3d04def89d2c8732a63bf 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 33442aca8cff76142c3a811bb0f181cdd3ee5c6c..9bf7aed8bc2bfe815b9bb5ae7fb730f96cda28c4 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 49ff010eb78b40b80fa806ae09d1edb47fdb2c94..2fa9ef98c9647cfdeef7323e7dc5daa119a1a917 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 09106c18c2f149f2e920d21627f42cfcbae7e150..bc17acaf7b31aedfcdd931ebf14ae93f001840df 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 167e5a1258787811c0804c52088a59f70bac8d90..2bd58974cd344fe78a5e4892639c6d6bfeb53142 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 6b1cf572978cf2475fec957874f6f18594bb0124..7bc345b97a2553572d0dfc3ddefebb44015e30ee 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 0b6c2fada0ca84ab5cd813ba6e1e8762fda96b2e..9fa0b02098502db4fec80949eb9cf5ec3bc24186 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 b30d0c4f91559451ded23f6055e944c79c4d20c4..5b501f77ca37e91ba4fb9469ff35ad55f288cd0e 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 48f268ae4f3dfcd0d0e2f7ad41b86a241af1a3c6..f2b485816e33c8add00008bf47c01a799118a7c7 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 af28268f6a15eef7650b792c10a1f1e57d536b09..d760e322ed104ed3c86ba4f17f1a8906bb18ee33 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 31231fe6339fcd9430377554e0699b2066aad52c..0ffe381e9f5e571c20ba6ab57572cffc03eb60a6 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 fc1a0b1a7c05909439311162fcb412cf0d109c2c..943b7709a0a52cd83fa5515ea0801c8e0f5df856 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 185ba13f1df5f9376f1da6ad86f8665eff1662ca..a6d73e6a6492dfcbd020b69ef8fab5024c62a1b4 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 5338dfc774153d3f466e27d7c76be25e28a17917..4883a8bf299002ddb275ad9be8505d9ac466fc57 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 8fa9e613bd7ce86236074fc754ee707e4cf71f05..3985acfaaf853106932af86047b5c1d044335286 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 bd9cb12b024b25340c7ec01335134b7ee733fb86..faba91a5c3a998ff992b5509357b837674d208e1 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 32e1e8c692f618ab8b2f4a4a2068a0451f54c6a0..03ed173a6b9513e0cc7fad1d48be7575df3bc591 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 5105e5f9edf8036213d9a00f305549271e749c08..14679dfa838e6d1ad67373f313616e7cc404f4ac 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 249d8f11c95e12117e084716bc576967b9a98273..decea8973fb32ff600428814a2d9dade4fb74c46 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 202baf52000223d300ed9ae9b154b27d5ab63acb..6be64f70db8e41a54628031c108fcc7b71da80f6 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 c35f51f435a16d6810195f533e710c786bab7c46..e645a93ad1e09013b3754e76a8c40aff9e9e6c60 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 4bcea775fc13ececd3582ac04e7ce668c269d93b..faef891c7d83cd9448f994ba06cc24bfae876d5a 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 1cf0aae09180aaa5af2d77cf20edd3b3fc9d673c..86c014b900c059cde3f60d6d5de71440359f5a2e 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 c9641e8770f142556e93b5b1f0b55e924dca065a..90b1df32a7985641335e62659e2f80c22e01b21f 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 b50fa7b28dab033d9ce39550b7dae6a3fcc7b5b8..4bea11406476bd4f9dfbf073cf8acc5eec86547e 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 038a999a8e0d5bf59c1785f21bc4ca666b527537..8256294b5c890306aec1a46c6b511176ab3c10d2 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 2004bc31483959c1925ede7a33ea9e0dc603fa73..393775328ecc8343f0197e32ad1c16c086597bcc 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 29268502aff2fc146e651caf95f36c3a77ecbc87..a3ce73ba242be09aa5694c83ea2067e2d134d712 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 b260e9c94279a1b471cb2c2467b3d2e09e6829e8..e3d5e42942c79f723cf72e2181aa73a5ba084303 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 0168a3aeeacd10bdcb163fd9c0aba8962bbc1e15..28085184874336f262712b5db34830ae8e553067 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 e812cc9641d53530d982b9ffbbf51592bff88a01..2d98e62e71c64649244a18c699d455a7bb9b567e 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 e2c473e877294955f6ad9ea7e83356bf69a0ed87..44be9eed1c0b722d93d1dab98aaa0d40c034bb3d 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 d52d402f28bb7849e2f1a5c633bd6b118e8882b6..13a813038a69d698e9ff22a84445ead4c8a4f1fe 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 d366efd12eb914df437d33e76079d55ca78bb8e9..eed0c1ea00c0f35d222ad71ac13b0d6b72084894 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 7f641ee4c5b6fb98254d4904720c1e5a09321ea0..3558347975fc3c51f40975a3e5037de27ed30b7c 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 f0b99cb6486665258be5d37b13436549a562e424..b52f3e6900a16f0eca22860e8ae3e7845e456e1c 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 39674b76eaef74ddd6201c34a52de1ce65ddf317..4d22ff4fb0661e8bd62868897a194c823c9389b0 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 b143caa544117886f4e947794ef9a927255959bd..4681bf8b1b8b32979cc659525423a587f81ca567 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 de8b2e1b3592853972eb475c5ed0907b403f3094..3c2f4508ee9c56bf827ab915bd322ad1c24ac2d5 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 ace014a2d77c457e732b500e7460abc2b9afd93c..6857c61d5a90f24c6f196f1ec22c879323a4e04b 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 780cb31ef95e17c1fda1823e40fdfabaabb65c98..a72398b73eaae20519e739cebfe1be180cf6bb48 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 5a9fec759f54c8bd7101a8605c47e81b1a12a901..8ca99b26badab04a1f7024c040ac886f9b171e86 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 335bbb467e301f7e42011f288925e09886f68d69..9c49dc6e0a15fb51b98df94ddb1cf807f43a32dc 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 0829f12b4f06eadf91a1b5a05759e2b46f2bfeae..44d8ae1587aca8ddfa30a9722af03880c0934246 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 ebef7244e89c8484a2ea6a233110cc40457d6cd6..e9a8342a25580b22283ecbf370ced5288881363b 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 795d567d17f5fdf24c7857d3a5efb55d34147429..6beb0d40015ba383fe0de95e07cf8750b05aeb12 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 9186d28a36e94d092ba6a83ee2eecc2d9df91773..91d4adf17f6646e474021ecb755fdafb6cb2b201 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 fd7976350ec373a1e13483ae9426604189dc1108..70a490ef9ad49796c5242487541556705e3bc178 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 d2f2a541ec6cb1117e93e5d8b5d854c6b6836d82..22931f99f5a8798a9eabcb1d8656e7a00cc36120 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 c2071afc60d64307376ebba20a1e664a3c0d35db..d76049480b6cbbe32c8e42910146aed55dbcb12a 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 c0da3d1f2fa86bfd7d12e31e91726f3a48a95e58..acf9349c21abab12f5fff4ef420f15b94276450f 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 9c30119c7fd96df0269c896b3937c67004140ebf..31f38bdb500c44dfb1965a9076a501af031c0778 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 18b47ee011875bfcb0fe080e0cec601dc750cf25..31e1513bd1c25c80a0370a97ff343e991624775c 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 59a8f78cc738c2eb22c0bbaf0f049134a18b0038..304a9353dd92ed0e116229cf97e557cc170d5a35 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 afcc70184de118e970b8fe68fd4f2141e8a0608a..1b82041523a055408ed94d2718e3d4017526b48b 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 87bd1e9e62f3f86ff44551bf49b4d91dd96bf6e3..4fa57dc70a0cc31ff136c2156897469cc0614d36 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 6bb84d2dc14d244901a8a7ee398b8bc0bb9c99ef..8a7355e9155f85e37ab742772a4e3ad60f2d1712 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 89a0683caee5df4a61f08126e276c939c901f20a..3e2994de521a3fb5b926316ef56fef57c92fa987 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 8adae8bea30c372a2c1ff929ea03ece2631bf99d..4738a7ec9b0a8892e4933a974ee2f9ea1cebc646 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 a7e9b8e9df7dd87205349dfe6095004de260b9c8..4668842ea95d21d9ed673b0b74fba1c2c24cdb79 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 d1b43d9f79efba8c3255f3bc90b5b14c39611886..52e5e6bb6a031af922c9fdd18049eaab6ef59671 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 53e08205d0bb1806b9653110c736caed2afe7d72..67f8bcefd9546aca2db59cfb1e52c7862f7bf476 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 15ed6e6887d4445dff74d6b3043ac374cebcdab2..682fa6a56acc913bc415dc11a6abcc6880e121a1 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 98a61cddebb23401dd958a4fa171fd58ced8ccd5..9ba9d44f208af11ede11a2ab4ab8117ca9f312ec 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 d1c8a8aec67db628274072ec89db2a667d129c53..3f37eb037926abb99919712b923c9c8a49f4cbd9 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 9632db62fe7b4e8723591d25577899df2a4a3289..cf9476bd97c5f9941bd90d7443d080906172f34a 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 660b93fea7087e1e64aeda165efe73176caeaa6c..631a6f10332a17181ae720ab0ed9c136d61c04d6 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 2d479def83d8a890ca51fc7632176cbfba53c657..74aedf02f9ea90275c165ca76e2fb7c76f63925b 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 5aff87c9b05cddf8ac1d77e44276810ae4c5b3b0..cd57c75eee7bc5bbc2535e84aab72bd6e654226a 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 0b2a1864b3c562d7fbe897302eb82edda50c3996..5ebd4a22002fd50b1fd7ac56482901a2b6fa667b 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 74e397257bace68b5e88e4e6da95d5d034e4e398..1092605f3005121c6e21a44ff7ffd891b4aff53f 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 20a87a29397d8a2d3a963a8ed2b4f648ad6829bf..8c3966b5ffa324d80328034aa2f2e390f0c510b5 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 45edf58ec9800ef2273bf8aacf401a7c33f7c9fc..c3e1b089981a7be0a17380acfc6860049f6b8cbd 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 a9577fbdcde06f8a8eb5145fca55a17da3ff49d1..79554d4f07e629c36b9e5dc1fa8827681318db7c 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 66cc1b6bdb867539d159beee905bdf25cfda1736..412a51beedb818742db90a02174c3cf4dd6eb790 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 fc5cad246ff1ba4aff79877fa1be8008704126c7..bd249812daf15403f90d71fbdd58f0cc2d452bb6 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 4d228268a7f13bf5afeccfca7b2276775b267593..d80ba74c28aec9a92896875cc509354370d624f0 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 ae7eaea7d09bddf114abd21a117ae7d7ee647e13..97b48412d0ec266a3ae863d0cfe33ceee1dbceed 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 291ec67fc052b80c17365566cfe2abb4fa22af93..910a366551c01a993cec9b1484a2bbce3f98407f 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 56a53c6117de7a301142884267d81beb3e0256d0..9cc837c122b555b17b37f41b5a29800724da45c6 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 d306c9eff8d619926b6f35abaa2434b6b1b93a76..f01940fb379be23ea2e7732ccd4a5e35b035ea28 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 e7b0a42cdc16895630731a9248e9eb0b8d17e2f6..da2d62a023e3e41437499d03cfbdddaf4f08932d 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 027ea5e8e1124487590a655ea5e539730d2c84e2..5eef81695e5653db288fbaf7c30b25a09882fe0e 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 6f37abae9b4142480b01025d13573aac64506af1..9a6f6a7edcceba2fa10cd39dcb486c980b216232 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 5c5c2b5b5cc5b7b92449c7e0a1c6028200bbc029..754775bb1b1b5bb85fcf0e286d5519de627f5cb1 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 290b75064d57829fc40f0eeb8c229539600fea61..11a0dcc661826cc6371351ee02cef80e8b58d726 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 7a4a9ee943503fc8c1cf0dbdc5401a45668f32fc..28a6f99afc4e88e66eb80b8084de915b679c973e 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 b6372508ce50c4f9fff7665fab66a13899f2f53a..406f57a756b77c75d6304120e7f4c64b82416214 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 dd779d35529528be2635db1744f2f346cff51f54..aa651d45d50becdce14f288b7b49c95faa6213c0 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 f129f4ede35eca24ae36dfd7eb0b9e0deb8bb28d..8dfd8f2165029da99bae737a3ef090aae9c4adba 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 4220df1b81ab2d07f24f35fe1af02df1d309bcf5..6736abcf421c547941c6b2f21486f9f3c65581ab 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 220cd9a3cb18ce0dea141e14cb69aeb02402754f..45e09d68b88ff248175824bdf7b990c044486f6b 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 937ba41cca8c637ea929e40d48d80f315087af6f..ba67df4a71d5d9894edc42aa3d1f411265a64d5f 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 030787585ba5366d841f3c5dfe01554e6272cd24..160224cdb31373a71732cdb2165192cd1daf271c 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 b0fa6568a914367e9e0f1a63138d57457d85c618..e522832deef4006ee4b26e6ffb41ee172ea6762c 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 378ace27a98966f40848d3b0888eff2870cf6fe7..76ced7b3cd0e6c3d20e6e164f39f07003314f226 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 67136765a2c4ca6ffab0a83e8ed39c6b6b8fd60c..3c32d4fcb1c967925b9ee65920aa54304d81b18b 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 9f0fafa343f82502467829aefd663ca8c1ab604e..7f2b956851b9c43fb6d587708aee7a21ab17d8c2 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 dc0a4a3a2f4da4b4895d65c15ecfa31e4045149e..1a3a5c98fe8656e4f06dbffa4434344775cfa1c5 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 b8fa48ba74b045f729611438455deaa2f2188689..4aed4637fedffcbe24387a4408a45db76de2906f 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 2e0b4d1024c7d0e17b50b168ef59465ed3c6e72c..c402184994123c3124f4f06710cf8567cf72a788 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 4d74f1cf28ee2c4497f8b0dc8c3ef9480763bd9a..2f5752a3d0ca0a04d799fd694e6c5fe789bfe30f 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 26f6562a07b37feb1b1d1313c7028daf860ebc1c..b4bb39724b9b9807e15e2734d7a302439d3fa803 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 84928af89b6966ec28650443beda71cecbb881e2..0afabba01c381629320c980f8723861b52d9b27a 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 d7932b4afba7f6ecd8355f779a646dd68890c65f..fcea157da4da532659cc9174560a5e14dff2e705 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 c226d7d7f54dfc514e21a9588c6397b0bdf30e97..84d41ff6dc429bc991ea80dd22a24935ebe9d093 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 a284e42fd5a647b17c8473bf2284ad1610486155..af8ad154820e632aced96408af47da069f6d70ad 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 427129d8a30028fd25c84585b19e86722a1a7754..97ecfa8108f3358cd4907dac93d42cafba0a7f9e 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 f407c3aa2c52acc069667c3c49adf1fd76612612..1937e9d78b2e92d752683988df7881972f2da6ac 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 633605b1b88d45a54ddce37a31553d9950270ff8..123f12fce50dd0423dd63a74b4bcb49518eb1a1e 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 1a805c25a007375f0c2e1c23bfccacbd38c7aa53..cab1be0997d072706c7ed96be4187df8f1110c1f 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 620433d949c4d4f630a111ac8bd90d7d931ad5af..c07de1a6d05fcdc315188439ed76d088f5de31ec 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 504e84b2763237427595489f905630aeda55bf13..c37ae6fdc86b6f75a13c1445d69e24e82c5f26bd 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 9987a633832d4ba4401b6e0dca6e370252a95a52..55f557638f2a6499f02c608cbefc647ae6eaba6d 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 7d3e1b5868ee2d6eb4f00326e565ad2392e4a62a..890bc06422c1d74467eb03474bb86239e9ab7daa 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 6012aa7a703522d366962f124b9e583f9808b4bb..1ffd40b8fb0bc9a8c32d9a2492657f8132c4a5c8 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 1d51f5964754361fc9bd5ad5e2b4a880e83b17b1..d6700ec7fdc6388b89857516d5f24db94131c526 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 5d44b15c3776a0003c2cafca0e6ea2c8980ad3bf..0d796b5c57c707aefed7c0dda277c126004eeed1 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 92ff9a41999639675ec23be2f494044e7e8a9d7b..0664a171e43def2ec44848cd23c6caf5072808bd 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 f85a02b6e7d240aaf62bb1d4a71a40dd941be6af..ae86eadf9a3df8f31ebd12db0fac3eda2aa1f776 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 385613a12add11feabaae127c890a544d8052c22..75011904d53d6da3ed0632eb981df77233379618 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 1f82d26706b5c27fb857501e7bdf8ad2ae3a6170..706700738db88430f4cb4e9f3da03962fbad0716 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 033dccc4667611b02052a40f83845766c4d87bf0..ed352c28a0be181a6ffadf23cbbfc9d5158fd21c 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 e8fe06929221f9b720908cbc3e3f1b42c2d16859..a2d90869b8b503ea88df5147e85b7f91131f552b 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 0e4f4c41156dd8225212b252f84ba83ee01a3161..6e211fb427205e06a0cef1022aecf31c77f13385 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 ead1a50568570ff8e83be09749ae5ecb0a61999d..8fb3a5d8ba488795918f87294386611b497751bd 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 2cbe37bc3c0c83b0c44d87927819eaadc0619743..a41ccbd6b674548aada914c4ab064560fe282b14 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 a3b2f610676dfafb9203dd9c8e693cdd3c5a806f..f90f2254aa33e84ce27de0fe53e02fdb7a3b5951 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 523152c0236fe18c8ccd987741bc53c504f20889..7ba490a55fd4a3be04c54bf2274ca51bf50dfe60 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 3d82e87b5d849a25f21bdb25a0029c7556ee1504..a4fe13b61220cfe4770c0c32efa71eaf28eb6373 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 f69e47eb70028eb9b82b0dc59e8817eae287b91c..697d0515765e630e570391935165992ce0d8545a 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 69faa6af64b2a0ccc20c8b8e0a7a47a529714f7c..d5e0a44e465a569f146811b6d9026f79641e90d3 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 eb428f653a5f1f9c902957561ac50965d49a4ee9..caf86ba43c59e9606086d84f71d01baf38aa9e15 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 807fd6c3423808fe53181dbd81434c7e4fba9f36..89cea605c7bab0aae83d1d9bb9eb145db6c1e9ca 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 b872a88b9a86cda0fa228eb3310aac3c937012a3..a2bbd0cf0ba630b26327c5cb53a79b23f1325b4e 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 ce03a74d84fe746024b2a6b713f710ef06c6d237..eb2104e2b763c485bd836f60ced187fd05d5ad84 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 ba1ddcf03a0bb05abc6cc58895604ec12cfc310e..1a5741b9a4cb45d9e73e7a9076de796d06fc7368 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 d237c34b83cd36512b2e9a8915176aab56f29713..02f83ea38ddd1e08815e0b9aa440f92682a96a7b 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 78892ac1845e97bdcab4ab229d97a310813e56ac..3213bf26a7fe86134976f43ebe37b5f8dc313228 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 c763ba3470f6c4d58eb16b7aca38c134e2a0360f..5fcab1e8c564ad9a542dc2a6f9972b562fb93d29 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 655ad6fb7d87a2c363cb98075af9badd4dd4aa15..5d1f01a0bcebbe251ad76ed068e61765bd318674 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 f8a58fa7463a44fd460a37295bc040399020a5c1..0e5679c5b3c289c7bf78da808fa6f5082fa9ecd7 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 8f77e1a016f89599f505aa228a54a1d70cd69bba..1c844c6d16c09bc86e8e4b4fdc4ece156c2a6fee 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 9d37000e9db1e6464f243a0d3833e58f1a17e986..c33ff0758f62391057fb691e66f8f7ec45d2fc04 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 2e8ba65306f7c287fd369eec8aaeb366d0e0d62d..4e2b45e1c44cbb172e3c2264a470cd8003c46e93 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 7d19c3002c26d547f115231b812f75e2812f123e..9e1ed3416c1a92f1a765855c46ece682f1a26a30 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 55b588a94603613f2cfcb0894652a0efe684a437..578847b16ecef13cf8f5bdf8d0d13a2487378739 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 25156a1374cc0efffbf3c5fc7a0e23cf8e3a2bd5..8c189e58a447e3f1875492c2a7f82b596d7ca3fd 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 f4e53daf0aa1b7cff1faa625cdd6f61a7b3bafbf..bbdd17e9da5483c6df8faed529599796007c2847 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 6b3063f525f5b0604cc445d9cb3516998f6b18f5..86bd0f865ea1bd1e26837ba40012cfd60a74a851 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 91202571c5b3888cafafa88cd396a150d7717714..3a2d6fc3be9ae13dd3b5dfe85f433ca7aa959836 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 aade83cafe1b97d7560ff7207fb15317a8ce0be7..3fb7db4504eb0117603ebfb1c86e008552fdf0f4 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 f4efc705d2c725998ff0b6b93778d65cc570cf3c..2ccaed30790dbaecad89ef671e4dc8d54e083d2e 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 727b0fd494dcb53580a13cf4407588ae43c8c9a1..b634531cd799fe48ae48379066a86d14f0e3e2f6 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 4f5d29d838a818fda139f9b40afc7ad3b5ec72e2..f92b2ef372de2c765c67224711e5f5dffc960740 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 665acb488bcd93e03ca7454206eab98e166d3030..8d4aee379c243201f8746364c3143d62e46a5870 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 172d973ab4a69e0aceb3f6007636d2f42dd1231a..939565703447b45cdc940196900c304d35b65785 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 119de4fe0a0fb879220d4b3154b8cee7338ee5e5..18bd0603a2baf8e1a611216a6711c5c981f8062e 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 806222f3a2af21aaa1a96a47baefaa6f5e0c7bd1..cbf1c785716d36d020d0a1ecfa7adc48dcce290a 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 fc156e9843d3c866b9a8e1c3e70be895be7056ce..3839f5e6259982a0585445d41b15ac0972d9f8bf 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 edcd9bee9d891a4a50e40073eca56d9f25c1e02a..0fb736ee264a2566600f17e9aa69e2c292124064 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 53cf9772d77f6b9b8995d3e11e1ed10771fa56ae..f91d3275a2dee008bfd5a8d9aa836468365acecb 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 2578ddff79b57b5d7483cc304b0b665b121e945b..400de713e0c660fc5bbda012cd8301b70e796841 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 1803d61214ed58c0c92a5a066e7e565b378b4352..b15102164d163a84791bd7a2581d2dba5ce62d4d 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 05cf5c07daef46acdcac8d227dffa07026de357e..6fa60495ff7286d780a0584db45329a3393bf05e 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 0bcd05d38d97769ea581fa025bd4bbf51151a47a..93bdafae1d2ca0460374846c62d1b34a7c5a6958 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 add73da7115a8b93d862e0d257ccdf9563a20a6d..6dfb84822d85cff0596f64d96d75fd9b795d9f2a 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 00a9dc2ea9ab211d3789e8b29cc19d0031a92998..c40000072c7ffe24eddbd7fae9649f8f0850fdae 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 98da21a4892f144964eb54d48018455a56a21126..0b3426868ee1e3a5d236ffcd50c025d182c33d15 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 6b2c87110ba2a5ac13954d56678aa5182e6915fa..53462b873b1079913ce6543b372f1a72359a2ee2 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 36c1ec9b0db8998527f1530b624dcd433ffd95bb..4578d10ccb2509a4cfc401fe6d7a2f70690d9962 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 bbea69957db42ea0d2dfa36389c7fd412a251615..4ca65f39e78aa2bbdc82c1918ed104281a277040 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 079862231a33a133b9d1be748594372417cce49d..21d30564159869c90eb86a0f0a5b8e0b90847dc0 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 d06e6654189628427d058f32038f9c7f28e58293..fb91b8c0994ddcc25e173228c8a2620b8bd7df9e 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 7685f1e72b06a68674da482b9bf400cb795c0c4c..91c15c075cec6707e72ffda1a54ae019cf3b5396 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 6c6e725b9afd72e2136fbfb20a5e515a1955f64d..99450848bdb208f9721120c5c7b02ab465bcf9d1 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 55080fe1fce2529a12e79360213895f1e9a47dab..3aa324aa1def72180ece873d733273ad05f326b1 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 e32a0b226045c66e712733d97215325a4a853b47..14b0aaf21b3b97b447aefdb28758bc74eb3333a2 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 54074d06f43b0ffde57a3ba543aba8b5ea00ebd7..063273e82dd00544262348a00bc2b026eaeae578 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 9392f1994b29ec2940d01cc5b4576413525a2e18..6177db9259f93aa3fffbb01b17e7f074369c6193 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 8da47daf6d8941e456255378db31cbe0cbcfa69d..d23348aa64c85fe665b596b21748de4d8b38038f 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 b22112bfe743b01c854f073f71560c674ec3c5fe..7bfe394b123db35177e3e891bb4893e2ca6c1f5d 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 83726e88f9e8c107453e007b514766d3b5ffaade..6171b72964211c4da48e82b52508ed21cc40349a 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 20dd0e94816009b0d3d829bf0380c3de42e4cd53..c8777cab8b68877d249ac0b79cde60503221c263 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 1579c0a4fb0d74b99a5cf26347908edd76b43c01..727ff12b818fde69b10667adaf358b7dd9f4f935 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 d64c6c9f45ad748c9e86db79c89ae80874d1d12b..0f3c135c8838be4dc9840582a1d055c64bf2a353 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 0e3977a58dba93228113fee83f5766e65dbd420a..3004bd6e49f1014bd4e413ff96f9ab984a4d16dd 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 0a1a6d40849e7e5d0f8459ceb327b5bf7f42e7a9..4e4cf6ec17dc8e2d376f8a5c6ae9d57423d28480 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 4762c9ed571d9590af13db898bc041fd8e85a6dd..b1267c33e4d83bd78a969f348bb31651f5066af5 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 168a1f3c6826ed6ba422688e14b99af6f1ad81d1..46b9ca38d3d3a67481707553827ec2f0e21b6706 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 3bf5cf3ae47c206e85d7674fde2dd76a8ae1a752..0648faf8fddd21eef8c91af6ac6e64204407dfeb 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 a465b7fe07dbedbb85e42b013878c1822ae10272..000fe62f072fcada0590931843d446592c276c4a 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 18a3cfc68fab2acab7b7f603886a27fae4aebbc1..69e39a05a49e58bb60bdd67dfcd937c770a10e63 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 d40a0f395446186bf50c99f13078327f56263b6e..9f5bfd696b9978f701f07ee3029a44660eecd3f8 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 12c5d6f27d3b5e21d717b50723bd4b3207266fd7..3e8312306da0e7fa4b0a1cad8c495aad575a2175 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 6e8c47c2bd2db12bb606fc26e408e6d2741d9d71..751e99c0177d774d6267d6f2a420c4191cae5be0 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 ddf92b8c188a96d406a0324599f1f6d4ec170cf7..d09917b3d9622e7bc902edec0655663bbc22213f 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 0028b945592d012048b6058ff5fb105966f52330..66b3811166c88aa82a1e2da4a8403f61c99d4b17 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 affa6b223d3b7fdc86894ede99a82c583e0ac187..4d55f8eebb1640fa96b15bb499dde130068a527b 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 ea8023e9305f5154458eb345310baaa8b4cdeaac..9ad532a7f6204f44490b7c1d21fbfb89ededc83f 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 10d79145e873494c729c692a074dcc8a1f4e20aa..f9360983cb9e625d355ef8d05f609f15cb629e36 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 7e669ccad078e72764013293a1ee71d245561a6d..267f7ff0b31093ef4882aeb08ab9c2e0c4a28ab5 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 ea3868e04347d92cdc2ed082b8e0b81be9da101b..08aaa182d475bb71dcbc674ae36f8678fb961ef8 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 236fc78cf746e606e355a5277de8c8991c3a3752..f29bd71b10a73b2e8f1fff48f8ea5724aa6da424 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 6fa75e0eb933af6361a9312db302bda04dd5334f..61ec30a5709463d63955755c4e6390accebb5a4f 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 5c9e67678ef1315c852f67e759bb59cddb7baaec..0aee75dd9f61f574dae25c87d7b677f5e1d61b92 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 aa63daf4d1187aefa95ed5ffa0dfa1d5a754b349..61ff7ab883aa2c1ba9df6d6eac0025c594d0f468 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 9c03a52c2aed98d3e98c06d31bb238ce02c2c7c4..b65ed2815d4838cea4e1a6b51d93d8ffc0783d31 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 b3abe60a22f23e36e8e78b56749411d5ddfa24a1..5a020fbaf20056efa9544f8b3495ce6f5f56eb32 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 e652dcacc1271ab177647ca795671908a33848bc..3f7abc58a254445919f103bf9690b8deefdf7fef 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 aeef299ee04ead0dcb4f7f3c0a3ed610b9ea0f2b..1de8705c56e30602fa4857b31c9dc020863f076e 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 0fb541d9c7a8121c9010a238c1545888ce57dfeb..160b0add8ee1761cfde8a79007706cf0f509a055 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 ac9b9c5edb60db58446e9b2210a8f496308c4751..149df8c47743a3075b13cbdbc9d0ab1896e70300 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 f82f30500ca81e4336fe6d6335c47dc14cc4ab0f..2de87beacd13b457c4df4b8aed9361d30753eeb7 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 ce5247be9a212004efd7b43db57eb0e636fa775c..be007cf8f31b3c753efe2509d00f3842fd98a831 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 6ca83966a167b81dc9dbe58d1b705c383bf2daa6..b08f478a8838004a3c6d81ecd42bd454dfb944b2 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 7caae998f9c0bbf4cf78b7688f66e376c281c8ad..135b0211e61ba0daeeb97234cf1bcc85f36aa6bc 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 26d7029d48717215c2cf24168060155d22f9b207..ca8ace8ff3e7d120679d46ee8f459289bf9a2bd6 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 c781349c9973e97e176bceda7e3973256702f614..548b7c3ecec6fd92830baf3e44eaf99cdf6fdf01 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 29a659f8c5fe041deade5f23c7aa8d3a6d2caa47..5b38eac8a2a905ed0b4a997a914dba82c50b3021 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 448fb4ec3e75e289f29f1747d535ea64a5d13b69..f9c813f66a6db85a630d36b69ddf6b14051452b5 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 d13493929127e7c63f8f53c243efc3eb749265f5..976f9d012de456e650eee2f1a4dedeabc343626b 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 a0ccf64728d971deeb81821f4e9bbc28dd01034a..3b6538142e316958d451bda9ad14cf2cb7535b2e 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 b95d4e65ac65e8aa675565fe17c2908cf854c96f..7ec009008fd3362b0ac58b5a16a07ddb4aadecb8 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 edca38f7f5fb17431b3ee5c5698fe947a359fa77..a46bd1f66d4668bd3a817017ceeefd91b71e69a8 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 0ba9a193915dd1c4f33f84e1cd0013f3c8e404f9..47be43abae119e3ceaf6e06115962d106e49ae49 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 18fbd9b6877706342c924f6f0811f2f74b8c5778..1d1f04967844863d8a33917ab1d994a04080724e 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 a9652d790128ca88f8c7ecdcb411371de42e693e..bf4a65fd954303cfe644695a0c75e0fb78878508 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 22972c6a946e5c597742be39795d6e0e247acf9d..0fd731d2cf93af98028b114eba47b183061450e0 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 31e99cf651e117004fc2fd34d7e285400ff9a006..9008835a99a7234f772942513a12d7508315187c 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 b5f12f1dabe64ccfc85fea33e771176a8cecb420..8d53d621babc38f222e4834c672465de313fd7c2 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 bc6b3e36e872fcf7759c50a36cb6d6c6c06f21a1..db0b9ef50104c5f496c80f9738b33ad26bed5b00 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 69344f82b4617ae93dc28ad08400ae8292cd1b46..45449f5a27f6bef53f245e125b9fae999271bd6c 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 bf1e5e98abdacecf965b595e368eeafd43e9b237..ded4637b7efc6da1173b044d76fe7dac88351746 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 5bcf60c3fdf97d8245eff876e23a7732261b8f3e..41c947b53da80de6e70a3d24c20a45168d13660c 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 2d7029947ec3e870bfb04f9db7542525806c1c27..126cf65c6ce96fb89af86b143743253eaa2d40b4 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 94bb4f9e0c3f82090ea01aa577fd17dc28ece58b..66eecd924cc960d5083ea3b00d423cce39d0e228 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 31a2330a9793670ccca433267626ef2f20f9fc95..69dd4b55aafc81401c4bcab547301c37b87ac279 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 e5e406201c4ec5843fe1ee93576bd24cf9cbfa84..efa4b7d58db0d20273ed5197e17d5719daf773d2 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 07d2c0a048adfe4d39a16872be5ba8eff344da8a..2c27a0fe6b8fbe3a1a9648b4bd10af4088fd7616 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 a40c22a0392ef91ac9d3915b157478fe5c9fd002..6ef20c4339d7792df9cd416e5438586ef57f5e25 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 5e1667bafa596e1ad05e871190d9ae86fc1729cb..9937094b2afc1f42c75a442aa3b3a1121f355a87 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 3f862f0ddb22d8635a66643618c5742d3937e80b..768f5377ed21106d2d3a4f838bfa67a398f3cd01 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 87e4c1ac29091a9ea8edf5d1c1eae3ce14ce2a24..528d82e55fa20f3533c8608ccecc64e2873d4291 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 aebdf026f26b881edb8c3f4622005659fd4b5e70..01d07deb8fa85955c756810ff1c85e7d3df5e487 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 92c2f756dcc6135532c49ccde9119bcef776e901..570ade88e7846aa2abc00c20aebab49e7660b53c 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 0e01a56f3832a79b2c3577da0567581d1e172741..3d34a72fb4e1f076800cdf736068c488dc5b2f29 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 0ef7b1ddd246c9801250154a9340e58b268baed0..7b378f9b64b016b5df43c827fd1003770af9b70c 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 2304ec849649b9c1ec422b52a805d5b26498d100..fbc62a7f348ac6b42b5947e24bc2498fbe64b484 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 d382904268e8ae1eaa8be8cefec49676c5f7cf81..5a3992d3f1ec77ce7463640c5a3ec2bcceac1c13 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 76a55ed8329e8faaaa08894138e5721bd799967f..b42b7810f8b05071a858b9de0ce53e4f9e48bd06 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 485801dfedc37dd2b1c291d02d274f3ba71dd20f..823e4ab92e6711df9fb5cf18429bd13cb749a71c 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 82d7884ef0aa9b5a1239c49586a11fd3012b9c70..80006e0a04200cac54289ae4a8ceac2f7a960469 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 f160929b65e5efe3bc218449af1ecaea7d017617..f697415bc2296386d3e61f84f81cac43508e1d02 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 9baeb167593746a8003f4b633ba25328d3d73186..7e8403c7df8173582765604b1d22d37b6b9a3432 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 55f51d7cd657c6ccd67a0015bcd23512e368d2f7..e1755eb6e43ce36b495e94d65d3abf8dfb1d032f 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 a22ebfcbdbe380928f157038261425dbb348aba0..3a797161f078c2111773f3c346105a42794e60fb 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 5d3560bd56a8e27b810fd8704fed236058ca4953..46532ca5ce017e597df319e1ae5b9e848ac4914c 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 bdf82b2d16acb3d3f4d130ac27310c63fee51f52..9c869f533f8c1913a8df4d66c011fdb2ab6ee0a5 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 337fb5fd69fbe8b2112693952579e21424b4880d..a29fd0d0e720e311d49522ae8e5f2022fdf65e5c 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 4c75bfd2faf3be05e8842f8ee820e5e84c70ed8c..561b1a403a90065bc30ecb44e60cc17830247152 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 7458a6931e6b7226921427b43e2b16b6e15465f2..b6a6fab59bf5aa52fe51fd0a12257cfea099975f 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 caf3147be796de0df1ea63a20683b16665a78637..18331b6bcadd5ade2d68065eca8bfbe11f770754 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 0233cfc0d17970b79b72ff28de31849d5e70019c..2ac43fafba63abd0723669e09756ceef66c95ece 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 f7c8a6b19ef2667f00ae9b12e353cb30256de92a..9aec278f7a2a907f89f43110109b195614280f86 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 0cd6238c62986306ce72747967a1bfc726091b6c..e883529fb3d57358fc19d24b8536924e5e9f1168 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 c3043911e17bc4a89d2cb3a54160b2c8e097462f..b187420e1714e5bf25ca370f6cb2d2a6545e8e70 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 ec907a4a89870665a68c8bb70891eb99ece6ab19..3d2db3cb29ec2a444085eb862be19025d276af83 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 e73cea713c912365a6485e3d565d4acfcf671385..95dd8283caebd9d92efe1be9fbabd87359f5a1fe 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 37d330f8db6e932853cd76d6a011246f6797e685..0d076c43530846c27a17aa1cf305df2c50942b62 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 8e8af0d39346189125f974dbaefb0e8af5d3fdd9..9e8a60f24905314e99a6a9b6b5fb02f9def4e2ff 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 2cee6ebd72e4ef1a3ac128e64f674e4081d52976..a9e8ab7ecc4663481f0677307403af2191ead08e 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 0383c72314a2e0c9870d1abfec79efed3af89450..569aacf75787da9369d5e92d189005a1365f3805 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 f6134e2e7eb878d8612cd688c8fa0bb51d62c76d..6a5faea759c38f9eccc3815f0b6034b0ba879f5e 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 c88e6cd45aff5700c828b4cae69ff40134750255..aa3be98e13c51c5045af829aa9d1f9efcfc353e0 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 459a5917f8f25d5ce0ed9e2d3f50d45fe3d4f08e..92f86899cef4f0bc363142973642b648fa692098 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 b92f6bf7d71844545f3cec503ae08f7eeb98f4ef..d6c19bc4225840861609163ea2ecd979901d176a 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 c2cd863eb107410e61ac6ede496d43156598a7e5..3d989969a2734eb1dab943af75efe29afb0346a2 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 09a82661e14217302c5134322c5845220f5a5878..ebceb328aee7edc82f2eb2adc5a639e931373854 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 573d6d1286012ba12b756adc62a6efafde03cebe..636f6433f489cbc04c88f0397af8bf43a78ff9d8 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 11382c98893bbb74d91a77d3b1909dc2d8e1b633..fb3210f217d2a5465901735bbc6d3633d5bc809e 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 4cdf80cf9e62d6cef0ca67df9c65b5c08dd32ddd..c7f38a4976c825d6f92e1aec19701d6f4dccc0ec 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 de06b5667ab8431abc2251b4427d5c9ab582feee..c030f6c5380c76d32e4113bac1ec6a26106b56c7 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 b23e228d4ca4d62924449e399c58cc0950db093f..04dfe193a725a8b92384ff209796bd82a1ba62da 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 abfcf7189eb5a6bd1e067113d9d2421b889d17a8..c33afa7391ddd105701ec0b619663543d20676c7 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 85b29db6e7d4ffa17dceccbfa5d76e257715ff5f..b6d52794f673bcc309176ec5222ad40a7f58b1b7 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 d2ef262eac8d31fc8cfdd349e6e67ca665337330..2dea528ba37a079c438b0a3997848eee3fb67a05 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 a2ea4102a8de9d16c985650491eea3fbc6c4a25d..ccb20cb49cfb5b73090a473d184771f4257b69f1 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 9d32155726db77e28e049eb9a1cb7ba1f9837033..c4f02aa759f86132a169e198e1ea7b8a253be993 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 9a270f935ef3b72e44a24bb62df91b0b8cdbbfb5..b450e2110049b4be6ee7cd19602168807d7e9d70 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 37d5367c8c88c024f9b131ca7150074ca8f2e1e4..f06f88b6bf08c9d50597349dcce8b5a758ba77b8 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 c99087ef9f776f18996e82959b8b7516c68fbce8..e256841b8e2cf8112d7a2b01b3c2fc291ec3e1e7 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 9ad860a9dfa2054698986398abe799f90f94c2c5..0b5ce8803e6153210aa982f9579ece558ac78dbd 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 fba130985614443746f7579cacd28909bca90ed2..b0cbffc7cdb212b3a71b58d566d5aba2844e19bd 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 93ee1e833d78c4431685d15201e52f23c38fc423..67f32def28e6e5b7405d789717e7dc084f5ca83f 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 85be01b82936b7b175e84ca21e67f4ee8115f8f0..9dd5a534d0e86e4981035d458b240935139b628f 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 420684a745671b3f324008af8ac055a3e9bf552b..1c987c5c6a27874de523c24dd5d969d896de9851 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 086120e2e8c4b601529615efe54370560527c7ee..de38a81e72dabb5bbc75719ac6ca0de9c6f58358 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 93fc0a5e87917b899ebeb36d7e64d846dcb36605..51ccb6cfbfb54ba3ce23d146263f9aee70dd95a7 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 c3a4d2cdd62ebeeea4b4ece0ca4d666bfe528721..8991a2e9d3fbe14662103422baecec70d1dbbb04 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 0f5ce4642491099ae9a5e01c82e29d825d007079..f7ecada37c28a16293f73559c881e8c16a449239 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 2237bfa6956f063c7dec872764588eff18082b3c..bb16d10b3ab06b23bf1865ed16c8294576b0c55e 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 4be60c2f8b0f9fdd92856ceb2411a8f6f40241d2..de1a4157e6a7db4f3c1f5f31cbbc9883a9c8eae5 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 bc7074fe32fe1b87631d162821bc946b479ed946..de8fb350c8ba71a125b15567e58a6ae260a7aca6 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 5b083055afadfbac8d3a7082146c93ffbc3c5e3a..92b6be8436b7ee1592578e8f2f314fc23eede32a 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 063edbb25c735d37807bb5f292f713072b235c95..fa8d036ba1fe2b62b0321ad0aa23c8e96f550fff 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 f3d9b7d3c56f789b98353d4d522f44b28ff34288..e4b8c6c8cc6cd1c1157fb3110df8b1cac01af979 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 c34ba721736ca8df4e9adf23929f4af28bc73abf..7cd8a1137136b6aa80344a28add3ce30e8f2ae17 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 4bcd4822daf74594fa3ebbe43b7cc8dfaaec8391..3f0c813669d70241082cac381cb2ee53c0641891 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 e8a4b1c6f5983cbec2f487972136fbf3a1cd7c98..0ac0fedcb97b17cafccfb6333f833c143c82a13b 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 72f2e3ab2e284b04a845d4467daabb73ff13b796..14c7c94b758bddf9c4d8d32de6e0062b48e6a0b8 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 e3263ef39bf6f7f3d48924293fa8df5f6d356b8c..92942ff0635e309f1ae812ae5d196e848cb62337 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 169aa09966405775f5bf818bd19e722e7a3796fb..e3547ec49f47b5769fc6ec2c744224b7d4bc5631 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 8d7bef88825455d837199ec345418f121c2753fb..1e6acc2bb3cdae2edf7e7567117e49f1a70e1fd2 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 b4733885355dde1c52c2e7ae7c7f9ba8fa83c47b..eebd14cc5772a2fb2e5479c37adba93d2ea5db79 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 66de61aa2cc4fb2d756c96050e95f4705aa25bca..285ec3aa2c836f2cb9222c99f4e5367ef665be7d 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 af1162b877d33c6d475c75a86d73d864c8bec062..59e5ca0aee795b2db04e57ed88aca506643ab988 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 07c7c98a97b8e4a73f5a7da8c5126b4699d62010..820eabfb16072e6b9a89c0aecfc35686e51a07fe 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 6cb11c1236e9cef1cf9fab175b32396f496d04e1..f8b104d5024cd17c1a524ce0d659be1ab1ff61dd 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 1b1fdc2f6d4706c7d17e8d53399330123036136e..c67862fcf64a46407eb81703ff371d35d2f8a625 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 e9ac72e4bc6cab14843b52defe7d34a3d3b6b9e9..28e4b7a7cedb840ef14b1c4ab90ab28e69b5667d 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 77e70dc2f0d26b223a525747aaf776eeec8cb094..dc391c1ec5550498218a71182ab50c9552887422 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 45e83b38f61e8429a1c579b300869347c491a387..65517c26191d16f710552b17762a52701a19ceaa 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 d2e14688a612f74bb5e4546dbb7dad1c9e2c21e4..d67bd47a2b1a980dc5a6d0e05746e8061afab33b 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 edef24581556941ba0a97ba884d1d564418f9ea9..8e4e466c949ca90b67392d07f37cdd17180bc5ec 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 699c8034668f38e1ab7afc0103abc91f988ed422..9ae7181ca2beed59962703d0cda1c46a9cd8b0b8 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 352117899a35abc702dd7a45410a2da308d5a838..b30e7131ef47f18b9257785d3cf398d9576fb0b2 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 3bc81fa77900835233484447aed2803f4d414efb..f39d59ddc967f040f2e0a04ec8ec1c0a2ea017b8 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 23305f5fc6f64c1c033618e62426cbb3de54c453..bcf864332eadae913dafbf233c469aa17c263e04 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 4886d2035dda354acbaf7cb8f42d1b8c26356e19..cc43b959b948dcce240344d4064e375485321992 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 83c740ebfb57ade67cf53bc8e4048a53166c0855..bfbc765398bdb0ab718f59145af5874e1180e609 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 c28c52390f7a805bb0be3d0d7d28f56536b91bec..0bcc069532e9ec30b99e4b3efa05abaf349aa457 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 761b590e57c00602e26ba340998702138e1e945b..7c231d50167346f3eab036dc7ff3a699287a6f85 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 e00d38f76ff1f78603ab01844761ab87370d3cc0..8b6e2bf95d6629c44e850952dbf2e7f12f0660cb 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 4fa89a16775352eb1d7732ed0a321e3bf5b242b9..b3341149a485a1ca5364394d45ee9f21bde6aacd 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 04bbcd8409bdba2caee22bcc952bf58f67595204..79ce8946c16e8d45aef50f83a6a83ed519d44ec6 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;