diff --git a/CommonTools/Utils/BuildFile.xml b/CommonTools/Utils/BuildFile.xml
index 6a8ff747377a4..1efbe7f35622c 100644
--- a/CommonTools/Utils/BuildFile.xml
+++ b/CommonTools/Utils/BuildFile.xml
@@ -1,13 +1,14 @@
+<use name="boost"/>
+<use name="boost_regex"/>
+<use name="roothistmatrix"/>
+<use name="tbb"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/Math"/>
+<use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/Reflection"/>
 <use name="FWCore/SOA" source_only="1"/>
 <use name="FWCore/Utilities"/>
-<use name="FWCore/MessageLogger"/>
-<use name="boost"/>
-<use name="boost_regex"/>
-<use name="roothistmatrix"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DQM/EcalCommon/BuildFile.xml b/DQM/EcalCommon/BuildFile.xml
index bb56f80b68d32..bd6181c9e763b 100644
--- a/DQM/EcalCommon/BuildFile.xml
+++ b/DQM/EcalCommon/BuildFile.xml
@@ -1,19 +1,20 @@
+<use name="boost"/>
+<use name="rootcore"/>
+<use name="tbb"/>
+<use name="CalibCalorimetry/EcalLaserAnalyzer"/>
+<use name="CondFormats/EcalObjects"/>
+<use name="DQMServices/Core"/>
 <use name="DataFormats/DetId"/>
 <use name="DataFormats/EcalDetId"/>
 <use name="DataFormats/EcalRawData"/>
-<use name="FWCore/Utilities"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/ServiceRegistry"/>
-<use name="Geometry/EcalMapping"/>
-<use name="Geometry/CaloTopology"/>
+<use name="FWCore/Utilities"/>
 <use name="Geometry/CaloGeometry"/>
+<use name="Geometry/CaloTopology"/>
+<use name="Geometry/EcalMapping"/>
 <use name="Geometry/Records"/>
-<use name="CalibCalorimetry/EcalLaserAnalyzer"/>
-<use name="CondFormats/EcalObjects"/>
-<use name="DQMServices/Core"/>
-<use name="rootcore"/>
-<use name="boost"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DQMServices/Core/BuildFile.xml b/DQMServices/Core/BuildFile.xml
index c43fcbc3481d8..7fbcfd39ed87b 100644
--- a/DQMServices/Core/BuildFile.xml
+++ b/DQMServices/Core/BuildFile.xml
@@ -1,10 +1,11 @@
+<use name="classlib"/>
+<use name="protobuf"/>
+<use name="roothistmatrix"/>
+<use name="tbb"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
-<use name="classlib"/>
-<use name="roothistmatrix"/>
-<use name="protobuf"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DQMServices/FwkIO/plugins/BuildFile.xml b/DQMServices/FwkIO/plugins/BuildFile.xml
index 0bf336d164e73..eb6e11f349d1a 100644
--- a/DQMServices/FwkIO/plugins/BuildFile.xml
+++ b/DQMServices/FwkIO/plugins/BuildFile.xml
@@ -1,12 +1,13 @@
-<use name="DataFormats/Histograms"/>
+<use name="roothistmatrix"/>
+<use name="tbb"/>
 <use name="DQMServices/Core"/>
+<use name="DataFormats/Histograms"/>
+<use name="FWCore/Catalog"/>
 <use name="FWCore/Framework"/>
-<use name="FWCore/Sources"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Sources"/>
 <use name="FWCore/Utilities"/>
-<use name="FWCore/Catalog"/>
-<use name="roothistmatrix"/>
 <library file="*.cc" name="DQMServicesFwkIOPlugins">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/DataFormats/Common/BuildFile.xml b/DataFormats/Common/BuildFile.xml
index b0378f58694d4..a8b822f9fc3ca 100644
--- a/DataFormats/Common/BuildFile.xml
+++ b/DataFormats/Common/BuildFile.xml
@@ -1,7 +1,8 @@
+<use name="boost"/>
+<use name="tbb"/>
 <use name="DataFormats/Provenance"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/Utilities"/>
