diff --git a/IOPool/Common/BuildFile.xml b/IOPool/Common/BuildFile.xml
index 286dfe469a9ee..5aae41ea341fc 100644
--- a/IOPool/Common/BuildFile.xml
+++ b/IOPool/Common/BuildFile.xml
@@ -1,5 +1,5 @@
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/IOPool/Common/bin/BuildFile.xml b/IOPool/Common/bin/BuildFile.xml
index 062d842066666..8f97da273ad1a 100644
--- a/IOPool/Common/bin/BuildFile.xml
+++ b/IOPool/Common/bin/BuildFile.xml
@@ -1,34 +1,36 @@
-<bin   name="edmProvDump" file="EdmProvDump.cc,">
-  <use   name="boost_program_options"/>
-  <use   name="rootcore"/>
-  <use   name="DataFormats/Common"/>
-  <use   name="DataFormats/Provenance"/>
-  <use   name="FWCore/Catalog"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="FWCore/ServiceRegistry"/>
-  <use   name="FWCore/Services"/>
-  <use   name="FWCore/Utilities"/>
-  <use   name="DataFormats/StdDictionaries"/>
-  <use   name="DataFormats/WrappedStdDictionaries"/>
+<bin name="edmProvDump" file="EdmProvDump.cc,">
+  <use name="boost_program_options"/>
+  <use name="rootcore"/>
+  <use name="DataFormats/Common"/>
+  <use name="DataFormats/Provenance"/>
+  <use name="FWCore/Catalog"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/ServiceRegistry"/>
+  <use name="FWCore/Services"/>
+  <use name="FWCore/Utilities"/>
+  <use name="DataFormats/StdDictionaries"/>
+  <use name="DataFormats/WrappedStdDictionaries"/>
 </bin>
-<bin   name="edmFileUtil" file="EdmFileUtil.cpp,CollUtil.cc">
-  <use   name="boost"/>
-  <use   name="boost_program_options"/>
-  <use   name="rootcore"/>
-  <use   name="roothistmatrix"/>
-  <use   name="DataFormats/Provenance"/>
-  <use   name="FWCore/Catalog"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="FWCore/PluginManager"/>
-  <use   name="FWCore/ServiceRegistry"/>
-  <use   name="FWCore/Services"/>
+
+<bin name="edmFileUtil" file="EdmFileUtil.cpp,CollUtil.cc">
+  <use name="boost"/>
+  <use name="boost_program_options"/>
+  <use name="rootcore"/>
+  <use name="roothistmatrix"/>
+  <use name="DataFormats/Provenance"/>
+  <use name="FWCore/Catalog"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/PluginManager"/>
+  <use name="FWCore/ServiceRegistry"/>
+  <use name="FWCore/Services"/>
 </bin>
-<bin   name="edmCopyUtil" file="EdmCopyUtil.cpp">
-  <use   name="boost"/>
-  <use   name="boost_program_options"/>
-  <use   name="Utilities/StorageFactory"/>
-  <use   name="FWCore/ServiceRegistry"/>
-  <use   name="FWCore/Services"/>
-  <use   name="FWCore/Catalog"/>
-  <use   name="FWCore/ParameterSet"/>
+
+<bin name="edmCopyUtil" file="EdmCopyUtil.cpp">
+  <use name="boost"/>
+  <use name="boost_program_options"/>
+  <use name="Utilities/StorageFactory"/>
+  <use name="FWCore/ServiceRegistry"/>
+  <use name="FWCore/Services"/>
+  <use name="FWCore/Catalog"/>
+  <use name="FWCore/ParameterSet"/>
 </bin>
diff --git a/IOPool/Common/test/BuildFile.xml b/IOPool/Common/test/BuildFile.xml
index a4c4529b32f0e..127df1a2d84b2 100644
--- a/IOPool/Common/test/BuildFile.xml
+++ b/IOPool/Common/test/BuildFile.xml
@@ -1,10 +1,12 @@
 <environment>
