diff --git a/GaudiCoreSvc/src/JobOptionsSvc/Analyzer.h b/GaudiCoreSvc/src/JobOptionsSvc/Analyzer.h
index 7c5dd03d85c12d2783a3db3bc1568e9bdfbc14d0..e549483354f9b62e76f07aa64cf57092a769858c 100644
--- a/GaudiCoreSvc/src/JobOptionsSvc/Analyzer.h
+++ b/GaudiCoreSvc/src/JobOptionsSvc/Analyzer.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2025 CERN for the benefit of 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,7 @@
 // ============================================================================
 // STD & STL:
 // ============================================================================
-#include <string>
-#include <vector>
+#include <string_view>
 // ============================================================================
 namespace Gaudi {
   namespace Parsers {
diff --git a/GaudiCoreSvc/src/JobOptionsSvc/Catalog.h b/GaudiCoreSvc/src/JobOptionsSvc/Catalog.h
index b31fbc3497aab6f9f32bd6c727b82488b203e956..6e32ad08fb52d3a2b2167d4a0a0f0db2d5666de3 100644
--- a/GaudiCoreSvc/src/JobOptionsSvc/Catalog.h
+++ b/GaudiCoreSvc/src/JobOptionsSvc/Catalog.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2025 CERN for the benefit of 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,6 @@
 // ============================================================================
 #include <iostream>
 #include <map>
-#include <set>
 #include <string>
 #include <vector>
 // ============================================================================
diff --git a/GaudiCoreSvc/src/JobOptionsSvc/Grammar.h b/GaudiCoreSvc/src/JobOptionsSvc/Grammar.h
index 30f933293764b6be61a62a719ee51396d52a0b67..d31e7e56439ef7501b44ce22287bf2dc413158e7 100644
--- a/GaudiCoreSvc/src/JobOptionsSvc/Grammar.h
+++ b/GaudiCoreSvc/src/JobOptionsSvc/Grammar.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2025 CERN for the benefit of 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,7 @@
 // ============================================================================
 // STD & STL:
 // ============================================================================
-#include <map>
 #include <string>
-#include <vector>
 // ============================================================================
 // Boost:
 // ============================================================================
diff --git a/GaudiCoreSvc/src/JobOptionsSvc/IncludedFiles.h b/GaudiCoreSvc/src/JobOptionsSvc/IncludedFiles.h
index ed5ea531365e4c26551b3098b5d66b4cfa2594aa..1e66f046927954777be28337c85b7ceff8b2398a 100644
--- a/GaudiCoreSvc/src/JobOptionsSvc/IncludedFiles.h
+++ b/GaudiCoreSvc/src/JobOptionsSvc/IncludedFiles.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2025 CERN for the benefit of 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,6 +17,7 @@
 // ============================================================================
 #include <map>
 #include <string>
+#include <string_view>
 // ============================================================================
 namespace Gaudi {
   namespace Parsers {
diff --git a/GaudiCoreSvc/src/JobOptionsSvc/Messages.h b/GaudiCoreSvc/src/JobOptionsSvc/Messages.h
index 966f3b7815b2ff901ffe1878dff19d5c02cbeebe..19f729152188b383690a443fc29808e55f0110a1 100644
--- a/GaudiCoreSvc/src/JobOptionsSvc/Messages.h
+++ b/GaudiCoreSvc/src/JobOptionsSvc/Messages.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2025 CERN for the benefit of 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,8 @@
 // ============================================================================
 // STD & STL
 // ============================================================================
-#include <iostream>
 #include <string>
-#include <vector>
+#include <string_view>
 // ============================================================================
 // Boost
 // ============================================================================
diff --git a/GaudiCoreSvc/src/JobOptionsSvc/Node.h b/GaudiCoreSvc/src/JobOptionsSvc/Node.h
index b98b72b6160257ce9657a74cfd64e54bb3185880..d7ae3b0f000b808064af7ff3e932ebcd0c2687c1 100644
--- a/GaudiCoreSvc/src/JobOptionsSvc/Node.h
+++ b/GaudiCoreSvc/src/JobOptionsSvc/Node.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2025 CERN for the benefit of 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,6 @@
 // ============================================================================
 // STD & STL:
 // ============================================================================
-#include <iostream>
 #include <string>
 #include <vector>
 // ============================================================================
diff --git a/GaudiCoreSvc/src/JobOptionsSvc/PragmaOptions.h b/GaudiCoreSvc/src/JobOptionsSvc/PragmaOptions.h
index 86656d4743e42c0709fda798f942abae662399f1..cf59b088feb02f03ddeae8f5b48f320f4380676e 100644
--- a/GaudiCoreSvc/src/JobOptionsSvc/PragmaOptions.h
+++ b/GaudiCoreSvc/src/JobOptionsSvc/PragmaOptions.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2025 CERN for the benefit of 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,6 +16,7 @@
 // ===========================================================================
 // STD & STL
 // ===========================================================================
+#include <string>
 // ===========================================================================
 // Boost
 // ===========================================================================
diff --git a/GaudiKernel/src/Lib/ParsersStandardSingle.cpp b/GaudiKernel/src/Lib/ParsersStandardSingle.cpp
index a770f0be1649ddd31aab4647d030c3d6e930cb72..959eecff0815ebf04b974558c862abebe0a57fad 100644
--- a/GaudiKernel/src/Lib/ParsersStandardSingle.cpp
+++ b/GaudiKernel/src/Lib/ParsersStandardSingle.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2023 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2025 CERN for the benefit of 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,10 +25,8 @@
 // ============================================================================
 // STD & STL
 // ============================================================================
-#include <map>
-#include <set>
 #include <string>
-#include <vector>
+#include <string_view>
 // ============================================================================
 // ============================================================================
 #define PARSERS_DEF_FOR_SINGLE( Type )                                                                                 \
diff --git a/GaudiPluginService/include/Gaudi/PluginServiceV2.h b/GaudiPluginService/include/Gaudi/PluginServiceV2.h
index ce8ec2baec01ff7082d8a60bf839b0255caa91f4..d172c9488ebc2f9911620c81e7bcf1c92018c819 100644
--- a/GaudiPluginService/include/Gaudi/PluginServiceV2.h
+++ b/GaudiPluginService/include/Gaudi/PluginServiceV2.h
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 2013-2022 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 2013-2025 CERN for the benefit of 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,9 @@
 /// See @ref GaudiPluginService-readme
 
 #include <Gaudi/Details/PluginServiceDetailsV2.h>
-#include <cstdint>
-#include <functional>
-#include <memory>
 #include <sstream>
 #include <string>
 #include <string_view>
-#include <type_traits>
-#include <typeinfo>
 #include <utility>
 
 #if __cplusplus > 201703L && __has_include( <source_location> ) && !defined (__CLING__)