diff --git a/CUDADataFormats/CaloCommon/BuildFile.xml b/CUDADataFormats/CaloCommon/BuildFile.xml
index 635af5bdaf6b3..2363b04fe7d34 100644
--- a/CUDADataFormats/CaloCommon/BuildFile.xml
+++ b/CUDADataFormats/CaloCommon/BuildFile.xml
@@ -1,4 +1,3 @@
-<use name="CUDADataFormats/Common" />
 <use name="HeterogeneousCore/CUDAUtilities"/>
 
 <export>
diff --git a/CUDADataFormats/EcalDigi/BuildFile.xml b/CUDADataFormats/EcalDigi/BuildFile.xml
index b7d25b0872646..b479a9f9db1ec 100644
--- a/CUDADataFormats/EcalDigi/BuildFile.xml
+++ b/CUDADataFormats/EcalDigi/BuildFile.xml
@@ -1,7 +1,6 @@
 <use name="CUDADataFormats/Common"/>
 <use name="CUDADataFormats/CaloCommon"/>
 <use name="DataFormats/Common"/>
-<use name="HeterogeneousCore/CUDAUtilities"/>
 
 <export>
   <lib   name="1"/>
diff --git a/CUDADataFormats/HcalDigi/BuildFile.xml b/CUDADataFormats/HcalDigi/BuildFile.xml
index fb871f16b69f0..2e8ab2fe58fcf 100644
--- a/CUDADataFormats/HcalDigi/BuildFile.xml
+++ b/CUDADataFormats/HcalDigi/BuildFile.xml
@@ -1,6 +1,6 @@
 <use name="DataFormats/Common"/>
 <use name="CUDADataFormats/CaloCommon"/>
-<use name="HeterogeneousCore/CUDAUtilities"/>
+<use name="CUDADataFormats/Common"/>
 <use name="cuda"/>
 
 <export>
diff --git a/HeterogeneousCore/CUDACore/BuildFile.xml b/HeterogeneousCore/CUDACore/BuildFile.xml
index 8454f44f3f1ae..a62395dc96d0c 100644
--- a/HeterogeneousCore/CUDACore/BuildFile.xml
+++ b/HeterogeneousCore/CUDACore/BuildFile.xml
@@ -4,7 +4,6 @@
   <use name="FWCore/ServiceRegistry"/>
   <use name="FWCore/ParameterSet"/>
   <use name="CUDADataFormats/Common"/>
-  <use name="DataFormats/Provenance"/>
   <use name="HeterogeneousCore/CUDAServices"/>
   <use name="cuda"/>
   <export>
diff --git a/HeterogeneousCore/CUDACore/test/BuildFile.xml b/HeterogeneousCore/CUDACore/test/BuildFile.xml
index 91f3a28137571..0cd9316b34b69 100644
--- a/HeterogeneousCore/CUDACore/test/BuildFile.xml
+++ b/HeterogeneousCore/CUDACore/test/BuildFile.xml
@@ -5,9 +5,7 @@
     <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>
diff --git a/HeterogeneousCore/CUDAServices/BuildFile.xml b/HeterogeneousCore/CUDAServices/BuildFile.xml
index 945d272ba8530..3c4c6a843fba8 100644
--- a/HeterogeneousCore/CUDAServices/BuildFile.xml
+++ b/HeterogeneousCore/CUDAServices/BuildFile.xml
@@ -1,5 +1,4 @@
 <iftool name="cuda">
-  <use name="FWCore/Framework"/>
   <use name="FWCore/ServiceRegistry"/>
   <use name="FWCore/ParameterSet"/>
   <use name="FWCore/MessageLogger"/>
diff --git a/HeterogeneousCore/CUDAServices/plugins/BuildFile.xml b/HeterogeneousCore/CUDAServices/plugins/BuildFile.xml
index 0928247e400d7..b9bd22319cc8c 100644
--- a/HeterogeneousCore/CUDAServices/plugins/BuildFile.xml
+++ b/HeterogeneousCore/CUDAServices/plugins/BuildFile.xml
@@ -2,12 +2,8 @@
   <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"/>
diff --git a/HeterogeneousCore/CUDATest/BuildFile.xml b/HeterogeneousCore/CUDATest/BuildFile.xml
index 80750b6fdf294..e50f088dd19fc 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="CUDADataFormats/Common"/>
   <use name="rootcore"/>
 </iftool>
diff --git a/HeterogeneousCore/CUDATest/plugins/BuildFile.xml b/HeterogeneousCore/CUDATest/plugins/BuildFile.xml
index c26ad21c16a90..e12fb032e7f8d 100644
--- a/HeterogeneousCore/CUDATest/plugins/BuildFile.xml
+++ b/HeterogeneousCore/CUDATest/plugins/BuildFile.xml
@@ -1,8 +1,8 @@
 <iftool name="cuda-gcc-support">
   <library file="*.cc *.cu" name="HeterogeneousCoreCUDATestPlugins">
     <flags EDM_PLUGIN="1"/>
+    <use name="CUDADataFormats/Common"/>
     <use name="FWCore/Framework"/>
-    <use name="FWCore/PluginManager"/>
     <use name="FWCore/ParameterSet"/>
     <use name="HeterogeneousCore/CUDACore"/>
     <use name="HeterogeneousCore/CUDAUtilities"/>
diff --git a/HeterogeneousCore/MPIServices/plugins/BuildFile.xml b/HeterogeneousCore/MPIServices/plugins/BuildFile.xml
index e857a457b005f..d26dc62c3c213 100644
--- a/HeterogeneousCore/MPIServices/plugins/BuildFile.xml
+++ b/HeterogeneousCore/MPIServices/plugins/BuildFile.xml
@@ -1,4 +1,4 @@
 <use name="openmpi"/>
-<use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
 <flags EDM_PLUGIN="1"/>