diff --git a/FastSimulation/CTPPSFastGeometry/BuildFile.xml b/FastSimulation/CTPPSFastGeometry/BuildFile.xml
index 52601f62f6841..e9f318e4f16ed 100644
--- a/FastSimulation/CTPPSFastGeometry/BuildFile.xml
+++ b/FastSimulation/CTPPSFastGeometry/BuildFile.xml
@@ -3,7 +3,7 @@
 <use name="FWCore/ParameterSet"/>
 <use name="SimDataFormats/TrackingHit"/>
 <use name="DataFormats/Common"/>
-<use name="clhep"/>    
+<use name="clhep"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/FastSimulation/CTPPSFastTrackingProducer/BuildFile.xml b/FastSimulation/CTPPSFastTrackingProducer/BuildFile.xml
index ea52503ecf6e1..c40f3f3f82514 100644
--- a/FastSimulation/CTPPSFastTrackingProducer/BuildFile.xml
+++ b/FastSimulation/CTPPSFastTrackingProducer/BuildFile.xml
@@ -1,13 +1,13 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="Utilities/PPS"/>
-<use   name="FastSimulation/CTPPSFastGeometry"/>
-<use   name="FastSimDataFormats/CTPPSFastSim"/>
-<use   name="DataFormats/Common"/>
-<use   name="clhep"/>
-<use   name="hector"/>
-<use   name="root"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="Utilities/PPS"/>
+<use name="FastSimulation/CTPPSFastGeometry"/>
+<use name="FastSimDataFormats/CTPPSFastSim"/>
+<use name="DataFormats/Common"/>
+<use name="clhep"/>
+<use name="hector"/>
+<use name="root"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/FastSimulation/CTPPSFastTrackingProducer/plugins/BuildFile.xml b/FastSimulation/CTPPSFastTrackingProducer/plugins/BuildFile.xml
index 8b6f29dd8fb21..9f82f636b48d1 100644
--- a/FastSimulation/CTPPSFastTrackingProducer/plugins/BuildFile.xml
+++ b/FastSimulation/CTPPSFastTrackingProducer/plugins/BuildFile.xml
@@ -1,13 +1,13 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FastSimulation/CTPPSFastGeometry"/>
-<use   name="FastSimDataFormats/CTPPSFastSim"/>
-<use   name="DataFormats/Common"/>
-<use   name="Utilities/PPS"/>
-<use   name="clhep"/>
-<use   name="hector"/>
-<use   name="root"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="FastSimulation/CTPPSFastGeometry"/>
+<use name="FastSimDataFormats/CTPPSFastSim"/>
+<use name="DataFormats/Common"/>
+<use name="Utilities/PPS"/>
+<use name="clhep"/>
+<use name="hector"/>
+<use name="root"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/FastSimulation/CTPPSSimHitProducer/plugins/BuildFile.xml b/FastSimulation/CTPPSSimHitProducer/plugins/BuildFile.xml
index 2cab1a9b6bc81..fc203a7198361 100644
--- a/FastSimulation/CTPPSSimHitProducer/plugins/BuildFile.xml
+++ b/FastSimulation/CTPPSSimHitProducer/plugins/BuildFile.xml
@@ -7,5 +7,4 @@
 <use name="SimDataFormats/Track"/>
 <use name="SimDataFormats/TrackingHit"/>
 <use name="SimDataFormats/Vertex"/>
-
 <flags EDM_PLUGIN="1"/>
