diff --git a/firmware/common/jtag.hpp b/firmware/common/jtag.hpp
index 23154485..57d258ac 100644
--- a/firmware/common/jtag.hpp
+++ b/firmware/common/jtag.hpp
@@ -22,6 +22,8 @@
 #ifndef __JTAG_H__
 #define __JTAG_H__
 
+#include "jtag_target.hpp"
+
 #include <cstdint>
 #include <cstddef>
 
@@ -29,20 +31,6 @@
 
 namespace jtag {
 
-class Target {
-public:
-	using bit_t = uint_fast8_t;
-
-	virtual ~Target() {
-	}
-
-	virtual void delay(const size_t n) = 0;
-	virtual bit_t clock(
-		const bit_t tms_value,
-		const bit_t tdi_value
-	) = 0;
-};
-
 class JTAG {
 public:
 	constexpr JTAG(
diff --git a/firmware/common/jtag_target.hpp b/firmware/common/jtag_target.hpp
new file mode 100644
index 00000000..455ae281
--- /dev/null
+++ b/firmware/common/jtag_target.hpp
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+
+#ifndef __JTAG_TARGET_H__
+#define __JTAG_TARGET_H__
+
+#include <cstdint>
+#include <cstddef>
+
+namespace jtag {
+
+class Target {
+public:
+	using bit_t = uint_fast8_t;
+
+	virtual ~Target() {
+	}
+
+	virtual void delay(const size_t n) = 0;
+	virtual bit_t clock(
+		const bit_t tms_value,
+		const bit_t tdi_value
+	) = 0;
+};
+
+} /* namespace jtag */
+
+#endif/*__JTAG_TARGET_H__*/
diff --git a/firmware/common/jtag_target_gpio.hpp b/firmware/common/jtag_target_gpio.hpp
index 0b26a6f5..180f4d04 100644
--- a/firmware/common/jtag_target_gpio.hpp
+++ b/firmware/common/jtag_target_gpio.hpp
@@ -22,7 +22,7 @@
 #ifndef __JTAG_TARGET_GPIO_H__
 #define __JTAG_TARGET_GPIO_H__
 
-#include "jtag.hpp"
+#include "jtag_target.hpp"
 
 #include <ch.h>