diff --git a/SimMuon/CSCDigitizer/BuildFile.xml b/SimMuon/CSCDigitizer/BuildFile.xml
index 30b4b04025037..37d6cd3184cdc 100644
--- a/SimMuon/CSCDigitizer/BuildFile.xml
+++ b/SimMuon/CSCDigitizer/BuildFile.xml
@@ -1,22 +1,22 @@
-<use   name="CalibMuon/CSCCalibration"/>
-<use   name="CondFormats/CSCObjects"/>
-<use   name="DataFormats/CSCDigi"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="DataFormats/MuonDetId"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Utilities"/>
-<use   name="Geometry/CSCGeometry"/>
-<use   name="Geometry/Records"/>
-<use   name="MagneticField/Engine"/>
-<use   name="MagneticField/Records"/>
-<use   name="SimDataFormats/CrossingFrame"/>
-<use   name="SimDataFormats/TrackingHit"/>
-<use   name="SimGeneral/HepPDTRecord"/>
-<use   name="SimMuon/Neutron"/>
-<use   name="boost"/>
-<use   name="clhep"/>
+<use name="CalibMuon/CSCCalibration"/>
+<use name="CondFormats/CSCObjects"/>
+<use name="DataFormats/CSCDigi"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="DataFormats/MuonDetId"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Utilities"/>
+<use name="Geometry/CSCGeometry"/>
+<use name="Geometry/Records"/>
+<use name="MagneticField/Engine"/>
+<use name="MagneticField/Records"/>
+<use name="SimDataFormats/CrossingFrame"/>
+<use name="SimDataFormats/TrackingHit"/>
+<use name="SimGeneral/HepPDTRecord"/>
+<use name="SimMuon/Neutron"/>
+<use name="boost"/>
+<use name="clhep"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/SimMuon/CSCDigitizer/plugins/BuildFile.xml b/SimMuon/CSCDigitizer/plugins/BuildFile.xml
index 0b488d0fe605c..56cde6f047076 100644
--- a/SimMuon/CSCDigitizer/plugins/BuildFile.xml
+++ b/SimMuon/CSCDigitizer/plugins/BuildFile.xml
@@ -1,29 +1,29 @@
-<use   name="SimMuon/CSCDigitizer"/>
-<library   file="*.cc" name="SimMuonCSCDigitizerPlugins">
-  <use   name="CondFormats/CSCObjects"/>
-  <use   name="DataFormats/CSCDigi"/>
-  <use   name="DataFormats/GeometryVector"/>
-  <use   name="DataFormats/MuonDetId"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="FWCore/Utilities"/>
-  <use   name="FWCore/PluginManager"/>
-  <use   name="Geometry/CSCGeometry"/>
-  <use   name="Geometry/Records"/>
-  <use   name="MagneticField/Engine"/>
-  <use   name="MagneticField/Records"/>
-  <use   name="CondFormats/RecoMuonObjects"/>
-  <use   name="CondFormats/DataRecord"/>
-  <use   name="SimDataFormats/CrossingFrame"/>
-  <use   name="SimDataFormats/TrackingHit"/>
-  <use   name="SimDataFormats/TrackerDigiSimLink"/>
-  <use   name="SimGeneral/HepPDTRecord"/>
-  <use   name="SimGeneral/NoiseGenerators"/>
-  <use   name="SimGeneral/PreMixingModule"/>
-  <use   name="SimMuon/Neutron"/>
-  <use   name="Utilities/General"/>
-  <use   name="boost"/>
-  <use   name="clhep"/>
-  <flags   EDM_PLUGIN="1"/>
+<use name="SimMuon/CSCDigitizer"/>
+<library file="*.cc" name="SimMuonCSCDigitizerPlugins">
+  <use name="CondFormats/CSCObjects"/>
+  <use name="DataFormats/CSCDigi"/>
+  <use name="DataFormats/GeometryVector"/>
+  <use name="DataFormats/MuonDetId"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/Utilities"/>
+  <use name="FWCore/PluginManager"/>
+  <use name="Geometry/CSCGeometry"/>
+  <use name="Geometry/Records"/>
+  <use name="MagneticField/Engine"/>
+  <use name="MagneticField/Records"/>
+  <use name="CondFormats/RecoMuonObjects"/>
+  <use name="CondFormats/DataRecord"/>
+  <use name="SimDataFormats/CrossingFrame"/>
+  <use name="SimDataFormats/TrackingHit"/>
+  <use name="SimDataFormats/TrackerDigiSimLink"/>
+  <use name="SimGeneral/HepPDTRecord"/>
+  <use name="SimGeneral/NoiseGenerators"/>
+  <use name="SimGeneral/PreMixingModule"/>
+  <use name="SimMuon/Neutron"/>
+  <use name="Utilities/General"/>
+  <use name="boost"/>
+  <use name="clhep"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/SimMuon/CSCDigitizer/test/BuildFile.xml b/SimMuon/CSCDigitizer/test/BuildFile.xml
index 1f11dba1e382e..9a841999be512 100644
--- a/SimMuon/CSCDigitizer/test/BuildFile.xml
+++ b/SimMuon/CSCDigitizer/test/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="SimMuon/CSCDigitizer"/>
-<flags   EDM_PLUGIN="1"/>
-<library   file="CSCNoiseMatrixTest.cc" name="CSCNoiseMatrixTest">
+<use name="SimMuon/CSCDigitizer"/>
+<flags EDM_PLUGIN="1"/>
+<library file="CSCNoiseMatrixTest.cc" name="CSCNoiseMatrixTest">
 </library>
