diff --git a/CalibTracker/SiStripCommon/plugins/ShallowSimTracksProducer.cc b/CalibTracker/SiStripCommon/plugins/ShallowSimTracksProducer.cc
index d952f580fe791..136413b51d220 100644
--- a/CalibTracker/SiStripCommon/plugins/ShallowSimTracksProducer.cc
+++ b/CalibTracker/SiStripCommon/plugins/ShallowSimTracksProducer.cc
@@ -3,7 +3,7 @@
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
diff --git a/CommonTools/RecoAlgos/BuildFile.xml b/CommonTools/RecoAlgos/BuildFile.xml
index 3b52eda82bb6c..736edd2d2c27e 100644
--- a/CommonTools/RecoAlgos/BuildFile.xml
+++ b/CommonTools/RecoAlgos/BuildFile.xml
@@ -13,6 +13,7 @@
 <use name="TrackingTools/IPTools"/>
 <use name="TrackingTools/TransientTrack"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
+<use name="SimDataFormats/TrackingAnalysis"/>
 <use name="fastjet"/>
 <export>
   <lib name="1"/>
diff --git a/DQMOffline/RecoB/plugins/BuildFile.xml b/DQMOffline/RecoB/plugins/BuildFile.xml
index deda6cb314cb7..a2849b075a367 100644
--- a/DQMOffline/RecoB/plugins/BuildFile.xml
+++ b/DQMOffline/RecoB/plugins/BuildFile.xml
@@ -1,7 +1,19 @@
 <use name="root"/>
+<use name="CommonTools/Statistics"/>
 <use name="DQMOffline/RecoB"/>
 <use name="DQMServices/Core"/>
-<use name="CommonTools/Statistics"/>
+<use name="DataFormats/BeamSpot"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/JetReco"/>
+<use name="DataFormats/VertexReco"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="JetMETCorrections/JetCorrector"/>
+<use name="SimDataFormats/GeneratorProducts"/>
 <library file="BTagPerformanceAnalyzerOnData.cc PrimaryVertexMonitor.cc BTagPerformanceHarvester.cc" name="DQMOfflineRecoBPlugins">
   <flags EDM_PLUGIN="1"/>
 </library>
+
diff --git a/DataFormats/RecoCandidate/BuildFile.xml b/DataFormats/RecoCandidate/BuildFile.xml
index 98f8e104eb6c1..7b733ce6deeed 100644
--- a/DataFormats/RecoCandidate/BuildFile.xml
+++ b/DataFormats/RecoCandidate/BuildFile.xml
@@ -6,7 +6,6 @@
 <use name="DataFormats/EgammaReco"/>
 <use name="DataFormats/GsfTrackReco"/>
 <use name="clhep"/>
-<use name="SimDataFormats/TrackingAnalysis"/>
 <use name="DataFormats/Math"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/Utilities"/>
diff --git a/DataFormats/RecoCandidate/src/classes.h b/DataFormats/RecoCandidate/src/classes.h
index 9783441487180..03d41a60380bc 100644
--- a/DataFormats/RecoCandidate/src/classes.h
+++ b/DataFormats/RecoCandidate/src/classes.h
@@ -17,7 +17,6 @@
 #include "DataFormats/RecoCandidate/interface/RecoEcalCandidateIsolation.h"
 #include "DataFormats/RecoCandidate/interface/FitResult.h"
 #include "DataFormats/RecoCandidate/interface/CaloRecHitCandidate.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
 #include "DataFormats/RecoCandidate/interface/TrackCandidateAssociation.h"
 #include "DataFormats/Common/interface/RefProd.h"
 #include "DataFormats/Common/interface/Wrapper.h"
diff --git a/DataFormats/RecoCandidate/src/classes_def.xml b/DataFormats/RecoCandidate/src/classes_def.xml
index 3da47126ef18c..9c04472e5ccfb 100644
--- a/DataFormats/RecoCandidate/src/classes_def.xml
+++ b/DataFormats/RecoCandidate/src/classes_def.xml
@@ -82,22 +82,9 @@
   <class name="edm::helpers::KeyVal<edm::RefProd<std::vector<reco::Track> >,edm::RefProd<edm::OwnVector<reco::Candidate,edm::ClonePolicy<reco::Candidate> > > >" />
   <class name="edm::Wrapper<edm::AssociationMap<edm::OneToOne<std::vector<reco::Track>,edm::OwnVector<reco::Candidate,edm::ClonePolicy<reco::Candidate> >,unsigned int> > >" />
 