-<use name="boost"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/L1GlobalMuonTrigger/BuildFile.xml b/DataFormats/L1GlobalMuonTrigger/BuildFile.xml
index 53f0864778f0f..9b048f5848b4b 100644
--- a/DataFormats/L1GlobalMuonTrigger/BuildFile.xml
+++ b/DataFormats/L1GlobalMuonTrigger/BuildFile.xml
@@ -1,3 +1,4 @@
+<use name="tbb"/>
 <use name="DataFormats/Common"/>
 <use name="FWCore/MessageLogger"/>
 <export>
diff --git a/DataFormats/PatCandidates/BuildFile.xml b/DataFormats/PatCandidates/BuildFile.xml
index e18a28f63c500..0b876ed1a519b 100644
--- a/DataFormats/PatCandidates/BuildFile.xml
+++ b/DataFormats/PatCandidates/BuildFile.xml
@@ -1,37 +1,38 @@
-<use name="FWCore/Utilities"/>
-<use name="FWCore/Common"/>
-<use name="DataFormats/Common"/>
-<use name="DataFormats/Candidate"/>
-<use name="DataFormats/MuonReco"/>
-<use name="DataFormats/TauReco"/>
-<use name="DataFormats/JetReco"/>
-<use name="DataFormats/METReco"/>
-<use name="DataFormats/EgammaCandidates"/>
-<use name="DataFormats/ParticleFlowCandidate"/>
-<use name="DataFormats/TrackReco"/>
-<use name="DataFormats/HepMCCandidate"/>
+<use name="boost"/>
+<use name="boost_regex"/>
+<use name="tbb"/>
 <use name="DataFormats/BTauReco"/>
-<use name="DataFormats/L1GlobalTrigger"/>
-<use name="DataFormats/L1Trigger"/>
-<use name="DataFormats/HLTReco"/>
+<use name="DataFormats/CLHEP"/>
 <use name="DataFormats/CaloTowers"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/Common"/>
 <use name="DataFormats/EcalRecHit"/>
-<use name="DataFormats/JetMatching"/>
-<use name="DataFormats/CLHEP"/>
+<use name="DataFormats/EgammaCandidates"/>
 <use name="DataFormats/EgammaReco"/>
 <use name="DataFormats/GeometryCommonDetAlgo"/>
 <use name="DataFormats/GsfTrackReco"/>
+<use name="DataFormats/HLTReco"/>
+<use name="DataFormats/HepMCCandidate"/>
+<use name="DataFormats/JetMatching"/>
+<use name="DataFormats/JetReco"/>
+<use name="DataFormats/L1GlobalTrigger"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="DataFormats/METReco"/>
 <use name="DataFormats/Math"/>
+<use name="DataFormats/MuonReco"/>
+<use name="DataFormats/ParticleFlowCandidate"/>
 <use name="DataFormats/Provenance"/>
 <use name="DataFormats/RecoCandidate"/>
 <use name="DataFormats/SiPixelDetId"/>
 <use name="DataFormats/SiStripDetId"/>
+<use name="DataFormats/TauReco"/>
+<use name="DataFormats/TrackReco"/>
 <use name="DataFormats/VertexReco"/>
+<use name="FWCore/Common"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/Reflection"/>
-<use name="boost"/>
-<use name="boost_regex"/>
+<use name="FWCore/Utilities"/>
 <flags LCG_DICT_HEADER="classes_objects.h classes_trigger.h classes_user.h classes_other.h"/>
 <flags LCG_DICT_XML="classes_def_objects.xml classes_def_trigger.xml classes_def_user.xml classes_def_other.xml"/>
 <export>
diff --git a/EventFilter/Utilities/BuildFile.xml b/EventFilter/Utilities/BuildFile.xml
index 12ed50192f0a0..c0d05c658a9d6 100644
--- a/EventFilter/Utilities/BuildFile.xml
+++ b/EventFilter/Utilities/BuildFile.xml
@@ -1,12 +1,13 @@
+<use name="curl"/>
+<use name="stdcxx-fs"/>
+<use name="tbb"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="DataFormats/TCDS"/>
+<use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ServiceRegistry"/>
-<use name="FWCore/Framework"/>
 <use name="FWCore/Sources"/>