-<bin file="CSCGasCollisionsTest.cpp"/>
 
+<bin file="CSCGasCollisionsTest.cpp"/>
diff --git a/SimMuon/DTDigitizer/BuildFile.xml b/SimMuon/DTDigitizer/BuildFile.xml
index c0b1aa1b9be21..7bd047366fb1a 100644
--- a/SimMuon/DTDigitizer/BuildFile.xml
+++ b/SimMuon/DTDigitizer/BuildFile.xml
@@ -1,15 +1,15 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/Common"/>
-<use   name="SimDataFormats/TrackingHit"/>
-<use   name="SimDataFormats/CrossingFrame"/>
-<use   name="DataFormats/DTDigi"/>
-<use   name="SimDataFormats/DigiSimLinks"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/DTGeometry"/>
-<use   name="MagneticField/Engine"/>
-<use   name="MagneticField/Records"/>
-<use   name="SimMuon/Neutron"/>
-<use   name="CLHEP"/>
-<use   name="root"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/Common"/>
+<use name="SimDataFormats/TrackingHit"/>
+<use name="SimDataFormats/CrossingFrame"/>
+<use name="DataFormats/DTDigi"/>
+<use name="SimDataFormats/DigiSimLinks"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/DTGeometry"/>
+<use name="MagneticField/Engine"/>
+<use name="MagneticField/Records"/>
+<use name="SimMuon/Neutron"/>
+<use name="CLHEP"/>
+<use name="root"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/SimMuon/DTDigitizer/plugins/BuildFile.xml b/SimMuon/DTDigitizer/plugins/BuildFile.xml
index 18a6dde9afad1..9bb7909ad7ad0 100644
--- a/SimMuon/DTDigitizer/plugins/BuildFile.xml
+++ b/SimMuon/DTDigitizer/plugins/BuildFile.xml
@@ -1,5 +1,4 @@
-
-<library file="*.cc" name="SimMuonDTDigitizerPlugins"> 
+<library file="*.cc" name="SimMuonDTDigitizerPlugins">
   <use name="FWCore/Utilities"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/ServiceRegistry"/>
@@ -13,6 +12,5 @@
   <use name="Geometry/Records"/>
   <use name="CondFormats/DataRecord"/>
   <use name="SimGeneral/PreMixingModule"/>
