diff --git a/Globals.h b/Globals.h
index 9e18082..82d4f8e 100644
--- a/Globals.h
+++ b/Globals.h
@@ -21,15 +21,6 @@
 
 #if defined(STM32F4XX) || defined(STM32F4)
 #include "stm32f4xx.h"
-#include "stm32f4xx_gpio.h"
-#include "stm32f4xx_rcc.h"
-#include "stm32f4xx_dac.h"
-#include "stm32f4xx_adc.h"
-#include "stm32f4xx_tim.h"
-#include "stm32f4xx_usart.h"
-#include "misc.h"
-#include <string.h>
-#include <stddef.h>
 #else
 #include <Arduino.h>
 #endif
@@ -42,11 +33,7 @@
 #error "Unknown processor type"
 #endif
 
-#if defined(STM32F4XX) || defined(STM32F4)
-#include "cmsis.h"
-#else
 #include <arm_math.h>
-#endif
 
 enum MMDVM_STATE {
   STATE_IDLE      = 0,
diff --git a/Makefile b/Makefile
index 96cd0e9..f5816d1 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ CXXSOURCES=$(shell find . -name '*.cpp')
 INC=$(shell find . -name '*.h' -exec dirname {} \; | uniq)
 INCLUDES=$(INC:%=-I%)
 # Find libraries
-INCLUDES_LIBS=libarm_cortexM4lf_math.a
+INCLUDES_LIBS=STM32F4XX_Lib/CMSIS/Lib/GCC/libarm_cortexM4lf_math.a
 LINK_LIBS=
 # Create object list
 OBJECTS=$(ASOURCES:%.s=%.o)
@@ -70,6 +70,7 @@ $(BINDIR)/$(BINHEX): $(BINDIR)/$(BINELF)
 	@echo "Objcopy from ELF to IHEX complete!\n"
 
 $(BINDIR)/$(BINELF): $(OBJECTS)
+	@mkdir -p $(@D)
 	$(CXX) $(OBJECTS) $(LDFLAGS) -o $@
 	@echo "Linking complete!\n"
 	$(SIZE) $(BINDIR)/$(BINELF)