diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index 41b1f0958..4f622e182 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -195,17 +195,17 @@ $(OBJLIBNAME):%$(OBJ):
 	@$(RM) $@
 	$(COMPILE.ctdt) $<
 
-%$(OBJ): %.c inc
+%$(OBJ): %.c $(COMMON_INC) $(INSTALL_INC)
 	@$(HDEPENDS_CMD)
 	@$(RM) $@
 	$(COMPILE.c) $(call PATH_FILTER,$<) $(COMPILE_FILTER.c)
 
-%$(OBJ): %.cc inc
+%$(OBJ): %.cc $(COMMON_INC) $(INSTALL_INC)
 	@$(HDEPENDS_CMD)
 	@$(RM) $@
 	$(COMPILE.cpp) $(call PATH_FILTER,$<) $(COMPILE_FILTER.cpp)
 
-%$(OBJ): %.cpp inc
+%$(OBJ): %.cpp $(COMMON_INC) $(INSTALL_INC)
 	@$(HDEPENDS_CMD)
 	@$(RM) $@
 	$(COMPILE.cpp) $(call PATH_FILTER,$<) $(COMPILE_FILTER.cpp)
diff --git a/src/gdd/Makefile b/src/gdd/Makefile
index 1b923cb35..c5b32dee4 100644
--- a/src/gdd/Makefile
+++ b/src/gdd/Makefile
@@ -30,9 +30,11 @@ INC += dbMapper.h
 INC += gddAppTable.h
 INC += gddAppFuncTable.h
 INC += smartGDDPointer.h
-INC += gddApps.h
 INC += gddEnumStringTable.h
 
+# Can't put this in INC, it causes a circular build dependency
+TARGETS += $(INSTALL_INCLUDE)/gddApps.h
+
 HTMLS += gdd.html
 HTMLS += gddref.html
 HTMLS += gddref2.html