diff --git a/sbncode/CAFMaker/RecoUtils/CMakeLists.txt b/sbncode/CAFMaker/RecoUtils/CMakeLists.txt
index 000c8a775..2e43e0fdc 100644
--- a/sbncode/CAFMaker/RecoUtils/CMakeLists.txt
+++ b/sbncode/CAFMaker/RecoUtils/CMakeLists.txt
@@ -2,16 +2,13 @@
 art_make_library( LIBRARY_NAME caf_RecoUtils
                   SOURCE  RecoUtils.cc
                   LIBRARIES
-                    sbnanaobj::StandardRecord
-                    art::Framework_Core
+                  PRIVATE
                     art::Framework_Services_Registry
-                    art::Framework_Principal
-                    art::Persistency_Common
-                    art::Utilities canvas::canvas
-                    cetlib::cetlib cetlib_except::cetlib_except
                     larsim::MCCheater_BackTrackerService_service
                     larsim::MCCheater_ParticleInventoryService_service
-                    larcorealg::Geometry
-                    sbnanaobj::StandardRecord
+                  PUBLIC
+                    lardataalg::DetectorInfo
+                    lardataobj::RecoBase
+                    canvas::canvas
                 )
 install_headers()
diff --git a/sbncode/CAFMaker/RecoUtils/RecoUtils.cc b/sbncode/CAFMaker/RecoUtils/RecoUtils.cc
index d8e9f210f..278a0661a 100644
--- a/sbncode/CAFMaker/RecoUtils/RecoUtils.cc
+++ b/sbncode/CAFMaker/RecoUtils/RecoUtils.cc
@@ -1,5 +1,16 @@
 #include "RecoUtils.h"
 