diff --git a/FastSimulation/CaloGeometryTools/BuildFile.xml b/FastSimulation/CaloGeometryTools/BuildFile.xml
index baa835b87b8f3..146adf6d4c641 100644
--- a/FastSimulation/CaloGeometryTools/BuildFile.xml
+++ b/FastSimulation/CaloGeometryTools/BuildFile.xml
@@ -1,16 +1,16 @@
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/EcalDetId"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="DataFormats/Math"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FastSimulation/CalorimeterProperties"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="Geometry/EcalAlgo"/>
-<use   name="Geometry/HcalTowerAlgo"/>
-<use   name="clhep"/>
-<use   name="rootmath"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/EcalDetId"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="DataFormats/Math"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FastSimulation/CalorimeterProperties"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="Geometry/CaloTopology"/>
+<use name="Geometry/EcalAlgo"/>
+<use name="Geometry/HcalTowerAlgo"/>
+<use name="clhep"/>
+<use name="rootmath"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/FastSimulation/CaloGeometryTools/test/BuildFile.xml b/FastSimulation/CaloGeometryTools/test/BuildFile.xml
index 3b3acde5c4486..2618d52dab3b1 100644
--- a/FastSimulation/CaloGeometryTools/test/BuildFile.xml
+++ b/FastSimulation/CaloGeometryTools/test/BuildFile.xml
@@ -1,16 +1,16 @@
-<use   name="rootgraphics"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="Geometry/EcalAlgo"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="DataFormats/HcalDetId"/>
-<use   name="DataFormats/EcalDetId"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FastSimulation/CaloGeometryTools"/>
-<use   name="FastSimulation/CaloHitMakers"/>
-<use   name="FastSimulation/Utilities"/>
-<use   name="Geometry/Records"/>
-<library   file="testCaloGeometryTools.cc" name="testCaloGeometryTools">
-  <flags   EDM_PLUGIN="1"/>
+<use name="rootgraphics"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="Geometry/EcalAlgo"/>
+<use name="Geometry/CaloTopology"/>
+<use name="DataFormats/HcalDetId"/>
+<use name="DataFormats/EcalDetId"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="FastSimulation/CaloGeometryTools"/>
+<use name="FastSimulation/CaloHitMakers"/>
+<use name="FastSimulation/Utilities"/>
+<use name="Geometry/Records"/>
+<library file="testCaloGeometryTools.cc" name="testCaloGeometryTools">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/FastSimulation/CaloHitMakers/BuildFile.xml b/FastSimulation/CaloHitMakers/BuildFile.xml
index ae0f95efbc0fe..955e9171e4d6b 100644
--- a/FastSimulation/CaloHitMakers/BuildFile.xml
+++ b/FastSimulation/CaloHitMakers/BuildFile.xml
@@ -1,16 +1,16 @@
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/EcalDetId"/>
-<use   name="DataFormats/HcalDetId"/>
-<use   name="DataFormats/Math"/>
-<use   name="SimG4CMS/Calo"/>
-<use   name="FastSimulation/CaloGeometryTools"/>
-<use   name="FastSimulation/CalorimeterProperties"/>
-<use   name="FastSimulation/Event"/>
-<use   name="FastSimulation/Utilities"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="Geometry/EcalAlgo"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="rootmath"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/EcalDetId"/>
+<use name="DataFormats/HcalDetId"/>
+<use name="DataFormats/Math"/>
+<use name="SimG4CMS/Calo"/>
+<use name="FastSimulation/CaloGeometryTools"/>
+<use name="FastSimulation/CalorimeterProperties"/>
+<use name="FastSimulation/Event"/>
+<use name="FastSimulation/Utilities"/>
+<use name="Geometry/CaloTopology"/>
+<use name="Geometry/EcalAlgo"/>
+<use name="FWCore/MessageLogger"/>
+<use name="rootmath"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/FastSimulation/CaloHitMakers/test/BuildFile.xml b/FastSimulation/CaloHitMakers/test/BuildFile.xml
index 3d072191bc7f3..3a7fd83c42af4 100644
--- a/FastSimulation/CaloHitMakers/test/BuildFile.xml
+++ b/FastSimulation/CaloHitMakers/test/BuildFile.xml
@@ -1,16 +1,16 @@
-<use   name="rootgraphics"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="Geometry/EcalAlgo"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="DataFormats/HcalDetId"/>
-<use   name="DataFormats/EcalDetId"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FastSimulation/CaloGeometryTools"/>
-<use   name="FastSimulation/CaloHitMakers"/>
-<use   name="FastSimulation/Utilities"/>
-<use   name="FastSimulation/ShowerDevelopment"/>
-<library   file="testEcalHitMaker.cc" name="testEcalHitMaker">
-  <flags   EDM_PLUGIN="1"/>
+<use name="rootgraphics"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="Geometry/EcalAlgo"/>
+<use name="Geometry/CaloTopology"/>
+<use name="DataFormats/HcalDetId"/>
+<use name="DataFormats/EcalDetId"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="FastSimulation/CaloGeometryTools"/>
+<use name="FastSimulation/CaloHitMakers"/>
+<use name="FastSimulation/Utilities"/>
+<use name="FastSimulation/ShowerDevelopment"/>
+<library file="testEcalHitMaker.cc" name="testEcalHitMaker">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/FastSimulation/CalorimeterProperties/BuildFile.xml b/FastSimulation/CalorimeterProperties/BuildFile.xml
index 2ecb40a3c0c49..546dc3c84c53d 100644
--- a/FastSimulation/CalorimeterProperties/BuildFile.xml
+++ b/FastSimulation/CalorimeterProperties/BuildFile.xml
@@ -1,10 +1,10 @@
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/EcalDetId"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="Geometry/EcalAlgo"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/EcalDetId"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="Geometry/CaloTopology"/>
+<use name="Geometry/EcalAlgo"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/FastSimulation/Calorimetry/BuildFile.xml b/FastSimulation/Calorimetry/BuildFile.xml
index 2bc36b5402458..0adc79a6219a4 100644
--- a/FastSimulation/Calorimetry/BuildFile.xml
+++ b/FastSimulation/Calorimetry/BuildFile.xml
@@ -1,20 +1,20 @@
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/HcalDetId"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="SimG4CMS/Calo"/>
-<use   name="FastSimulation/CaloGeometryTools"/>
-<use   name="FastSimulation/CaloHitMakers"/>
-<use   name="FastSimulation/Event"/>
-<use   name="FastSimulation/Particle"/>
-<use   name="FastSimulation/ParticlePropagator"/>
-<use   name="FastSimulation/ShowerDevelopment"/>
-<use   name="FastSimulation/Utilities"/>
-<use   name="FastSimulation/MaterialEffects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="Geometry/HcalTowerAlgo"/>
-<use   name="DQMServices/Core"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/HcalDetId"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="SimG4CMS/Calo"/>
+<use name="FastSimulation/CaloGeometryTools"/>
+<use name="FastSimulation/CaloHitMakers"/>
+<use name="FastSimulation/Event"/>
+<use name="FastSimulation/Particle"/>
+<use name="FastSimulation/ParticlePropagator"/>
+<use name="FastSimulation/ShowerDevelopment"/>
+<use name="FastSimulation/Utilities"/>
+<use name="FastSimulation/MaterialEffects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="Geometry/HcalTowerAlgo"/>
+<use name="DQMServices/Core"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/FastSimulation/Event/BuildFile.xml b/FastSimulation/Event/BuildFile.xml
index 2d94fb9790953..b99767a0dbac1 100644
--- a/FastSimulation/Event/BuildFile.xml
+++ b/FastSimulation/Event/BuildFile.xml
@@ -1,17 +1,17 @@
-<use   name="DataFormats/HepMCCandidate"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/Math"/>
-<use   name="DataFormats/Provenance"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CommonTools/BaseParticlePropagator"/>
-<use   name="FastSimulation/Particle"/>
-<use   name="FastSimulation/Utilities"/>
-<use   name="SimDataFormats/Track"/>
-<use   name="SimDataFormats/Vertex"/>
-<use   name="SimDataFormats/GeneratorProducts"/>
-<use   name="FastSimDataFormats/NuclearInteractions"/>
-<use   name="SimGeneral/HepPDTRecord"/>
-<use   name="hepmc"/>
+<use name="DataFormats/HepMCCandidate"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/Math"/>
+<use name="DataFormats/Provenance"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CommonTools/BaseParticlePropagator"/>
+<use name="FastSimulation/Particle"/>
+<use name="FastSimulation/Utilities"/>
+<use name="SimDataFormats/Track"/>
+<use name="SimDataFormats/Vertex"/>
+<use name="SimDataFormats/GeneratorProducts"/>
+<use name="FastSimDataFormats/NuclearInteractions"/>
+<use name="SimGeneral/HepPDTRecord"/>
+<use name="hepmc"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/FastSimulation/EventProducer/BuildFile.xml b/FastSimulation/EventProducer/BuildFile.xml
index fb3de4ea10339..81127412fd622 100644
--- a/FastSimulation/EventProducer/BuildFile.xml
+++ b/FastSimulation/EventProducer/BuildFile.xml
@@ -1,24 +1,24 @@
-<use   name="DataFormats/BeamSpot"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Provenance"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FastSimulation/CaloGeometryTools"/>
-<use   name="FastSimulation/Calorimetry"/>
-<use   name="FastSimulation/Event"/>
-<use   name="FastSimulation/Particle"/>
-<use   name="FastSimulation/ParticlePropagator"/>
-<use   name="FastSimulation/TrajectoryManager"/>
-<use   name="FastSimulation/Utilities"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="Geometry/Records"/>
-<use   name="MagneticField/Engine"/>
-<use   name="MagneticField/Records"/>
-<use   name="RecoTracker/Record"/>
-<use   name="SimDataFormats/GeneratorProducts"/>
-<use   name="FastSimDataFormats/NuclearInteractions"/>
-<use   name="SimGeneral/HepPDTRecord"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="DataFormats/BeamSpot"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Provenance"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="FastSimulation/CaloGeometryTools"/>
+<use name="FastSimulation/Calorimetry"/>
+<use name="FastSimulation/Event"/>
+<use name="FastSimulation/Particle"/>
+<use name="FastSimulation/ParticlePropagator"/>
+<use name="FastSimulation/TrajectoryManager"/>
+<use name="FastSimulation/Utilities"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="Geometry/Records"/>
+<use name="MagneticField/Engine"/>
+<use name="MagneticField/Records"/>
+<use name="RecoTracker/Record"/>
+<use name="SimDataFormats/GeneratorProducts"/>
+<use name="FastSimDataFormats/NuclearInteractions"/>
+<use name="SimGeneral/HepPDTRecord"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/FastSimulation/ForwardDetectors/plugins/BuildFile.xml b/FastSimulation/ForwardDetectors/plugins/BuildFile.xml
index 79b0c6d7559e1..7aca905a78758 100644
--- a/FastSimulation/ForwardDetectors/plugins/BuildFile.xml
+++ b/FastSimulation/ForwardDetectors/plugins/BuildFile.xml
@@ -1,52 +1,55 @@
-<library   name="FastSimDataFilter" file="FastSimDataFilter.cc">
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="FWCore/PluginManager"/>
-  <use   name="boost"/>
-  <use   name="root"/>
-  <use   name="DataFormats/Common"/>
-  <use   name="DataFormats/HcalDetId"/>
-  <use   name="DataFormats/CaloRecHit"/>
-  <use   name="Geometry/CaloGeometry"/>
-  <flags   EDM_PLUGIN="1"/>
+<library name="FastSimDataFilter" file="FastSimDataFilter.cc">
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/PluginManager"/>
+  <use name="boost"/>
+  <use name="root"/>
+  <use name="DataFormats/Common"/>
+  <use name="DataFormats/HcalDetId"/>
+  <use name="DataFormats/CaloRecHit"/>
+  <use name="Geometry/CaloGeometry"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   name="ProtonTaggerFilter" file="ProtonTaggerFilter.cc AcceptanceTableHelper.cc">
-  <use   name="root"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="FWCore/PluginManager"/>
-  <use   name="FWCore/ServiceRegistry"/>
-  <use   name="FWCore/Utilities"/>
-  <use   name="Utilities/General"/>
-  <use   name="hepmc"/>
-  <use   name="SimDataFormats/GeneratorProducts"/>
-  <flags   EDM_PLUGIN="1"/>
+
+<library name="ProtonTaggerFilter" file="ProtonTaggerFilter.cc AcceptanceTableHelper.cc">
+  <use name="root"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/PluginManager"/>
+  <use name="FWCore/ServiceRegistry"/>
+  <use name="FWCore/Utilities"/>
+  <use name="Utilities/General"/>
+  <use name="hepmc"/>
+  <use name="SimDataFormats/GeneratorProducts"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   name="CastorFastTowerProducer" file="CastorFastTowerProducer.cc">
-  <use   name="DataFormats/Common"/>
-  <use   name="DataFormats/CastorReco"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="FWCore/PluginManager"/>
-  <use   name="FWCore/ServiceRegistry"/>
-  <use   name="FWCore/Utilities"/>
-  <use   name="FastSimulation/Utilities"/>
-  <use   name="boost"/>
-  <use   name="clhep"/>
-  <flags   EDM_PLUGIN="1"/>
+
+<library name="CastorFastTowerProducer" file="CastorFastTowerProducer.cc">
+  <use name="DataFormats/Common"/>
+  <use name="DataFormats/CastorReco"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/PluginManager"/>
+  <use name="FWCore/ServiceRegistry"/>
+  <use name="FWCore/Utilities"/>
+  <use name="FastSimulation/Utilities"/>
+  <use name="boost"/>
+  <use name="clhep"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   name="CastorFastClusterProducer" file="CastorFastClusterProducer.cc">
-  <use   name="DataFormats/Common"/>
-  <use   name="DataFormats/CastorReco"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="FWCore/PluginManager"/>
-  <use   name="FWCore/ServiceRegistry"/>
-  <use   name="FWCore/Utilities"/>
-  <use   name="FastSimulation/Utilities"/>
-  <use   name="boost"/>
-  <use   name="clhep"/>
-  <flags   EDM_PLUGIN="1"/>
+
+<library name="CastorFastClusterProducer" file="CastorFastClusterProducer.cc">
+  <use name="DataFormats/Common"/>
+  <use name="DataFormats/CastorReco"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/PluginManager"/>
+  <use name="FWCore/ServiceRegistry"/>
+  <use name="FWCore/Utilities"/>
+  <use name="FastSimulation/Utilities"/>
+  <use name="boost"/>
+  <use name="clhep"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/FastSimulation/L1CaloTriggerProducer/BuildFile.xml b/FastSimulation/L1CaloTriggerProducer/BuildFile.xml
index d82366fe6b646..c0b11f4c7a801 100644
--- a/FastSimulation/L1CaloTriggerProducer/BuildFile.xml
+++ b/FastSimulation/L1CaloTriggerProducer/BuildFile.xml
@@ -1,20 +1,20 @@
-<flags   EDM_PLUGIN="1"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FastSimDataFormats/External"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="DataFormats/JetReco"/>
-<use   name="DataFormats/L1Trigger"/>
-<use   name="DataFormats/CaloTowers"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/EcalRecHit"/>
-<use   name="DataFormats/EcalDetId"/>
-<use   name="DataFormats/EcalDigi"/>
-<use   name="DataFormats/HcalDigi"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="DataFormats/HcalRecHit"/>
-<use   name="Geometry/Records"/>
+<flags EDM_PLUGIN="1"/>
+<use name="FWCore/PluginManager"/>
+<use name="FastSimDataFormats/External"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/MessageLogger"/>
+<use name="DataFormats/JetReco"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="DataFormats/CaloTowers"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="Geometry/CaloTopology"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/EcalRecHit"/>
+<use name="DataFormats/EcalDetId"/>
+<use name="DataFormats/EcalDigi"/>
+<use name="DataFormats/HcalDigi"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="DataFormats/HcalRecHit"/>
+<use name="Geometry/Records"/>
diff --git a/FastSimulation/MaterialEffects/BuildFile.xml b/FastSimulation/MaterialEffects/BuildFile.xml
index a665d7af56072..b65ed5f12addf 100644
--- a/FastSimulation/MaterialEffects/BuildFile.xml
+++ b/FastSimulation/MaterialEffects/BuildFile.xml
@@ -1,11 +1,11 @@
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FastSimulation/Event"/>
-<use   name="FastSimulation/Utilities"/>
-<use   name="rootcore"/>
-<use   name="clhep"/>
-<use   name="geant4core"/>
-<use   name="DQMServices/Core"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Utilities"/>
+<use name="FastSimulation/Event"/>
+<use name="FastSimulation/Utilities"/>
+<use name="rootcore"/>
+<use name="clhep"/>
+<use name="geant4core"/>
+<use name="DQMServices/Core"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/FastSimulation/MaterialEffects/test/BuildFile.xml b/FastSimulation/MaterialEffects/test/BuildFile.xml
index aa14331b6ddd4..7b961faaef595 100644
--- a/FastSimulation/MaterialEffects/test/BuildFile.xml
+++ b/FastSimulation/MaterialEffects/test/BuildFile.xml
@@ -1,16 +1,17 @@
-<use   name="root"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="SimDataFormats/Track"/>
-<use   name="DataFormats/Provenance"/>
-<use   name="FastSimulation/Event"/>
-<use   name="FastSimulation/Particle"/>
-<use   name="FastSimulation/Utilities"/>
-<use   name="DQMServices/Core"/>
-<library   file="testMaterialEffects.cc" name="testMaterialEffects">
-  <flags   EDM_PLUGIN="1"/>
+<use name="root"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
+<use name="SimDataFormats/Track"/>
+<use name="DataFormats/Provenance"/>
+<use name="FastSimulation/Event"/>
+<use name="FastSimulation/Particle"/>
+<use name="FastSimulation/Utilities"/>
+<use name="DQMServices/Core"/>
+<library file="testMaterialEffects.cc" name="testMaterialEffects">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="testNuclearInteractions.cc" name="testNuclearInteractions">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="testNuclearInteractions.cc" name="testNuclearInteractions">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/FastSimulation/MuonSimHitProducer/BuildFile.xml b/FastSimulation/MuonSimHitProducer/BuildFile.xml
index ce66f08531606..03a01b128fa5b 100644
--- a/FastSimulation/MuonSimHitProducer/BuildFile.xml
+++ b/FastSimulation/MuonSimHitProducer/BuildFile.xml
@@ -1,23 +1,23 @@
-<use   name="TrackPropagation/SteppingHelixPropagator"/>
-<use   name="DataFormats/GeometrySurface"/>
-<use   name="DataFormats/MuonDetId"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FastSimulation/MaterialEffects"/>
-<use   name="FastSimulation/ParticlePropagator"/>
-<use   name="FastSimulation/Utilities"/>
-<use   name="Geometry/CSCGeometry"/>
-<use   name="Geometry/DTGeometry"/>
-<use   name="Geometry/RPCGeometry"/>
-<use   name="Geometry/Records"/>
-<use   name="MagneticField/Records"/>
-<use   name="RecoMuon/MeasurementDet"/>
-<use   name="RecoMuon/Navigation"/>
-<use   name="RecoMuon/TrackingTools"/>
-<use   name="TrackingTools/KalmanUpdators"/>
-<use   name="SimDataFormats/Track"/>
-<use   name="SimDataFormats/TrackingHit"/>
-<use   name="SimDataFormats/Vertex"/>
-<use   name="TrackingTools/GeomPropagators"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="TrackPropagation/SteppingHelixPropagator"/>
+<use name="DataFormats/GeometrySurface"/>
+<use name="DataFormats/MuonDetId"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="FastSimulation/MaterialEffects"/>
+<use name="FastSimulation/ParticlePropagator"/>
+<use name="FastSimulation/Utilities"/>
+<use name="Geometry/CSCGeometry"/>
+<use name="Geometry/DTGeometry"/>
+<use name="Geometry/RPCGeometry"/>
+<use name="Geometry/Records"/>
+<use name="MagneticField/Records"/>
+<use name="RecoMuon/MeasurementDet"/>
+<use name="RecoMuon/Navigation"/>
+<use name="RecoMuon/TrackingTools"/>
+<use name="TrackingTools/KalmanUpdators"/>
+<use name="SimDataFormats/Track"/>
+<use name="SimDataFormats/TrackingHit"/>
+<use name="SimDataFormats/Vertex"/>
+<use name="TrackingTools/GeomPropagators"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/FastSimulation/Muons/plugins/BuildFile.xml b/FastSimulation/Muons/plugins/BuildFile.xml
index 0ea8462e931e9..9787bec5d00d5 100644
--- a/FastSimulation/Muons/plugins/BuildFile.xml
+++ b/FastSimulation/Muons/plugins/BuildFile.xml
@@ -1,30 +1,30 @@
-<library   name="FastSimulationMuonsPlugins" file="*.cc">
-  <use   name="CondFormats/DataRecord"/>
-  <use   name="CondFormats/L1TObjects"/>
-  <use   name="DataFormats/L1GlobalMuonTrigger"/>
-  <use   name="DataFormats/L1Trigger"/>
-  <use   name="DataFormats/Math"/>
-  <use   name="DataFormats/MuonSeed"/>
-  <use   name="DataFormats/TrackReco"/>
-  <use   name="DataFormats/TrackerRecHit2D"/>
-  <use   name="DataFormats/TrajectorySeed"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="FWCore/PluginManager"/>
-  <use   name="FWCore/ServiceRegistry"/>
-  <use   name="FWCore/Utilities"/>
-  <use   name="FastSimDataFormats/L1GlobalMuonTrigger"/>
-  <use   name="FastSimulation/Tracking"/>
-  <use   name="FastSimulation/Utilities"/>
-  <use   name="Geometry/RPCGeometry"/>
-  <use   name="RecoMuon/GlobalTrackingTools"/>
-  <use   name="RecoMuon/L3TrackFinder"/>
-  <use   name="RecoMuon/TrackerSeedGenerator"/>
-  <use   name="RecoMuon/TrackingTools"/>
-  <use   name="RecoTracker/TkTrackingRegions"/>
-  <use   name="SimDataFormats/Track"/>
-  <use   name="TrackingTools/DetLayers"/>
-  <use   name="TrackingTools/PatternTools"/>
-  <use   name="Utilities/General"/>
+<library name="FastSimulationMuonsPlugins" file="*.cc">
+  <use name="CondFormats/DataRecord"/>
+  <use name="CondFormats/L1TObjects"/>
+  <use name="DataFormats/L1GlobalMuonTrigger"/>
+  <use name="DataFormats/L1Trigger"/>
+  <use name="DataFormats/Math"/>
+  <use name="DataFormats/MuonSeed"/>
+  <use name="DataFormats/TrackReco"/>
+  <use name="DataFormats/TrackerRecHit2D"/>
+  <use name="DataFormats/TrajectorySeed"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/PluginManager"/>
+  <use name="FWCore/ServiceRegistry"/>
+  <use name="FWCore/Utilities"/>
+  <use name="FastSimDataFormats/L1GlobalMuonTrigger"/>
+  <use name="FastSimulation/Tracking"/>
+  <use name="FastSimulation/Utilities"/>
+  <use name="Geometry/RPCGeometry"/>
+  <use name="RecoMuon/GlobalTrackingTools"/>
+  <use name="RecoMuon/L3TrackFinder"/>
+  <use name="RecoMuon/TrackerSeedGenerator"/>
+  <use name="RecoMuon/TrackingTools"/>
+  <use name="RecoTracker/TkTrackingRegions"/>
+  <use name="SimDataFormats/Track"/>
+  <use name="TrackingTools/DetLayers"/>
+  <use name="TrackingTools/PatternTools"/>
+  <use name="Utilities/General"/>
 </library>