-
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/SimMuon/DTDigitizer/test/BuildFile.xml b/SimMuon/DTDigitizer/test/BuildFile.xml
index 767dae4502bec..bce826fdfc277 100644
--- a/SimMuon/DTDigitizer/test/BuildFile.xml
+++ b/SimMuon/DTDigitizer/test/BuildFile.xml
@@ -1,17 +1,19 @@
-<use   name="CLHEP"/>
-<use   name="root"/>
-<use   name="boost"/>
-<use   name="sigcpp"/>
-<bin   name="testDriftTimeParam" file="testDriftTimeParam.cpp">
+<use name="CLHEP"/>
+<use name="root"/>
+<use name="boost"/>
+<use name="sigcpp"/>
+<bin name="testDriftTimeParam" file="testDriftTimeParam.cpp">
 </bin>
-<library   file="stubs/*.cc" name="testSimMuonDTDigitizer">
+
+<library file="stubs/*.cc" name="testSimMuonDTDigitizer">
 </library>
-<library   file="DTDigiAnalyzer.cc" name="testDTDigiAnalyzer">
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="DataFormats/MuonDetId"/>
-  <use   name="Geometry/DTGeometry"/>
-  <use   name="Geometry/Records"/>
-  <use   name="DataFormats/DTDigi"/>
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="DTDigiAnalyzer.cc" name="testDTDigiAnalyzer">
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="DataFormats/MuonDetId"/>
+  <use name="Geometry/DTGeometry"/>
+  <use name="Geometry/Records"/>
+  <use name="DataFormats/DTDigi"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/SimMuon/GEMDigitizer/BuildFile.xml b/SimMuon/GEMDigitizer/BuildFile.xml
index b389b9e8994dc..d61a62b5bb38a 100644
--- a/SimMuon/GEMDigitizer/BuildFile.xml
+++ b/SimMuon/GEMDigitizer/BuildFile.xml
@@ -1,17 +1,16 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="Geometry/GEMGeometry"/>
-<use   name="DataFormats/GEMDigi"/>
-<use   name="DataFormats/Common"/>
-<use   name="CoralBase"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="RelationalAccess"/>
-<use   name="SimDataFormats/CrossingFrame"/>
-<use   name="SimDataFormats/GEMDigiSimLink"/>
-
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="Geometry/GEMGeometry"/>
+<use name="DataFormats/GEMDigi"/>
+<use name="DataFormats/Common"/>
+<use name="CoralBase"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="RelationalAccess"/>
+<use name="SimDataFormats/CrossingFrame"/>
+<use name="SimDataFormats/GEMDigiSimLink"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/SimMuon/GEMDigitizer/plugins/BuildFile.xml b/SimMuon/GEMDigitizer/plugins/BuildFile.xml
index 80230841a796f..552e75959cf1b 100644
--- a/SimMuon/GEMDigitizer/plugins/BuildFile.xml
+++ b/SimMuon/GEMDigitizer/plugins/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/RecoMuonObjects"/>
-<use   name="SimGeneral/PreMixingModule"/>
-<use   name="SimMuon/GEMDigitizer"/>
-<use   name="Geometry/Records"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/RecoMuonObjects"/>
+<use name="SimGeneral/PreMixingModule"/>
+<use name="SimMuon/GEMDigitizer"/>
+<use name="Geometry/Records"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/SimMuon/GEMDigitizer/test/BuildFile.xml b/SimMuon/GEMDigitizer/test/BuildFile.xml
index f340b52060240..fc2440452ce02 100644
--- a/SimMuon/GEMDigitizer/test/BuildFile.xml
+++ b/SimMuon/GEMDigitizer/test/BuildFile.xml
@@ -1,25 +1,29 @@
-<use   name="DataFormats/MuonDetId"/>
-<use   name="DataFormats/GEMDigi"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/GEMGeometry"/>
-<use   name="SimDataFormats/TrackerDigiSimLink"/>
-<use   name="SimDataFormats/TrackingHit"/>
-<use   name="CommonTools/UtilAlgos"/>
-<library   file="GEMDigiReader.cc" name="GEMDigiReader">
-  <flags   EDM_PLUGIN="1"/>
+<use name="DataFormats/MuonDetId"/>
+<use name="DataFormats/GEMDigi"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/GEMGeometry"/>
+<use name="SimDataFormats/TrackerDigiSimLink"/>
+<use name="SimDataFormats/TrackingHit"/>
+<use name="CommonTools/UtilAlgos"/>
+<library file="GEMDigiReader.cc" name="GEMDigiReader">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="GEMFakeEvent.cc" name="GEMFakeEvent">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="GEMFakeEvent.cc" name="GEMFakeEvent">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="GEMDigiSimLinkReader.cc" name="GEMDigiSimLinkReader">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="GEMDigiSimLinkReader.cc" name="GEMDigiSimLinkReader">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="ME0DigiSimLinkReader.cc" name="ME0DigiSimLinkReader">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="ME0DigiSimLinkReader.cc" name="ME0DigiSimLinkReader">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="ME0DigiReader.cc" name="ME0DigiReader">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="ME0DigiReader.cc" name="ME0DigiReader">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/SimMuon/MCTruth/BuildFile.xml b/SimMuon/MCTruth/BuildFile.xml
index 5c4bb0e83b715..25375843863ac 100644
--- a/SimMuon/MCTruth/BuildFile.xml
+++ b/SimMuon/MCTruth/BuildFile.xml
@@ -1,31 +1,30 @@
-<use   name="CondFormats/DataRecord"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Utilities"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/CSCRecHit"/>
-<use   name="DataFormats/DTRecHit"/>
-<use   name="DataFormats/RPCRecHit"/>
-<use   name="DataFormats/GEMRecHit"/>
-<use   name="DataFormats/TrackingRecHit"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/MuonReco"/>
-<use   name="DataFormats/TrackerCommon"/>
-<use   name="SimDataFormats/Track"/>
-<use   name="SimDataFormats/TrackingHit"/>
-<use   name="SimDataFormats/TrackerDigiSimLink"/>
-<use   name="SimDataFormats/DigiSimLinks"/>
-<use   name="SimTracker/TrackerHitAssociation"/>
-<use   name="SimDataFormats/TrackingAnalysis"/>
-<use   name="CondFormats/CSCObjects"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/CSCGeometry"/>
-<use   name="Geometry/DTGeometry"/>
-<use   name="boost"/>
-<use   name="clhep"/>
-<use   name="root"/>
-
+<use name="CondFormats/DataRecord"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Utilities"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/CSCRecHit"/>
+<use name="DataFormats/DTRecHit"/>
+<use name="DataFormats/RPCRecHit"/>
+<use name="DataFormats/GEMRecHit"/>
+<use name="DataFormats/TrackingRecHit"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/MuonReco"/>
+<use name="DataFormats/TrackerCommon"/>
+<use name="SimDataFormats/Track"/>
+<use name="SimDataFormats/TrackingHit"/>
+<use name="SimDataFormats/TrackerDigiSimLink"/>
+<use name="SimDataFormats/DigiSimLinks"/>
+<use name="SimTracker/TrackerHitAssociation"/>
+<use name="SimDataFormats/TrackingAnalysis"/>
+<use name="CondFormats/CSCObjects"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/CSCGeometry"/>
+<use name="Geometry/DTGeometry"/>
+<use name="boost"/>
+<use name="clhep"/>
+<use name="root"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/SimMuon/MCTruth/plugins/BuildFile.xml b/SimMuon/MCTruth/plugins/BuildFile.xml
index 5708541c09d97..1ce8002738a98 100644
--- a/SimMuon/MCTruth/plugins/BuildFile.xml
+++ b/SimMuon/MCTruth/plugins/BuildFile.xml
@@ -1,21 +1,21 @@
-<library   file="*.cc" name="SimMuonMCTruthPlugins">
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="FWCore/Utilities"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="DataFormats/GeometryVector"/>
-  <use   name="DataFormats/CSCRecHit"/>
-  <use   name="DataFormats/MuonReco"/>
-  <use   name="Geometry/CSCGeometry"/>
-  <use   name="Geometry/Records"/>
-  <use   name="SimDataFormats/Track"/>
-  <use   name="SimDataFormats/TrackingHit"/>
-  <use   name="SimDataFormats/TrackerDigiSimLink"/>
-  <use   name="SimDataFormats/Associations"/>
-  <use   name="SimTracker/Records"/>
-  <use   name="SimTracker/TrackAssociation"/>
-  <use   name="SimMuon/MCTruth"/>
-  <use   name="boost"/>
-  <use   name="clhep"/>
-  <flags   EDM_PLUGIN="1"/>
+<library file="*.cc" name="SimMuonMCTruthPlugins">
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/Utilities"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="DataFormats/GeometryVector"/>
+  <use name="DataFormats/CSCRecHit"/>
+  <use name="DataFormats/MuonReco"/>
+  <use name="Geometry/CSCGeometry"/>
+  <use name="Geometry/Records"/>
+  <use name="SimDataFormats/Track"/>
+  <use name="SimDataFormats/TrackingHit"/>
+  <use name="SimDataFormats/TrackerDigiSimLink"/>
+  <use name="SimDataFormats/Associations"/>
+  <use name="SimTracker/Records"/>
+  <use name="SimTracker/TrackAssociation"/>
+  <use name="SimMuon/MCTruth"/>
+  <use name="boost"/>
+  <use name="clhep"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/SimMuon/MCTruth/test/BuildFile.xml b/SimMuon/MCTruth/test/BuildFile.xml
index fee3cbac923a3..f20a0a8f93b52 100644
--- a/SimMuon/MCTruth/test/BuildFile.xml
+++ b/SimMuon/MCTruth/test/BuildFile.xml
@@ -1,14 +1,14 @@
-<library   file="*.cc" name="SimMuonMCTruthTest">
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="DataFormats/Common"/>
-  <use   name="SimDataFormats/TrackingHit"/>
-  <use   name="SimDataFormats/Track"/>
-  <use   name="DataFormats/TrackReco"/>
-  <use   name="DataFormats/MuonReco"/>
-  <use   name="SimDataFormats/TrackingAnalysis"/>
-  <use   name="SimTracker/TrackAssociation"/>
-  <use   name="SimTracker/Records"/>
-  <use   name="SimMuon/MCTruth"/>
-  <flags   EDM_PLUGIN="1"/>
+<library file="*.cc" name="SimMuonMCTruthTest">
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="DataFormats/Common"/>
+  <use name="SimDataFormats/TrackingHit"/>
+  <use name="SimDataFormats/Track"/>
+  <use name="DataFormats/TrackReco"/>
+  <use name="DataFormats/MuonReco"/>
+  <use name="SimDataFormats/TrackingAnalysis"/>
+  <use name="SimTracker/TrackAssociation"/>
+  <use name="SimTracker/Records"/>
+  <use name="SimMuon/MCTruth"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/SimMuon/Neutron/BuildFile.xml b/SimMuon/Neutron/BuildFile.xml
index 84d337d7698f0..3475c3ce45e72 100644
--- a/SimMuon/Neutron/BuildFile.xml
+++ b/SimMuon/Neutron/BuildFile.xml
@@ -1,9 +1,9 @@
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="SimDataFormats/TrackingHit"/>
-<use   name="CLHEP"/>
-<use   name="rootcore"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/MessageLogger"/>
+<use name="SimDataFormats/TrackingHit"/>
+<use name="CLHEP"/>
+<use name="rootcore"/>
diff --git a/SimMuon/Neutron/plugins/BuildFile.xml b/SimMuon/Neutron/plugins/BuildFile.xml
index de50fee57843b..f906deeedcd5c 100644
--- a/SimMuon/Neutron/plugins/BuildFile.xml
+++ b/SimMuon/Neutron/plugins/BuildFile.xml
@@ -2,7 +2,6 @@
 <use name="FWCore/ParameterSet"/>
 <use name="SimDataFormats/GeneratorProducts"/>
 <use name="boost"/>
