diff --git a/Muon/MuonID/include/MuonID/CommonMuonHit.h b/Muon/MuonID/include/MuonID/CommonMuonHit.h
index 24892d9ee8193a71b2e646e86f792fee4aecc7eb..384e8a9b706e039fa799e054de36f7d1497fda11 100644
--- a/Muon/MuonID/include/MuonID/CommonMuonHit.h
+++ b/Muon/MuonID/include/MuonID/CommonMuonHit.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-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".   *
@@ -13,6 +13,8 @@
 
 #include "GaudiKernel/Range.h"
 #include "Kernel/MuonTileID.h"
+#include <array>
+#include <vector>
 
 /** @class CommonMuonHit CommonMuonHit.h
  * A container for a muon hit that holds a reference to the corresponding tile
diff --git a/Muon/MuonID/include/MuonID/ICommonMuonTool.h b/Muon/MuonID/include/MuonID/ICommonMuonTool.h
index c5a8b84cb184ec3cfe1e9ad34168d09ecba8cbc2..cb3582dd3f18bb87c52b1d4bc81f463038fef530 100644
--- a/Muon/MuonID/include/MuonID/ICommonMuonTool.h
+++ b/Muon/MuonID/include/MuonID/ICommonMuonTool.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-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".   *
@@ -13,6 +13,10 @@
 
 #include "GaudiKernel/IAlgTool.h"
 #include "MuonID/CommonMuonHit.h"
+#include <Event/Track.h>
+#include <array>
+#include <utility>
+#include <vector>
 
 static const InterfaceID IID_ICommonMuonTool( "ICommonMuonTool", 1, 0 );
 
diff --git a/Rec/LoKiTrack/include/LoKi/VeloHitPatternFunctions.h b/Rec/LoKiTrack/include/LoKi/VeloHitPatternFunctions.h
index 89342d2b5f0f6d6b449dd522614375863ced55ee..52f1d96a0bd11cc8239aca126a40b95a95bd3cd9 100644
--- a/Rec/LoKiTrack/include/LoKi/VeloHitPatternFunctions.h
+++ b/Rec/LoKiTrack/include/LoKi/VeloHitPatternFunctions.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-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".   *
@@ -16,6 +16,7 @@
 // LoKi
 // ============================================================================
 #include "LoKi/BasicFunctors.h"
+#include <Event/Track.h>
 // ============================================================================
 /** @file LoKi/VeloHitPatternFunctions.h
  *  Collection of Velo hit-pattern functions (that are not just counting the
diff --git a/Rich/RichFutureRecBase/include/RichFutureRecBase/RichRecBase.h b/Rich/RichFutureRecBase/include/RichFutureRecBase/RichRecBase.h
index d5e4269340c02526cba5f5b040eb2bbe05351298..905943ddcab3a334f45faf651fa6c1db5c0af47e 100644
--- a/Rich/RichFutureRecBase/include/RichFutureRecBase/RichRecBase.h
+++ b/Rich/RichFutureRecBase/include/RichFutureRecBase/RichRecBase.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-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".   *
@@ -29,6 +29,7 @@ namespace LHCb {
 
 // Gaudi
 #include "GaudiKernel/StatusCode.h"
+#include <GaudiKernel/ToolHandle.h>
 
 // Interfaces
 #include "RichInterfaces/IRichParticleProperties.h"
diff --git a/Rich/RichRecEvent/include/Event/RichRecRingOnPixel.h b/Rich/RichRecEvent/include/Event/RichRecRingOnPixel.h
index a23e7d3259f0128e7fd5917cd1eaf39560ac11a2..8614cfb5665a41c1cab0ccf37ee5b01a3fc4bd6f 100644
--- a/Rich/RichRecEvent/include/Event/RichRecRingOnPixel.h
+++ b/Rich/RichRecEvent/include/Event/RichRecRingOnPixel.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-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".   *
@@ -12,6 +12,7 @@
 
 // Include files
 #include <ostream>
+#include <vector>
 
 // Forward declarations
 
diff --git a/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichGeomEff.h b/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichGeomEff.h
index f4a89c65f31299ee4da1271307f7f69d93801aaf..9fcdc7a2cd325dd6bbe7a08a571daa7c8044ae36 100755
--- a/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichGeomEff.h
+++ b/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichGeomEff.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-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".   *
@@ -24,6 +24,7 @@
 
 // from Gaudi
 #include "GaudiKernel/IAlgTool.h"
+#include <Kernel/RichParticleIDType.h>
 
 // Event model
 namespace LHCb {
diff --git a/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichPIDPlots.h b/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichPIDPlots.h
index 5fd1798a506a12d72d16aa0fd61f69370d7acc97..8a53c42ce7f7813e64c6ed70d79d24234b9f4917 100755
--- a/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichPIDPlots.h
+++ b/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichPIDPlots.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-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".   *
@@ -31,6 +31,8 @@
 // Kernel
 #include "Kernel/RichParticleIDType.h"
 
+#include <GaudiKernel/SystemOfUnits.h>
+
 // Event
 namespace LHCb {
   class Track;
diff --git a/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichPhotonEmissionPoint.h b/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichPhotonEmissionPoint.h
index ad8efb88dae0c005c7ca66535e3e3bcfdbd27b8e..6767f805921a4c109d0a0ceec3b9f5e358afc072 100755
--- a/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichPhotonEmissionPoint.h
+++ b/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichPhotonEmissionPoint.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-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".   *
@@ -24,6 +24,7 @@
 
 // from Gaudi
 #include "GaudiKernel/IAlgTool.h"
+#include <Event/RichRecPixel.h>
 
 // Event model
 namespace LHCb {
diff --git a/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichPhotonSignal.h b/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichPhotonSignal.h
index 7e7b89a9932a358d8d57c49bc2fd8d07e2606016..a9b59fd61644704304713c80dd43c05436dd5b69 100755
--- a/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichPhotonSignal.h
+++ b/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichPhotonSignal.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-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".   *
@@ -24,6 +24,7 @@
 
 // from Gaudi
 #include "GaudiKernel/IAlgTool.h"
+#include <Kernel/RichParticleIDType.h>
 
 // Event
 namespace LHCb {
diff --git a/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichRayleighScatter.h b/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichRayleighScatter.h
index 5916b4b5aa509b614ebce5418599959be12d2c38..b3834701ccec326f79e88299151fb1710454d85c 100755
--- a/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichRayleighScatter.h
+++ b/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichRayleighScatter.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-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".   *
@@ -22,6 +22,9 @@
 #ifndef RICHRECTOOLS_IRICHRAYLEIGHSCATTER_H
 #define RICHRECTOOLS_IRICHRAYLEIGHSCATTER_H 1
 
+#include <Event/RichRecSegment.h>
+#include <GaudiKernel/IAlgTool.h>
+
 // Event model
 namespace LHCb {
   class RichRecSegment;
diff --git a/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichRecGeomTool.h b/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichRecGeomTool.h
index 94b52bf3b2aee3bf67e40c7c5dba29d49a139f30..3b835228b3c79feaea7637e593a726f442befdfe 100755
--- a/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichRecGeomTool.h
+++ b/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichRecGeomTool.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-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".   *
@@ -24,6 +24,10 @@
 
 // from Gaudi
 #include "GaudiKernel/IAlgTool.h"
+#include <GaudiKernel/Point3DTypes.h>
+#include <Kernel/RichDetectorType.h>
+#include <Kernel/RichParticleIDType.h>
+#include <Kernel/RichRadiatorType.h>
 
 // Event
 namespace LHCb {
diff --git a/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichSegmentCreator.h b/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichSegmentCreator.h
index 2a780a7e4acb32ebda41f3f33711b28378108c64..808d0b76e6f9ea397f2602256bcd795d95d91bb1 100755
--- a/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichSegmentCreator.h
+++ b/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichSegmentCreator.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-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".   *
@@ -24,6 +24,7 @@
 
 // Event model
 #include "Event/RichRecSegment.h"
+#include <GaudiKernel/IAlgTool.h>
 
 /// Static Interface Identification
 static const InterfaceID IID_IRichSegmentCreator( "Rich::Rec::ISegmentCreator", 1, 0 );
diff --git a/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichSellmeirFunc.h b/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichSellmeirFunc.h
index 9099292ca97bae3e2887492dd66ff8f3e671f307..d2a92a17068c24979f457263d88d4194f144acfe 100755
--- a/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichSellmeirFunc.h
+++ b/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichSellmeirFunc.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-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".   *
@@ -24,6 +24,8 @@
 
 // from Gaudi
 #include "GaudiKernel/IAlgTool.h"
+#include <Kernel/RichDetectorType.h>
+#include <Kernel/RichParticleIDType.h>
 
 // Event model
 namespace LHCb {
diff --git a/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichSignalDetectionEff.h b/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichSignalDetectionEff.h
index b99977e877fc4682d167b6f60c7d8c47fd4728aa..3317923c4c065b30c33b6a5090c070e595064c3b 100755
--- a/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichSignalDetectionEff.h
+++ b/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichSignalDetectionEff.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-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".   *
@@ -24,6 +24,7 @@
 
 // from Gaudi
 #include "GaudiKernel/IAlgTool.h"
+#include <Kernel/RichParticleIDType.h>
 
 // Event model
 namespace LHCb {
diff --git a/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichStereoFitter.h b/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichStereoFitter.h
index 3881a74dc5d3eb130454acebb38685772558eb1a..7a4aa3225a860d1d3e32b2a9310c02da27e1b670 100755
--- a/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichStereoFitter.h
+++ b/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichStereoFitter.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-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".   *
@@ -25,6 +25,7 @@
 
 // from Gaudi
 #include "GaudiKernel/IAlgTool.h"
+#include <Kernel/RichParticleIDType.h>
 
 // Event model
 namespace LHCb {
diff --git a/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichStereoProjection.h b/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichStereoProjection.h
index 780540b9f54d50f7781a948230f3e1bafe1c478c..7a901f4e2f5ca532512ea1ef50d92b1f6330edb6 100755
--- a/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichStereoProjection.h
+++ b/Rich/RichRecInterfaces/include/RichRecInterfaces/IRichStereoProjection.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-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".   *
@@ -24,6 +24,7 @@
 
 // from Gaudi
 #include "GaudiKernel/IAlgTool.h"
+#include <Event/RichRecPhoton.h>
 
 // Event model
 namespace LHCb {
diff --git a/Rich/RichRecUtils/include/RichRecUtils/QuarticSolverNewton.h b/Rich/RichRecUtils/include/RichRecUtils/QuarticSolverNewton.h
index e54bb6286aa7479db23267a5de26920c1440a980..001d5b5ee6d76bd532b1b50a66b31ebd9ba2fbdd 100755
--- a/Rich/RichRecUtils/include/RichRecUtils/QuarticSolverNewton.h
+++ b/Rich/RichRecUtils/include/RichRecUtils/QuarticSolverNewton.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-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".   *
@@ -21,6 +21,7 @@
 
 // Gaudi
 #include "GaudiKernel/Kernel.h"
+#include <GaudiKernel/Point3DTypes.h>
 
 // STL
 #include <array>
diff --git a/Tf/TfKernel/include/TfKernel/IndexedHitContainer.h b/Tf/TfKernel/include/TfKernel/IndexedHitContainer.h
index 65aa64df34d970d14dd5a06e6fc3081a28be51cc..b24f25fdf716f9881752fc0f9fd7f4a761e40316 100644
--- a/Tf/TfKernel/include/TfKernel/IndexedHitContainer.h
+++ b/Tf/TfKernel/include/TfKernel/IndexedHitContainer.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-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".   *
@@ -11,8 +11,10 @@
 #ifndef INDEXEDHITCONTAINER_H
 #define INDEXEDHITCONTAINER_H 1
 
+#include <GaudiKernel/Range.h>
 #include <algorithm>
 #include <assert.h>
+#include <limits>
 #include <vector>
 
 template <size_t NStations, size_t NLayersPerStation, size_t NRegionsPerLayer, typename Hit>
diff --git a/Tf/TfKernel/include/TfKernel/SIMDChi2Fit.h b/Tf/TfKernel/include/TfKernel/SIMDChi2Fit.h
index e53301b0b111a45c8cda3f6d1148211cffddbbd8..dd9fbf189585e0bb811ec016601f9ab312530b44 100644
--- a/Tf/TfKernel/include/TfKernel/SIMDChi2Fit.h
+++ b/Tf/TfKernel/include/TfKernel/SIMDChi2Fit.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-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".   *
@@ -16,6 +16,8 @@
 #ifndef SIMDCHI2FIT_H
 #define SIMDCHI2FIT_H
 
+#include <bits/c++config.h>
+
 #if defined( __GNUC__ )
 #  if defined( VECTOPTS )
 #    undef VECTOPTS
diff --git a/Tf/TsaKernel/include/TsaKernel/TsaFun.h b/Tf/TsaKernel/include/TsaKernel/TsaFun.h
index 580085c4b90a8a61f07f87a0c7dd3a8959d9d800..3941c05573dbf207bf197bb902bed1797ef8e8fb 100644
--- a/Tf/TsaKernel/include/TsaKernel/TsaFun.h
+++ b/Tf/TsaKernel/include/TsaKernel/TsaFun.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-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".   *
@@ -11,6 +11,7 @@
 #ifndef _TsaFun_H_
 #define _TsaFun_H_
 
+#include "TsaConstants.h"
 #include "gsl/gsl_math.h"
 
 namespace Tf {
diff --git a/Tr/TrackInterfaces/include/TrackInterfaces/IGhostProbability.h b/Tr/TrackInterfaces/include/TrackInterfaces/IGhostProbability.h
index d7d56ef4d3f3f6d4a33fbd317e4773879ee53f47..f43a9afaa7ece6be9d0ceca879787ca81548081a 100644
--- a/Tr/TrackInterfaces/include/TrackInterfaces/IGhostProbability.h
+++ b/Tr/TrackInterfaces/include/TrackInterfaces/IGhostProbability.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-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".   *
@@ -12,6 +12,7 @@
 #define _IGhostProbability_H
 
 #include "GaudiKernel/IAlgTool.h"
+#include <Event/Track.h>
 
 /** @class IGhostProbability
  *
diff --git a/Tr/TrackKernel/include/TrackKernel/LinearStateZTraj.h b/Tr/TrackKernel/include/TrackKernel/LinearStateZTraj.h
index 6e5184e4a09660d92a0e2e416c6b0fa206beb92c..8bbd24385bd8301ca59ec606f80d9c621e978c02 100644
--- a/Tr/TrackKernel/include/TrackKernel/LinearStateZTraj.h
+++ b/Tr/TrackKernel/include/TrackKernel/LinearStateZTraj.h
@@ -1,5 +1,5 @@
 /*****************************************************************************\
-* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration      *
+* (c) Copyright 2000-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".   *
@@ -12,6 +12,7 @@
 #define LINEARSTATEZTRAJ_H
 
 #include "TrackKernel/ZTrajectory.h"
+#include <GaudiKernel/SystemOfUnits.h>
 
 namespace LHCb {
   // ==========================================================================