diff --git a/offline/packages/CaloReco/CaloTowerBuilder.cc b/offline/packages/CaloReco/CaloTowerBuilder.cc
index 2d0f31a017..9d439e4c24 100644
--- a/offline/packages/CaloReco/CaloTowerBuilder.cc
+++ b/offline/packages/CaloReco/CaloTowerBuilder.cc
@@ -13,9 +13,12 @@
 #include <ffarawobjects/CaloPacket.h>
 #include <ffarawobjects/CaloPacketContainer.h>
 
+#include <cdbobjects/CDBTTree.h>  // for CDBTTree
+
+#include <ffamodules/CDBInterface.h>
+
 #include <fun4all/Fun4AllReturnCodes.h>
 #include <fun4all/SubsysReco.h>  // for SubsysReco
-#include <phool/recoConsts.h>
 
 #include <phool/PHCompositeNode.h>
 #include <phool/PHIODataNode.h>    // for PHIODataNode
@@ -23,10 +26,7 @@
 #include <phool/PHNodeIterator.h>  // for PHNodeIterator
 #include <phool/PHObject.h>        // for PHObject
 #include <phool/getClass.h>
-
-#include <cdbobjects/CDBTTree.h>  // for CDBTTree
-
-#include <ffamodules/CDBInterface.h>
+#include <phool/recoConsts.h>
 
 #include <Event/Event.h>
 #include <Event/EventTypes.h>
@@ -58,6 +58,7 @@ CaloTowerBuilder::~CaloTowerBuilder()
 {
   delete cdbttree;
   delete cdbttree_tbt_zs;
+  delete cdbttree_sepd_map;
   delete WaveformProcessing;
 }
 
diff --git a/offline/packages/mbd/MbdSig.cc b/offline/packages/mbd/MbdSig.cc
index 65de1006fc..8c65012756 100644
--- a/offline/packages/mbd/MbdSig.cc
+++ b/offline/packages/mbd/MbdSig.cc
@@ -7,12 +7,14 @@
 #include <TFile.h>
 #include <TGraphErrors.h>
 #include <TRatioPlot.h>
+#include <TH1.h>
 #include <TH2.h>
 #include <TMath.h>
 #include <TPad.h>
 #include <TSpectrum.h>
 #include <TSpline.h>
 #include <TTree.h>
+#include <TVirtualFitter.h>
 
 #include <algorithm>
 #include <fstream>
@@ -140,6 +142,8 @@ MbdSig::~MbdSig()
   {
     _pileupfile->close();
   }
+  // ROOT keeps the current fitter as a process-wide cache after Fit().
+  TVirtualFitter::SetFitter(nullptr, 0);
   delete hRawPulse;
   delete hSubPulse;
   delete gRawPulse;
diff --git a/offline/packages/mbd/MbdSig.h b/offline/packages/mbd/MbdSig.h
index 69d5ca7bfd..a00607ba03 100644
--- a/offline/packages/mbd/MbdSig.h
+++ b/offline/packages/mbd/MbdSig.h
@@ -3,13 +3,16 @@
 
 #include "MbdRunningStats.h"
 
-#include <TH1.h>
+#include <Rtypes.h>
 
 #include <fstream>
+#include <limits>
 #include <vector>
 
 class TTree;
+class TF1;
 class TGraphErrors;
+class TH1;
 class TH2;
 class MbdCalib;