diff --git a/solanaceae/ngc_ext/ngcext.hpp b/solanaceae/ngc_ext/ngcext.hpp
index df12c36..0820e1d 100644
--- a/solanaceae/ngc_ext/ngcext.hpp
+++ b/solanaceae/ngc_ext/ngcext.hpp
@@ -8,7 +8,6 @@
 
 #include <solanaceae/toxcore/tox_key.hpp>
 
-#include <array>
 #include <vector>
 
 namespace Events {
diff --git a/solanaceae/ngc_ft1/cca.hpp b/solanaceae/ngc_ft1/cca.hpp
index 1bc7ba1..4d8a9d2 100644
--- a/solanaceae/ngc_ft1/cca.hpp
+++ b/solanaceae/ngc_ft1/cca.hpp
@@ -5,15 +5,6 @@
 #include <cstddef>
 
 // TODO: refactor, more state tracking in ccai and seperate into flow and congestion algos
-inline bool isSkipSeqID(const std::pair<uint8_t, uint16_t>& a, const std::pair<uint8_t, uint16_t>& b) {
-	// this is not perfect, would need more ft id based history
-	if (a.first != b.first) {
-		return false; // we dont know
-	} else {
-		return a.second+1 != b.second;
-	}
-}
-
 struct CCAI {
 	public: // config
 		using SeqIDType = std::pair<uint8_t, uint16_t>; // tf_id, seq_id
diff --git a/solanaceae/ngc_ft1/ledbat.cpp b/solanaceae/ngc_ft1/ledbat.cpp
index f4f86b8..fa0b6dc 100644
--- a/solanaceae/ngc_ft1/ledbat.cpp
+++ b/solanaceae/ngc_ft1/ledbat.cpp
@@ -14,6 +14,15 @@
 
 // https://youtu.be/0HRwNSA-JYM
 
+static bool isSkipSeqID(const std::pair<uint8_t, uint16_t>& a, const std::pair<uint8_t, uint16_t>& b) {
+	// this is not perfect, would need more ft id based history
+	if (a.first != b.first) {
+		return false; // we dont know
+	} else {
+		return a.second+1 != b.second;
+	}
+}
+
 inline constexpr bool PLOTTING = false;
 
 LEDBAT::LEDBAT(size_t maximum_segment_data_size) : CCAI(maximum_segment_data_size) {
diff --git a/solanaceae/ngc_ft1/ngcft1.hpp b/solanaceae/ngc_ft1/ngcft1.hpp
index 7182cd6..2640322 100644
--- a/solanaceae/ngc_ft1/ngcft1.hpp
+++ b/solanaceae/ngc_ft1/ngcft1.hpp
@@ -6,6 +6,7 @@
 #include <solanaceae/toxcore/tox_interface.hpp>
 
 #include <solanaceae/ngc_ext/ngcext.hpp>
+
 #include "./cca.hpp"
 
 #include "./rcv_buf.hpp"
diff --git a/solanaceae/ngc_ft1_sha1/sha1_ngcft1.cpp b/solanaceae/ngc_ft1_sha1/sha1_ngcft1.cpp
index e3bfe3c..f6e347d 100644
--- a/solanaceae/ngc_ft1_sha1/sha1_ngcft1.cpp
+++ b/solanaceae/ngc_ft1_sha1/sha1_ngcft1.cpp
@@ -28,10 +28,8 @@
 #include "./transfer_stats_systems.hpp"
 
 #include <iostream>
-#include <variant>
 #include <filesystem>
-#include <mutex>
-#include <future>
+#include <thread>
 #include <vector>
 
 namespace Message::Components {
diff --git a/solanaceae/ngc_ft1_sha1/sha1_ngcft1.hpp b/solanaceae/ngc_ft1_sha1/sha1_ngcft1.hpp
index b00b30c..e19169d 100644
--- a/solanaceae/ngc_ft1_sha1/sha1_ngcft1.hpp
+++ b/solanaceae/ngc_ft1_sha1/sha1_ngcft1.hpp
@@ -6,7 +6,6 @@
 #include <solanaceae/contact/contact_model3.hpp>
 #include <solanaceae/message3/registry_message_model.hpp>
 #include <solanaceae/tox_contacts/tox_contact_model2.hpp>
-#include <solanaceae/util/bitset.hpp>
 
 #include <solanaceae/ngc_ft1/ngcft1.hpp>
 
@@ -14,11 +13,8 @@
 #include "./sending_transfers.hpp"
 #include "./receiving_transfers.hpp"
 
-#include <entt/entity/registry.hpp>
-#include <entt/entity/handle.hpp>
 #include <entt/container/dense_map.hpp>
 
-#include <variant>
 #include <random>
 #include <atomic>
 #include <mutex>