diff --git a/firmware/baseband/Makefile b/firmware/baseband/Makefile
index 2970d145..4d167f9a 100755
--- a/firmware/baseband/Makefile
+++ b/firmware/baseband/Makefile
@@ -155,6 +155,7 @@ CPPSRC = main.cpp \
          rssi_thread.cpp \
          audio.cpp \
          audio_dma.cpp \
+         audio_stats_collector.cpp \
          touch_dma.cpp \
          ../common/utility.cpp \
          ../common/chibios_cpp.cpp \
diff --git a/firmware/baseband/audio_stats_collector.cpp b/firmware/baseband/audio_stats_collector.cpp
new file mode 100644
index 00000000..a82e8f40
--- /dev/null
+++ b/firmware/baseband/audio_stats_collector.cpp
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "audio_stats_collector.hpp"
+
+#include "utility.hpp"
+
+void AudioStatsCollector::consume_audio_buffer(const buffer_s16_t& src) {
+	auto src_p = src.p;
+	const auto src_end = &src.p[src.count];
+	while(src_p < src_end) {
+		const auto sample = *(src_p++);
+		const uint64_t sample_squared = sample * sample;
+		squared_sum += sample_squared;
+		if( sample_squared > max_squared ) {
+			max_squared = sample_squared;
+		}
+	}
+}
+
+bool AudioStatsCollector::update_stats(const size_t sample_count, const size_t sampling_rate) {
+	count += sample_count;
+
+	const size_t samples_per_update = sampling_rate * update_interval;
+
+	if( count >= samples_per_update ) {
+		const float squared_sum_f = squared_sum;
+		const float max_squared_f = max_squared;
+		const float squared_avg_f = squared_sum_f / count;
+		statistics.rms_db = complex16_mag_squared_to_dbv_norm(squared_avg_f);
+		statistics.max_db = complex16_mag_squared_to_dbv_norm(max_squared_f);
+		statistics.count = count;
+
+		squared_sum = 0;
+		max_squared = 0;
+		count = 0;
+
+		return true;
+	} else {
+		return false;
+	}
+}
diff --git a/firmware/baseband/audio_stats_collector.hpp b/firmware/baseband/audio_stats_collector.hpp
index 15405673..1193fd0d 100644
--- a/firmware/baseband/audio_stats_collector.hpp
+++ b/firmware/baseband/audio_stats_collector.hpp
@@ -22,9 +22,8 @@
 #ifndef __AUDIO_STATS_COLLECTOR_H__
 #define __AUDIO_STATS_COLLECTOR_H__
 
-#include "buffer.hpp"
+#include "dsp_types.hpp"
 #include "message.hpp"
-#include "utility.hpp"
 
 #include <cstdint>
 #include <cstddef>
@@ -55,41 +54,9 @@ private:
 
 	AudioStatistics statistics;
 
-	void consume_audio_buffer(const buffer_s16_t& src) {
-		auto src_p = src.p;
-		const auto src_end = &src.p[src.count];
-		while(src_p < src_end) {
-			const auto sample = *(src_p++);
-			const uint64_t sample_squared = sample * sample;
-			squared_sum += sample_squared;
-			if( sample_squared > max_squared ) {
-				max_squared = sample_squared;
-			}
-		}
-	}
+	void consume_audio_buffer(const buffer_s16_t& src);
 
-	bool update_stats(const size_t sample_count, const size_t sampling_rate) {
-		count += sample_count;
-
-		const size_t samples_per_update = sampling_rate * update_interval;
-
-		if( count >= samples_per_update ) {
-			const float squared_sum_f = squared_sum;
-			const float max_squared_f = max_squared;
-			const float squared_avg_f = squared_sum_f / count;
-			statistics.rms_db = complex16_mag_squared_to_dbv_norm(squared_avg_f);
-			statistics.max_db = complex16_mag_squared_to_dbv_norm(max_squared_f);
-			statistics.count = count;
-
-			squared_sum = 0;
-			max_squared = 0;
-			count = 0;
-
-			return true;
-		} else {
-			return false;
-		}
-	}
+	bool update_stats(const size_t sample_count, const size_t sampling_rate);
 };
 
 #endif/*__AUDIO_STATS_COLLECTOR_H__*/