diff --git a/HeterogeneousCore/CUDACore/BuildFile.xml b/HeterogeneousCore/CUDACore/BuildFile.xml
index a10567db16edb..13f4c5fbb5588 100644
--- a/HeterogeneousCore/CUDACore/BuildFile.xml
+++ b/HeterogeneousCore/CUDACore/BuildFile.xml
@@ -1,14 +1,13 @@
 <iftool name="cuda-gcc-support">
-<use name="FWCore/Concurrency"/>
-<use name="FWCore/Framework"/>
-<use name="FWCore/ServiceRegistry"/>
-<use name="FWCore/ParameterSet"/>
-<use name="CUDADataFormats/Common"/>
-<use name="DataFormats/Provenance"/>
-<use name="HeterogeneousCore/CUDAServices"/>
-<use name="cuda"/>
-
-<export>
+  <use name="FWCore/Concurrency"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ServiceRegistry"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="CUDADataFormats/Common"/>
+  <use name="DataFormats/Provenance"/>
+  <use name="HeterogeneousCore/CUDAServices"/>
+  <use name="cuda"/>
+  <export>
     <lib name="1"/>
-</export>
+  </export>
 </iftool>
diff --git a/HeterogeneousCore/CUDACore/test/BuildFile.xml b/HeterogeneousCore/CUDACore/test/BuildFile.xml
index 474f3cee1b3e8..00b64e2090a53 100644
--- a/HeterogeneousCore/CUDACore/test/BuildFile.xml
+++ b/HeterogeneousCore/CUDACore/test/BuildFile.xml
@@ -1,18 +1,18 @@
 <iftool name="cuda-gcc-support">
-<bin file="test_*.cc test_*.cu" name="testHeterogeneousCoreCUDACore">
-  <use name="CUDADataFormats/Common"/>
-  <use name="FWCore/ParameterSet"/>
-  <use name="FWCore/ParameterSetReader"/>
-  <use name="FWCore/PluginManager"/>
-  <use name="FWCore/ServiceRegistry"/>
-  <use name="FWCore/TestProcessor"/>
-  <use name="HeterogeneousCore/CUDACore"/>
-  <use name="HeterogeneousCore/CUDAServices"/>
-  <use name="catch2"/>
-  <use name="cuda"/>
-</bin>
-<bin file="testStreamEvent.cu" name="testHeterogeneousCoreCUDACoreStreamEvent">
-  <use name="HeterogeneousCore/CUDAUtilities"/>
-  <use name="cuda"/>
-</bin>
+  <bin file="test_*.cc test_*.cu" name="testHeterogeneousCoreCUDACore">
+    <use name="CUDADataFormats/Common"/>
+    <use name="FWCore/ParameterSet"/>
+    <use name="FWCore/ParameterSetReader"/>
+    <use name="FWCore/PluginManager"/>
+    <use name="FWCore/ServiceRegistry"/>
+    <use name="FWCore/TestProcessor"/>
+    <use name="HeterogeneousCore/CUDACore"/>
+    <use name="HeterogeneousCore/CUDAServices"/>
+    <use name="catch2"/>
+    <use name="cuda"/>
+  </bin>
+  <bin file="testStreamEvent.cu" name="testHeterogeneousCoreCUDACoreStreamEvent">
+    <use name="HeterogeneousCore/CUDAUtilities"/>
+    <use name="cuda"/>
+  </bin>
 </iftool>
diff --git a/HeterogeneousCore/CUDAServices/BuildFile.xml b/HeterogeneousCore/CUDAServices/BuildFile.xml
index c2d566baf5c1b..e063a0dd4e738 100644
--- a/HeterogeneousCore/CUDAServices/BuildFile.xml
+++ b/HeterogeneousCore/CUDAServices/BuildFile.xml
@@ -1,12 +1,11 @@
 <iftool name="cuda-gcc-support">
-<use name="FWCore/Framework"/>
-<use name="FWCore/ServiceRegistry"/>
-<use name="FWCore/ParameterSet"/>
-<use name="FWCore/MessageLogger"/>
-<use name="HeterogeneousCore/CUDAUtilities"/>
-<use name="cuda"/>
-
-<export>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ServiceRegistry"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="HeterogeneousCore/CUDAUtilities"/>
+  <use name="cuda"/>
+  <export>
     <lib name="1"/>