diff --git a/FastSimulation/Particle/BuildFile.xml b/FastSimulation/Particle/BuildFile.xml
index d9667bff5de9f..f015a381af751 100644
--- a/FastSimulation/Particle/BuildFile.xml
+++ b/FastSimulation/Particle/BuildFile.xml
@@ -1,7 +1,7 @@
-<use   name="DataFormats/Math"/>
-<use   name="SimGeneral/HepPDTRecord"/>
-<use   name="CommonTools/BaseParticlePropagator"/>
-<use   name="rootmath"/>
+<use name="DataFormats/Math"/>
+<use name="SimGeneral/HepPDTRecord"/>
+<use name="CommonTools/BaseParticlePropagator"/>
+<use name="rootmath"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/FastSimulation/ParticleDecay/BuildFile.xml b/FastSimulation/ParticleDecay/BuildFile.xml
index d5adabe04899d..ceb4ddfa71ce9 100644
--- a/FastSimulation/ParticleDecay/BuildFile.xml
+++ b/FastSimulation/ParticleDecay/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="hepmc"/>
-<use   name="FastSimulation/ParticlePropagator"/>
-<use   name="GeneratorInterface/Pythia6Interface"/>
+<use name="hepmc"/>
+<use name="FastSimulation/ParticlePropagator"/>
+<use name="GeneratorInterface/Pythia6Interface"/>
 <use name="SimDataFormats/GeneratorProducts"/>
 <use name="GeneratorInterface/Core"/>
 <use name="GeneratorInterface/ExternalDecays"/>