-
 <library file="*.cc" name="SimMuonNeutronPlugins">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/SimMuon/RPCDigitizer/BuildFile.xml b/SimMuon/RPCDigitizer/BuildFile.xml
index 48417ea52ca01..f64a6ee5fec51 100644
--- a/SimMuon/RPCDigitizer/BuildFile.xml
+++ b/SimMuon/RPCDigitizer/BuildFile.xml
@@ -1,22 +1,21 @@
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/RPCObjects"/>
-<use   name="CoralBase"/>
-<use   name="DataFormats/MuonDetId"/>
-<use   name="DataFormats/RPCDigi"/>
-<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="Geometry/Records"/>
-<use   name="Geometry/RPCGeometry"/>
-<use   name="RelationalAccess"/>
-<use   name="root"/>
-
-<use   name="SimDataFormats/CrossingFrame"/>
-<use   name="SimDataFormats/RPCDigiSimLink"/>
-<use   name="SimDataFormats/TrackerDigiSimLink"/>
-<use   name="SimDataFormats/TrackingHit"/>
-<use   name="SimMuon/Neutron"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/RPCObjects"/>
+<use name="CoralBase"/>
+<use name="DataFormats/MuonDetId"/>
+<use name="DataFormats/RPCDigi"/>
+<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="Geometry/Records"/>
+<use name="Geometry/RPCGeometry"/>
+<use name="RelationalAccess"/>
+<use name="root"/>
+<use name="SimDataFormats/CrossingFrame"/>
+<use name="SimDataFormats/RPCDigiSimLink"/>
+<use name="SimDataFormats/TrackerDigiSimLink"/>
+<use name="SimDataFormats/TrackingHit"/>
+<use name="SimMuon/Neutron"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/SimMuon/RPCDigitizer/plugins/BuildFile.xml b/SimMuon/RPCDigitizer/plugins/BuildFile.xml
index 0188e451aa6a1..bb543c1376abf 100644
--- a/SimMuon/RPCDigitizer/plugins/BuildFile.xml
+++ b/SimMuon/RPCDigitizer/plugins/BuildFile.xml
@@ -1,5 +1,4 @@
-
-<library file="*.cc" name="SimMuonRPCDigitizerPlugins"> 
+<library file="*.cc" name="SimMuonRPCDigitizerPlugins">
   <use name="FWCore/Utilities"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/ServiceRegistry"/>