+// framework
+#include "art/Framework/Services/Registry/ServiceHandle.h"
+ 
+// LArSoft
+#include "larsim/MCCheater/BackTrackerService.h"
+#include "larsim/MCCheater/ParticleInventoryService.h"
+ 
+// C++
+#include <map>
+
+
 std::vector<std::pair<int, float>> CAFRecoUtils::AllTrueParticleIDEnergyMatches(const detinfo::DetectorClocksData &clockData, const std::vector<art::Ptr<recob::Hit> >& hits, bool rollup_unsaved_ids) {
   art::ServiceHandle<cheat::BackTrackerService> bt_serv;
   std::map<int, float> trackIDToEDepMap;
diff --git a/sbncode/CAFMaker/RecoUtils/RecoUtils.h b/sbncode/CAFMaker/RecoUtils/RecoUtils.h
index a99121d8e..55907b482 100644
--- a/sbncode/CAFMaker/RecoUtils/RecoUtils.h
+++ b/sbncode/CAFMaker/RecoUtils/RecoUtils.h
@@ -10,32 +10,14 @@
 ///////////////////////////////////////////////
 
 // framework
-#include "art/Framework/Principal/Event.h"
-#include "fhiclcpp/ParameterSet.h" 
-#include "art/Framework/Principal/Handle.h" 
-#include "art/Framework/Services/Registry/ServiceHandle.h"
 #include "canvas/Persistency/Common/Ptr.h" 
-#include "canvas/Persistency/Common/PtrVector.h" 
-#include "canvas/Persistency/Common/FindManyP.h"
 
 // LArSoft
-#include "nusimdata/SimulationBase/MCParticle.h"
-#include "nusimdata/SimulationBase/MCTruth.h"
+#include "lardataalg/DetectorInfo/DetectorClocksData.h"
 #include "lardataobj/RecoBase/Hit.h"
-#include "lardataobj/RecoBase/Track.h"
-#include "lardataobj/RecoBase/Shower.h"
-//#include "lardataobj/AnalysisBase/MVAPIDResult.h"
-//#include "lardataobj/AnalysisBase/ParticleID.h"
-#include "larsim/MCCheater/BackTrackerService.h"
-#include "larsim/MCCheater/ParticleInventoryService.h"
-#include "larcore/Geometry/Geometry.h"
-
-// c++
-#include <vector>
-#include <map>
 
-// ROOT
-#include "TTree.h"
+// C++
+#include <vector>
 
 namespace CAFRecoUtils{
 
diff --git a/sbncode/TPCReco/CMakeLists.txt b/sbncode/TPCReco/CMakeLists.txt
index c5f85eba3..46de1daa4 100644
--- a/sbncode/TPCReco/CMakeLists.txt
+++ b/sbncode/TPCReco/CMakeLists.txt
@@ -17,6 +17,7 @@ cet_build_plugin(NuVertexChargeTree art::module
         art::Utilities canvas::canvas
         cetlib::cetlib cetlib_except::cetlib_except
         ROOT::X3d
+        ROOT::Tree
         messagefacility::MF_MessageLogger
         lardata::DetectorInfoServices_DetectorClocksServiceStandard_service
         sbnobj::Common_Reco
diff --git a/sbncode/TPCReco/CalorimetryAnalysis/CMakeLists.txt b/sbncode/TPCReco/CalorimetryAnalysis/CMakeLists.txt
index b9ad49157..8a4739c60 100644
--- a/sbncode/TPCReco/CalorimetryAnalysis/CMakeLists.txt
+++ b/sbncode/TPCReco/CalorimetryAnalysis/CMakeLists.txt
@@ -16,6 +16,7 @@ cet_build_plugin( CalorimetryAnalysis art::module
                             caf_RecoUtils
                             larreco::RecoAlg
                             lardataobj::AnalysisBase
+                            lardataobj::Simulation
                             lardataobj::RecoBase
                             larcorealg::Geometry
                             larcore::Geometry_Geometry_service
diff --git a/sbncode/TPCReco/CalorimetryAnalysis/CalorimetryAnalysis_module.cc b/sbncode/TPCReco/CalorimetryAnalysis/CalorimetryAnalysis_module.cc
index f85f953db..c857625ff 100644
--- a/sbncode/TPCReco/CalorimetryAnalysis/CalorimetryAnalysis_module.cc
+++ b/sbncode/TPCReco/CalorimetryAnalysis/CalorimetryAnalysis_module.cc
@@ -3,9 +3,12 @@
 
 #include <iostream>
 #include <map>
+#include <array>
+#include <vector>
 
 #include "TDatabasePDG.h"
 #include "TParticlePDG.h"
+#include "TTree.h"
 #include "art/Framework/Core/EDAnalyzer.h"
 #include "canvas/Utilities/InputTag.h"
 #include "fhiclcpp/ParameterSet.h"
@@ -30,6 +33,7 @@
 
 #include "larreco/RecoAlg/TrackMomentumCalculator.h"
 
+#include "lardataobj/Simulation/SimChannel.h"
 #include "lardataobj/RecoBase/PFParticle.h"
 #include "lardataobj/RecoBase/Shower.h"
 #include "lardataobj/RecoBase/Slice.h"
@@ -37,6 +41,7 @@
 #include "lardataobj/RecoBase/Wire.h"
 #include "lardataobj/RecoBase/Hit.h"
 #include "lardataobj/RecoBase/Cluster.h"
+#include "lardataobj/RecoBase/SpacePoint.h"
 #include "lardataobj/AnalysisBase/Calorimetry.h"
 #include "lardataobj/AnalysisBase/ParticleID.h"
 #include "lardataobj/AnalysisBase/T0.h"
@@ -56,6 +61,7 @@
 #include "lardataalg/DetectorInfo/DetectorPropertiesStandard.h"
 #include "lardata/DetectorInfoServices/DetectorPropertiesService.h"
 #include "lardata/DetectorInfoServices/DetectorClocksService.h"
+#include "larsim/MCCheater/BackTrackerService.h"
 
 // #include "larpandora/LArPandoraInterface/LArPandoraHelper.h"
 
diff --git a/sbncode/TPCReco/NuVertexChargeTree_module.cc b/sbncode/TPCReco/NuVertexChargeTree_module.cc
index 8f6ab4357..7ac0d78df 100644
--- a/sbncode/TPCReco/NuVertexChargeTree_module.cc
+++ b/sbncode/TPCReco/NuVertexChargeTree_module.cc
@@ -14,6 +14,7 @@
 #include "messagefacility/MessageLogger/MessageLogger.h"
 
 #include "art_root_io/TFileService.h"
+#include "TTree.h"
 
 #include "sbncode/CAFMaker/RecoUtils/RecoUtils.h"
 #include "lardataobj/RecoBase/Hit.h"