@@ -8,9 +8,9 @@
 <use name="FWCore/ServiceRegistry"/>
 <use name="boost"/>
 <use name="clhep"/>
-<use name="pythia8"/> 
-<use   name="f77compiler"/>
-<use   name="pydata"/>
+<use name="pythia8"/>
+<use name="f77compiler"/>
+<use name="pydata"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/FastSimulation/ParticleDecay/plugins/BuildFile.xml b/FastSimulation/ParticleDecay/plugins/BuildFile.xml
index 9dd01e90f65a5..bc2400f15fef5 100644
--- a/FastSimulation/ParticleDecay/plugins/BuildFile.xml
+++ b/FastSimulation/ParticleDecay/plugins/BuildFile.xml
@@ -3,7 +3,7 @@
 <use name="FWCore/ParameterSet"/>
 <use name="heppdt"/>
 <use name="root"/>
-<use name="pythia8"/> 
-<use   name="DataFormats/Math"/>
+<use name="pythia8"/>
+<use name="DataFormats/Math"/>
 <flags CXXFLAGS="-g"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/FastSimulation/ParticlePropagator/BuildFile.xml b/FastSimulation/ParticlePropagator/BuildFile.xml
index 01e7214e959ab..cafbe396cb598 100644
--- a/FastSimulation/ParticlePropagator/BuildFile.xml
+++ b/FastSimulation/ParticlePropagator/BuildFile.xml
@@ -1,13 +1,13 @@
-<use   name="DataFormats/GeometrySurface"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="FWCore/Framework"/>
-<use   name="CommonTools/BaseParticlePropagator"/>
-<use   name="FastSimulation/Event"/>
-<use   name="FastSimulation/TrackerSetup"/>
-<use   name="FastSimulation/Utilities"/>
-<use   name="MagneticField/Engine"/>
-<use   name="MagneticField/Records"/>
-<use   name="boost"/>
+<use name="DataFormats/GeometrySurface"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="FWCore/Framework"/>
+<use name="CommonTools/BaseParticlePropagator"/>
+<use name="FastSimulation/Event"/>
+<use name="FastSimulation/TrackerSetup"/>
+<use name="FastSimulation/Utilities"/>
+<use name="MagneticField/Engine"/>
+<use name="MagneticField/Records"/>
+<use name="boost"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/FastSimulation/ParticlePropagator/plugins/BuildFile.xml b/FastSimulation/ParticlePropagator/plugins/BuildFile.xml
index e2c4d71dd2b81..1412729035de0 100644
--- a/FastSimulation/ParticlePropagator/plugins/BuildFile.xml
+++ b/FastSimulation/ParticlePropagator/plugins/BuildFile.xml
@@ -1,8 +1,8 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FastSimulation/TrackerSetup"/>
-<use   name="FastSimulation/ParticlePropagator"/>
-<use   name="boost"/>
-<library   file="*.cc" name="FastSimulationParticlePropagatorPlugin">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FastSimulation/TrackerSetup"/>
+<use name="FastSimulation/ParticlePropagator"/>
+<use name="boost"/>
+<library file="*.cc" name="FastSimulationParticlePropagatorPlugin">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/FastSimulation/ShowerDevelopment/BuildFile.xml b/FastSimulation/ShowerDevelopment/BuildFile.xml
index 0a3b62698c164..fc70e1ebe4295 100644
--- a/FastSimulation/ShowerDevelopment/BuildFile.xml
+++ b/FastSimulation/ShowerDevelopment/BuildFile.xml
@@ -1,12 +1,12 @@
-<use   name="DataFormats/Math"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FastSimulation/CaloHitMakers"/>
-<use   name="FastSimulation/CalorimeterProperties"/>
-<use   name="FastSimulation/Particle"/>
-<use   name="FastSimulation/Utilities"/>
-<use   name="DQMServices/Core"/>
-<use   name="clhep"/>
+<use name="DataFormats/Math"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FastSimulation/CaloHitMakers"/>
+<use name="FastSimulation/CalorimeterProperties"/>
+<use name="FastSimulation/Particle"/>
+<use name="FastSimulation/Utilities"/>
+<use name="DQMServices/Core"/>
+<use name="clhep"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/FastSimulation/SimplifiedGeometryPropagator/BuildFile.xml b/FastSimulation/SimplifiedGeometryPropagator/BuildFile.xml
index 83d2f79cf81b0..2ba0592dfa978 100644
--- a/FastSimulation/SimplifiedGeometryPropagator/BuildFile.xml
+++ b/FastSimulation/SimplifiedGeometryPropagator/BuildFile.xml
@@ -2,44 +2,34 @@
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/Utilities"/>
 <use name="FWCore/PluginManager"/>