-  <class name="edm::Wrapper<reco::SimToRecoCollection>" />
-  <class name="edm::Wrapper<reco::RecoToSimCollection>" />
-
-  <class name="reco::SimToRecoCollection" >
-   <field name="transientMap_" transient="true"/>
-  </class>
-  <class name="reco::RecoToSimCollection" >
-   <field name="transientMap_" transient="true"/>
-  </class>
-
-
   <class name="edm::ValueMap<reco::IsoDeposit>" />
   <class name="edm::ValueMap<reco::FitQuality>" />
   <!-- <class pattern="edm::Wrapper<edm::ValueMap<*>" /> -->
-  <class name="edm::Wrapper<edm::AssociationMap<edm::OneToManyWithQualityGeneric<edm::View<reco::Track>,vector<TrackingParticle>,double,unsigned int,edm::RefToBaseProd<reco::Track>,edm::RefProd<vector<TrackingParticle> >,edm::RefToBase<reco::Track>,edm::Ref<vector<TrackingParticle>,TrackingParticle,edm::refhelper::FindUsingAdvance<vector<TrackingParticle>,TrackingParticle> > > > >" />
-<class name="edm::Wrapper<edm::AssociationMap<edm::OneToManyWithQualityGeneric<vector<TrackingParticle>,edm::View<reco::Track>,double,unsigned int,edm::RefProd<vector<TrackingParticle> >,edm::RefToBaseProd<reco::Track>,edm::Ref<vector<TrackingParticle>,TrackingParticle,edm::refhelper::FindUsingAdvance<vector<TrackingParticle>,TrackingParticle> >,edm::RefToBase<reco::Track> > > >" />
 <class name="edm::Wrapper<edm::AssociationMap<edm::OneToOne<vector<reco::Track>,edm::OwnVector<reco::Candidate,edm::ClonePolicy<reco::Candidate> >,unsigned int> > >" />
 <class name="edm::Wrapper<edm::AssociationMap<edm::OneToValue<vector<reco::RecoChargedCandidate>,float,unsigned int> > >" />
 <class name="edm::Wrapper<edm::AssociationMap<edm::OneToValue<vector<reco::RecoEcalCandidate>,float,unsigned int> > >" />
diff --git a/EgammaAnalysis/ElectronTools/plugins/BuildFile.xml b/EgammaAnalysis/ElectronTools/plugins/BuildFile.xml
index 0bfacf54bfc5f..1e63654c44fbc 100644
--- a/EgammaAnalysis/ElectronTools/plugins/BuildFile.xml
+++ b/EgammaAnalysis/ElectronTools/plugins/BuildFile.xml
@@ -9,6 +9,16 @@
 <use name="Geometry/Records"/>
 <use name="EgammaAnalysis/ElectronTools"/>
 <use name="TrackingTools/Records"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/GBRForest"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="DataFormats/ParticleFlowCandidate"/>
+<use name="DataFormats/RecoCandidate"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/Utilities"/>
+<use name="Geometry/CaloEventSetup"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="TrackingTools/IPTools"/>
 <library name="EgammaAnalysisElectronToolsPlugins" file="*.cc">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/EgammaAnalysis/ElectronTools/test/BuildFile.xml b/EgammaAnalysis/ElectronTools/test/BuildFile.xml
index 43822e20c21c8..af9f9c00ea02f 100644
--- a/EgammaAnalysis/ElectronTools/test/BuildFile.xml
+++ b/EgammaAnalysis/ElectronTools/test/BuildFile.xml
@@ -8,6 +8,7 @@
   <use name="FWCore/ParameterSet"/>
   <use name="EgammaAnalysis/ElectronTools"/>
   <use name="TrackingTools/Records"/>
