diff --git a/src/platforms/common/cdcacm.h b/src/platforms/common/cdcacm.h
index ea84ef1..1a73655 100644
--- a/src/platforms/common/cdcacm.h
+++ b/src/platforms/common/cdcacm.h
@@ -33,8 +33,6 @@
 #include "usb.h"
 
 void usb_serial_set_config(usbd_device *dev, uint16_t wValue);
-/* Returns current usb configuration, or 0 if not configured. */
-uint16_t usb_get_config(void);
 
 bool gdb_uart_get_dtr(void);
 
diff --git a/src/platforms/common/usb.h b/src/platforms/common/usb.h
index 7becdfe..35d961f 100644
--- a/src/platforms/common/usb.h
+++ b/src/platforms/common/usb.h
@@ -45,4 +45,7 @@ extern uint16_t usb_config;
 
 void blackmagic_usb_init(void);
 
+/* Returns current usb configuration, or 0 if not configured. */
+uint16_t usb_get_config(void);
+
 #endif /*USB_H*/
diff --git a/src/platforms/stm32/usbuart.c b/src/platforms/stm32/usbuart.c
index 9c2f2c3..fc849f8 100644
--- a/src/platforms/stm32/usbuart.c
+++ b/src/platforms/stm32/usbuart.c
@@ -29,7 +29,7 @@
 #include <libopencm3/usb/cdc.h>
 
 #include "general.h"
-#include "cdcacm.h"
+#include "usb.h"
 
 #ifdef DMA_STREAM0
 #define dma_channel_reset(dma, channel) dma_stream_reset(dma, channel)
diff --git a/src/platforms/tm4c/usbuart.c b/src/platforms/tm4c/usbuart.c
index 647037f..e3800df 100644
--- a/src/platforms/tm4c/usbuart.c
+++ b/src/platforms/tm4c/usbuart.c
@@ -19,8 +19,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "general.h"
-#include "cdcacm.h"
 
 #include <libopencm3/cm3/nvic.h>
 #include <libopencm3/cm3/scs.h>
@@ -29,6 +27,9 @@
 #include <libopencm3/lm4f/rcc.h>
 #include <libopencm3/lm4f/uart.h>
 
+#include "general.h"
+#include "usb.h"
+
 #define FIFO_SIZE 128
 
 /* RX Fifo buffer */