-
 <use name="TrackingTools/DetLayers"/>
 <use name="TrackingTools/TrajectoryState"/>
 <use name="TrackingTools/GeomPropagators"/>
-
 <use name="DataFormats/GeometrySurface"/>
 <use name="DataFormats/GeometryVector"/>
 <use name="SimDataFormats/TrackingHit"/>
 <use name="SimDataFormats/Track"/>
 <use name="SimDataFormats/Vertex"/>
 <use name="SimDataFormats/EncodedEventId"/>
-
 <use name="Geometry/CommonDetUnit"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/CaloGeometry"/>
-
 <use name="CondFormats/External"/>
 <use name="DataFormats/Math"/>
-
 <use name="MagneticField/Engine"/>
 <use name="MagneticField/Records"/>
-
 <use name="FastSimulation/TrajectoryManager"/>
 <use name="FastSimulation/Calorimetry"/>
 <use name="FastSimulation/CaloGeometryTools"/>
 <use name="FastSimulation/ShowerDevelopment"/>
-
 <use name="RecoTracker/Record"/>
 <use name="RecoTracker/TkDetLayers"/>
-
 <use name="FWCore/ServiceRegistry"/>
 <use name="GeneratorInterface/Pythia8Interface"/>
 <use name="pythia8"/>
-
 <use name="HepPDT"/>
 <use name="clhep"/>
 <use name="rootcore"/>