+  <use name="SimDataFormats/GeneratorProducts"/>
   <use name="clhep"/>
   <use name="root"/>
   <use name="roottmva"/>
diff --git a/L1Trigger/L1TNtuples/plugins/BuildFile.xml b/L1Trigger/L1TNtuples/plugins/BuildFile.xml
index 4c67d28934aa3..7daf789cd70c2 100644
--- a/L1Trigger/L1TNtuples/plugins/BuildFile.xml
+++ b/L1Trigger/L1TNtuples/plugins/BuildFile.xml
@@ -30,6 +30,32 @@
 <use name="L1Trigger/GlobalTriggerAnalyzer"/>
 <use name="HLTrigger/HLTcore"/>
 <use name="L1Trigger/L1TNtuples"/>
+<use name="CondFormats/AlignmentRecord"/>
+<use name="DataFormats/BeamSpot"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="DataFormats/GeometrySurface"/>
+<use name="DataFormats/HLTReco"/>
+<use name="DataFormats/HepMCCandidate"/>
+<use name="DataFormats/Math"/>
+<use name="DataFormats/MuonDetId"/>
+<use name="DataFormats/Provenance"/>
+<use name="DataFormats/TauReco"/>
+<use name="EventFilter/L1TRawToDigi"/>
+<use name="FWCore/Common"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="Geometry/CommonDetUnit"/>
+<use name="Geometry/Records"/>
+<use name="JetMETCorrections/JetCorrector"/>
+<use name="MagneticField/Engine"/>
+<use name="SimDataFormats/GeneratorProducts"/>
+<use name="SimDataFormats/PileupSummaryInfo"/>
+<use name="TrackingTools/GeomPropagators"/>
+<use name="TrackingTools/PatternTools"/>
+<use name="TrackingTools/Records"/>
 <library file="*.cc" name="L1TriggerL1TNtuplePlugins">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoHI/HiTracking/BuildFile.xml b/RecoHI/HiTracking/BuildFile.xml
index d1738726c0d12..89650c4c800f6 100644
--- a/RecoHI/HiTracking/BuildFile.xml
+++ b/RecoHI/HiTracking/BuildFile.xml
@@ -1,11 +1,18 @@
+<use name="DataFormats/BeamSpot"/>
+<use name="DataFormats/CaloTowers"/>
+<use name="DataFormats/Math"/>
+<use name="DataFormats/TrackerCommon"/>
+<use name="DataFormats/ParticleFlowReco"/>
+<use name="DataFormats/ParticleFlowCandidate"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/VertexReco"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/PluginManager"/>
 <use name="TrackingTools/PatternTools"/>
 <use name="RecoPixelVertexing/PixelTrackFitting"/>
 <use name="RecoPixelVertexing/PixelLowPtUtilities"/>
-<use name="DataFormats/ParticleFlowReco"/>
-<use name="DataFormats/ParticleFlowCandidate"/>
+<use name="SimDataFormats/TrackingAnalysis"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/RecoHI/HiTracking/plugins/BuildFile.xml b/RecoHI/HiTracking/plugins/BuildFile.xml
index 9b56e1d081030..7b63d6e9b0ea6 100644
--- a/RecoHI/HiTracking/plugins/BuildFile.xml
+++ b/RecoHI/HiTracking/plugins/BuildFile.xml
@@ -1,5 +1,29 @@
-<use name="RecoHI/HiTracking"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="CommonTools/Utils"/>
 <use name="CondFormats/GBRForest"/>
+<use name="DataFormats/BeamSpot"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="DataFormats/SiPixelCluster"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/TrackerCommon"/>
+<use name="DataFormats/TrackerRecHit2D"/>
+<use name="DataFormats/VertexReco"/>
+<use name="CondFormats/DataRecord"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/Utilities"/>
+<use name="Geometry/CommonDetUnit"/>
+<use name="Geometry/CommonTopologies"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/TrackerGeometryBuilder"/>
+<use name="RecoPixelVertexing/PixelTrackFitting"/>
+<use name="RecoTracker/TkTrackingRegions"/>
+<use name="RecoHI/HiTracking"/>
+<use name="SimDataFormats/Vertex"/>
+<use name="TrackingTools/PatternTools"/>
 <use name="rootminuit"/>
 <library file="*.cc" name="RecoHIHiTrackingPlugins">
   <flags EDM_PLUGIN="1"/>
