diff --git a/Makefile b/Makefile
index 74b888eb8..cda4d0421 100644
--- a/Makefile
+++ b/Makefile
@@ -105,6 +105,12 @@ STDPERIPH_DIR	 = $(ROOT)/lib/main/STM32F10x_StdPeriph_Driver
 
 STDPERIPH_SRC = $(notdir $(wildcard $(STDPERIPH_DIR)/src/*.c))
 
+EXCLUDES	= stm32f10x_crc.c \
+		stm32f10x_cec.c \
+		stm32f10x_can.c
+
+STDPERIPH_SRC := $(filter-out ${EXCLUDES}, $(STDPERIPH_SRC))
+
 # Search path and source files for the CMSIS sources
 VPATH		:= $(VPATH):$(CMSIS_DIR)/CM3/CoreSupport:$(CMSIS_DIR)/CM3/DeviceSupport/ST/STM32F10x
 CMSIS_SRC	 = $(notdir $(wildcard $(CMSIS_DIR)/CM3/CoreSupport/*.c \
@@ -129,6 +135,12 @@ STDPERIPH_DIR	 = $(ROOT)/lib/main/STM32F10x_StdPeriph_Driver
 
 STDPERIPH_SRC = $(notdir $(wildcard $(STDPERIPH_DIR)/src/*.c))
 
+EXCLUDES	= stm32f10x_crc.c \
+		stm32f10x_cec.c \
+		stm32f10x_can.c
+
+STDPERIPH_SRC := $(filter-out ${EXCLUDES}, $(STDPERIPH_SRC))
+
 # Search path and source files for the CMSIS sources
 VPATH		:= $(VPATH):$(CMSIS_DIR)/CM3/CoreSupport:$(CMSIS_DIR)/CM3/DeviceSupport/ST/STM32F10x
 CMSIS_SRC	 = $(notdir $(wildcard $(CMSIS_DIR)/CM3/CoreSupport/*.c \
@@ -355,6 +367,7 @@ CJMCU_SRC	 = startup_stm32f10x_md_gcc.S \
 		   drivers/system_stm32f10x.c \
 		   drivers/timer.c \
 		   drivers/timer_stm32f10x.c \
+		   blackbox/blackbox.c \
 		   hardware_revision.c \
 		   $(COMMON_SRC)
 
diff --git a/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_conf.h b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_conf.h
index a390e78f4..9b31e0afb 100644
--- a/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_conf.h
+++ b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_conf.h
@@ -32,8 +32,8 @@
 /* Includes ------------------------------------------------------------------*/
 /* Comment the line below to disable peripheral header file inclusion */
 #include "stm32f30x_adc.h"
-#include "stm32f30x_can.h"
-#include "stm32f30x_crc.h"
+//#include "stm32f30x_can.h"
+//#include "stm32f30x_crc.h"
 #include "stm32f30x_comp.h"
 #include "stm32f30x_dac.h"
 #include "stm32f30x_dbgmcu.h"
diff --git a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x_conf.h b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x_conf.h
index 1865daf1e..0c8603d8a 100755
--- a/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x_conf.h
+++ b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x_conf.h
@@ -27,9 +27,9 @@
 /* Uncomment/Comment the line below to enable/disable peripheral header file inclusion */
 #include "stm32f10x_adc.h"
 #include "stm32f10x_bkp.h"
-#include "stm32f10x_can.h"
-#include "stm32f10x_cec.h"
-#include "stm32f10x_crc.h"
+//#include "stm32f10x_can.h"
+//#include "stm32f10x_cec.h"
+//#include "stm32f10x_crc.h"
 #include "stm32f10x_dac.h"
 #include "stm32f10x_dbgmcu.h"
 #include "stm32f10x_dma.h"