diff --git a/Makefile b/Makefile
index 6652ebbdc40e5f50bd74cf185771250559ca56e2..7c4fe94a7890e7b6dec8ed742a22dcaca4f04594 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ define make_tests
     endif
     SRCS = $$(filter-out $$(PROJECTFILE), $$(SOURCES))
     OBJS = $$(SRCS:%.cpp=%.o)
-    HDRS = $$(wildcard *.h)
+    HDRS = $$(wildcard *.h *.hpp)
     $(1): CXXFLAGS += -g3 -DDEBUG
     $(1): $$(OBJS) $$(HDRS) $(1).cpp
 	$$(CXX) $$(CXXFLAGS) $$(OBJS) $(1).cpp -o $(1)
@@ -117,7 +117,7 @@ clean:
 	rm -Rf *.dSYM
 
 # make partialsubmit.tar.gz - cleans, runs dos2unix, creates tarball omitting test cases
-PARTIAL_SUBMITFILES=$(filter-out $(TESTSOURCES), $(wildcard Makefile *.h *.cpp))
+PARTIAL_SUBMITFILES=$(filter-out $(TESTSOURCES), $(wildcard Makefile *.h *.hpp *.cpp))
 $(PARTIAL_SUBMITFILE): $(PARTIAL_SUBMITFILES)
 	rm -f $(PARTIAL_SUBMITFILE) $(FULL_SUBMITFILE)
 	-dos2unix $(PARTIAL_SUBMITFILES)
@@ -125,7 +125,7 @@ $(PARTIAL_SUBMITFILE): $(PARTIAL_SUBMITFILES)
 	@echo !!! WARNING: No test cases included. Use 'make fullsubmit' to include test cases. !!!
 
 # make fullsubmit.tar.gz - cleans, runs dos2unix, creates tarball including test cases
-FULL_SUBMITFILES=$(filter-out $(TESTSOURCES), $(wildcard Makefile *.h *.cpp test*.txt))
+FULL_SUBMITFILES=$(filter-out $(TESTSOURCES), $(wildcard Makefile *.h *.hpp *.cpp test*.txt))
 $(FULL_SUBMITFILE): $(FULL_SUBMITFILES)
 	rm -f $(PARTIAL_SUBMITFILE) $(FULL_SUBMITFILE)
 	-dos2unix $(FULL_SUBMITFILES)