cms-sw · smuzaffar · Jan 23, 2026 · Jan 13, 2026 · Jan 16, 2026 · Jan 21, 2026
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmBase.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmBase.h
@@ -37,16 +37,14 @@ class Trajectory;
 #include "DataFormats/Alignment/interface/TkFittedLasBeamCollectionFwd.h"
 #include "DataFormats/Alignment/interface/AliClusterValueMapFwd.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
+#include "DataFormats/BeamSpot/interface/BeamSpotFwd.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 
 namespace edm {
   class EventSetup;
   class ParameterSet;
 }  // namespace edm
-namespace reco {
-  class BeamSpot;
-}  // namespace reco
 
 /*** Global typedefs part I (see EOF for part II) ***/
 typedef std::pair<const Trajectory *, const reco::Track *> ConstTrajTrackPair;

diff --git a/Alignment/ReferenceTrajectories/interface/DualReferenceTrajectory.h b/Alignment/ReferenceTrajectories/interface/DualReferenceTrajectory.h
@@ -28,11 +28,9 @@
 
 #include "Alignment/ReferenceTrajectories/interface/ReferenceTrajectoryBase.h"
 #include "DataFormats/TrajectorySeed/interface/PropagationDirection.h"
+#include "DataFormats/BeamSpot/interface/BeamSpotFwd.h"
 
 class ReferenceTrajectory;