-  <bin   file="TestIOPoolCommon.cpp" name="TestEdmFastMerge">
-    <flags   TEST_RUNNER_ARGS=" /bin/bash IOPool/Common/test TestEdmFastMerge.sh"/>
-    <use   name="FWCore/Utilities"/>
+  <bin file="TestIOPoolCommon.cpp" name="TestEdmFastMerge">
+    <flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Common/test TestEdmFastMerge.sh"/>
+    <use name="FWCore/Utilities"/>
   </bin>
-  <bin   file="TestIOPoolCommon.cpp" name="TestEdmConfigDump">
-    <flags   TEST_RUNNER_ARGS=" /bin/bash IOPool/Common/test run_TestEdmConfigDump.sh"/>
-    <use   name="FWCore/Utilities"/>
+
+  <bin file="TestIOPoolCommon.cpp" name="TestEdmConfigDump">
+    <flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Common/test run_TestEdmConfigDump.sh"/>
+    <use name="FWCore/Utilities"/>
   </bin>
+
 </environment>
diff --git a/IOPool/Input/BuildFile.xml b/IOPool/Input/BuildFile.xml
index 2abce406e50db..a3facb908cebb 100644
--- a/IOPool/Input/BuildFile.xml
+++ b/IOPool/Input/BuildFile.xml
@@ -1,14 +1,14 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Provenance"/>
-<use   name="FWCore/Catalog"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Sources"/>
-<use   name="FWCore/Utilities"/>
-<use   name="IOPool/Common"/>
-<use   name="Utilities/StorageFactory"/>
-<use   name="clhep"/>
-<use   name="rootcore"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Provenance"/>
+<use name="FWCore/Catalog"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Sources"/>
+<use name="FWCore/Utilities"/>
+<use name="IOPool/Common"/>
+<use name="Utilities/StorageFactory"/>
+<use name="clhep"/>
+<use name="rootcore"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/IOPool/Input/test/BuildFile.xml b/IOPool/Input/test/BuildFile.xml
index 425fe96e26e7c..4b3d26e420fd4 100644
--- a/IOPool/Input/test/BuildFile.xml
+++ b/IOPool/Input/test/BuildFile.xml
@@ -1,12 +1,14 @@
 <environment>
-  <bin   file="TestPoolInput.cpp">
-    <flags   TEST_RUNNER_ARGS=" /bin/bash IOPool/Input/test TestPoolInput.sh"/>
-    <use   name="FWCore/Utilities"/>
+  <bin file="TestPoolInput.cpp">
+    <flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Input/test TestPoolInput.sh"/>
+    <use name="FWCore/Utilities"/>
   </bin>
-  <library   file="IOExerciser.cc" name="IOExerciser">
-    <flags   EDM_PLUGIN="1"/>
+
+  <library file="IOExerciser.cc" name="IOExerciser">
+    <flags EDM_PLUGIN="1"/>
     <use name="FWCore/Framework"/>
     <use name="FWCore/PluginManager"/>
     <use name="FWCore/ParameterSet"/>
   </library>
+
 </environment>
