diff --git a/firmware/baseband/packet_builder.hpp b/firmware/baseband/packet_builder.hpp
index edf50357..3d756a7c 100644
--- a/firmware/baseband/packet_builder.hpp
+++ b/firmware/baseband/packet_builder.hpp
@@ -29,6 +29,20 @@
 
 #include "bit_pattern.hpp"
 
+struct NeverMatch {
+	bool operator()(const BitHistory&, const size_t) const {
+		return false;
+	}
+};
+
+struct FixedLength {
+	bool operator()(const BitHistory&, const size_t symbols_received) const {
+		return symbols_received >= length;
+	}
+
+	const size_t length;
+};
+
 template<typename PreambleMatcher, typename UnstuffMatcher, typename EndMatcher>
 class PacketBuilder {
 public:
diff --git a/firmware/baseband/proc_tpms.hpp b/firmware/baseband/proc_tpms.hpp
index 0bde7d68..dc10259a 100644
--- a/firmware/baseband/proc_tpms.hpp
+++ b/firmware/baseband/proc_tpms.hpp
@@ -37,20 +37,6 @@
 #include <cstddef>
 #include <bitset>
 
-struct NeverMatch {
-	bool operator()(const BitHistory&, const size_t) const {
-		return false;
-	}
-};
-
-struct FixedLength {
-	bool operator()(const BitHistory&, const size_t symbols_received) const {
-		return symbols_received >= length;
-	}
-
-	const size_t length;
-};
-
 // Translate+rectangular filter
 // sample=153.6k, deviation=38400, symbol=19200
 // Length: 8 taps, 1 symbols, 2 cycles of sinusoid