diff --git a/RecoJets/JetProducers/BuildFile.xml b/RecoJets/JetProducers/BuildFile.xml
index 09e4540192265..502708e773160 100644
--- a/RecoJets/JetProducers/BuildFile.xml
+++ b/RecoJets/JetProducers/BuildFile.xml
@@ -7,6 +7,8 @@
 <use name="Geometry/Records"/>
 <use name="Geometry/CommonDetUnit"/>
 <use name="SimDataFormats/CaloHit"/>
+<use name="SimDataFormats/Vertex"/>
+<use name="SimDataFormats/Track"/>
 <use name="RecoJets/JetAlgorithms"/>
 <use name="JetMETCorrections/JetCorrector"/>
 <use name="DataFormats/CastorReco"/>
diff --git a/RecoVertex/KalmanVertexFit/interface/VertexFitterResult.h b/RecoVertex/KalmanVertexFit/interface/VertexFitterResult.h
index 543cc0c679952..08c3dcfc691a9 100644
--- a/RecoVertex/KalmanVertexFit/interface/VertexFitterResult.h
+++ b/RecoVertex/KalmanVertexFit/interface/VertexFitterResult.h
@@ -10,7 +10,7 @@
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingVertex.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 
 #include <vector>
 
diff --git a/DataFormats/RecoCandidate/interface/TrackAssociation.h b/SimDataFormats/Associations/interface/TrackAssociation.h
similarity index 100%
rename from DataFormats/RecoCandidate/interface/TrackAssociation.h
rename to SimDataFormats/Associations/interface/TrackAssociation.h
diff --git a/SimDataFormats/Associations/interface/TrackToGenParticleAssociator.h b/SimDataFormats/Associations/interface/TrackToGenParticleAssociator.h
index 15d1b6e7783db..621b6a7a3abf2 100644
--- a/SimDataFormats/Associations/interface/TrackToGenParticleAssociator.h
+++ b/SimDataFormats/Associations/interface/TrackToGenParticleAssociator.h
@@ -11,7 +11,7 @@
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
 #include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 
diff --git a/SimDataFormats/Associations/interface/TrackToGenParticleAssociatorBaseImpl.h b/SimDataFormats/Associations/interface/TrackToGenParticleAssociatorBaseImpl.h
index 4ba3f48a7fe32..fe36625feed75 100644
--- a/SimDataFormats/Associations/interface/TrackToGenParticleAssociatorBaseImpl.h
+++ b/SimDataFormats/Associations/interface/TrackToGenParticleAssociatorBaseImpl.h
@@ -11,7 +11,7 @@
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
 #include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 
diff --git a/SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h b/SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h
index 98364a9c8190c..3355393b51a37 100644
--- a/SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h
+++ b/SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h
@@ -23,7 +23,7 @@
 #include <memory>
 
 // user include files
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 
 #include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h"
 #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
diff --git a/SimDataFormats/Associations/interface/TrackToTrackingParticleAssociatorBaseImpl.h b/SimDataFormats/Associations/interface/TrackToTrackingParticleAssociatorBaseImpl.h
index d18662f12bab6..23f69df201638 100644
--- a/SimDataFormats/Associations/interface/TrackToTrackingParticleAssociatorBaseImpl.h
+++ b/SimDataFormats/Associations/interface/TrackToTrackingParticleAssociatorBaseImpl.h
@@ -10,7 +10,7 @@
  */
 
 #include "DataFormats/Common/interface/Handle.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 
 #include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h"
 #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
