diff --git a/firmware/hackrf_usb/hackrf_usb.c b/firmware/hackrf_usb/hackrf_usb.c
index f25e7c9a..26bdbb34 100644
--- a/firmware/hackrf_usb/hackrf_usb.c
+++ b/firmware/hackrf_usb/hackrf_usb.c
@@ -22,9 +22,13 @@
 
 #include <stddef.h>
 
+#include <libopencm3/cm3/vector.h>
+
 #include <libopencm3/lpc43xx/gpio.h>
 #include <libopencm3/lpc43xx/m4/nvic.h>
 
+#include <streaming.h>
+
 #include "usb.h"
 #include "usb_standard_request.h"
 
@@ -37,7 +41,66 @@
 
 #include "usb_api_transceiver.h"
 #include "rf_path.h"
+#include "sgpio_isr.h"
 #include "usb_bulk_buffer.h"
+ 
+static volatile transceiver_mode_t _transceiver_mode = TRANSCEIVER_MODE_OFF;
+
+void set_transceiver_mode(const transceiver_mode_t new_transceiver_mode) {
+	baseband_streaming_disable();
+	
+	usb_endpoint_disable(&usb_endpoint_bulk_in);
+	usb_endpoint_disable(&usb_endpoint_bulk_out);
+	
+	_transceiver_mode = new_transceiver_mode;
+	
+	if( _transceiver_mode == TRANSCEIVER_MODE_RX ) {
+		gpio_clear(PORT_LED1_3, PIN_LED3);
+		gpio_set(PORT_LED1_3, PIN_LED2);
+		usb_endpoint_init(&usb_endpoint_bulk_in);
+		rf_path_set_direction(RF_PATH_DIRECTION_RX);
+		vector_table.irq[NVIC_SGPIO_IRQ] = sgpio_isr_rx;
+	} else if (_transceiver_mode == TRANSCEIVER_MODE_TX) {
+		gpio_clear(PORT_LED1_3, PIN_LED2);
+		gpio_set(PORT_LED1_3, PIN_LED3);
+		usb_endpoint_init(&usb_endpoint_bulk_out);
+		rf_path_set_direction(RF_PATH_DIRECTION_TX);
+		vector_table.irq[NVIC_SGPIO_IRQ] = sgpio_isr_tx;
+	} else {
+		gpio_clear(PORT_LED1_3, PIN_LED2);
+		gpio_clear(PORT_LED1_3, PIN_LED3);
+		rf_path_set_direction(RF_PATH_DIRECTION_OFF);
+		vector_table.irq[NVIC_SGPIO_IRQ] = sgpio_isr_rx;
+	}
+
+	if( _transceiver_mode != TRANSCEIVER_MODE_OFF ) {
+		baseband_streaming_enable();
+	}
+}
+
+transceiver_mode_t transceiver_mode(void) {
+	return _transceiver_mode;
+}
+
+usb_request_status_t usb_vendor_request_set_transceiver_mode(
+	usb_endpoint_t* const endpoint,
+	const usb_transfer_stage_t stage
+) {
+	if( stage == USB_TRANSFER_STAGE_SETUP ) {
+		switch( endpoint->setup.value ) {
+		case TRANSCEIVER_MODE_OFF:
+		case TRANSCEIVER_MODE_RX:
+		case TRANSCEIVER_MODE_TX:
+			set_transceiver_mode(endpoint->setup.value);
+			usb_transfer_schedule_ack(endpoint->in);
+			return USB_REQUEST_STATUS_OK;
+		default:
+			return USB_REQUEST_STATUS_STALL;
+		}
+	} else {
+		return USB_REQUEST_STATUS_OK;
+	}
+}
 
 static const usb_request_handler_fn vendor_request_handler[] = {
 	NULL,
diff --git a/firmware/hackrf_usb/usb_api_transceiver.c b/firmware/hackrf_usb/usb_api_transceiver.c
index 4b24fcdf..6566c9e2 100644
--- a/firmware/hackrf_usb/usb_api_transceiver.c
+++ b/firmware/hackrf_usb/usb_api_transceiver.c
@@ -22,60 +22,18 @@
 
 #include "usb_api_transceiver.h"
 
-#include <libopencm3/cm3/vector.h>
-
 #include <libopencm3/lpc43xx/gpio.h>
 
 #include <max2837.h>
 #include <rf_path.h>
-#include <streaming.h>
 #include <tuning.h>
 #include <usb.h>
 #include <usb_queue.h>
 
 #include <stddef.h>
 
-#include "sgpio_isr.h"
 #include "usb_endpoint.h"
 
-static volatile transceiver_mode_t _transceiver_mode = TRANSCEIVER_MODE_OFF;
-
-void set_transceiver_mode(const transceiver_mode_t new_transceiver_mode) {
-	baseband_streaming_disable();
-	
-	usb_endpoint_disable(&usb_endpoint_bulk_in);
-	usb_endpoint_disable(&usb_endpoint_bulk_out);
-	
-	_transceiver_mode = new_transceiver_mode;
-	
-	if( _transceiver_mode == TRANSCEIVER_MODE_RX ) {
-		gpio_clear(PORT_LED1_3, PIN_LED3);
-		gpio_set(PORT_LED1_3, PIN_LED2);
-		usb_endpoint_init(&usb_endpoint_bulk_in);
-		rf_path_set_direction(RF_PATH_DIRECTION_RX);
-		vector_table.irq[NVIC_SGPIO_IRQ] = sgpio_isr_rx;
-	} else if (_transceiver_mode == TRANSCEIVER_MODE_TX) {
-		gpio_clear(PORT_LED1_3, PIN_LED2);
-		gpio_set(PORT_LED1_3, PIN_LED3);
-		usb_endpoint_init(&usb_endpoint_bulk_out);
-		rf_path_set_direction(RF_PATH_DIRECTION_TX);
-		vector_table.irq[NVIC_SGPIO_IRQ] = sgpio_isr_tx;
-	} else {
-		gpio_clear(PORT_LED1_3, PIN_LED2);
-		gpio_clear(PORT_LED1_3, PIN_LED3);
-		rf_path_set_direction(RF_PATH_DIRECTION_OFF);
-		vector_table.irq[NVIC_SGPIO_IRQ] = sgpio_isr_rx;
-	}
-
-	if( _transceiver_mode != TRANSCEIVER_MODE_OFF ) {
-		baseband_streaming_enable();
-	}
-}
-
-transceiver_mode_t transceiver_mode(void) {
-	return _transceiver_mode;
-}
-
 typedef struct {
 	uint32_t freq_mhz;
 	uint32_t freq_hz;
@@ -90,26 +48,6 @@ typedef struct {
 
 set_sample_r_params_t set_sample_r_params;
 
-usb_request_status_t usb_vendor_request_set_transceiver_mode(
-	usb_endpoint_t* const endpoint,
-	const usb_transfer_stage_t stage
-) {
-	if( stage == USB_TRANSFER_STAGE_SETUP ) {
-		switch( endpoint->setup.value ) {
-		case TRANSCEIVER_MODE_OFF:
-		case TRANSCEIVER_MODE_RX:
-		case TRANSCEIVER_MODE_TX:
-			set_transceiver_mode(endpoint->setup.value);
-			usb_transfer_schedule_ack(endpoint->in);
-			return USB_REQUEST_STATUS_OK;
-		default:
-			return USB_REQUEST_STATUS_STALL;
-		}
-	} else {
-		return USB_REQUEST_STATUS_OK;
-	}
-}
-
 usb_request_status_t usb_vendor_request_set_baseband_filter_bandwidth(
 	usb_endpoint_t* const endpoint,
 	const usb_transfer_stage_t stage
diff --git a/firmware/hackrf_usb/usb_api_transceiver.h b/firmware/hackrf_usb/usb_api_transceiver.h
index ce686640..4cc98dd4 100644
--- a/firmware/hackrf_usb/usb_api_transceiver.h
+++ b/firmware/hackrf_usb/usb_api_transceiver.h
@@ -27,9 +27,6 @@
 #include <usb_type.h>
 #include <usb_request.h>
 
-void set_transceiver_mode(const transceiver_mode_t new_transceiver_mode);
-transceiver_mode_t transceiver_mode(void);
-
 usb_request_status_t usb_vendor_request_set_transceiver_mode(
 	usb_endpoint_t* const endpoint,
 	const usb_transfer_stage_t stage);