diff --git a/IOPool/Output/BuildFile.xml b/IOPool/Output/BuildFile.xml
index 2aaef5d8b79f3..29153e8aed0bf 100644
--- a/IOPool/Output/BuildFile.xml
+++ b/IOPool/Output/BuildFile.xml
@@ -1,14 +1,14 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Provenance"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/Version"/>
-<use   name="IOPool/Common"/>
-<use   name="IOPool/Provenance"/>
-<use   name="rootcore"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Provenance"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="FWCore/Version"/>
+<use name="IOPool/Common"/>
+<use name="IOPool/Provenance"/>
+<use name="rootcore"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/IOPool/Output/plugins/BuildFile.xml b/IOPool/Output/plugins/BuildFile.xml
index 9e8f78d3fceac..1b190ad35d6f0 100644
--- a/IOPool/Output/plugins/BuildFile.xml
+++ b/IOPool/Output/plugins/BuildFile.xml
@@ -1,4 +1,4 @@
-<use   name="IOPool/Output"/>
-<library   file="Module.cc" name="IOPoolOutputPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="IOPool/Output"/>
+<library file="Module.cc" name="IOPoolOutputPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/IOPool/Output/test/BuildFile.xml b/IOPool/Output/test/BuildFile.xml
index f5737ef14ad37..c1b878731f1c8 100644
--- a/IOPool/Output/test/BuildFile.xml
+++ b/IOPool/Output/test/BuildFile.xml
@@ -1,6 +1,7 @@
 <environment>
-  <bin   file="TestPoolOutput.cpp">
-    <flags   TEST_RUNNER_ARGS=" /bin/bash IOPool/Output/test TestPoolOutput.sh"/>
-    <use   name="FWCore/Utilities"/>
+  <bin file="TestPoolOutput.cpp">
+    <flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Output/test TestPoolOutput.sh"/>
+    <use name="FWCore/Utilities"/>
   </bin>
+
 </environment>
diff --git a/IOPool/Provenance/BuildFile.xml b/IOPool/Provenance/BuildFile.xml
index 1389dfb6c50f5..8f6edcbc3b839 100644
--- a/IOPool/Provenance/BuildFile.xml
+++ b/IOPool/Provenance/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="DataFormats/Provenance"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="rootcore"/>
+<use name="DataFormats/Provenance"/>
+<use name="FWCore/ParameterSet"/>
+<use name="rootcore"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/IOPool/SecondaryInput/test/BuildFile.xml b/IOPool/SecondaryInput/test/BuildFile.xml
index 8430d52f5da45..a4e896c6b24a0 100644
--- a/IOPool/SecondaryInput/test/BuildFile.xml
+++ b/IOPool/SecondaryInput/test/BuildFile.xml
@@ -1,13 +1,15 @@
 <environment>
-  <bin   file="TestSecondaryInput.cpp">
-    <flags   TEST_RUNNER_ARGS=" /bin/bash IOPool/SecondaryInput/test TestSecondaryInput.sh"/>
-    <use   name="FWCore/Utilities"/>
+  <bin file="TestSecondaryInput.cpp">
+    <flags TEST_RUNNER_ARGS=" /bin/bash IOPool/SecondaryInput/test TestSecondaryInput.sh"/>
+    <use name="FWCore/Utilities"/>
   </bin>
-  <library   file="SecondaryProducer.cc" name="SecondaryProducer">
-    <flags   EDM_PLUGIN="1"/>
-    <use   name="DataFormats/Provenance"/>
-    <use   name="FWCore/Framework"/>
-    <use   name="FWCore/Sources"/>
-    <use   name="FWCore/Utilities"/>
+
+  <library file="SecondaryProducer.cc" name="SecondaryProducer">
+    <flags EDM_PLUGIN="1"/>
+    <use name="DataFormats/Provenance"/>
+    <use name="FWCore/Framework"/>
+    <use name="FWCore/Sources"/>
+    <use name="FWCore/Utilities"/>
   </library>
+
 </environment>
