diff --git a/RecoParticleFlow/Benchmark/BuildFile.xml b/RecoParticleFlow/Benchmark/BuildFile.xml
index 6af6b9deaa204..cf7f05492ff4b 100644
--- a/RecoParticleFlow/Benchmark/BuildFile.xml
+++ b/RecoParticleFlow/Benchmark/BuildFile.xml
@@ -1,14 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/RecoParticleFlow/Configuration/plugins/BuildFile.xml b/RecoParticleFlow/Configuration/plugins/BuildFile.xml
index 59d1b3f1f27b6..aec1251b7bca0 100644
--- a/RecoParticleFlow/Configuration/plugins/BuildFile.xml
+++ b/RecoParticleFlow/Configuration/plugins/BuildFile.xml
@@ -1,7 +1,7 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/RecoParticleFlow/Configuration/test/BuildFile.xml b/RecoParticleFlow/Configuration/test/BuildFile.xml
index d850182a16d44..08f58d426b80d 100644
--- a/RecoParticleFlow/Configuration/test/BuildFile.xml
+++ b/RecoParticleFlow/Configuration/test/BuildFile.xml
@@ -1,28 +1,30 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/RecoParticleFlow/PFClusterProducer/BuildFile.xml b/RecoParticleFlow/PFClusterProducer/BuildFile.xml
index 707d8bd54b7a7..be5199e988a77 100644
--- a/RecoParticleFlow/PFClusterProducer/BuildFile.xml
+++ b/RecoParticleFlow/PFClusterProducer/BuildFile.xml
@@ -1,23 +1,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/RecoParticleFlow/PFClusterProducer/plugins/BuildFile.xml b/RecoParticleFlow/PFClusterProducer/plugins/BuildFile.xml
index c5da8d0e753fa..e9b08cbf4bb62 100644
--- a/RecoParticleFlow/PFClusterProducer/plugins/BuildFile.xml
+++ b/RecoParticleFlow/PFClusterProducer/plugins/BuildFile.xml
@@ -1,50 +1,50 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/RecoParticleFlow/PFClusterProducer/test/BuildFile.xml b/RecoParticleFlow/PFClusterProducer/test/BuildFile.xml
index 9823dc3e124a8..1b74ac95dbebb 100644
--- a/RecoParticleFlow/PFClusterProducer/test/BuildFile.xml
+++ b/RecoParticleFlow/PFClusterProducer/test/BuildFile.xml
@@ -1,18 +1,19 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/RecoParticleFlow/PFClusterTools/BuildFile.xml b/RecoParticleFlow/PFClusterTools/BuildFile.xml
index a1e4ba93b2c77..bf28c48d22a6c 100644
--- a/RecoParticleFlow/PFClusterTools/BuildFile.xml
+++ b/RecoParticleFlow/PFClusterTools/BuildFile.xml
@@ -1,11 +1,10 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
diff --git a/RecoParticleFlow/PFClusterTools/test/BuildFile.xml b/RecoParticleFlow/PFClusterTools/test/BuildFile.xml
index 5bc1f71e924ac..e6f732c3f8bde 100644
--- a/RecoParticleFlow/PFClusterTools/test/BuildFile.xml
+++ b/RecoParticleFlow/PFClusterTools/test/BuildFile.xml
@@ -1,10 +1,10 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/RecoParticleFlow/PFProducer/BuildFile.xml b/RecoParticleFlow/PFProducer/BuildFile.xml
index 6b102cf0ec6e6..fc07e515bb655 100644
--- a/RecoParticleFlow/PFProducer/BuildFile.xml
+++ b/RecoParticleFlow/PFProducer/BuildFile.xml
@@ -1,20 +1,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/RecoParticleFlow/PFProducer/plugins/BuildFile.xml b/RecoParticleFlow/PFProducer/plugins/BuildFile.xml
index 9b3a61b78f442..efffb9617d475 100644
--- a/RecoParticleFlow/PFProducer/plugins/BuildFile.xml
+++ b/RecoParticleFlow/PFProducer/plugins/BuildFile.xml
@@ -1,91 +1,91 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/RecoParticleFlow/PFProducer/test/BuildFile.xml b/RecoParticleFlow/PFProducer/test/BuildFile.xml
index bc99d6e8fdf6d..50e22630a89c7 100644
--- a/RecoParticleFlow/PFProducer/test/BuildFile.xml
+++ b/RecoParticleFlow/PFProducer/test/BuildFile.xml
@@ -1,90 +1,96 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/RecoParticleFlow/PFSimProducer/plugins/BuildFile.xml b/RecoParticleFlow/PFSimProducer/plugins/BuildFile.xml
index 9c5c79bd0ad97..e9ad22ae1f8f7 100644
--- a/RecoParticleFlow/PFSimProducer/plugins/BuildFile.xml
+++ b/RecoParticleFlow/PFSimProducer/plugins/BuildFile.xml
@@ -1,60 +1,61 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/RecoParticleFlow/PFTracking/BuildFile.xml b/RecoParticleFlow/PFTracking/BuildFile.xml
index e84341b336354..7b3cc6e16fa1c 100644
--- a/RecoParticleFlow/PFTracking/BuildFile.xml
+++ b/RecoParticleFlow/PFTracking/BuildFile.xml
@@ -1,33 +1,33 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/RecoParticleFlow/PFTracking/plugins/BuildFile.xml b/RecoParticleFlow/PFTracking/plugins/BuildFile.xml
index 9d39b761e1341..cf46b1f01abfc 100644
--- a/RecoParticleFlow/PFTracking/plugins/BuildFile.xml
+++ b/RecoParticleFlow/PFTracking/plugins/BuildFile.xml
@@ -1,27 +1,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/RecoParticleFlow/PFTracking/test/BuildFile.xml b/RecoParticleFlow/PFTracking/test/BuildFile.xml
index 4479767f00b8f..42bfd5928547f 100644
--- a/RecoParticleFlow/PFTracking/test/BuildFile.xml
+++ b/RecoParticleFlow/PFTracking/test/BuildFile.xml
@@ -1,12 +1,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+