-
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/FastSimulation/SimplifiedGeometryPropagator/plugins/BuildFile.xml b/FastSimulation/SimplifiedGeometryPropagator/plugins/BuildFile.xml
index babcb535f96e8..08afb4ad01904 100644
--- a/FastSimulation/SimplifiedGeometryPropagator/plugins/BuildFile.xml
+++ b/FastSimulation/SimplifiedGeometryPropagator/plugins/BuildFile.xml
@@ -1,28 +1,20 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
-
 <use name="SimGeneral/HepPDTRecord"/>
-
 <use name="TrackingTools/DetLayers"/>
 <use name="TrackingTools/TrajectoryState"/>
 <use name="TrackingTools/GeomPropagators"/>
 <use name="RecoTracker/DeDx"/>
-
 <use name="SimDataFormats/EncodedEventId"/>
-
 <use name="FastSimulation/TrajectoryManager"/>
 <use name="FastSimulation/SimplifiedGeometryPropagator"/>
 <use name="FastSimulation/Calorimetry"/>
 <use name="FastSimulation/CaloGeometryTools"/>
 <use name="FastSimulation/ShowerDevelopment"/>
-
 <use name="Geometry/Records"/>
 <use name="Geometry/CaloGeometry"/>
-
 <use name="DataFormats/Math"/>
-
 <use name="hepmc"/>
 <use name="clhep"/>