-<use name="DataFormats/FEDRawData"/>
-<use name="DataFormats/TCDS"/>
 <use name="IOPool/Streamer"/>
-<use name="curl"/>
-<use name="stdcxx-fs"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/FWCore/Common/BuildFile.xml b/FWCore/Common/BuildFile.xml
index 78f2d10bf1cc3..0ad3c706d908e 100644
--- a/FWCore/Common/BuildFile.xml
+++ b/FWCore/Common/BuildFile.xml
@@ -1,5 +1,6 @@
-<use name="DataFormats/Provenance"/>
+<use name="tbb"/>
 <use name="DataFormats/Common"/>
+<use name="DataFormats/Provenance"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/Utilities"/>
 <export>
diff --git a/FWCore/Framework/BuildFile.xml b/FWCore/Framework/BuildFile.xml
index e3d2db1663de0..eb5011162f757 100644
--- a/FWCore/Framework/BuildFile.xml
+++ b/FWCore/Framework/BuildFile.xml
@@ -1,3 +1,6 @@
+<use name="boost"/>
+<use name="rootcore"/>
+<use name="tbb"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/Provenance"/>
 <use name="FWCore/Common"/>
@@ -5,12 +8,10 @@
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/PluginManager"/>
-<use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Reflection"/>
+<use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
 <use name="FWCore/Version"/>
-<use name="boost"/>
-<use name="rootcore"/>
 <flags ADD_SUBDIR="1"/>
 <export>
   <lib name="1"/>
diff --git a/FWCore/PythonFramework/BuildFile.xml b/FWCore/PythonFramework/BuildFile.xml
index 494ae853b4491..4eb771476d940 100644
--- a/FWCore/PythonFramework/BuildFile.xml
+++ b/FWCore/PythonFramework/BuildFile.xml
@@ -1,13 +1,14 @@
-<use name="FWCore/Framework"/>
-<use name="FWCore/PythonParameterSet"/>
+<use name="boost"/>
+<use name="py3-pybind11"/>
+<use name="tbb"/>
 <use name="FWCore/Concurrency"/>
+<use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/PluginManager"/>
+<use name="FWCore/PythonParameterSet"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
-<use name="boost"/>
-<use name="py3-pybind11"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/FWCore/Reflection/BuildFile.xml b/FWCore/Reflection/BuildFile.xml
index 2b76428f73270..c543fb9cdcf24 100644
--- a/FWCore/Reflection/BuildFile.xml
+++ b/FWCore/Reflection/BuildFile.xml
@@ -1,4 +1,5 @@
 <use name="rootcling"/>
+<use name="tbb"/>
 <use name="FWCore/Utilities"/>
 <export>
   <lib name="1"/>
diff --git a/FWCore/Services/plugins/BuildFile.xml b/FWCore/Services/plugins/BuildFile.xml
index ab67dbd79af03..edf64b9e1e338 100644
--- a/FWCore/Services/plugins/BuildFile.xml
+++ b/FWCore/Services/plugins/BuildFile.xml
@@ -1,15 +1,16 @@
+<use name="boost"/>
+<use name="cpu_features"/>
+<use name="gcc-atomic"/>
+<use name="tbb"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/Provenance"/>
 <use name="FWCore/Concurrency"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/PluginManager"/>
-<use name="FWCore/Services"/>
 <use name="FWCore/Reflection"/>
+<use name="FWCore/Services"/>
 <use name="Utilities/StorageFactory"/>
 <use name="Utilities/XrdAdaptor"/>
-<use name="boost"/>
-<use name="gcc-atomic"/>
-<use name="cpu_features"/>
 <library file="*.cc" name="FWCoreServicesPlugins">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/FWCore/TestProcessor/BuildFile.xml b/FWCore/TestProcessor/BuildFile.xml
index c590ba41dd6bb..d0c742b071a2d 100644
--- a/FWCore/TestProcessor/BuildFile.xml
+++ b/FWCore/TestProcessor/BuildFile.xml
@@ -1,13 +1,14 @@
-<use name="FWCore/Framework"/>
-<use name="FWCore/ParameterSetReader"/>
+<use name="boost"/>
+<use name="tbb"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/Provenance"/>
 <use name="FWCore/Concurrency"/>
