diff --git a/IOMC/EventVertexGenerators/BuildFile.xml b/IOMC/EventVertexGenerators/BuildFile.xml
index da61e96e933d6..0df3f926b33b4 100644
--- a/IOMC/EventVertexGenerators/BuildFile.xml
+++ b/IOMC/EventVertexGenerators/BuildFile.xml
@@ -1,14 +1,14 @@
-<flags   EDM_PLUGIN="1"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="SimDataFormats/GeneratorProducts"/>
-<use   name="boost"/>
-<use   name="clhep"/>
-<use   name="hepmc"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/BeamSpotObjects"/>
-<use   name="CondFormats/PPSObjects"/>
-<use   name="CondCore/DBOutputService"/>
+<flags EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="SimDataFormats/GeneratorProducts"/>
+<use name="boost"/>
+<use name="clhep"/>
+<use name="hepmc"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/BeamSpotObjects"/>
+<use name="CondFormats/PPSObjects"/>
+<use name="CondCore/DBOutputService"/>
diff --git a/IOMC/EventVertexGenerators/test/BuildFile.xml b/IOMC/EventVertexGenerators/test/BuildFile.xml
index 5ae3c99faedd1..42515760f664e 100644
--- a/IOMC/EventVertexGenerators/test/BuildFile.xml
+++ b/IOMC/EventVertexGenerators/test/BuildFile.xml
@@ -1,14 +1,16 @@
 <environment>
-  <use   name="FWCore/PluginManager"/>
-  <use   name="DataFormats/Common"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="boost"/>
-  <use   name="root"/>
-  <use   name="SimDataFormats/GeneratorProducts"/>
-  <library   file="VtxTester.cc" name="VtxSmearingTest">
-    <flags   EDM_PLUGIN="1"/>
+  <use name="FWCore/PluginManager"/>
+  <use name="DataFormats/Common"/>
+  <use name="FWCore/Framework"/>
+  <use name="boost"/>
+  <use name="root"/>
+  <use name="SimDataFormats/GeneratorProducts"/>
+  <library file="VtxTester.cc" name="VtxSmearingTest">
+    <flags EDM_PLUGIN="1"/>
   </library>
-  <library   file="BoostTester.cc" name="VtxSmearingBoostTest">
-    <flags   EDM_PLUGIN="1"/>
+
+  <library file="BoostTester.cc" name="VtxSmearingBoostTest">
+    <flags EDM_PLUGIN="1"/>
   </library>
+
 </environment>
diff --git a/IOMC/Input/BuildFile.xml b/IOMC/Input/BuildFile.xml
index 9f0ef87f94a10..b1ea4477ab7c4 100644
--- a/IOMC/Input/BuildFile.xml
+++ b/IOMC/Input/BuildFile.xml
@@ -1,9 +1,9 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/Sources"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="SimDataFormats/GeneratorProducts"/>
-<use   name="hepmc"/>
-<use   name="clhep"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/Sources"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Utilities"/>
+<use name="FWCore/PluginManager"/>
+<use name="SimDataFormats/GeneratorProducts"/>
+<use name="hepmc"/>
+<use name="clhep"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/IOMC/Input/plugins/BuildFile.xml b/IOMC/Input/plugins/BuildFile.xml
index 47317111dc4ae..dfdc4e6e4fab2 100644
--- a/IOMC/Input/plugins/BuildFile.xml
+++ b/IOMC/Input/plugins/BuildFile.xml
@@ -5,8 +5,8 @@
 <use name="boost"/>
 <use name="hepmc"/>
 <library name="GeneratorInterfaceHepMCWriter" file="HepMCEventWriter.cc">
-	<use name="FWCore/Framework"/>
-	<use name="FWCore/Sources"/>
-	<use name="SimDataFormats/GeneratorProducts"/>
-	<flags EDM_PLUGIN="1"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/Sources"/>
+  <use name="SimDataFormats/GeneratorProducts"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/IOMC/ParticleGuns/BuildFile.xml b/IOMC/ParticleGuns/BuildFile.xml
index 703d92851666a..f061134749833 100644
--- a/IOMC/ParticleGuns/BuildFile.xml
+++ b/IOMC/ParticleGuns/BuildFile.xml
@@ -1,8 +1,8 @@
-<use   name="boost"/>
-<use   name="FWCore/Framework"/>
-<use   name="SimDataFormats/GeneratorProducts"/>
-<use   name="SimGeneral/HepPDTRecord"/>
-<use   name="clhep"/>
-<use   name="hepmc"/>
-<use   name="heppdt"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="boost"/>
+<use name="FWCore/Framework"/>
+<use name="SimDataFormats/GeneratorProducts"/>
+<use name="SimGeneral/HepPDTRecord"/>
+<use name="clhep"/>
+<use name="hepmc"/>
+<use name="heppdt"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/IOMC/RandomEngine/BuildFile.xml b/IOMC/RandomEngine/BuildFile.xml
index 4a092d4f9a29e..429c47bc13492 100644
--- a/IOMC/RandomEngine/BuildFile.xml
+++ b/IOMC/RandomEngine/BuildFile.xml
@@ -1,13 +1,13 @@
-<use   name="DataFormats/Provenance"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="SimDataFormats/RandomEngine"/>
-<use   name="clhep"/>
-<use   name="rootcore"/>
-<use   name="rootmath"/>
+<use name="DataFormats/Provenance"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="FWCore/MessageLogger"/>
+<use name="SimDataFormats/RandomEngine"/>
+<use name="clhep"/>
+<use name="rootcore"/>
+<use name="rootmath"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/IOMC/RandomEngine/plugins/BuildFile.xml b/IOMC/RandomEngine/plugins/BuildFile.xml
index c6d5a7d0f3bea..b640f3a8e1bbf 100644
--- a/IOMC/RandomEngine/plugins/BuildFile.xml
+++ b/IOMC/RandomEngine/plugins/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Framework"/>
-<use   name="IOMC/RandomEngine"/>
-<library   file="Module.cc" name="IOMCRandomEnginePlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Framework"/>
+<use name="IOMC/RandomEngine"/>
+<library file="Module.cc" name="IOMCRandomEnginePlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/IOMC/RandomEngine/test/BuildFile.xml b/IOMC/RandomEngine/test/BuildFile.xml
index 6df0fbbb708b1..bace9dc3949d9 100644
--- a/IOMC/RandomEngine/test/BuildFile.xml
+++ b/IOMC/RandomEngine/test/BuildFile.xml
@@ -1,13 +1,14 @@
-<use   name="DataFormats/Provenance"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="IOMC/RandomEngine"/>
-<use   name="clhep"/>
-<library   file="TestRandomNumberServiceGlobal.cc" name="IOMCRandomEngineTestRandomNumberServiceGlobal">
-  <flags   EDM_PLUGIN="1"/>
+<use name="DataFormats/Provenance"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="IOMC/RandomEngine"/>
+<use name="clhep"/>
+<library file="TestRandomNumberServiceGlobal.cc" name="IOMCRandomEngineTestRandomNumberServiceGlobal">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<bin   file="TestIOMCRandomEngineService.cpp">
-  <flags   TEST_RUNNER_ARGS=" /bin/bash IOMC/RandomEngine/test testRandomService.sh"/>
+
+<bin file="TestIOMCRandomEngineService.cpp">
+  <flags TEST_RUNNER_ARGS=" /bin/bash IOMC/RandomEngine/test testRandomService.sh"/>
 </bin>