-
-<flags EDM_PLUGIN="1"/>
\ No newline at end of file
+<flags EDM_PLUGIN="1"/>
diff --git a/FastSimulation/TrackerSetup/BuildFile.xml b/FastSimulation/TrackerSetup/BuildFile.xml
index 3be861c7913a8..7f84b27825f31 100644
--- a/FastSimulation/TrackerSetup/BuildFile.xml
+++ b/FastSimulation/TrackerSetup/BuildFile.xml
@@ -1,11 +1,11 @@
-<use   name="DataFormats/GeometrySurface"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Utilities"/>
-<use   name="RecoTracker/Record"/>
-<use   name="TrackingTools/DetLayers"/>
-<use   name="RecoTracker/TkDetLayers"/>
-<use   name="boost"/>
+<use name="DataFormats/GeometrySurface"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Utilities"/>
+<use name="RecoTracker/Record"/>
+<use name="TrackingTools/DetLayers"/>
+<use name="RecoTracker/TkDetLayers"/>
+<use name="boost"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/FastSimulation/TrackerSetup/plugins/BuildFile.xml b/FastSimulation/TrackerSetup/plugins/BuildFile.xml
index e5b1c1cb18b42..e3150a15f7e7b 100644
--- a/FastSimulation/TrackerSetup/plugins/BuildFile.xml
+++ b/FastSimulation/TrackerSetup/plugins/BuildFile.xml
@@ -1,9 +1,9 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="RecoTracker/TkDetLayers"/>
-<use   name="RecoTracker/Record"/>
-<use   name="FastSimulation/TrackerSetup"/>
-<use   name="boost"/>
-<library   file="*.cc" name="FastSimulationTrackerSetupPlugin">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="RecoTracker/TkDetLayers"/>
+<use name="RecoTracker/Record"/>
+<use name="FastSimulation/TrackerSetup"/>
+<use name="boost"/>
+<library file="*.cc" name="FastSimulationTrackerSetupPlugin">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/FastSimulation/Tracking/BuildFile.xml b/FastSimulation/Tracking/BuildFile.xml
index 826f286d5ce8d..f4c2586036da7 100644
--- a/FastSimulation/Tracking/BuildFile.xml
+++ b/FastSimulation/Tracking/BuildFile.xml
@@ -1,21 +1,21 @@
-<use   name="DataFormats/TrajectoryState"/>
-<use   name="TrackingTools/GeomPropagators"/>
-<use   name="TrackingTools/TrajectoryParametrization"/>
-<use   name="SimDataFormats/Track"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="DataFormats/SiPixelDetId"/>
-<use   name="DataFormats/SiStripDetId"/>
-<use   name="DataFormats/TrackerCommon"/>
-<use   name="DataFormats/TrackingRecHit"/>
-<use   name="DataFormats/TrackerRecHit2D"/>
-<use   name="DataFormats/EgammaTrackReco"/>
-<use   name="Geometry/CommonDetUnit"/>
-<use   name="Geometry/TrackerGeometryBuilder"/>
-<use   name="Geometry/Records"/>
-<use   name="DataFormats/EgammaReco"/>
-<use   name="RecoTracker/TkHitPairs"/>
-<use   name="RecoPixelVertexing/PixelTriplets"/>
-<use   name="RecoTracker/MeasurementDet"/>
+<use name="DataFormats/TrajectoryState"/>
+<use name="TrackingTools/GeomPropagators"/>
+<use name="TrackingTools/TrajectoryParametrization"/>
+<use name="SimDataFormats/Track"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="DataFormats/SiPixelDetId"/>
+<use name="DataFormats/SiStripDetId"/>
+<use name="DataFormats/TrackerCommon"/>
+<use name="DataFormats/TrackingRecHit"/>
+<use name="DataFormats/TrackerRecHit2D"/>
+<use name="DataFormats/EgammaTrackReco"/>
+<use name="Geometry/CommonDetUnit"/>
+<use name="Geometry/TrackerGeometryBuilder"/>
+<use name="Geometry/Records"/>
+<use name="DataFormats/EgammaReco"/>
+<use name="RecoTracker/TkHitPairs"/>
+<use name="RecoPixelVertexing/PixelTriplets"/>
+<use name="RecoTracker/MeasurementDet"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/FastSimulation/Tracking/plugins/BuildFile.xml b/FastSimulation/Tracking/plugins/BuildFile.xml
index f243063846536..62211680f385c 100644
--- a/FastSimulation/Tracking/plugins/BuildFile.xml
+++ b/FastSimulation/Tracking/plugins/BuildFile.xml
@@ -1,32 +1,32 @@
-<use   name="DataFormats/BeamSpot"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="DataFormats/TrackCandidate"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/TrackerRecHit2D"/>
-<use   name="DataFormats/TrackingRecHit"/>
-<use   name="DataFormats/TrajectorySeed"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CommonTools/BaseParticlePropagator"/>
-<use   name="FastSimulation/ParticlePropagator"/>
-<use   name="FastSimulation/Tracking"/>
-<use   name="Geometry/CommonDetUnit"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/TrackerGeometryBuilder"/>
-<use   name="RecoPixelVertexing/PixelTrackFitting"/>
-<use   name="RecoTracker/TkTrackingRegions"/>
-<use   name="RecoTracker/TkSeedGenerator"/>
-<use   name="SimDataFormats/Track"/>
-<use   name="SimDataFormats/Vertex"/>
-<use   name="TrackingTools/PatternTools"/>
-<use   name="TrackingTools/TrajectoryParametrization"/>
-<use   name="TrackingTools/TrajectoryState"/>
-<use   name="TrackingTools/MaterialEffects"/>
-<use   name="SimGeneral/MixingModule"/>
-<use   name="RecoPixelVertexing/PixelTriplets"/>
-<library   name="FastSimulationTrackingPlugins" file="*.cc">
-  <flags   EDM_PLUGIN="1"/>
+<use name="DataFormats/BeamSpot"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="DataFormats/TrackCandidate"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/TrackerRecHit2D"/>
+<use name="DataFormats/TrackingRecHit"/>
+<use name="DataFormats/TrajectorySeed"/>
+<use name="DataFormats/VertexReco"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CommonTools/BaseParticlePropagator"/>
+<use name="FastSimulation/ParticlePropagator"/>
+<use name="FastSimulation/Tracking"/>
+<use name="Geometry/CommonDetUnit"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/TrackerGeometryBuilder"/>
+<use name="RecoPixelVertexing/PixelTrackFitting"/>
+<use name="RecoTracker/TkTrackingRegions"/>
+<use name="RecoTracker/TkSeedGenerator"/>
+<use name="SimDataFormats/Track"/>
+<use name="SimDataFormats/Vertex"/>
+<use name="TrackingTools/PatternTools"/>
+<use name="TrackingTools/TrajectoryParametrization"/>
+<use name="TrackingTools/TrajectoryState"/>
+<use name="TrackingTools/MaterialEffects"/>
+<use name="SimGeneral/MixingModule"/>
+<use name="RecoPixelVertexing/PixelTriplets"/>
+<library name="FastSimulationTrackingPlugins" file="*.cc">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/FastSimulation/Tracking/test/BuildFile.xml b/FastSimulation/Tracking/test/BuildFile.xml
index d748e85d40ae3..9aecd3054f83b 100644
--- a/FastSimulation/Tracking/test/BuildFile.xml
+++ b/FastSimulation/Tracking/test/BuildFile.xml
@@ -1,17 +1,17 @@
-<library   file="testGeneralTracks.cc" name="testGeneralTracks">
-  <use   name="root"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="FWCore/PluginManager"/>
-  <use   name="Geometry/Records"/>
-  <use   name="Geometry/TrackerGeometryBuilder"/>
-  <use   name="SimDataFormats/Track"/>
-  <use   name="DataFormats/TrackReco"/>
-  <use   name="DataFormats/Provenance"/>
-  <use   name="FastSimulation/Event"/>
-  <use   name="FastSimulation/Particle"/>
-  <use   name="FastSimulation/Utilities"/>
-  <use   name="FastSimulation/Tracking"/>
-  <use   name="DQMServices/Core"/>
-  <flags   EDM_PLUGIN="1"/>
+<library file="testGeneralTracks.cc" name="testGeneralTracks">
+  <use name="root"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/PluginManager"/>
+  <use name="Geometry/Records"/>
+  <use name="Geometry/TrackerGeometryBuilder"/>
+  <use name="SimDataFormats/Track"/>
+  <use name="DataFormats/TrackReco"/>
+  <use name="DataFormats/Provenance"/>
+  <use name="FastSimulation/Event"/>
+  <use name="FastSimulation/Particle"/>
+  <use name="FastSimulation/Utilities"/>
+  <use name="FastSimulation/Tracking"/>
+  <use name="DQMServices/Core"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/FastSimulation/TrackingRecHitProducer/BuildFile.xml b/FastSimulation/TrackingRecHitProducer/BuildFile.xml
index 5e9936bbbc72d..231ed978720b7 100644
--- a/FastSimulation/TrackingRecHitProducer/BuildFile.xml
+++ b/FastSimulation/TrackingRecHitProducer/BuildFile.xml
@@ -1,37 +1,37 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/GeometrySurface"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="DataFormats/SiPixelCluster"/>
-<use   name="DataFormats/SiPixelDetId"/>
-<use   name="DataFormats/SiStripCluster"/>
-<use   name="DataFormats/SiStripDetId"/>
-<use   name="DataFormats/TrackerRecHit2D"/>
-<use   name="DataFormats/TrackingRecHit"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FastSimDataFormats/External"/>
-<use   name="FastSimulation/Utilities"/>
-<use   name="Geometry/CommonDetUnit"/>
-<use   name="Geometry/CommonTopologies"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/TrackerGeometryBuilder"/>
-<use   name="MagneticField/Engine"/>
-<use   name="MagneticField/Records"/>
-<use   name="RecoLocalTracker/ClusterParameterEstimator"/>
-<use   name="RecoLocalTracker/SiPixelRecHits"/>
-<use   name="RecoLocalTracker/Records"/>
-<use   name="SimDataFormats/CrossingFrame"/>
-<use   name="SimDataFormats/EncodedEventId"/>
-<use   name="SimDataFormats/TrackingHit"/>
-<use   name="CondFormats/SiPixelTransient"/>
-<use   name="boost"/>
-<use   name="clhep"/>
-<use   name="gsl"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/GeometrySurface"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="DataFormats/SiPixelCluster"/>
+<use name="DataFormats/SiPixelDetId"/>
+<use name="DataFormats/SiStripCluster"/>
+<use name="DataFormats/SiStripDetId"/>
+<use name="DataFormats/TrackerRecHit2D"/>
+<use name="DataFormats/TrackingRecHit"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="FastSimDataFormats/External"/>
+<use name="FastSimulation/Utilities"/>
+<use name="Geometry/CommonDetUnit"/>
+<use name="Geometry/CommonTopologies"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/TrackerGeometryBuilder"/>
+<use name="MagneticField/Engine"/>
+<use name="MagneticField/Records"/>
+<use name="RecoLocalTracker/ClusterParameterEstimator"/>
+<use name="RecoLocalTracker/SiPixelRecHits"/>
+<use name="RecoLocalTracker/Records"/>
+<use name="SimDataFormats/CrossingFrame"/>
+<use name="SimDataFormats/EncodedEventId"/>
+<use name="SimDataFormats/TrackingHit"/>
+<use name="CondFormats/SiPixelTransient"/>
+<use name="boost"/>
+<use name="clhep"/>
+<use name="gsl"/>
 <export>