+<use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
+<use name="FWCore/ParameterSetReader"/>
 <use name="FWCore/PluginManager"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
-<use name="boost"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/GeneratorInterface/LHEInterface/plugins/BuildFile.xml b/GeneratorInterface/LHEInterface/plugins/BuildFile.xml
index 167989f991b0d..4de5f4ef71cb6 100644
--- a/GeneratorInterface/LHEInterface/plugins/BuildFile.xml
+++ b/GeneratorInterface/LHEInterface/plugins/BuildFile.xml
@@ -1,25 +1,27 @@
+<use name="stdcxx-fs"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
 <use name="GeneratorInterface/LHEInterface"/>
-<use name="stdcxx-fs"/>
+
 <library name="GeneratorInterfaceLHEProducer" file="LHEFilter.cc LHE2HepMCConverter.cc ExternalLHEProducer.cc ExternalLHEAsciiDumper.cc">
+  <use name="tbb"/>
   <use name="FWCore/Framework"/>
   <use name="SimDataFormats/GeneratorProducts"/>
   <flags EDM_PLUGIN="1"/>
 </library>
-<library name="GeneratorInterfaceLHEIO" file="LH5Source.cc LHESource.cc LHEProvenanceHelper.cc LHEWriter.cc">
-	<use name="FWCore/Framework"/>
-	<use name="FWCore/Sources"/>
-        <use name="SimDataFormats/GeneratorProducts"/>
-	<flags EDM_PLUGIN="1"/>
 
+<library name="GeneratorInterfaceLHEIO" file="LH5Source.cc LHESource.cc LHEProvenanceHelper.cc LHEWriter.cc">
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/Sources"/>
+  <use name="SimDataFormats/GeneratorProducts"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
 
 <library name="GeneratorInterfaceLHECOMWeightProducer" file="LHECOMWeightProducer.cc">
+  <use name="lhapdf"/>
   <use name="FWCore/Framework"/>
   <use name="SimDataFormats/GeneratorProducts"/>
-  <use name="lhapdf"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/HLTrigger/Timer/plugins/BuildFile.xml b/HLTrigger/Timer/plugins/BuildFile.xml
index 17502dddb9de9..f2f2314d7c6e6 100644
--- a/HLTrigger/Timer/plugins/BuildFile.xml
+++ b/HLTrigger/Timer/plugins/BuildFile.xml
@@ -1,6 +1,8 @@
 <library file="*.cc" name="HLTriggerTimerPlugins">
+  <use name="boost_regex"/>
   <use name="fmt"/>
   <use name="json"/>
+  <use name="tbb"/>
   <use name="DQMServices/Core"/>
   <use name="DataFormats/Provenance"/>
   <use name="DataFormats/Scalers"/>
@@ -9,6 +11,5 @@
   <use name="FWCore/ServiceRegistry"/>
   <use name="FWCore/Utilities"/>
   <use name="HLTrigger/Timer"/>
-  <use name="boost_regex"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/HeterogeneousCore/CUDACore/test/BuildFile.xml b/HeterogeneousCore/CUDACore/test/BuildFile.xml
index 750c6092808f5..efbdf4fb865b1 100644
--- a/HeterogeneousCore/CUDACore/test/BuildFile.xml
+++ b/HeterogeneousCore/CUDACore/test/BuildFile.xml
@@ -1,31 +1,31 @@
 <iftool name="cuda-gcc-support">
   <bin file="test_*.cc test_*.cu" name="testHeterogeneousCoreCUDACore">
+    <use name="catch2"/>
+    <use name="cuda"/>
+    <use name="tbb"/>
     <use name="CUDADataFormats/Common"/>
     <use name="FWCore/ParameterSet"/>
     <use name="FWCore/ParameterSetReader"/>
     <use name="FWCore/PluginManager"/>
     <use name="FWCore/ServiceRegistry"/>
     <use name="HeterogeneousCore/CUDACore"/>
-    <use name="catch2"/>
-    <use name="cuda"/>
   </bin>
 
   <bin file="testStreamEvent.cu" name="testHeterogeneousCoreCUDACoreStreamEvent">
-    <use name="HeterogeneousCore/CUDAUtilities"/>
     <use name="cuda"/>
