diff --git a/firmware/common/manchester.cpp b/firmware/common/manchester.cpp
index 3862faccb..c6d1cb9be 100644
--- a/firmware/common/manchester.cpp
+++ b/firmware/common/manchester.cpp
@@ -23,7 +23,7 @@
 
 #include "string_format.hpp"
 
-ManchesterDecoder::DecodedSymbol ManchesterDecoder::operator[](const size_t index) const {
+DecodedSymbol ManchesterDecoder::operator[](const size_t index) const {
 	const size_t encoded_index = index * 2;
 	if( (encoded_index + 1) < packet.size() ) {
 		const auto value = packet[encoded_index + sense];
diff --git a/firmware/common/manchester.hpp b/firmware/common/manchester.hpp
index 50cae73f2..c2bc820da 100644
--- a/firmware/common/manchester.hpp
+++ b/firmware/common/manchester.hpp
@@ -29,13 +29,13 @@
 
 #include "baseband_packet.hpp"
 
+struct DecodedSymbol {
+	uint_fast8_t value;
+	uint_fast8_t error;
+};
+
 class ManchesterDecoder {
 public:
-	struct DecodedSymbol {
-		uint_fast8_t value;
-		uint_fast8_t error;
-	};
-
 	constexpr ManchesterDecoder(
 		const baseband::Packet& packet,
 		const size_t sense = 0
@@ -54,7 +54,7 @@ private:
 };
 
 template<typename T>
-T operator|(const T& l, const ManchesterDecoder::DecodedSymbol& r) {
+T operator|(const T& l, const DecodedSymbol& r) {
 	return l | r.value;
 }