diff --git a/flight/OpenPilot/System/inc/pios_config.h b/flight/OpenPilot/System/inc/pios_config.h
index 282f20fdf..1e2ce4e45 100644
--- a/flight/OpenPilot/System/inc/pios_config.h
+++ b/flight/OpenPilot/System/inc/pios_config.h
@@ -47,6 +47,7 @@
 #define PIOS_INCLUDE_COM
 #define PIOS_INCLUDE_SDCARD
 #define PIOS_INCLUDE_SETTINGS
+#define PIOS_INCLUDE_FREERTOS
 
 
 /* Defaults for Logging */
diff --git a/flight/PiOS/Common/pios_com.c b/flight/PiOS/Common/pios_com.c
index e4d3fcba9..4d878e3d2 100644
--- a/flight/PiOS/Common/pios_com.c
+++ b/flight/PiOS/Common/pios_com.c
@@ -52,8 +52,13 @@ int32_t PIOS_COM_Init(void)
 	receive_callback_func = NULL;
 
 	/* If any COM assignment: */
+#if defined(PIOS_INCLUDE_USART)
 	PIOS_USART_Init();
+#endif
+
+#if defined(PIOS_INCLUDE_USB_HID)
 	PIOS_USB_HID_Init(0);
+#endif
 
 	return ret;
 }