+    <use name="HeterogeneousCore/CUDAUtilities"/>
   </bin>
 
   <bin name="cudaTimeMeasurement" file="cudaTimeMeasurement.cu">
     <use name="cuda"/>
     <use name="HeterogeneousCore/CUDAUtilities"/>
     <flags TEST_RUNNER_CMD="cudaTimeMeasurement -a10 -t100 -s10000 -q -p12345"/>
-</bin>
+  </bin>
 
-<bin name="mpiCudaGeneric" file="mpiCudaGeneric.cu">
-    <use name="openmpi"/>
+  <bin name="mpiCudaGeneric" file="mpiCudaGeneric.cu">
     <use name="cuda"/>
+    <use name="openmpi"/>
     <use name="HeterogeneousCore/CUDAUtilities"/>
     <flags TEST_RUNNER_CMD="cudaIsEnabled &amp;&amp; cmsenv_mpirun -np 2 mpiCudaGeneric -t100 -a10 -s200000 -p123 || echo 'Failed to initialise the CUDA runtime, the test will be skipped.'"/>
-</bin>
-
+  </bin>
 </iftool>
diff --git a/HeterogeneousCore/CUDAServices/plugins/BuildFile.xml b/HeterogeneousCore/CUDAServices/plugins/BuildFile.xml
index f6b5f0a63fb12..942a573f77515 100644
--- a/HeterogeneousCore/CUDAServices/plugins/BuildFile.xml
+++ b/HeterogeneousCore/CUDAServices/plugins/BuildFile.xml
@@ -1,16 +1,15 @@
 <iftool name="cuda">
   <use name="cuda"/>
+  <use name="tbb"/>
   <use name="DataFormats/Common"/>
   <use name="DataFormats/Provenance"/>
   <use name="FWCore/MessageLogger"/>
   <use name="FWCore/ParameterSet"/>
   <use name="FWCore/ServiceRegistry"/>
   <use name="FWCore/Utilities"/>
-  <use name="HeterogeneousCore/CUDAServices"/>
   <use name="HLTrigger/Timer"/>
-
+  <use name="HeterogeneousCore/CUDAServices"/>
   <library file="*.cc" name="HeterogeneousCoreCUDAServicesPlugins">
     <flags EDM_PLUGIN="1"/>
   </library>
-
 </iftool>
diff --git a/IOPool/Output/BuildFile.xml b/IOPool/Output/BuildFile.xml
index 29153e8aed0bf..d015b94c5fbf0 100644
--- a/IOPool/Output/BuildFile.xml
+++ b/IOPool/Output/BuildFile.xml
@@ -1,3 +1,5 @@
+<use name="rootcore"/>
+<use name="tbb"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/Provenance"/>
 <use name="FWCore/Framework"/>
@@ -8,7 +10,6 @@
 <use name="FWCore/Version"/>
 <use name="IOPool/Common"/>
 <use name="IOPool/Provenance"/>
-<use name="rootcore"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/Mixing/Base/BuildFile.xml b/Mixing/Base/BuildFile.xml
index 64b3c60a22cae..ef1363872185f 100644
--- a/Mixing/Base/BuildFile.xml
+++ b/Mixing/Base/BuildFile.xml
@@ -1,3 +1,8 @@
+<use name="clhep"/>
+<use name="roothistmatrix"/>
+<use name="tbb"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/RunInfo"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/Provenance"/>
 <use name="FWCore/Framework"/>
@@ -9,10 +14,6 @@
 <use name="FWCore/Version"/>
 <use name="IOMC/RandomEngine"/>
 <use name="SimDataFormats/RandomEngine"/>
