diff --git a/src/test/Makefile b/src/test/Makefile
index 4704c52961..f33bc3e12d 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -114,9 +114,9 @@ $(OBJECT_DIR)/gtest_main.a : $(OBJECT_DIR)/gtest-all.o $(OBJECT_DIR)/gtest_main.
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(AR) $(ARFLAGS) $@ $^ 
 
-# Builds a sample test.  A test should link with either gtest.a or
-# gtest_main.a, depending on whether it defines its own main()
-# function.
+-include $(OBJECT_DIR)/gtest-all.d \
+         $(OBJECT_DIR)/gtest_main.d
+
 
 # includes in test dir must override includes in user dir
 TEST_INCLUDE_DIRS := $(TEST_DIR) \
@@ -126,6 +126,8 @@ TEST_CFLAGS	 = $(addprefix -I,$(TEST_INCLUDE_DIRS))
 
 DEPS = $(TEST_BINARIES:%=%.d)
 
+
+
 $(OBJECT_DIR)/common/maths.o : \
 	$(USER_DIR)/common/maths.c \
 	$(USER_DIR)/common/maths.h \
@@ -151,6 +153,10 @@ $(OBJECT_DIR)/maths_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/maths_unittest.d \
+         $(OBJECT_DIR)/common/maths.d
+
+
 $(OBJECT_DIR)/common/filter.o : \
 	$(USER_DIR)/common/filter.c \
 	$(USER_DIR)/common/filter.h \
@@ -176,6 +182,10 @@ $(OBJECT_DIR)/common_filter_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/common_filter_unittest.d \
+         $(OBJECT_DIR)/common/filter.d
+
+
 $(OBJECT_DIR)/common/encoding.o : $(USER_DIR)/common/encoding.c $(USER_DIR)/common/encoding.h $(GTEST_HEADERS)
 	@echo "compiling $@" "$(STDOUT)"
 	@mkdir -p $(dir $@)
@@ -198,6 +208,10 @@ $(OBJECT_DIR)/encoding_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/common/encoding.d \
+         $(OBJECT_DIR)/encoding_unittest.d
+
+
 $(OBJECT_DIR)/common/typeconversion.o : \
 	$(USER_DIR)/common/typeconversion.c \
 	$(USER_DIR)/common/typeconversion.h \
@@ -224,6 +238,10 @@ $(OBJECT_DIR)/type_conversion_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/common/typeconversion.d \
+         $(OBJECT_DIR)/type_conversion_unittest.d
+
+
 $(OBJECT_DIR)/fc/runtime_config.o : \
 	$(USER_DIR)/fc/runtime_config.c \
 	$(USER_DIR)/fc/runtime_config.h \
@@ -261,6 +279,12 @@ $(OBJECT_DIR)/flight_imu_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/flight/imu.d \
+         $(OBJECT_DIR)/flight/altitudehold.d \
+         $(OBJECT_DIR)/flight_imu_unittest.d \
+         $(OBJECT_DIR)/common/maths.d
+
+
 $(OBJECT_DIR)/flight/altitudehold.o : \
 	$(USER_DIR)/flight/altitudehold.c \
 	$(USER_DIR)/flight/altitudehold.h \
@@ -287,6 +311,9 @@ $(OBJECT_DIR)/altitude_hold_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/flight/altitudehold.d \
+         $(OBJECT_DIR)/altitude_hold_unittest.d
+
 
 $(OBJECT_DIR)/common/gps_conversion.o : \
 	$(USER_DIR)/common/gps_conversion.c \
@@ -314,6 +341,8 @@ $(OBJECT_DIR)/gps_conversion_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/common/gps_conversion.d \
+         $(OBJECT_DIR)/gps_conversion_unittest.d
 
 
 $(OBJECT_DIR)/flight/mixer.o : \
@@ -353,6 +382,12 @@ $(OBJECT_DIR)/flight_mixer_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/flight/mixer.d \
+         $(OBJECT_DIR)/flight/servos.d \
+         $(OBJECT_DIR)/flight_mixer_unittest.d \
+         $(OBJECT_DIR)/common/maths.d
+
+
 $(OBJECT_DIR)/flight/failsafe.o : \
 	$(USER_DIR)/flight/failsafe.c \
 	$(USER_DIR)/flight/failsafe.h \