diff --git a/IOPool/Streamer/BuildFile.xml b/IOPool/Streamer/BuildFile.xml
index a1ea8b6076a93..83e32f1a0e328 100644
--- a/IOPool/Streamer/BuildFile.xml
+++ b/IOPool/Streamer/BuildFile.xml
@@ -1,20 +1,20 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Provenance"/>
-<use   name="DataFormats/Streamer"/>
-<use   name="FWCore/Catalog"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Sources"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/Reflection"/>
-<use   name="FWCore/Version"/>
-<use   name="Utilities/StorageFactory"/>
-<use   name="rootcore"/>
-<use   name="zlib"/>
-<use   name="xz"/>
-<use   name="zstd"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Provenance"/>
+<use name="DataFormats/Streamer"/>
+<use name="FWCore/Catalog"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Sources"/>
+<use name="FWCore/Utilities"/>
+<use name="FWCore/Reflection"/>
+<use name="FWCore/Version"/>
+<use name="Utilities/StorageFactory"/>
+<use name="rootcore"/>
+<use name="zlib"/>
+<use name="xz"/>
+<use name="zstd"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/IOPool/Streamer/bin/BuildFile.xml b/IOPool/Streamer/bin/BuildFile.xml
index 2cd1a7f706fc5..0e142d0ce9084 100644
--- a/IOPool/Streamer/bin/BuildFile.xml
+++ b/IOPool/Streamer/bin/BuildFile.xml
@@ -1,10 +1,12 @@
 <environment>
-  <bin   file="DiagStreamerFile.cpp">
-    <use   name="FWCore/Utilities"/>
-    <use   name="IOPool/Streamer"/>
+  <bin file="DiagStreamerFile.cpp">
+    <use name="FWCore/Utilities"/>
+    <use name="IOPool/Streamer"/>
   </bin>
-  <bin   file="CalcAdler32.cpp">
-    <use   name="FWCore/Utilities"/>
-    <use   name="boost"/>
+
+  <bin file="CalcAdler32.cpp">
+    <use name="FWCore/Utilities"/>
+    <use name="boost"/>
   </bin>
+
 </environment>
diff --git a/IOPool/Streamer/plugins/BuildFile.xml b/IOPool/Streamer/plugins/BuildFile.xml
index caf8d715cd367..44b7611a2f3e9 100644
--- a/IOPool/Streamer/plugins/BuildFile.xml
+++ b/IOPool/Streamer/plugins/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="IOPool/Streamer"/>
-<library   file="*.cc" name="IOPoolStreamerPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="IOPool/Streamer"/>
+<library file="*.cc" name="IOPoolStreamerPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/IOPool/Streamer/test/BuildFile.xml b/IOPool/Streamer/test/BuildFile.xml
index 75f2f29d5053f..a8242dc66d1de 100644
--- a/IOPool/Streamer/test/BuildFile.xml
+++ b/IOPool/Streamer/test/BuildFile.xml
@@ -1,38 +1,47 @@
 <environment>
-  <use   name="FWCore/Framework"/>
-  <bin   file="EventMessageTest.cpp">
-    <use   name="IOPool/Streamer"/>
+  <use name="FWCore/Framework"/>
+  <bin file="EventMessageTest.cpp">
+    <use name="IOPool/Streamer"/>
   </bin>
-  <bin   file="ReadStreamerFile.cpp">
-    <use   name="IOPool/Streamer"/>
-    <use   name="FWCore/Catalog"/>
-    <use   name="FWCore/PluginManager"/>
-    <use   name="FWCore/ServiceRegistry"/>
-    <use   name="FWCore/Services"/>
-    <use   name="FWCore/ParameterSetReader"/>
-    <flags   TEST_RUNNER_ARGS="all"/>
-    <flags   PRE_TEST="WriteStreamerFile"/>
+
+  <bin file="ReadStreamerFile.cpp">
+    <use name="IOPool/Streamer"/>
+    <use name="FWCore/Catalog"/>
+    <use name="FWCore/PluginManager"/>
+    <use name="FWCore/ServiceRegistry"/>
+    <use name="FWCore/Services"/>
+    <use name="FWCore/ParameterSetReader"/>
+    <flags TEST_RUNNER_ARGS="all"/>
+    <flags PRE_TEST="WriteStreamerFile"/>
   </bin>
-  <bin   file="WriteStreamerFile.cpp">
-    <use   name="IOPool/Streamer"/>
+
+  <bin file="WriteStreamerFile.cpp">
+    <use name="IOPool/Streamer"/>
   </bin>