diff --git a/SimDataFormats/Associations/src/classes.h b/SimDataFormats/Associations/src/classes.h
index d327d03291380..03bf3c2d97d7a 100644
--- a/SimDataFormats/Associations/src/classes.h
+++ b/SimDataFormats/Associations/src/classes.h
@@ -8,6 +8,7 @@
 #include "SimDataFormats/Associations/interface/VertexToTrackingVertexAssociator.h"
 #include "SimDataFormats/Associations/interface/LayerClusterToCaloParticleAssociator.h"
 #include "SimDataFormats/Associations/interface/LayerClusterToSimClusterAssociator.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "SimDataFormats/Associations/interface/TracksterToSimClusterAssociator.h"
 #include "SimDataFormats/Associations/interface/MultiClusterToCaloParticleAssociator.h"
 #include "SimDataFormats/Associations/interface/TTTrackTruthPair.h"
diff --git a/SimDataFormats/Associations/src/classes_def.xml b/SimDataFormats/Associations/src/classes_def.xml
index 0e1edcd95fc26..28e4362e2d419 100644
--- a/SimDataFormats/Associations/src/classes_def.xml
+++ b/SimDataFormats/Associations/src/classes_def.xml
@@ -71,7 +71,19 @@
   <class name="edm::helpers::KeyVal<edm::RefProd<vector<SimCluster> >,edm::RefProd<vector<reco::CaloCluster> > >" />
   <class name="edm::helpers::KeyVal<edm::RefProd<vector<reco::CaloCluster> >,edm::RefProd<vector<SimCluster> > >" />
 
-  <class name="hgcal::SimToRecoCollectionWithMultiClusters" >
+  <class name="edm::Wrapper<reco::SimToRecoCollection>" />
+  <class name="edm::Wrapper<reco::RecoToSimCollection>" />
+
+  <class name="reco::SimToRecoCollection" >
+   <field name="transientMap_" transient="true"/>
+  </class>
+  <class name="reco::RecoToSimCollection" >
+   <field name="transientMap_" transient="true"/>
+  </class>
+  <class name="edm::Wrapper<edm::AssociationMap<edm::OneToManyWithQualityGeneric<edm::View<reco::Track>,vector<TrackingParticle>,double,unsigned int,edm::RefToBaseProd<reco::Track>,edm::RefProd<vector<TrackingParticle> >,edm::RefToBase<reco::Track>,edm::Ref<vector<TrackingParticle>,TrackingParticle,edm::refhelper::FindUsingAdvance<vector<TrackingParticle>,TrackingParticle> > > > >" />
+  <class name="edm::Wrapper<edm::AssociationMap<edm::OneToManyWithQualityGeneric<vector<TrackingParticle>,edm::View<reco::Track>,double,unsigned int,edm::RefProd<vector<TrackingParticle> >,edm::RefToBaseProd<reco::Track>,edm::Ref<vector<TrackingParticle>,TrackingParticle,edm::refhelper::FindUsingAdvance<vector<TrackingParticle>,TrackingParticle> >,edm::RefToBase<reco::Track> > > >" />
+
+   <class name="hgcal::SimToRecoCollectionWithMultiClusters" >
     <field name="transientMap_" transient="true"/>
   </class>
   <class name="edm::Wrapper<hgcal::SimToRecoCollectionWithMultiClusters>" />
@@ -86,6 +98,7 @@
 
   <class name="TTTrackTruthPair<edm::Ref<edm::DetSetVector<Phase2TrackerDigi>,Phase2TrackerDigi,edm::refhelper::FindForDetSetVector<Phase2TrackerDigi> > >" />
   <class name="std::vector<TTTrackTruthPair<edm::Ref<edm::DetSetVector<Phase2TrackerDigi>,Phase2TrackerDigi,edm::refhelper::FindForDetSetVector<Phase2TrackerDigi> > > >" />
+
   <class name="edm::Ref<std::vector<TTTrackTruthPair<edm::Ref<edm::DetSetVector<Phase2TrackerDigi>,Phase2TrackerDigi,edm::refhelper::FindForDetSetVector<Phase2TrackerDigi> > > > >" />
   <class name="edm::Wrapper<std::vector<TTTrackTruthPair<edm::Ref<edm::DetSetVector<Phase2TrackerDigi>,Phase2TrackerDigi,edm::refhelper::FindForDetSetVector<Phase2TrackerDigi> > > > >" />
 </lcgdict>
