diff --git a/Makefile b/Makefile
index a46826b..9bf9e2c 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ CC_SRCS += $(wildcard $(SRC_DIR)/platform/$(PLATFORM)/*.cc)
 CC_SRCS += $(wildcard $(SRC_DIR)/application/$(APPLICATION)/*.cc)
 CC_OBJS = $(patsubst $(SRC_DIR)%,$(OBJ_DIR)%,$(patsubst %.cc,%.cc.o,$(CC_SRCS)))
 
-OBJS = $(NRF_A_OBJS) $(NRF_C_OBJS) $(C_OBJS) $(CC_OBJS)
+OBJS = $(A_OBJS) $(C_OBJS) $(CC_OBJS)
 
 TARGET = $(BIN_DIR)/$(TARGET_FILE)
 TARGET_HEX = $(patsubst %.elf,%.hex,$(TARGET))
@@ -92,13 +92,17 @@ $(TARGET_HEX): $(TARGET) $(THIS_MAKEFILE)
 	$(OBJCOPY) -O ihex $(TARGET) $(TARGET_HEX)
 	ln -sf $(shell pwd)/$@ $(shell pwd)/bin/firmware.hex
 
-$(OBJ_DIR)/%.d: $(SRC_DIR)/%.c $(THIS_MAKEFILE)
+$(OBJ_DIR)/%.d: $(SRC_DIR)/%.S $(THIS_MAKEFILE)
 	@mkdir -p $(dir $@)
-	$(CPP) -MM -MF $@ -MP -MT $(patsubst %.d,%.o,$@) $(C_FLAGS) $(CPP_FLAGS) $(patsubst $(OBJ_DIR)/%.d,$(SRC_DIR)/%.c,$@)
+	$(CPP) -MM -MF $@ -MP -MT $(patsubst %.d,%.o,$@) $(C_FLAGS) $(CPP_FLAGS) $(patsubst $(OBJ_DIR)/%.d,$(SRC_DIR)/%.S,$@)
 
-$(OBJ_DIR)/%.d: $(SRC_DIR)/%.cc $(THIS_MAKEFILE)
+$(OBJ_DIR)/%.c.d: $(SRC_DIR)/%.c $(THIS_MAKEFILE)
+	mkdir -p $(dir $@)
+	$(CPP) -MM -MF $@ -MP -MT $(patsubst %.c.d,%.c.o,$@) $(C_FLAGS) $(CPP_FLAGS) $(patsubst $(OBJ_DIR)/%.c.d,$(SRC_DIR)/%.c,$@)
+
+$(OBJ_DIR)/%.cc.d: $(SRC_DIR)/%.cc $(THIS_MAKEFILE)
 	@mkdir -p $(dir $@)
-	$(CPP) -MM -MF $@ -MP -MT $(patsubst %.d,%.o,$@) $(CXX_FLAGS) $(CPP_FLAGS) $(patsubst $(OBJ_DIR)/%.d,$(SRC_DIR)/%.cc,$@)
+	$(CPP) -MM -MF $@ -MP -MT $(patsubst %.cc.d,%.cc.o,$@) $(CXX_FLAGS) $(CPP_FLAGS) $(patsubst $(OBJ_DIR)/%.cc.d,$(SRC_DIR)/%.cc,$@)
 
 $(OBJ_DIR)/%.cc.o: $(SRC_DIR)/%.cc $(THIS_MAKEFILE)
 	@mkdir -p $(dir $@)
@@ -108,6 +112,12 @@ $(OBJ_DIR)/%.c.o: $(SRC_DIR)/%.c $(THIS_MAKEFILE)
 	@mkdir -p $(dir $@)
 	$(CC) -c $(CPP_FLAGS) $(C_FLAGS) $< -o $@
 
+$(OBJ_DIR)/%.o: $(SRC_DIR)/%.S $(THIS_MAKEFILE)
+	@mkdir -p $(dir $@)
+	$(CC) -c $(ASMFLAGS) $< -o $@
+
 ifeq "$(findstring $(MAKECMDGOALS), clean distclean)" ""
--include $(patsubst %.o,%.d,$(OBJS))
+include $(patsubst %.o,%.d,$(A_OBJS))
+include $(patsubst %.c.o,%.c.d,$(C_OBJS))
+include $(patsubst %.cc.o,%.cc.d,$(CC_OBJS))
 endif
diff --git a/build_system/platform/nrf52/Makefile b/build_system/platform/nrf52/Makefile
index a83fdfa..f72714d 100644
--- a/build_system/platform/nrf52/Makefile
+++ b/build_system/platform/nrf52/Makefile
@@ -7,10 +7,10 @@ INCLUDES += src/platform/nrf52/sdk
 INCLUDES += src/platform/cm4/cmsis/include
 
 NRF_C_SRCS += src/platform/nrf52/sdk/system_nrf52.c
-NRF_C_OBJS = $(patsubst $(SRC_DIR)%,$(OBJ_DIR)%,$(patsubst %.c,%.c.o,$(NRF_C_SRCS)))
+C_OBJS += $(patsubst $(SRC_DIR)%,$(OBJ_DIR)%,$(patsubst %.c,%.c.o,$(NRF_C_SRCS)))
 
 NRF_A_SRCS = src/platform/nrf52/sdk/gcc_startup_nrf52.S
-NRF_A_OBJS = $(patsubst $(SRC_DIR)%,$(OBJ_DIR)/%,$(patsubst %.S,%.o,$(NRF_A_SRCS)))
+A_OBJS += $(patsubst $(SRC_DIR)%,$(OBJ_DIR)/%,$(patsubst %.S,%.o,$(NRF_A_SRCS)))
 
 C_FLAGS += -DBOARD_PCA10040
 C_FLAGS += -DBSP_DEFINES_ONLY
@@ -93,15 +93,3 @@ flash_softdevice: $(THIS_MAKEFILE)
 
 erase:
 	nrfjprog -f nrf52 --eraseall
-
-$(OBJ_DIR)/%.d: $(SRC_DIR)/%.S $(THIS_MAKEFILE)
-	@mkdir -p $(dir $@)
-	$(CPP) -MM -MF $@ -MP -MT $(patsubst %.d,%.o,$@) $(C_FLAGS) $(CPP_FLAGS) $(patsubst $(OBJ_DIR)/%.d,$(SRC_DIR)/%.S,$@)
-
-$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c $(THIS_MAKEFILE)
-	@mkdir -p $(dir $@)
-	$(CC) -std=c99 -MP -MD -c -o $@ $< $(C_FLAGS) $(CPP_FLAGS)
-
-$(OBJ_DIR)/%.o: $(SRC_DIR)/%.S $(THIS_MAKEFILE)
-	@mkdir -p $(dir $@)
-	$(CC) -c $(ASMFLAGS) $< -o $@