diff --git a/FWCore/FWLite/BuildFile.xml b/FWCore/FWLite/BuildFile.xml
index 461f124c9d1a0..86cbe62d32672 100644
--- a/FWCore/FWLite/BuildFile.xml
+++ b/FWCore/FWLite/BuildFile.xml
@@ -2,6 +2,7 @@
 <use name="DataFormats/Provenance"/>
 <use name="FWCore/PluginManager"/>
 <use name="FWCore/Utilities"/>
+<use name="FWCore/Reflection"/>
 <use name="rootcore"/>
 <export>
   <lib name="1"/>
diff --git a/FWCore/Modules/BuildFile.xml b/FWCore/Modules/BuildFile.xml
index 341123e945d44..f547b0a833c07 100644
--- a/FWCore/Modules/BuildFile.xml
+++ b/FWCore/Modules/BuildFile.xml
@@ -5,5 +5,7 @@
 <use name="FWCore/Sources"/>
 <use name="FWCore/Utilities"/>
 <use name="DataFormats/Common"/>
+<use name="FWCore/Reflection"/>
+<use name="FWCore/ServiceRegistry"/>
 <use name="boost"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/FWCore/PrescaleService/BuildFile.xml b/FWCore/PrescaleService/BuildFile.xml
index 9e8fa8515c23c..e0d187a306920 100644
--- a/FWCore/PrescaleService/BuildFile.xml
+++ b/FWCore/PrescaleService/BuildFile.xml
@@ -1,6 +1,7 @@
 <use name="DataFormats/Provenance"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/Utilities"/>
+<use name="FWCore/ServiceRegistry"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/FWCore/PythonFramework/BuildFile.xml b/FWCore/PythonFramework/BuildFile.xml
index 363852df4932c..13223f824ab5c 100644
--- a/FWCore/PythonFramework/BuildFile.xml
+++ b/FWCore/PythonFramework/BuildFile.xml
@@ -1,5 +1,11 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/PythonParameterSet"/>
+<use name="FWCore/Concurrency"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
 <use name="boost"/>
 <use name="py2-pybind11"/>
 <export>
diff --git a/FWCore/ServiceRegistry/BuildFile.xml b/FWCore/ServiceRegistry/BuildFile.xml
index 79ef410843e56..e3086e319aeb7 100644
--- a/FWCore/ServiceRegistry/BuildFile.xml
+++ b/FWCore/ServiceRegistry/BuildFile.xml
@@ -2,6 +2,7 @@
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/PluginManager"/>
 <use name="FWCore/Utilities"/>
+<use name="FWCore/MessageLogger"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/FWCore/Services/BuildFile.xml b/FWCore/Services/BuildFile.xml
index f9f51d66f8c25..ece100f8425d5 100644
--- a/FWCore/Services/BuildFile.xml
+++ b/FWCore/Services/BuildFile.xml
@@ -3,6 +3,7 @@
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
+<use name="FWCore/Catalog"/>
 <use name="boost"/>
 <use name="tinyxml2"/>
 <use name="rootcore"/>
diff --git a/FWCore/SharedMemory/BuildFile.xml b/FWCore/SharedMemory/BuildFile.xml
index b81e2600bec9f..c7a5650c1d6b0 100644
--- a/FWCore/SharedMemory/BuildFile.xml
+++ b/FWCore/SharedMemory/BuildFile.xml
@@ -1,4 +1,5 @@
 <use name="boost"/>
+<use name="FWCore/Utilities"/>
 <use name="rootcore"/>
 <export>
   <lib name="1"/>
diff --git a/FWCore/Sources/BuildFile.xml b/FWCore/Sources/BuildFile.xml
index 8e095391dc3b5..874e1b87c202d 100644
--- a/FWCore/Sources/BuildFile.xml
+++ b/FWCore/Sources/BuildFile.xml
@@ -5,6 +5,8 @@
 <use name="FWCore/PluginManager"/>
 <use name="FWCore/Reflection"/>
 <use name="FWCore/Utilities"/>
+<use name="DataFormats/Common"/>
+<use name="FWCore/Version"/>
 <use name="tbb"/>
 <export>
   <lib name="1"/>
diff --git a/FWCore/TFWLiteSelectorTest/BuildFile.xml b/FWCore/TFWLiteSelectorTest/BuildFile.xml
index 88df63caa9b2f..21a7647fa4433 100644
--- a/FWCore/TFWLiteSelectorTest/BuildFile.xml
+++ b/FWCore/TFWLiteSelectorTest/BuildFile.xml
@@ -1,5 +1,8 @@
 <use name="DataFormats/Common"/>
 <use name="FWCore/TFWLiteSelector"/>
+<use name="DataFormats/TestObjects"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/Utilities"/>
 <use name="rootgraphics"/>
 <export>
   <lib name="1"/>
diff --git a/FWCore/TestProcessor/BuildFile.xml b/FWCore/TestProcessor/BuildFile.xml
index 1dac13262ab6d..c590ba41dd6bb 100644
--- a/FWCore/TestProcessor/BuildFile.xml
+++ b/FWCore/TestProcessor/BuildFile.xml
@@ -1,5 +1,12 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSetReader"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Provenance"/>
+<use name="FWCore/Concurrency"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
 <use name="boost"/>
 <export>
   <lib name="1"/>