@@ -13,6 +12,5 @@
   <use name="Geometry/Records"/>
   <use name="CondFormats/DataRecord"/>
   <use name="SimGeneral/PreMixingModule"/>
-
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/SimMuon/RPCDigitizer/test/BuildFile.xml b/SimMuon/RPCDigitizer/test/BuildFile.xml
index 20ea0f1b74b0d..fcce690e413ff 100644
--- a/SimMuon/RPCDigitizer/test/BuildFile.xml
+++ b/SimMuon/RPCDigitizer/test/BuildFile.xml
@@ -1,17 +1,19 @@
-<use   name="DataFormats/MuonDetId"/>
-<use   name="DataFormats/RPCDigi"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/RPCGeometry"/>
-<use   name="SimDataFormats/RPCDigiSimLink"/>
-<use   name="SimDataFormats/TrackingHit"/>
-<library   file="RPCDigiReader.cc" name="RPCDigiReader">
-  <flags   EDM_PLUGIN="1"/>
+<use name="DataFormats/MuonDetId"/>
+<use name="DataFormats/RPCDigi"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/RPCGeometry"/>
+<use name="SimDataFormats/RPCDigiSimLink"/>
+<use name="SimDataFormats/TrackingHit"/>
+<library file="RPCDigiReader.cc" name="RPCDigiReader">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="RPCEventDump.cc" name="RPCEventDump">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="RPCEventDump.cc" name="RPCEventDump">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="RPCFakeEvent.cc" name="RPCFakeEvent">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="RPCFakeEvent.cc" name="RPCFakeEvent">
+  <flags EDM_PLUGIN="1"/>
 </library>