diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerTool.icc b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerTool.icc
index 077bd02b24077245348396b6342dd07fb03e327d..47e07602e900242079c5993d24609199596f9ae8 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerTool.icc
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerTool.icc
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file D3PDMakerUtils/BlockFillerTool.h
  * @author scott snyder <snyder@bnl.gov>
@@ -26,6 +24,7 @@ BlockFillerTool<T>::BlockFillerTool (const std::string& type,
                                      const IInterface* parent)
   : BlockFillerToolImpl (type, name, parent)
 {
+  // cppcheck-suppress missingReturn; false positive
 }
 
 
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerToolMulti.icc b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerToolMulti.icc
index 723ddf9d9190ec2fe9d84086407dd26a318cce42..d32f9f8212c781a6e6554bedae2d07b6ab188566 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerToolMulti.icc
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerToolMulti.icc
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file D3PDMakerUtils/BlockFillerToolMulti.icc
@@ -32,6 +32,7 @@ BlockFillerTool<Types<T0> >::BlockFillerTool
   : BlockFillerToolImpl (type, name, parent),
     m_which (0)
 {
+  // cppcheck-suppress missingReturn; false positive
 }
 
 
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/CollectionGetterTool.icc b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/CollectionGetterTool.icc
index a18e8ef3f6a178db9bd92a382ba1c886faa0cc99..5196636fddadd79cd2e47d7c85dce99d476a2e2e 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/CollectionGetterTool.icc
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/CollectionGetterTool.icc
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file D3PDMakerUtils/CollectionGetterTool.h 
@@ -80,6 +80,7 @@ CollectionGetterTool<CONT>::CollectionGetterTool (const std::string& type,
                                                   const IInterface* parent)
   : CollectionGetterToolImpl (type, name, parent)
 {
+  // cppcheck-suppress missingReturn; false positive
 }
 
 
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationTool.icc b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationTool.icc
index 90e0ed4a3fb8c837e70de23f8611194ff44b2cb4..05a69f5b8853da674edf58455455a6a16266b266 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationTool.icc
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationTool.icc
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file D3PDMakerUtils/MultiAssociationTool.icc
  * @author scott snyder <snyder@bnl.gov>
@@ -27,6 +25,7 @@ MultiAssociationToolTo<TO_T>::MultiAssociationToolTo
    const IInterface* parent)
     : MultiAssociationToolImpl (type, name, parent)
 {
+  // cppcheck-suppress missingReturn; false positive
 }
 
 
@@ -104,6 +103,7 @@ MultiAssociationTool<FROM_T, TO_T>::MultiAssociationTool
    const IInterface* parent)
     : MultiAssociationToolTo<TO_T> (type, name, parent)
 {
+  // cppcheck-suppress missingReturn; false positive
 }
 
 
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationToolMulti.icc b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationToolMulti.icc
index 2e5fad9cd683007182d9921721786dac3532be71..c9c9c02ab2ef368ba46f0ec793d0c8319c495db9 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationToolMulti.icc
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationToolMulti.icc
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file D3PDMakerUtils/MultiAssociationToolMulti.icc
@@ -175,6 +175,7 @@ MultiAssociationTool<Types<T0>, Types<U0> >::MultiAssociationTool
    const IInterface* parent)
     : MultiAssociationTool<Types<T0>, U0> (type, name, parent)
 {
+  // cppcheck-suppress missingReturn; false positive
 }
 
 
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/SGCollectionGetterTool.icc b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/SGCollectionGetterTool.icc
index f0a912670f210337002d2fc6b999322d23b5a65c..08b1517efac309e38600d651a9c179b072fa3321 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/SGCollectionGetterTool.icc
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/SGCollectionGetterTool.icc
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file D3PDMakerUtils/SGCollectionGetterTool.icc
  * @author scott snyder <snyder@bnl.gov>
@@ -35,6 +33,7 @@ SGCollectionGetterTool<CONT>::SGCollectionGetterTool
   {
     REPORT_MESSAGE (MSG::ERROR) << "Can't set TypeName property for tool "
                                 << type << "/" << name;
+    // cppcheck-suppress missingReturn; false positive
   }
 }