diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/data/launch/src/Makefile b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/data/launch/src/Makefile
index a54528f6acd..4e3bcb25774 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/data/launch/src/Makefile
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/data/launch/src/Makefile
@@ -2,6 +2,9 @@ BINDIR = ../bin
 SRC_C = $(wildcard *.c)
 SRC_CXX = $(wildcard *.cc)
 
+# We rebuild everything whenever one of the headers change
+HEADERS = $(wildcard *.h)
+
 # Use .exe extension so that files are named the same way in Linux and Windows.
 BINS = $(patsubst %.c,$(BINDIR)/%.exe,$(SRC_C)) $(patsubst %.cc,$(BINDIR)/%.exe,$(SRC_CXX))
 COREFILE = $(BINDIR)/core
@@ -23,10 +26,10 @@ all: $(BINS) $(COREFILE)
 $(BINDIR):
 	$(MKDIR) $@
 
-$(BINDIR)/%.exe: %.c | $(BINDIR)
+$(BINDIR)/%.exe: %.c $(HEADERS) | $(BINDIR)
 	$(CC) $(CFLAGS) -o $@ $<
 
-$(BINDIR)/%.exe: %.cc | $(BINDIR)
+$(BINDIR)/%.exe: %.cc $(HEADERS) | $(BINDIR)
 	$(CXX) $(CXXFLAGS) -o $@ $<
 
 # Generate a core file that is needed for post-morted core-file tests