-<use name="clhep"/>
-<use name="roothistmatrix"/>
-<use name="CondFormats/RunInfo"/>
-<use name="CondFormats/DataRecord"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/PhysicsTools/NanoAOD/plugins/BuildFile.xml b/PhysicsTools/NanoAOD/plugins/BuildFile.xml
index b66dea70dbb0e..99e2fff7608f0 100644
--- a/PhysicsTools/NanoAOD/plugins/BuildFile.xml
+++ b/PhysicsTools/NanoAOD/plugins/BuildFile.xml
@@ -1,28 +1,29 @@
-<use name="FWCore/Framework"/>
-<use name="FWCore/ParameterSet"/>
-<use name="FWCore/ServiceRegistry"/>
-<use name="FWCore/Utilities"/>
-<use name="DataFormats/Candidate"/>
-<use name="DataFormats/PatCandidates"/>
-<use name="CommonTools/Egamma"/>
-<use name="PhysicsTools/PatAlgos"/>
-<use name="DataFormats/NanoAOD"/>
+<use name="fastjet"/>
+<use name="fastjet-contrib"/>
 <use name="roothistmatrix"/>
-<use name="RecoVertex/VertexTools"/>
-<use name="RecoVertex/VertexPrimitives"/>
-<use name="DataFormats/L1TGlobal"/>
-<use name="IOPool/Provenance"/>
-<use name="DQMServices/Core"/>
+<use name="tbb"/>
+<use name="CommonTools/Egamma"/>
 <use name="CondFormats/BTauObjects"/>
+<use name="CondFormats/DataRecord"/>
 <use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/RunInfo"/>
 <use name="CondTools/BTau"/>
+<use name="DQMServices/Core"/>
 <use name="DataFormats/CTPPSDetId"/>
 <use name="DataFormats/CTPPSReco"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/L1TGlobal"/>
+<use name="DataFormats/NanoAOD"/>
+<use name="DataFormats/PatCandidates"/>
 <use name="DataFormats/ProtonReco"/>
-<use name="CondFormats/RunInfo"/>
-<use name="CondFormats/DataRecord"/>
-<use name="fastjet"/>
-<use name="fastjet-contrib"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="IOPool/Provenance"/>
+<use name="PhysicsTools/PatAlgos"/>
+<use name="RecoVertex/VertexPrimitives"/>
+<use name="RecoVertex/VertexTools"/>
 <library file="*.cc" name="PhysicsToolsNanoAODPlugins">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/PhysicsTools/TensorFlow/BuildFile.xml b/PhysicsTools/TensorFlow/BuildFile.xml
index f4f81f722a32c..90d48104241aa 100644
--- a/PhysicsTools/TensorFlow/BuildFile.xml
+++ b/PhysicsTools/TensorFlow/BuildFile.xml
@@ -1,7 +1,8 @@
+<use name="tbb"/>
 <use name="tensorflow-cc"/>
 <use name="FWCore/Framework"/>
-<use name="FWCore/Utilities"/>
 <use name="FWCore/MessageLogger"/>
+<use name="FWCore/Utilities"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/RecoLocalCalo/HGCalRecProducers/plugins/BuildFile.xml b/RecoLocalCalo/HGCalRecProducers/plugins/BuildFile.xml
index 5118f4ebfdc12..2f34dd47bee24 100644
--- a/RecoLocalCalo/HGCalRecProducers/plugins/BuildFile.xml
+++ b/RecoLocalCalo/HGCalRecProducers/plugins/BuildFile.xml
@@ -1,23 +1,24 @@
 <use name="cuda"/>
+<use name="tbb"/>
 <use name="CommonTools/UtilAlgos"/>
-<use name="HeterogeneousCore/CUDACore"/>
-<use name="HeterogeneousCore/CUDAUtilities"/>
-<use name="FWCore/Framework"/>
-<use name="FWCore/Utilities"/>
-<use name="FWCore/ParameterSet"/>
-<use name="FWCore/ServiceRegistry"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/HGCalObjects"/>
 <use name="DataFormats/ForwardDetId"/>
 <use name="DataFormats/HGCDigi"/>
 <use name="DataFormats/HGCRecHit"/>
 <use name="DataFormats/HcalDetId"/>
-<use name="RecoLocalCalo/HGCalRecAlgos"/>
-<use name="RecoLocalCalo/HGCalRecProducers"/>
+<use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
 <use name="Geometry/CaloGeometry"/>
-<use name="Geometry/HGCalGeometry"/>
 <use name="Geometry/HGCalCommonData"/>