-  <bin   file="RunThis_t.cpp" name="NewStreamerUNCOMPRESSED">
-    <flags   TEST_RUNNER_ARGS="/bin/bash IOPool/Streamer/test RunUNCOMPRESSED.sh"/>
+
+  <bin file="RunThis_t.cpp" name="NewStreamerUNCOMPRESSED">
+    <flags TEST_RUNNER_ARGS="/bin/bash IOPool/Streamer/test RunUNCOMPRESSED.sh"/>
   </bin>
-  <bin   file="RunThis_t.cpp" name="NewStreamerZLIB">
-    <flags   TEST_RUNNER_ARGS=" /bin/bash IOPool/Streamer/test RunZLIB.sh"/>
+
+  <bin file="RunThis_t.cpp" name="NewStreamerZLIB">
+    <flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Streamer/test RunZLIB.sh"/>
   </bin>
-  <bin   file="RunThis_t.cpp" name="NewStreamerLZMA">
-    <flags   TEST_RUNNER_ARGS=" /bin/bash IOPool/Streamer/test RunLZMA.sh"/>
+
+  <bin file="RunThis_t.cpp" name="NewStreamerLZMA">
+    <flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Streamer/test RunLZMA.sh"/>
   </bin>
-  <bin   file="RunThis_t.cpp" name="NewStreamerZSTD">
-    <flags   TEST_RUNNER_ARGS=" /bin/bash IOPool/Streamer/test RunZSTD.sh"/>
+
+  <bin file="RunThis_t.cpp" name="NewStreamerZSTD">
+    <flags TEST_RUNNER_ARGS=" /bin/bash IOPool/Streamer/test RunZSTD.sh"/>
   </bin>
-  <library   file="StreamThingProducer.cc" name="StreamThingProducer">
-    <flags   EDM_PLUGIN="1"/>
-    <use   name="DataFormats/TestObjects"/>
+
+  <library file="StreamThingProducer.cc" name="StreamThingProducer">
+    <flags EDM_PLUGIN="1"/>
+    <use name="DataFormats/TestObjects"/>
   </library>
-  <library   file="StreamThingAnalyzer.cc" name="StreamThingAnalyzer">
-    <flags   EDM_PLUGIN="1"/>
+
+  <library file="StreamThingAnalyzer.cc" name="StreamThingAnalyzer">
+    <flags EDM_PLUGIN="1"/>
   </library>
+
 </environment>
diff --git a/IOPool/TFileAdaptor/BuildFile.xml b/IOPool/TFileAdaptor/BuildFile.xml
index 9ecd56ea04304..2ada9bfa04e0e 100644
--- a/IOPool/TFileAdaptor/BuildFile.xml
+++ b/IOPool/TFileAdaptor/BuildFile.xml
@@ -1,9 +1,9 @@
-<use   name="Utilities/StorageFactory"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Catalog"/>
-<use   name="rootcore"/>
+<use name="Utilities/StorageFactory"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Catalog"/>
+<use name="rootcore"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/IOPool/TFileAdaptor/test/BuildFile.xml b/IOPool/TFileAdaptor/test/BuildFile.xml
index 14c396e55c798..4eb073188d373 100644
--- a/IOPool/TFileAdaptor/test/BuildFile.xml
+++ b/IOPool/TFileAdaptor/test/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="FWCore/PluginManager"/>
-<use   name="IOPool/TFileAdaptor"/>
-<use   name="Utilities/StorageFactory"/>
-<use   name="rootcore"/>
-<bin   name="test_TFileAdaptor_TFile" file="tfileTest.cpp">
+<use name="FWCore/PluginManager"/>
+<use name="IOPool/TFileAdaptor"/>
+<use name="Utilities/StorageFactory"/>
+<use name="rootcore"/>
+<bin name="test_TFileAdaptor_TFile" file="tfileTest.cpp">
 </bin>