diff --git a/firmware/application/CMakeLists.txt b/firmware/application/CMakeLists.txt
index 81e1d4bd..856ed999 100644
--- a/firmware/application/CMakeLists.txt
+++ b/firmware/application/CMakeLists.txt
@@ -130,6 +130,7 @@ set(CPPSRC
 	rffc507x_spi.cpp
 	max2837.cpp
 	max5864.cpp
+	${COMMON}/buffer.cpp
 	debounce.cpp
 	touch.cpp
 	touch_adc.cpp
diff --git a/firmware/baseband/CMakeLists.txt b/firmware/baseband/CMakeLists.txt
index eade87c1..f029f7c0 100644
--- a/firmware/baseband/CMakeLists.txt
+++ b/firmware/baseband/CMakeLists.txt
@@ -106,6 +106,7 @@ set(CPPSRC
 	baseband_dma.cpp
 	${COMMON}/baseband_sgpio.cpp
 	${COMMON}/portapack_shared_memory.cpp
+	${COMMON}/buffer.cpp
 	baseband_thread.cpp
 	baseband_processor.cpp
 	baseband_stats_collector.cpp
diff --git a/firmware/common/buffer.cpp b/firmware/common/buffer.cpp
new file mode 100644
index 00000000..344b91a4
--- /dev/null
+++ b/firmware/common/buffer.cpp
@@ -0,0 +1,36 @@
+/*
+ * 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 "buffer.hpp"
+
+#if defined(LPC43XX_M4)
+#include "lpc43xx_m4.h"
+
+Timestamp Timestamp::now() {
+	// Code stolen from LPC43xx rtc_lld.c
+	Timestamp timestamp;
+    do {
+		timestamp.tv_time = LPC_RTC->CTIME0;
+		timestamp.tv_date = LPC_RTC->CTIME1;
+    } while( (timestamp.tv_time != LPC_RTC->CTIME0) || (timestamp.tv_date != LPC_RTC->CTIME1) );
+    return timestamp;
+}
+#endif
diff --git a/firmware/common/buffer.hpp b/firmware/common/buffer.hpp
index 2b3d7170..8676f6f5 100644
--- a/firmware/common/buffer.hpp
+++ b/firmware/common/buffer.hpp
@@ -33,21 +33,11 @@
  * a knot to tackle at the moment, though...
  */
 #if defined(LPC43XX_M4)
-#include "lpc43xx_m4.h"
-
 struct Timestamp {
 	uint32_t tv_date { 0 };
 	uint32_t tv_time { 0 };
 
-	static Timestamp now() {
-		// Code stolen from LPC43xx rtc_lld.c
-		Timestamp timestamp;
-	    do {
-			timestamp.tv_time = LPC_RTC->CTIME0;
-			timestamp.tv_date = LPC_RTC->CTIME1;
-	    } while( (timestamp.tv_time != LPC_RTC->CTIME0) || (timestamp.tv_date != LPC_RTC->CTIME1) );
-	    return timestamp;
-	}
+	static Timestamp now();
 };
 #endif