diff --git a/src/global/splitting/TimeframeSplitter.cc b/src/global/splitting/TimeframeSplitter.cc
index 50bbdaa242..725a7422de 100644
--- a/src/global/splitting/TimeframeSplitter.cc
+++ b/src/global/splitting/TimeframeSplitter.cc
@@ -6,11 +6,9 @@
 #include <JANA/JEvent.h>
 #include <JANA/Utils/JEventLevel.h>
 #include <JANA/Utils/JTypeInfo.h>
-#include <edm4hep/Vector3f.h>
-
 #include <cmath>
-#include <stdexcept>
 #include <numbers>
+#include <stdexcept>
 
 TimeframeSplitter::TimeframeSplitter() {
   SetTypeName(NAME_OF_THIS);
diff --git a/src/global/splitting/TimeframeSplitter.h b/src/global/splitting/TimeframeSplitter.h
index a1dd346152..83d32f8e76 100644
--- a/src/global/splitting/TimeframeSplitter.h
+++ b/src/global/splitting/TimeframeSplitter.h
@@ -6,7 +6,6 @@
 #include <JANA/Components/JComponent.h>
 #include <JANA/Components/JPodioOutput.h>
 #include <JANA/JEventUnfolder.h>
-#include <RtypesCore.h>
 #include <edm4eic/CalorimeterHitCollection.h>
 #include <edm4eic/MCRecoCalorimeterHitAssociationCollection.h>
 #include <edm4eic/MCRecoCalorimeterHitLinkCollection.h>
@@ -26,6 +25,7 @@
 #include <stddef.h>
 #include <algorithm>
 #include <array>
+#include <cmath>
 #include <cstdint>
 #include <deque>
 #include <initializer_list>
@@ -37,8 +37,6 @@
 #include <utility>
 #include <variant>
 #include <vector>
-#include <optional>
-#include <tuple>
 
 struct TimeframeSplitter : public JEventUnfolder {
 
diff --git a/src/global/splitting/splitting.cc b/src/global/splitting/splitting.cc
index 4e6209538e..d8a194fdf0 100644
--- a/src/global/splitting/splitting.cc
+++ b/src/global/splitting/splitting.cc
@@ -6,8 +6,12 @@
 #include <JANA/Utils/JEventLevel.h>
 #include <JANA/Utils/JTypeInfo.h>
 #include <edm4eic/CalorimeterHit.h>
+#include <edm4eic/MutableCalorimeterHit.h>
+#include <edm4eic/MutableTrackerHit.h>
 #include <edm4eic/TrackerHit.h>
+#include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "TimeframeSplitter.h"