-</export>
+  </export>
 </iftool>
diff --git a/HeterogeneousCore/CUDAServices/bin/BuildFile.xml b/HeterogeneousCore/CUDAServices/bin/BuildFile.xml
index 68e32b64b4032..67201b8759d66 100644
--- a/HeterogeneousCore/CUDAServices/bin/BuildFile.xml
+++ b/HeterogeneousCore/CUDAServices/bin/BuildFile.xml
@@ -1,9 +1,8 @@
 <iftool name="cuda-gcc-support">
-<bin name="cudaComputeCapabilities" file="cudaComputeCapabilities.cpp">
-  <use name="cuda"/>
-</bin>
-
-<bin name="cudaIsEnabled" file="cudaIsEnabled.cpp">
-  <use name="cuda"/>
-</bin>
+  <bin name="cudaComputeCapabilities" file="cudaComputeCapabilities.cpp">
+    <use name="cuda"/>
+  </bin>
+  <bin name="cudaIsEnabled" file="cudaIsEnabled.cpp">
+    <use name="cuda"/>
+  </bin>
 </iftool>
diff --git a/HeterogeneousCore/CUDAServices/plugins/BuildFile.xml b/HeterogeneousCore/CUDAServices/plugins/BuildFile.xml
index 95857d74e7dfa..7c2d45f7476b9 100644
--- a/HeterogeneousCore/CUDAServices/plugins/BuildFile.xml
+++ b/HeterogeneousCore/CUDAServices/plugins/BuildFile.xml
@@ -1,17 +1,17 @@
 <iftool name="cuda-gcc-support">
-<use name="cuda"/>
-<use name="DataFormats/Common"/>
-<use name="DataFormats/Provenance"/>
-<use name="DataFormats/Streamer"/>
-<use name="FWCore/Concurrency"/>
-<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="HeterogeneousCore/CUDAServices"/>
-<library file="*.cc" name="HeterogeneousCoreCUDAServicesPlugins">
-  <flags EDM_PLUGIN="1"/>
-</library>
+  <use name="cuda"/>
+  <use name="DataFormats/Common"/>
+  <use name="DataFormats/Provenance"/>
+  <use name="DataFormats/Streamer"/>
+  <use name="FWCore/Concurrency"/>
+  <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="HeterogeneousCore/CUDAServices"/>
+  <library file="*.cc" name="HeterogeneousCoreCUDAServicesPlugins">
+    <flags EDM_PLUGIN="1"/>
+  </library>
 </iftool>
diff --git a/HeterogeneousCore/CUDAServices/test/BuildFile.xml b/HeterogeneousCore/CUDAServices/test/BuildFile.xml
index 020b3736617c5..35b1851961dc8 100644
--- a/HeterogeneousCore/CUDAServices/test/BuildFile.xml
+++ b/HeterogeneousCore/CUDAServices/test/BuildFile.xml
@@ -1,7 +1,7 @@
 <iftool name="cuda-gcc-support">
-<bin  file="testCUDAService.cpp test_main.cpp" name="testCUDAService">
-  <use  name="HeterogeneousCore/CUDAServices"/>
-  <use  name="cuda"/>
-  <use name="catch2"/>
-</bin>
+  <bin file="testCUDAService.cpp test_main.cpp" name="testCUDAService">
+    <use name="HeterogeneousCore/CUDAServices"/>
+    <use name="cuda"/>
+    <use name="catch2"/>
+  </bin>
 </iftool>
diff --git a/HeterogeneousCore/CUDATest/BuildFile.xml b/HeterogeneousCore/CUDATest/BuildFile.xml
index 84905be5e2db8..80750b6fdf294 100644
--- a/HeterogeneousCore/CUDATest/BuildFile.xml
+++ b/HeterogeneousCore/CUDATest/BuildFile.xml
@@ -1,5 +1,5 @@
 <iftool name="cuda-gcc-support">
