diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e3aa67a4..3c1643cee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,6 +51,7 @@ find_package(ifbeam REQUIRED )
 find_package(ifdhc REQUIRED )
 find_package(ifdh_art REQUIRED )
 find_package(Range-v3 REQUIRED )
+find_package(sbnalg REQUIRED )
 find_package(sbnobj REQUIRED )
 find_package(icarus_signal_processing REQUIRED )
 find_package(icarusalg REQUIRED )
diff --git a/icaruscode/Analysis/trigger/CMakeLists.txt b/icaruscode/Analysis/trigger/CMakeLists.txt
index 93695d925..5a5c9e3af 100644
--- a/icaruscode/Analysis/trigger/CMakeLists.txt
+++ b/icaruscode/Analysis/trigger/CMakeLists.txt
@@ -77,6 +77,7 @@ cet_build_plugin(TimeTrackTreeStorageCRT art::module
   icaruscode_CRTUtils
   icaruscode::PMT_Algorithms
   icaruscode::Decode_DataProducts
+  sbnalg::Utilities
   larcore::Geometry_Geometry_service
   larcorealg::Geometry
   lardataobj::AnalysisBase
diff --git a/icaruscode/Analysis/trigger/TimeTrackTreeStorageCRT_module.cc b/icaruscode/Analysis/trigger/TimeTrackTreeStorageCRT_module.cc
index 1cfa533e5..7aca675ce 100644
--- a/icaruscode/Analysis/trigger/TimeTrackTreeStorageCRT_module.cc
+++ b/icaruscode/Analysis/trigger/TimeTrackTreeStorageCRT_module.cc
@@ -17,7 +17,7 @@
 #include "icaruscode/Utilities/TrajectoryUtils.h"
 #include "icaruscode/Utilities/ArtAssociationCaches.h" // OneToOneAssociationCache
 #include "icarusalg/Utilities/TrackTimeInterval.h"
-#include "icarusalg/Utilities/AssnsCrosser.h"
+#include "sbnalg/Utilities/AssnsCrosser.h"
 #include "sbnobj/Common/CRT/CRTHit.hh"
 #include "sbnobj/Common/Trigger/ExtraTriggerInfo.h"
 
@@ -697,7 +697,7 @@ void sbn::TimeTrackTreeStorage::analyze(art::Event const& e)
   art::FindOneP<anab::T0> TrackT0s(tracks,e,fT0selProducer);
 
   // t0 from TPC (cathode crossing tracks)
-  icarus::ns::util::AssnsCrosser<recob::Track, recob::PFParticle, anab::T0> const
+  sbn::ns::util::AssnsCrosser<recob::Track, recob::PFParticle, anab::T0> const
   TrackTPCt0s{ e, fPFPproducer, fT0Producer };
 
   // optical flashes
diff --git a/icaruscode/PMT/CMakeLists.txt b/icaruscode/PMT/CMakeLists.txt
index a34d31b95..4265812a8 100644
--- a/icaruscode/PMT/CMakeLists.txt
+++ b/icaruscode/PMT/CMakeLists.txt
@@ -260,7 +260,7 @@ cet_build_plugin(ReassociatePMTbaselines art::module
     icaruscode::IcarusObj
     icaruscode::PMT_Algorithms
     icaruscode::PMT_Data
-    icarusalg::Utilities
+    sbnalg::Utilities
     sbnobj::ICARUS_PMT_Data
     lardata::headers
     lardataalg::headers
diff --git a/icaruscode/PMT/ReassociatePMTbaselines_module.cc b/icaruscode/PMT/ReassociatePMTbaselines_module.cc
index 3b0906d76..e7b2399eb 100644
--- a/icaruscode/PMT/ReassociatePMTbaselines_module.cc
+++ b/icaruscode/PMT/ReassociatePMTbaselines_module.cc
@@ -10,7 +10,7 @@
 #include "icaruscode/PMT/Algorithms/OpDetWaveformMetaUtils.h" // OpDetWaveformMetaMaker
 #include "icaruscode/PMT/Data/WaveformRMS.h"
 #include "icaruscode/IcarusObj/OpDetWaveformMeta.h"
-#include "icarusalg/Utilities/AssnsCrosser.h"
+#include "sbnalg/Utilities/AssnsCrosser.h"
 #include "sbnobj/ICARUS/PMT/Data/WaveformBaseline.h"
 
 // LArSoft libraries
@@ -480,9 +480,9 @@ void icarus::trigger::ReassociatePMTbaselines::produce
   
   // associate original metadata with (original) baselines:
   auto const metaToBaseline = makeAssnsCrosser(event,
-      icarus::ns::util::startFrom<sbn::OpDetWaveformMeta>{}
-    , icarus::ns::util::hopTo    <raw::OpDetWaveform>{ fOriginalWaveformTag }
-    , icarus::ns::util::hopTo    <icarus::WaveformBaseline>{ fBaselineTag }
+      sbn::ns::util::startFrom<sbn::OpDetWaveformMeta>{}
+    , sbn::ns::util::hopTo    <raw::OpDetWaveform>{ fOriginalWaveformTag }
+    , sbn::ns::util::hopTo    <icarus::WaveformBaseline>{ fBaselineTag }
     );
   
   // find which original metadata we need