-<use name="CondFormats/DataRecord"/>
-<use name="CondFormats/HGCalObjects"/>
-<library   file="*.cc *.cu" name="RecoLocalCaloHGCalRecProducersPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="Geometry/HGCalGeometry"/>
+<use name="HeterogeneousCore/CUDACore"/>
+<use name="HeterogeneousCore/CUDAUtilities"/>
+<use name="RecoLocalCalo/HGCalRecAlgos"/>
+<use name="RecoLocalCalo/HGCalRecProducers"/>
+<library file="*.cc *.cu" name="RecoLocalCaloHGCalRecProducersPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoTauTag/RecoTau/plugins/BuildFile.xml b/RecoTauTag/RecoTau/plugins/BuildFile.xml
index 835155b5da213..a0ae22f08babb 100644
--- a/RecoTauTag/RecoTau/plugins/BuildFile.xml
+++ b/RecoTauTag/RecoTau/plugins/BuildFile.xml
@@ -1,32 +1,33 @@
 <library file="*.cc" name="RecoTauTagRecoTauPlugins">
-  <flags EDM_PLUGIN="1"/>
-  <use name="TrackingTools/IPTools"/>
-  <use name="TrackingTools/Records"/>
-  <use name="RecoVertex/KalmanVertexFit"/>
+  <use name="root"/>
+  <use name="tbb"/>
+  <use name="CommonTools/BaseParticlePropagator"/>
   <use name="CommonTools/CandUtils"/>
+  <use name="CommonTools/UtilAlgos"/>
+  <use name="CondFormats/DataRecord"/>
+  <use name="CondFormats/GBRForest"/>
   <use name="DataFormats/Candidate"/>
+  <use name="DataFormats/JetReco"/>
   <use name="DataFormats/MuonReco"/>
+  <use name="DataFormats/ParticleFlowReco"/>
+  <use name="DataFormats/TauReco"/>
   <use name="DataFormats/TrackReco"/>
-  <use name="TrackingTools/TransientTrack"/>
-  <use name="RecoVertex/VertexPrimitives"/>
+  <use name="DataFormats/VertexReco"/>
   <use name="FWCore/Framework"/>
-  <use name="FWCore/ParameterSet"/>
   <use name="FWCore/MessageLogger"/>
+  <use name="FWCore/ParameterSet"/>
   <use name="FWCore/Utilities"/>
-  <use name="DataFormats/TauReco"/>
-  <use name="CommonTools/UtilAlgos"/>
-  <use name="RecoTauTag/RecoTau"/>
-  <use name="DataFormats/JetReco"/>
-  <use name="DataFormats/ParticleFlowReco"/>
-  <use name="RecoBTag/SecondaryVertex"/>
-  <use name="DataFormats/VertexReco"/>
-  <use name="CondFormats/GBRForest"/>
-  <use name="CondFormats/DataRecord"/>
   <use name="Geometry/CaloGeometry"/>
   <use name="Geometry/HcalTowerAlgo"/>
   <use name="Geometry/Records"/>
   <use name="MagneticField/Engine"/>
   <use name="MagneticField/Records"/>
-  <use name="CommonTools/BaseParticlePropagator"/>
-  <use name="root"/>
+  <use name="RecoBTag/SecondaryVertex"/>
+  <use name="RecoTauTag/RecoTau"/>
+  <use name="RecoVertex/KalmanVertexFit"/>
+  <use name="RecoVertex/VertexPrimitives"/>
+  <use name="TrackingTools/IPTools"/>
+  <use name="TrackingTools/Records"/>
+  <use name="TrackingTools/TransientTrack"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoTracker/CkfPattern/BuildFile.xml b/RecoTracker/CkfPattern/BuildFile.xml
index df7161f709460..65936048265bf 100644
--- a/RecoTracker/CkfPattern/BuildFile.xml
+++ b/RecoTracker/CkfPattern/BuildFile.xml
@@ -1,22 +1,25 @@
-<export>
-  <lib name="1"/>
-</export>
-<use name="RecoTracker/TkDetLayers"/>
-<use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
-<use name="FWCore/ParameterSet"/>
-<use name="FWCore/MessageLogger"/>
+<use name="root"/>
+<!-- used only if VI_TBB is defined in src/CkfTrackCandidateMakerBase.cc
+<use name="tbb"/>
+-->
 <use name="DataFormats/Common"/>
 <use name="DataFormats/TrajectorySeed"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