-<use name="DataFormats/Common"/>
-<use name="HeterogeneousCore/CUDACore"/>
-<use name="rootcore"/>
+  <use name="DataFormats/Common"/>
+  <use name="HeterogeneousCore/CUDACore"/>
+  <use name="rootcore"/>
 </iftool>
diff --git a/HeterogeneousCore/CUDATest/plugins/BuildFile.xml b/HeterogeneousCore/CUDATest/plugins/BuildFile.xml
index 13f9ef6c06cd2..b253d3d344383 100644
--- a/HeterogeneousCore/CUDATest/plugins/BuildFile.xml
+++ b/HeterogeneousCore/CUDATest/plugins/BuildFile.xml
@@ -1,11 +1,11 @@
 <iftool name="cuda-gcc-support">
-<library file="*.cc *.cu" name="HeterogeneousCoreCUDATestPlugins">
-  <flags EDM_PLUGIN="1"/>
-  <use name="FWCore/Framework"/>
-  <use name="FWCore/PluginManager"/>
-  <use name="FWCore/ParameterSet"/>
-  <use name="HeterogeneousCore/CUDACore"/>
-  <use name="HeterogeneousCore/CUDAUtilities"/>
-  <use name="cuda"/>
-</library>
+  <library file="*.cc *.cu" name="HeterogeneousCoreCUDATestPlugins">
+    <flags EDM_PLUGIN="1"/>
+    <use name="FWCore/Framework"/>
+    <use name="FWCore/PluginManager"/>
+    <use name="FWCore/ParameterSet"/>
+    <use name="HeterogeneousCore/CUDACore"/>
+    <use name="HeterogeneousCore/CUDAUtilities"/>
+    <use name="cuda"/>
+  </library>
 </iftool>
diff --git a/HeterogeneousCore/CUDATest/test/BuildFile.xml b/HeterogeneousCore/CUDATest/test/BuildFile.xml
index 23f20762c629c..1fb501395e207 100644
--- a/HeterogeneousCore/CUDATest/test/BuildFile.xml
+++ b/HeterogeneousCore/CUDATest/test/BuildFile.xml
@@ -1,9 +1,8 @@
 <iftool name="cuda-gcc-support">
-<bin file="test*.cc" name="testHeterogeneousCoreCUDATest">
-  <use name="FWCore/TestProcessor"/>
-  <use name="HeterogeneousCore/CUDACore"/>
-  <use name="catch2"/>
-</bin>
-
-<test name="TestCUDATest" command="runtests.sh"/>
+  <bin file="test*.cc" name="testHeterogeneousCoreCUDATest">
+    <use name="FWCore/TestProcessor"/>
+    <use name="HeterogeneousCore/CUDACore"/>
+    <use name="catch2"/>
+  </bin>
+  <test name="TestCUDATest" command="runtests.sh"/>
 </iftool>
diff --git a/HeterogeneousCore/CUDAUtilities/BuildFile.xml b/HeterogeneousCore/CUDAUtilities/BuildFile.xml
index 1e2de51dc0053..87268b5cfb86a 100644
--- a/HeterogeneousCore/CUDAUtilities/BuildFile.xml
+++ b/HeterogeneousCore/CUDAUtilities/BuildFile.xml
@@ -1,11 +1,10 @@
 <iftool name="cuda-gcc-support">
-<use name="cub"/>
-<use name="cuda"/>
-<use name="eigen"/>
-<use name="FWCore/Utilities"/>
-<use name="FWCore/MessageLogger"/>
-
-<export>
+  <use name="cub"/>
+  <use name="cuda"/>
+  <use name="eigen"/>
+  <use name="FWCore/Utilities"/>
+  <use name="FWCore/MessageLogger"/>
+  <export>
     <lib name="1"/>
-</export>
+  </export>
 </iftool>
diff --git a/HeterogeneousCore/CUDAUtilities/test/BuildFile.xml b/HeterogeneousCore/CUDAUtilities/test/BuildFile.xml
index 5455860900400..ec2c62d557933 100644
--- a/HeterogeneousCore/CUDAUtilities/test/BuildFile.xml
+++ b/HeterogeneousCore/CUDAUtilities/test/BuildFile.xml
@@ -1,85 +1,65 @@
 <use name="HeterogeneousCore/CUDAUtilities"/>