-    <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/FastSimulation/TrackingRecHitProducer/plugins/BuildFile.xml b/FastSimulation/TrackingRecHitProducer/plugins/BuildFile.xml
index da72d895b08bf..7ee816f1b0dff 100644
--- a/FastSimulation/TrackingRecHitProducer/plugins/BuildFile.xml
+++ b/FastSimulation/TrackingRecHitProducer/plugins/BuildFile.xml
@@ -1,37 +1,37 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/GeometrySurface"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="DataFormats/SiPixelCluster"/>
-<use   name="DataFormats/SiPixelDetId"/>
-<use   name="DataFormats/SiStripCluster"/>
-<use   name="DataFormats/SiStripDetId"/>
-<use   name="DataFormats/TrackerRecHit2D"/>
-<use   name="DataFormats/TrackingRecHit"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FastSimDataFormats/External"/>
-<use   name="FastSimulation/Utilities"/>
-<use   name="Geometry/CommonDetUnit"/>
-<use   name="Geometry/CommonTopologies"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/TrackerGeometryBuilder"/>
-<use   name="MagneticField/Engine"/>
-<use   name="MagneticField/Records"/>
-<use   name="RecoLocalTracker/ClusterParameterEstimator"/>
-<use   name="RecoLocalTracker/SiPixelRecHits"/>
-<use   name="RecoLocalTracker/Records"/>
-<use   name="SimDataFormats/CrossingFrame"/>
-<use   name="SimDataFormats/EncodedEventId"/>
-<use   name="PhysicsTools/UtilAlgos"/>
-<use   name="SimDataFormats/TrackingHit"/>
-<use   name="FastSimulation/TrackingRecHitProducer"/>
-<use   name="CondFormats/SiPixelTransient"/>
-<use   name="boost"/>
-<use   name="clhep"/>
-<use   name="gsl"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/GeometrySurface"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="DataFormats/SiPixelCluster"/>
+<use name="DataFormats/SiPixelDetId"/>
+<use name="DataFormats/SiStripCluster"/>
+<use name="DataFormats/SiStripDetId"/>
+<use name="DataFormats/TrackerRecHit2D"/>
+<use name="DataFormats/TrackingRecHit"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="FastSimDataFormats/External"/>
+<use name="FastSimulation/Utilities"/>
+<use name="Geometry/CommonDetUnit"/>
+<use name="Geometry/CommonTopologies"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/TrackerGeometryBuilder"/>
+<use name="MagneticField/Engine"/>
+<use name="MagneticField/Records"/>
+<use name="RecoLocalTracker/ClusterParameterEstimator"/>
+<use name="RecoLocalTracker/SiPixelRecHits"/>
+<use name="RecoLocalTracker/Records"/>
+<use name="SimDataFormats/CrossingFrame"/>
+<use name="SimDataFormats/EncodedEventId"/>
+<use name="PhysicsTools/UtilAlgos"/>
+<use name="SimDataFormats/TrackingHit"/>
+<use name="FastSimulation/TrackingRecHitProducer"/>
+<use name="CondFormats/SiPixelTransient"/>
+<use name="boost"/>
+<use name="clhep"/>
+<use name="gsl"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/FastSimulation/TrajectoryManager/BuildFile.xml b/FastSimulation/TrajectoryManager/BuildFile.xml
index 8bddf12050527..674a6fa8cf0db 100644
--- a/FastSimulation/TrajectoryManager/BuildFile.xml
+++ b/FastSimulation/TrajectoryManager/BuildFile.xml
@@ -1,21 +1,21 @@
-<use   name="DataFormats/GeometrySurface"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="DataFormats/SiStripDetId"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FastSimulation/Event"/>
-<use   name="FastSimulation/MaterialEffects"/>
-<use   name="FastSimulation/ParticleDecay"/>
-<use   name="FastSimulation/ParticlePropagator"/>
-<use   name="FastSimulation/TrackerSetup"/>
-<use   name="FastSimulation/Utilities"/>
-<use   name="Geometry/CommonDetUnit"/>
-<use   name="MagneticField/Engine"/>
-<use   name="RecoTracker/TkDetLayers"/>
-<use   name="TrackingTools/DetLayers"/>
-<use   name="TrackingTools/GeomPropagators"/>
-<use   name="TrackingTools/PatternTools"/>
-<use   name="TrackingTools/TrajectoryState"/>
+<use name="DataFormats/GeometrySurface"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="DataFormats/SiStripDetId"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FastSimulation/Event"/>
+<use name="FastSimulation/MaterialEffects"/>
+<use name="FastSimulation/ParticleDecay"/>
+<use name="FastSimulation/ParticlePropagator"/>
+<use name="FastSimulation/TrackerSetup"/>
+<use name="FastSimulation/Utilities"/>
+<use name="Geometry/CommonDetUnit"/>
+<use name="MagneticField/Engine"/>
+<use name="RecoTracker/TkDetLayers"/>
+<use name="TrackingTools/DetLayers"/>
+<use name="TrackingTools/GeomPropagators"/>
+<use name="TrackingTools/PatternTools"/>
+<use name="TrackingTools/TrajectoryState"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/FastSimulation/Utilities/BuildFile.xml b/FastSimulation/Utilities/BuildFile.xml
index c110c92950e7f..6cf11edfdbbda 100644
--- a/FastSimulation/Utilities/BuildFile.xml
+++ b/FastSimulation/Utilities/BuildFile.xml
@@ -1,9 +1,9 @@
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="IOMC/RandomEngine"/>
-<use   name="clhep"/>
-<use   name="root"/>
-<use   name="rootmath"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="IOMC/RandomEngine"/>
+<use name="clhep"/>
+<use name="root"/>
+<use name="rootmath"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/FastSimulation/Validation/test/BuildFile.xml b/FastSimulation/Validation/test/BuildFile.xml
index 76fca513edf59..1f758b8399245 100644
--- a/FastSimulation/Validation/test/BuildFile.xml
+++ b/FastSimulation/Validation/test/BuildFile.xml
@@ -1,14 +1,15 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DQMServices/Core"/>
-<use   name="boost"/>
-<use   name="rootgraphics"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/HcalDetId"/>
-<use   name="DataFormats/CaloRecHit"/>
-<use   name="DataFormats/JetReco"/>
-<library   file="JetComparison.cc" name="JetComparison">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DQMServices/Core"/>
+<use name="boost"/>
+<use name="rootgraphics"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/HcalDetId"/>
+<use name="DataFormats/CaloRecHit"/>
+<use name="DataFormats/JetReco"/>
+<library file="JetComparison.cc" name="JetComparison">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<bin   file="timing.cpp">
+
+<bin file="timing.cpp">
 </bin>