@@ -380,6 +415,9 @@ $(OBJECT_DIR)/flight_failsafe_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/flight/failsafe.d \
+         $(OBJECT_DIR)/flight_failsafe_unittest.d \
+         $(OBJECT_DIR)/common/maths.d
 
 
 $(OBJECT_DIR)/telemetry/hott.o : \
@@ -409,6 +447,10 @@ $(OBJECT_DIR)/telemetry_hott_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/telemetry/hott.d \
+         $(OBJECT_DIR)/telemetry_hott_unittest.d \
+         $(OBJECT_DIR)/common/gps_conversion.d
+
 
 $(OBJECT_DIR)/fc/rc_controls.o : \
 	$(USER_DIR)/fc/rc_controls.c \
@@ -437,6 +479,10 @@ $(OBJECT_DIR)/rc_controls_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/common/maths.d \
+         $(OBJECT_DIR)/fc/rc_controls.d \
+         $(OBJECT_DIR)/rc_controls_unittest.d
+
 
 $(OBJECT_DIR)/io/ledstrip.o : \
 	$(USER_DIR)/io/ledstrip.c \
@@ -464,6 +510,8 @@ $(OBJECT_DIR)/ledstrip_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/io/ledstrip.d \
+         $(OBJECT_DIR)/ledstrip_unittest.d
 
 
 $(OBJECT_DIR)/drivers/light_ws2811strip.o : \
@@ -492,6 +540,9 @@ $(OBJECT_DIR)/ws2811_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/drivers/light_ws2811strip.d \
+         $(OBJECT_DIR)/ws2811_unittest.d
+
 
 $(OBJECT_DIR)/io/serial.o : \
 	$(USER_DIR)/io/serial.c \
@@ -519,6 +570,10 @@ $(OBJECT_DIR)/io_serial_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/io/serial.d \
+         $(OBJECT_DIR)/io_serial_unittest.d
+
+
 $(OBJECT_DIR)/rx/rx.o : \
 	$(USER_DIR)/rx/rx.c \
 	$(USER_DIR)/rx/rx.h \
@@ -546,6 +601,11 @@ $(OBJECT_DIR)/rx_rx_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/rx/rx.d \
+         $(OBJECT_DIR)/rx_rx_unittest.d \
+         $(OBJECT_DIR)/common/maths.d
+
+
 $(OBJECT_DIR)/rx/crsf.o : \
 	$(USER_DIR)/rx/crsf.c \
 	$(USER_DIR)/rx/crsf.h \
@@ -574,6 +634,11 @@ $(OBJECT_DIR)/rx_crsf_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/rx/crsf.d \
+         $(OBJECT_DIR)/rx_crsf_unittest.d \
+         $(OBJECT_DIR)/common/maths.d
+
+
 $(OBJECT_DIR)/telemetry/crsf.o : \
 	$(USER_DIR)/telemetry/crsf.c \
 	$(USER_DIR)/telemetry/crsf.h \
@@ -609,6 +674,15 @@ $(OBJECT_DIR)/telemetry_crsf_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/rx/crsf.d \
+         $(OBJECT_DIR)/telemetry/crsf.d \
+         $(OBJECT_DIR)/telemetry_crsf_unittest.d \
+         $(OBJECT_DIR)/common/maths.d \
+         $(OBJECT_DIR)/common/streambuf.d \
+         $(OBJECT_DIR)/common/gps_conversion.d \
+         $(OBJECT_DIR)/fc/runtime_config.d
+
+
 $(OBJECT_DIR)/rx_ranges_unittest.o : \
 	$(TEST_DIR)/rx_ranges_unittest.cc \
 	$(USER_DIR)/rx/rx.h \
@@ -627,6 +701,10 @@ $(OBJECT_DIR)/rx_ranges_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/rx/rx.d \
+         $(OBJECT_DIR)/rx_ranges_unittest.d \
+         $(OBJECT_DIR)/common/maths.d
+
 
 $(OBJECT_DIR)/sensors/battery.o : $(USER_DIR)/sensors/battery.c $(USER_DIR)/sensors/battery.h $(GTEST_HEADERS)
 	@echo "compiling $@" "$(STDOUT)"
@@ -650,6 +728,11 @@ $(OBJECT_DIR)/battery_unittest : \
 
 	$(CXX) $(CXX_FLAGS) $^ -o $@
 
+-include $(OBJECT_DIR)/sensors/battery.d \
+         $(OBJECT_DIR)/common/maths.d \
+         $(OBJECT_DIR)/battery_unittest.d
+
+
 $(OBJECT_DIR)/drivers/barometer_ms5611.o : \
     $(USER_DIR)/drivers/barometer_ms5611.c \
     $(USER_DIR)/drivers/barometer_ms5611.h \