-<use name="TrackingTools/KalmanUpdators"/>
-<use name="MagneticField/Records"/>
 <use name="MagneticField/Engine"/>
-<use name="TrackingTools/MeasurementDet"/>
+<use name="MagneticField/Records"/>
 <use name="RecoTracker/MeasurementDet"/>
-<use name="TrackingTools/PatternTools"/>
+<use name="RecoTracker/TkDetLayers"/>
+<use name="TrackingTools/KalmanUpdators"/>
 <use name="TrackingTools/MaterialEffects"/>
+<use name="TrackingTools/MeasurementDet"/>
+<use name="TrackingTools/PatternTools"/>
+<use name="TrackingTools/TrackFitters"/>
 <use name="TrackingTools/TrajectoryCleaning"/>
 <use name="TrackingTools/TrajectoryFiltering"/>
-<use name="TrackingTools/TrackFitters"/>
-<use name="root"/>
+<export>
+  <lib name="1"/>
+</export>
diff --git a/RecoTracker/MkFit/plugins/BuildFile.xml b/RecoTracker/MkFit/plugins/BuildFile.xml
index 126654202ce6d..90d293da63054 100644
--- a/RecoTracker/MkFit/plugins/BuildFile.xml
+++ b/RecoTracker/MkFit/plugins/BuildFile.xml
@@ -1,13 +1,15 @@
 <library file="*.cc" name="RecoTrackerMkFitPlugins">
+  <use name="rootmath"/>
+  <use name="tbb"/>
   <use name="CalibFormats/SiStripObjects"/>
   <use name="CalibTracker/Records"/>
   <use name="CondFormats/DataRecord"/>
   <use name="CondFormats/SiPixelObjects"/>
   <use name="DataFormats/BeamSpot"/>
   <use name="DataFormats/Common"/>
+  <use name="DataFormats/SiPixelCluster"/>
   <use name="DataFormats/SiStripCluster"/>
   <use name="DataFormats/SiStripCommon"/>
-  <use name="DataFormats/SiPixelCluster"/>
   <use name="DataFormats/TrackCandidate"/>
   <use name="DataFormats/TrackReco"/>
   <use name="DataFormats/TrackerCommon"/>
@@ -19,18 +21,17 @@
   <use name="Geometry/CommonTopologies"/>
   <use name="Geometry/Records"/>
   <use name="Geometry/TrackerGeometryBuilder"/>
+  <use name="PhysicsTools/TensorFlow"/>
   <use name="RecoTracker/MkFit"/>
   <use name="RecoTracker/TkDetLayers"/>
   <use name="RecoTracker/TransientTrackingRecHit"/>
   <use name="TrackingTools/GeomPropagators"/>
   <use name="TrackingTools/KalmanUpdators"/>
   <use name="TrackingTools/MaterialEffects"/>
+  <use name="TrackingTools/PatternTools"/>
   <use name="TrackingTools/Records"/>
   <use name="TrackingTools/TrackFitters"/>
   <use name="TrackingTools/TrajectoryState"/>
   <use name="TrackingTools/TransientTrackingRecHit"/>
-  <use name="rootmath"/>
-  <use name="PhysicsTools/TensorFlow"/>
-  <use name="TrackingTools/PatternTools"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/Utilities/XrdAdaptor/BuildFile.xml b/Utilities/XrdAdaptor/BuildFile.xml
index 5a0d3c4c56581..51b8b3994f7f1 100644
--- a/Utilities/XrdAdaptor/BuildFile.xml
+++ b/Utilities/XrdAdaptor/BuildFile.xml
@@ -1,8 +1,9 @@
+<use name="tbb"/>
+<use name="xrootd"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/Utilities"/>
+<use name="Utilities/StorageFactory"/>
+<flags CPPDEFINES="_FILE_OFFSET_BITS=64"/>
 <export>
   <lib name="1"/>
 </export>
-<use name="Utilities/StorageFactory"/>
-<use name="FWCore/Utilities"/>
-<use name="FWCore/MessageLogger"/>
-<use name="xrootd"/>
-<flags CPPDEFINES="_FILE_OFFSET_BITS=64"/>