-namespace reco {
-  class BeamSpot;
-}
 
 class DualReferenceTrajectory : public ReferenceTrajectoryBase {
 public:

diff --git a/Alignment/ReferenceTrajectories/interface/ReferenceTrajectory.h b/Alignment/ReferenceTrajectories/interface/ReferenceTrajectory.h
@@ -38,6 +38,7 @@
 #include "Alignment/ReferenceTrajectories/interface/ReferenceTrajectoryBase.h"
 #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h"
 #include "DataFormats/TrajectorySeed/interface/PropagationDirection.h"
+#include "DataFormats/BeamSpot/interface/BeamSpotFwd.h"
 #include "TrackingTools/TrajectoryState/interface/SurfaceSideDefinition.h"
 
 #include "GblTrajectory.h"
@@ -48,10 +49,6 @@ class MaterialEffectsUpdator;
 class Plane;
 class BeamSpotTransientTrackingRecHit;
 
-namespace reco {
-  class BeamSpot;
-}
-
 class ReferenceTrajectory : public ReferenceTrajectoryBase {
 public:
   typedef SurfaceSideDefinition::SurfaceSide SurfaceSide;

diff --git a/Alignment/ReferenceTrajectories/interface/TrajectoryFactoryBase.h b/Alignment/ReferenceTrajectories/interface/TrajectoryFactoryBase.h
@@ -7,17 +7,14 @@
 #include "TrackingTools/PatternTools/interface/Trajectory.h"
 
 #include "DataFormats/TrajectorySeed/interface/PropagationDirection.h"
+#include "DataFormats/BeamSpot/interface/BeamSpotFwd.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 /// Base class for factories producing reference trajectories, i.e. instances of classes deriving from
 /// ReferenceTrajectoryBase, from a TrajTrackPairCollection.
 
-namespace reco {
-  class BeamSpot;
-}
-
 class TrajectoryFactoryBase {
 public:
   typedef ReferenceTrajectoryBase::ReferenceTrajectoryPtr ReferenceTrajectoryPtr;

diff --git a/Alignment/ReferenceTrajectories/interface/TwoBodyDecayTrajectory.h b/Alignment/ReferenceTrajectories/interface/TwoBodyDecayTrajectory.h
@@ -3,15 +3,12 @@
 
 #include "Alignment/ReferenceTrajectories/interface/ReferenceTrajectory.h"
 #include "Alignment/ReferenceTrajectories/interface/TwoBodyDecayTrajectoryState.h"
+#include "DataFormats/BeamSpot/interface/BeamSpotFwd.h"
 
 /**
    by Edmund Widl, see CMS NOTE-2007/032.
  */
 
-namespace reco {
-  class BeamSpot;
-}
-
 class TwoBodyDecayTrajectory : public ReferenceTrajectoryBase {
 public:
   typedef TransientTrackingRecHit::ConstRecHitContainer ConstRecHitContainer;

diff --git a/Alignment/ReferenceTrajectories/plugins/BzeroReferenceTrajectoryFactory.h b/Alignment/ReferenceTrajectories/plugins/BzeroReferenceTrajectoryFactory.h
@@ -1,13 +1,11 @@
 #include "Alignment/ReferenceTrajectories/interface/TrajectoryFactoryBase.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
+#include "DataFormats/BeamSpot/interface/BeamSpotFwd.h"
 
 namespace edm {
   class ParameterSet;
   class EventSetup;
 }  // namespace edm
-namespace reco {
-  class BeamSpot;
-}
 
 /// A factory that produces instances of class BzeroReferenceTrajectory from a
 /// given TrajTrackPairCollection.

diff --git a/AnalysisDataFormats/TopObjects/interface/TtEventPartons.h b/AnalysisDataFormats/TopObjects/interface/TtEventPartons.h
@@ -2,6 +2,7 @@
 #define TtEventPartons_h
 
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
+#include "DataFormats/Candidate/interface/CandidateOnlyFwd.h"
 
 #include <vector>
 
@@ -11,9 +12,6 @@
    \brief   Common base class for TtFullLepEvtPartons, TtFullHadEvtPartons and TtSemiLepEvtPartons
 */
 
-namespace reco {
-  class Candidate;
-}
 class TtGenEvent;
 
 class TtEventPartons {

diff --git a/AnalysisDataFormats/TopObjects/interface/TtFullHadEvtPartons.h b/AnalysisDataFormats/TopObjects/interface/TtFullHadEvtPartons.h
@@ -2,6 +2,7 @@
 #define TtFullHadEvtPartons_h
 
 #include "AnalysisDataFormats/TopObjects/interface/TtEventPartons.h"
+#include "DataFormats/Candidate/interface/CandidateOnlyFwd.h"
 
 #include <vector>
 
@@ -13,9 +14,6 @@
    This class is mainly used for the jet-parton matching in TopTools.
 */
 
-namespace reco {
-  class Candidate;
-}
 class TtGenEvent;
 
 class TtFullHadEvtPartons : public TtEventPartons {

diff --git a/AnalysisDataFormats/TopObjects/interface/TtFullLepEvtPartons.h b/AnalysisDataFormats/TopObjects/interface/TtFullLepEvtPartons.h
@@ -2,6 +2,7 @@
 #define TtFullLepEvtPartons_h
 
 #include "AnalysisDataFormats/TopObjects/interface/TtEventPartons.h"
+#include "DataFormats/Candidate/interface/CandidateOnlyFwd.h"
 
 #include <vector>
 
@@ -13,9 +14,6 @@
    This class is mainly used for the jet-parton matching in TopTools.
 */
 
-namespace reco {
-  class Candidate;
-}
 class TtGenEvent;
 
 class TtFullLepEvtPartons : public TtEventPartons {

diff --git a/AnalysisDataFormats/TopObjects/interface/TtSemiLepEvtPartons.h b/AnalysisDataFormats/TopObjects/interface/TtSemiLepEvtPartons.h
@@ -2,6 +2,7 @@
 #define TtSemiLepEvtPartons_h
 
 #include "AnalysisDataFormats/TopObjects/interface/TtEventPartons.h"
+#include "DataFormats/Candidate/interface/CandidateOnlyFwd.h"
 
 #include <vector>
 
@@ -13,9 +14,6 @@
    This class is mainly used for the jet-parton matching in TopTools.
 */
 
-namespace reco {
-  class Candidate;
-}
 class TtGenEvent;
 
 class TtSemiLepEvtPartons : public TtEventPartons {

diff --git a/CommonTools/CandAlgos/interface/GenJetParticleSelector.h b/CommonTools/CandAlgos/interface/GenJetParticleSelector.h
@@ -9,6 +9,7 @@
  */
 #include "SimGeneral/HepPDTRecord/interface/PdtEntry.h"
 #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h"
+#include "DataFormats/Candidate/interface/CandidateOnlyFwd.h"
 #include "FWCore/Utilities/interface/ESGetToken.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include <set>
@@ -19,9 +20,6 @@ namespace edm {
   class Event;
   class ConsumesCollector;
 }  // namespace edm
-namespace reco {
-  class Candidate;
-}
 
 class GenJetParticleSelector {
 public:

diff --git a/CommonTools/CandUtils/interface/CandSelector.h b/CommonTools/CandUtils/interface/CandSelector.h
@@ -12,9 +12,7 @@
  *
  */
 
-namespace reco {
-  class Candidate;
-}
+#include "DataFormats/Candidate/interface/CandidateOnlyFwd.h"
 
 class CandSelector {
 public:

diff --git a/CommonTools/CandUtils/interface/zMCLeptonDaughters.h b/CommonTools/CandUtils/interface/zMCLeptonDaughters.h
@@ -2,8 +2,9 @@
 #define CommonTools_CandUtils_zMCLeptonDaughters_h
 #include <utility>
 
+#include "DataFormats/Candidate/interface/CandidateOnlyFwd.h"
+
 namespace reco {
-  class Candidate;
   std::pair<const Candidate *, const Candidate *> zMCLeptonDaughters(const Candidate &z, int leptonPdgId);
 }  // namespace reco
 

diff --git a/DQM/Physics/src/EwkDQM.h b/DQM/Physics/src/EwkDQM.h
@@ -18,14 +18,11 @@
 #include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
+#include "DataFormats/METReco/interface/METFwd.h"
+#include "DataFormats/JetReco/interface/JetFwd.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 
-namespace reco {
-  class Jet;
-  class MET;
-}  // namespace reco
-
 class EwkDQM : public DQMEDAnalyzer {
 public:
   /// Constructor

diff --git a/DQM/Physics/src/EwkElecDQM.h b/DQM/Physics/src/EwkElecDQM.h
@@ -15,15 +15,12 @@
 
 #include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
+#include "DataFormats/BeamSpot/interface/BeamSpotFwd.h"
+#include "DataFormats/METReco/interface/METFwd.h"
+#include "DataFormats/JetReco/interface/JetFwd.h"
 #include "DQMServices/Core/interface/DQMOneEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 
-namespace reco {
-  class Jet;
-  class MET;
-  class BeamSpot;
-}  // namespace reco
-
 class EwkElecDQM : public DQMOneEDAnalyzer<> {
 public:
   EwkElecDQM(const edm::ParameterSet&);

diff --git a/DQM/Physics/src/EwkMuDQM.h b/DQM/Physics/src/EwkMuDQM.h
@@ -11,19 +11,17 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "HLTrigger/HLTcore/interface/HLTPrescaleProvider.h"
 
+#include "DataFormats/BeamSpot/interface/BeamSpotFwd.h"
+#include "DataFormats/METReco/interface/METFwd.h"
+#include "DataFormats/JetReco/interface/JetFwd.h"
+#include "DataFormats/MuonReco/interface/MuonFwd.h"
+#include "DataFormats/VertexReco/interface/VertexFwd.h"
+#include "DataFormats/EgammaCandidates/interface/PhotonFwd.h"
+
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 
-namespace reco {
-  class Muon;
-  class Jet;
-  class MET;
-  class Vertex;
-  class Photon;
-  class BeamSpot;
-}  // namespace reco
-
 class EwkMuDQM : public DQMEDAnalyzer {
 public:
   EwkMuDQM(const edm::ParameterSet&);

diff --git a/DQM/Physics/src/EwkMuLumiMonitorDQM.h b/DQM/Physics/src/EwkMuLumiMonitorDQM.h
@@ -21,17 +21,15 @@
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/TrackReco/interface/Track.h"
+#include "DataFormats/BeamSpot/interface/BeamSpotFwd.h"
+#include "DataFormats/METReco/interface/METFwd.h"
 #include "DataFormats/CaloTowers/interface/CaloTowerDefs.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 
 namespace trigger {
   class TriggerEvent;
 }
-namespace reco {
-  class BeamSpot;
-  class MET;
-}  // namespace reco
 
 class EwkMuLumiMonitorDQM : public DQMEDAnalyzer {
 public:

diff --git a/DQM/Physics/src/QcdPhotonsDQM.h b/DQM/Physics/src/QcdPhotonsDQM.h
@@ -16,15 +16,12 @@
 #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 #include "DataFormats/EgammaCandidates/interface/PhotonFwd.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
+#include "DataFormats/JetReco/interface/JetFwd.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 
 #include "RecoEcal/EgammaCoreTools/interface/EcalClusterLazyTools.h"
 
-namespace reco {
-  class Jet;
-}
-
 class QcdPhotonsDQM : public DQMEDAnalyzer {
 public:
   /// Constructor

diff --git a/DQM/TrackingMonitor/interface/TrackAnalyzer.h b/DQM/TrackingMonitor/interface/TrackAnalyzer.h
@@ -34,7 +34,6 @@ Monitoring source for general quantities related to tracks.
 #include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
 #include "TrackingTools/Records/interface/TransientTrackRecord.h"
 
-class BeamSpot;
 namespace tadqm {
   class TrackAnalyzer {
   public:

diff --git a/DQM/TrackingMonitorSource/interface/TrackToTrackComparisonHists.h b/DQM/TrackingMonitorSource/interface/TrackToTrackComparisonHists.h
@@ -12,6 +12,7 @@
 #include "FWCore/Utilities/interface/EDGetToken.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
+#include "DataFormats/BeamSpot/interface/BeamSpotFwd.h"
 #include "DataFormats/Scalers/interface/LumiScalers.h"
 #include "DataFormats/OnlineMetaData/interface/OnlineLuminosityRecord.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
@@ -28,11 +29,6 @@
 // class declaration
 //
 class DQMStore;
-namespace reco {
-  class BeamSpot;
-  class Vertex;
-}  // namespace reco
-class DQMStore;
 class GenericTriggerEventFlag;
 
 class TrackToTrackComparisonHists : public DQMEDAnalyzer {

diff --git a/DataFormats/BeamSpot/interface/BeamSpotFwd.h b/DataFormats/BeamSpot/interface/BeamSpotFwd.h
@@ -0,0 +1,6 @@
+#ifndef DataFormats_BeamSpot_BeamSpotFwd_h
+#define DataFormats_BeamSpot_BeamSpotFwd_h
+namespace reco {
+  class BeamSpot;
+}
+#endif
diff --git a/DataFormats/BeamSpot/src/classes_def.xml b/DataFormats/BeamSpot/src/classes_def.xml
@@ -5,7 +5,7 @@
   </class>
   <class name="edm::Wrapper<reco::BeamSpot>"/>
 
-  <class name="BeamSpotHost"/>
+  <class name="BeamSpotHost" rntupleStreamerMode="true"/>
   <!-- BeamSpotHost::Product must be listed before the aliased-to type -->
   <!-- TODO: we should find a better way than replicating the class versions and checksums -->
   <class name="BeamSpotHost::Product" ClassVersion="3">

diff --git a/DataFormats/Candidate/interface/CandidateOnlyFwd.h b/DataFormats/Candidate/interface/CandidateOnlyFwd.h
@@ -0,0 +1,6 @@
+#ifndef DataFormats_Candidate_CandidateOnlyFwd_h
+#define DataFormats_Candidate_CandidateOnlyFwd_h
+namespace reco {
+  class Candidate;
+}
+#endif
diff --git a/DataFormats/Candidate/interface/OverlapChecker.h b/DataFormats/Candidate/interface/OverlapChecker.h
@@ -10,9 +10,7 @@
  *
  */
 
-namespace reco {
-  class Candidate;
-}
+#include "DataFormats/Candidate/interface/CandidateOnlyFwd.h"
 
 class OverlapChecker {
 public:

diff --git a/DataFormats/Candidate/interface/VertexCompositeCandidateOnlyFwd.h b/DataFormats/Candidate/interface/VertexCompositeCandidateOnlyFwd.h
@@ -0,0 +1,6 @@
+#ifndef DataFormats_Candidate_VertexCompositeCandidateOnlyFwd_h
+#define DataFormats_Candidate_VertexCompositeCandidateOnlyFwd_h
+namespace reco {
+  class VertexCompositeCandidate;
+}
+#endif
diff --git a/DataFormats/Candidate/interface/component.h b/DataFormats/Candidate/interface/component.h
@@ -10,10 +10,9 @@
  */
 #include "FWCore/Utilities/interface/Exception.h"
 
+#include "DataFormats/Candidate/interface/CandidateOnlyFwd.h"
 namespace reco {
 
-  class Candidate;
-
   struct DefaultComponentTag {};
 
   namespace componenthelper {