@@ -676,6 +759,10 @@ $(OBJECT_DIR)/baro_ms5611_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/drivers/barometer_ms5611.d \
+         $(OBJECT_DIR)/baro_ms5611_unittest.d
+
+
 $(OBJECT_DIR)/drivers/barometer_bmp085.o : \
     $(USER_DIR)/drivers/barometer_bmp085.c \
     $(USER_DIR)/drivers/barometer_bmp085.h \
@@ -703,6 +790,11 @@ $(OBJECT_DIR)/baro_bmp085_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/drivers/barometer_bmp085.d \
+         $(OBJECT_DIR)/drivers/io.d \
+         $(OBJECT_DIR)/baro_bmp085_unittest.d
+
+
 $(OBJECT_DIR)/drivers/barometer_bmp280.o : \
     $(USER_DIR)/drivers/barometer_bmp280.c \
     $(USER_DIR)/drivers/barometer_bmp280.h \
@@ -729,6 +821,10 @@ $(OBJECT_DIR)/baro_bmp280_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/drivers/barometer_bmp280.d \
+         $(OBJECT_DIR)/baro_bmp280_unittest.d
+
+
 $(OBJECT_DIR)/sensors/boardalignment.o : \
 	$(USER_DIR)/sensors/boardalignment.c \
 	$(USER_DIR)/sensors/boardalignment.h \
@@ -756,6 +852,10 @@ $(OBJECT_DIR)/alignsensor_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/common/maths.d \
+         $(OBJECT_DIR)/sensors/boardalignment.d \
+         $(OBJECT_DIR)/alignsensor_unittest.d
+
 
 $(OBJECT_DIR)/build/debug.o : \
     $(USER_DIR)/build/debug.c \
@@ -816,6 +916,15 @@ $(OBJECT_DIR)/sensor_gyro_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/build/debug.d \
+         $(OBJECT_DIR)/common/filter.d \
+         $(OBJECT_DIR)/common/maths.d \
+         $(OBJECT_DIR)/drivers/accgyro_fake.d \
+         $(OBJECT_DIR)/drivers/gyro_sync.d \
+         $(OBJECT_DIR)/sensors/boardalignment.d \
+         $(OBJECT_DIR)/sensors/gyro.d \
+         $(OBJECT_DIR)/sensor_gyro_unittest.d
+
 
 $(OBJECT_DIR)/build/version.o : \
 	$(USER_DIR)/build/version.c \
@@ -880,6 +989,12 @@ $(OBJECT_DIR)/cms_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/cms_unittest.d \
+         $(OBJECT_DIR)/common/typeconversion.d \
+         $(OBJECT_DIR)/drivers/display.d \
+         $(OBJECT_DIR)/cms/cms.d
+
+
 $(OBJECT_DIR)/drivers/io.o : \
 	$(USER_DIR)/drivers/io.c \
 	$(USER_DIR)/drivers/io.h \
@@ -914,6 +1029,9 @@ $(OBJECT_DIR)/parameter_groups_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $(PG_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/parameter_groups_unittest.d \
+         $(OBJECT_DIR)/config/parameter_group.d
+
 
 $(OBJECT_DIR)/rx/ibus.o : \
 	$(USER_DIR)/rx/ibus.c \
@@ -940,6 +1058,9 @@ $(OBJECT_DIR)/rx_ibus_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $(PG_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/rx_ibus_unittest.d \
+         $(OBJECT_DIR)/rx/ibus.d
+
 
 $(OBJECT_DIR)/telemetry/ibus.o : \
 	$(USER_DIR)/telemetry/ibus.c \
@@ -976,6 +1097,11 @@ $(OBJECT_DIR)/telemetry_ibus_unittest : \
 	@echo "linking $@" "$(STDOUT)"
 	$(V1) $(CXX) $(CXX_FLAGS) $(PG_FLAGS) $^ -o $(OBJECT_DIR)/$@
 
+-include $(OBJECT_DIR)/telemetry_ibus_unittest.d \
+         $(OBJECT_DIR)/telemetry/ibus_shared.d \
+         $(OBJECT_DIR)/telemetry/ibus.d
+
+
 
 ## test        : Build and run the Unit Tests
 test: $(TESTS:%=test-%)