diff --git a/SimMuon/MCTruth/interface/MuonAssociatorByHitsHelper.h b/SimMuon/MCTruth/interface/MuonAssociatorByHitsHelper.h
index cefeee85dbe22..2796b03b471fd 100644
--- a/SimMuon/MCTruth/interface/MuonAssociatorByHitsHelper.h
+++ b/SimMuon/MCTruth/interface/MuonAssociatorByHitsHelper.h
@@ -3,13 +3,13 @@
 
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/Common/interface/Ref.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 #include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
diff --git a/SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.cc b/SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.cc
index 79a1dd05ed921..670563dae9ec2 100644
--- a/SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.cc
+++ b/SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.cc
@@ -1,5 +1,5 @@
 #include "DataFormats/Common/interface/Handle.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.h"
 #include <memory>
diff --git a/SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.h b/SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.h
index 4f6c8447531a1..88796d7a989da 100644
--- a/SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.h
+++ b/SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.h
@@ -1,7 +1,7 @@
 #ifndef MCTruth_MuonAssociatorEDProducer_h
 #define MCTruth_MuonAssociatorEDProducer_h
 
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/stream/EDProducer.h"
diff --git a/SimMuon/MCTruth/test/testReader.cc b/SimMuon/MCTruth/test/testReader.cc
index 33a21d73f9322..03e579de581b4 100644
--- a/SimMuon/MCTruth/test/testReader.cc
+++ b/SimMuon/MCTruth/test/testReader.cc
@@ -1,4 +1,4 @@
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
diff --git a/SimTracker/TrackAssociatorProducers/plugins/TrackGenAssociatorByChi2Impl.h b/SimTracker/TrackAssociatorProducers/plugins/TrackGenAssociatorByChi2Impl.h
index b624b9e494c3e..1b7a5907b8bbd 100644
--- a/SimTracker/TrackAssociatorProducers/plugins/TrackGenAssociatorByChi2Impl.h
+++ b/SimTracker/TrackAssociatorProducers/plugins/TrackGenAssociatorByChi2Impl.h
@@ -15,7 +15,7 @@
 #include "DataFormats/BeamSpot/interface/BeamSpot.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "SimDataFormats/Associations/interface/TrackToGenParticleAssociatorBaseImpl.h"
 
 #include <map>