-
 <iftool name="cuda-gcc-support">
-<bin file="assert_t.cu" name="cudaAssert_t">
-</bin>
-
-<bin file="assert_t.cu"    name="cudaAssert_debug">
-  <flags CUDA_FLAGS="-g -DGPU_DEBUG"/>
-</bin>
-
-<bin file="test_SimpleVector.cu" name="test_SimpleVector">
-  <flags CUDA_FLAGS="-g -DGPU_DEBUG"/>
-</bin>
-
-<bin file="cudastdAlgorithm_t.cpp">
-</bin>
-
-<bin file="cudastdAlgorithm_t.cu" name="gpuCudastdAlgorithm_t">
-  <flags CUDA_FLAGS="-g -DGPU_DEBUG"/>
-</bin>
-
-<bin file="radixSort_t.cu" name="gpuRadixSort_t">
-  <flags CUDA_FLAGS="-g -DGPU_DEBUG"/>
-</bin>
-
-<bin file="radixSort_t.cu" name="gpuRadixSort_debug">
-  <flags CUDA_FLAGS="-g -G -DGPU_DEBUG"/>
-  <flags REM_CUDA_FLAGS="--generate-line-info -lineinfo"/>
-</bin>
-
-<bin file="HistoContainer_t.cpp">
-  <flags CXXFLAGS="-g"/>
-</bin>
-
-<bin file="HistoContainer_t.cu" name="gpuHistoContainer_t">
-  <use name="cub"/>
-  <flags CUDA_FLAGS="-g -DGPU_DEBUG"/>
-</bin>
-
-<bin file="HistoContainer_t.cu" name="gpuHistoContainer_debug">
-  <use name="cub"/>
-  <flags CUDA_FLAGS="-g -G -DGPU_DEBUG"/>
-  <flags REM_CUDA_FLAGS="--generate-line-info -lineinfo"/>
-</bin>
-
-<bin file="OneHistoContainer_t.cu" name="gpuOneHistoContainer_t">
-  <use name="cub"/>
-  <flags CUDA_FLAGS="-g -DGPU_DEBUG"/>
-</bin>
-
-<bin file="AtomicPairCounter_t.cu" name="gpuAtomicPairCounter_t">
-  <flags CUDA_FLAGS="-g -DGPU_DEBUG"/>
-</bin>
-
-<bin file="OneToManyAssoc_t.cu" name="gpuOneToManyAssoc_t">
-  <use name="cub"/>
-  <flags CUDA_FLAGS="-g -DGPU_DEBUG"/>
-</bin>
-
-<bin file="OneToManyAssoc_t.cpp" name="cpuOneToManyAssoc_t">
-  <flags CXXFLAGS="-g -DGPU_DEBUG"/>
-</bin>
-
-<bin file="prefixScan_t.cu" name="gpuPrefixScan_t">
-  <use name="cub"/>
-  <flags CUDA_FLAGS="-g -DGPU_DEBUG"/>
-</bin>
-
-<bin file="testCatch2Main.cpp,device_unique_ptr_t.cpp,host_unique_ptr_t.cpp,host_noncached_unique_ptr_t.cpp,copyAsync_t.cpp,memsetAsync_t.cpp" name="cudaMemUtils_t">
-  <use name="catch2"/>
-</bin>
-
-
-<bin file="eigenSoA_t.cpp" name="cpuEigenSoA_t">
-  <use name="eigen"/>
-  <flags CXXFLAGS="-g -DGPU_DEBUG"/>
-</bin>
-
-<bin file="eigenSoA_t.cu" name="gpuEigenSoA_t">
-  <use name="eigen"/>
-  <flags CUDA_FLAGS="-g -DGPU_DEBUG"/>
-  <flags CXXFLAGS="-g -DGPU_DEBUG"/>
-</bin>
-
+  <bin file="assert_t.cu" name="cudaAssert_t">
+  </bin>
+  <bin file="assert_t.cu" name="cudaAssert_debug">
+    <flags CUDA_FLAGS="-g -DGPU_DEBUG"/>
+  </bin>
+  <bin file="test_SimpleVector.cu" name="test_SimpleVector">
+    <flags CUDA_FLAGS="-g -DGPU_DEBUG"/>
+  </bin>
+  <bin file="cudastdAlgorithm_t.cpp">
+  </bin>
+  <bin file="cudastdAlgorithm_t.cu" name="gpuCudastdAlgorithm_t">
+    <flags CUDA_FLAGS="-g -DGPU_DEBUG"/>
+  </bin>
+  <bin file="radixSort_t.cu" name="gpuRadixSort_t">
+    <flags CUDA_FLAGS="-g -DGPU_DEBUG"/>
+  </bin>
+  <bin file="radixSort_t.cu" name="gpuRadixSort_debug">
+    <flags CUDA_FLAGS="-g -G -DGPU_DEBUG"/>
+    <flags REM_CUDA_FLAGS="--generate-line-info -lineinfo"/>
+  </bin>
+  <bin file="HistoContainer_t.cpp">
+    <flags CXXFLAGS="-g"/>
+  </bin>
+  <bin file="HistoContainer_t.cu" name="gpuHistoContainer_t">
+    <use name="cub"/>
+    <flags CUDA_FLAGS="-g -DGPU_DEBUG"/>
+  </bin>
+  <bin file="HistoContainer_t.cu" name="gpuHistoContainer_debug">
+    <use name="cub"/>
+    <flags CUDA_FLAGS="-g -G -DGPU_DEBUG"/>
+    <flags REM_CUDA_FLAGS="--generate-line-info -lineinfo"/>
+  </bin>
+  <bin file="OneHistoContainer_t.cu" name="gpuOneHistoContainer_t">
+    <use name="cub"/>
+    <flags CUDA_FLAGS="-g -DGPU_DEBUG"/>
+  </bin>
+  <bin file="AtomicPairCounter_t.cu" name="gpuAtomicPairCounter_t">
+    <flags CUDA_FLAGS="-g -DGPU_DEBUG"/>
+  </bin>
+  <bin file="OneToManyAssoc_t.cu" name="gpuOneToManyAssoc_t">
+    <use name="cub"/>
+    <flags CUDA_FLAGS="-g -DGPU_DEBUG"/>
+  </bin>
+  <bin file="OneToManyAssoc_t.cpp" name="cpuOneToManyAssoc_t">
+    <flags CXXFLAGS="-g -DGPU_DEBUG"/>
+  </bin>
+  <bin file="prefixScan_t.cu" name="gpuPrefixScan_t">
+    <use name="cub"/>
+    <flags CUDA_FLAGS="-g -DGPU_DEBUG"/>
+  </bin>
+  <bin file="testCatch2Main.cpp,device_unique_ptr_t.cpp,host_unique_ptr_t.cpp,host_noncached_unique_ptr_t.cpp,copyAsync_t.cpp,memsetAsync_t.cpp" name="cudaMemUtils_t">
+    <use name="catch2"/>
+  </bin>
+  <bin file="eigenSoA_t.cpp" name="cpuEigenSoA_t">
+    <use name="eigen"/>
+    <flags CXXFLAGS="-g -DGPU_DEBUG"/>
+  </bin>
+  <bin file="eigenSoA_t.cu" name="gpuEigenSoA_t">
+    <use name="eigen"/>
+    <flags CUDA_FLAGS="-g -DGPU_DEBUG"/>
+    <flags CXXFLAGS="-g -DGPU_DEBUG"/>
+  </bin>
 </iftool>
diff --git a/HeterogeneousCore/SonicCore/BuildFile.xml b/HeterogeneousCore/SonicCore/BuildFile.xml
index 78155cf0eafb0..ad38619117433 100644
--- a/HeterogeneousCore/SonicCore/BuildFile.xml
+++ b/HeterogeneousCore/SonicCore/BuildFile.xml
@@ -3,6 +3,5 @@
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
-