diff --git a/SimTracker/VertexAssociation/interface/VertexAssociatorByPositionAndTracks.h b/SimTracker/VertexAssociation/interface/VertexAssociatorByPositionAndTracks.h
index 486fc7f637f7a..d7931a3315c22 100644
--- a/SimTracker/VertexAssociation/interface/VertexAssociatorByPositionAndTracks.h
+++ b/SimTracker/VertexAssociation/interface/VertexAssociatorByPositionAndTracks.h
@@ -1,7 +1,7 @@
 #ifndef SimTracker_VertexAssociation_VertexAssociatorByPositionAndTracks_h
 #define SimTracker_VertexAssociation_VertexAssociatorByPositionAndTracks_h
 
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "SimDataFormats/Associations/interface/VertexToTrackingVertexAssociatorBaseImpl.h"
 
 /**
diff --git a/SimTracker/VertexAssociation/interface/VertexAssociatorByTracks.h b/SimTracker/VertexAssociation/interface/VertexAssociatorByTracks.h
index 891852fe68fcc..e2f44f9fe283a 100644
--- a/SimTracker/VertexAssociation/interface/VertexAssociatorByTracks.h
+++ b/SimTracker/VertexAssociation/interface/VertexAssociatorByTracks.h
@@ -1,7 +1,7 @@
 #ifndef VertexAssociatorByTracks_h
 #define VertexAssociatorByTracks_h
 
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "SimDataFormats/Associations/interface/VertexToTrackingVertexAssociatorBaseImpl.h"
 
 class TrackingParticleSelector;
diff --git a/SimTracker/VertexAssociation/interface/calculateVertexSharedTracks.h b/SimTracker/VertexAssociation/interface/calculateVertexSharedTracks.h
index bed39eabe9284..0b8e341619d33 100644
--- a/SimTracker/VertexAssociation/interface/calculateVertexSharedTracks.h
+++ b/SimTracker/VertexAssociation/interface/calculateVertexSharedTracks.h
@@ -1,7 +1,7 @@
 #ifndef SimTracker_VertexAssociation_calculateVertexSharedTracks_h
 #define SimTracker_VertexAssociation_calculateVertexSharedTracks_h
 
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingVertex.h"
 
diff --git a/TauAnalysis/MCEmbeddingTools/plugins/BuildFile.xml b/TauAnalysis/MCEmbeddingTools/plugins/BuildFile.xml
index 2eb6faaeee75b..33c623f453439 100644
--- a/TauAnalysis/MCEmbeddingTools/plugins/BuildFile.xml
+++ b/TauAnalysis/MCEmbeddingTools/plugins/BuildFile.xml
@@ -8,4 +8,5 @@
 <use name="TrackingTools/TrackAssociator"/>
 <use name="DataFormats/TrackReco"/>
 <use name="CondFormats/BeamSpotObjects"/>
+<use name="SimDataFormats/GeneratorProducts"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/TopQuarkAnalysis/TopEventProducers/BuildFile.xml b/TopQuarkAnalysis/TopEventProducers/BuildFile.xml
index 58ddaf460a130..f4e9bfd7c6834 100644
--- a/TopQuarkAnalysis/TopEventProducers/BuildFile.xml
+++ b/TopQuarkAnalysis/TopEventProducers/BuildFile.xml
@@ -6,5 +6,13 @@
 <use name="TopQuarkAnalysis/TopJetCombination"/>
 <use name="TopQuarkAnalysis/TopEventSelection"/>
 <use name="RecoJets/JetProducers"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/HepMCCandidate"/>
+<use name="DataFormats/Math"/>
+<use name="FWCore/Common"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/Utilities"/>
+<use name="SimDataFormats/GeneratorProducts"/>
+<use name="TopQuarkAnalysis/TopTools"/>
 <use name="fastjet"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/Validation/RecoJets/plugins/BuildFile.xml b/Validation/RecoJets/plugins/BuildFile.xml
index 7e47c4d93dc0f..71487742e1f54 100644
--- a/Validation/RecoJets/plugins/BuildFile.xml
+++ b/Validation/RecoJets/plugins/BuildFile.xml
@@ -9,6 +9,7 @@
 <use name="DataFormats/PatCandidates"/>
 <use name="DataFormats/HeavyIonEvent"/>
 <use name="JetMETCorrections/JetCorrector"/>
+<use name="SimDataFormats/GeneratorProducts"/>
 <use name="root"/>
 <library file="*.cc" name="ValidationRecoJetsPlugins">
   <flags EDM_PLUGIN="1"/>
diff --git a/Validation/RecoMuon/plugins/MuonTrackValidator.h b/Validation/RecoMuon/plugins/MuonTrackValidator.h
index 03e52419af9f0..9206193e1d7e5 100644
--- a/Validation/RecoMuon/plugins/MuonTrackValidator.h
+++ b/Validation/RecoMuon/plugins/MuonTrackValidator.h
@@ -11,7 +11,7 @@
 #include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h"
 
 #include "DataFormats/TrackReco/interface/Track.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
 class MuonTrackValidator : public DQMEDAnalyzer, protected MuonTrackValidatorBase {
diff --git a/Validation/RecoParticleFlow/plugins/PFAnalysisNtuplizer.cc b/Validation/RecoParticleFlow/plugins/PFAnalysisNtuplizer.cc
index a7b43bad1ed6b..c070f8597e2b2 100644
--- a/Validation/RecoParticleFlow/plugins/PFAnalysisNtuplizer.cc
+++ b/Validation/RecoParticleFlow/plugins/PFAnalysisNtuplizer.cc
@@ -31,7 +31,7 @@
 #include "SimDataFormats/CaloAnalysis/interface/SimCluster.h"
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 #include "DataFormats/ParticleFlowReco/interface/PFBlock.h"
 
 #include "DataFormats/Math/interface/deltaPhi.h"