diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile
index 4e44a12fb14..73e607e5880 100644
--- a/reactos/ntoskrnl/Makefile
+++ b/reactos/ntoskrnl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.115 2004/02/24 23:51:38 dwelch Exp $
+# $Id: Makefile,v 1.116 2004/03/02 22:36:17 dwelch Exp $
 #
 # ReactOS Operating System
 #
@@ -69,9 +69,8 @@ TARGETNAME := ntoskrnl
 
 OBJECTS_PATH = objects
 
-all: \
-	$(OBJECTS_PATH) \
-	bugcodes.rc \
+all: $(OBJECTS_PATH) \
+	bugcodes.rc $(PATH_TO_TOP)/include/reactos/bugcodes.h \
 	$(TARGETNAME).nostrip.exe \
 	$(TARGETNAME).exe \
 	$(TARGETNAME).sym \
@@ -376,6 +375,7 @@ TAG_OBJECTS := $(join $(dir $(DEP_OBJECTS)),$(patsubst %.o, .%.TAG, $(notdir $(D
 # Include automatic dependancy tracking
 #
 DEP_EXCLUDE_FILTER := ex/napi.% nt/zw.%
+GENERATED_HEADER_FILES := $(PATH_TO_TOP)/include/reactos/bugcodes.h
 include $(PATH_TO_TOP)/tools/depend.mk
 
 
@@ -682,7 +682,7 @@ $(TARGETNAME).o: $(OBJECTS)
 		-o $(TARGETNAME).o \
 		$(OBJECTS)
 
-bugcodes.rc: ntoskrnl.mc
+$(PATH_TO_TOP)/include/reactos/bugcodes.h bugcodes.rc: ntoskrnl.mc
 	$(MC) \
 		-H $(PATH_TO_TOP)/include/reactos/bugcodes.h \
 		-o bugcodes.rc \
@@ -704,7 +704,7 @@ clean:
               lpc/*.o kd/*.o $(TARGETNAME).o junk.tmp base.tmp temp.exp \
               $(TARGETNAME).exe $(TARGETNAME).nostrip.exe $(TARGETNAME).sym ntoskrnl.map \
 	          $(TARGETNAME).coff bugcodes.rc msg?????.bin $(DEP_FILES) \
-	      $(TAG_OBJECTS)
+	      $(TAG_OBJECTS) $(PATH_TO_TOP)/include/reactos/bugcodes.h
 
 
 .PHONY: clean
diff --git a/reactos/tools/depend.mk b/reactos/tools/depend.mk
index 64cf053ecc3..bb39f948d65 100644
--- a/reactos/tools/depend.mk
+++ b/reactos/tools/depend.mk
@@ -19,20 +19,20 @@ else
 DEPENDS_PATH := $(PATH_TO_TOP)/tools
 endif
 
-.%.d: %.c $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX)
+.%.d: %.c $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES)
 	$(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
 
-.%.d: %.cc $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX)
+.%.d: %.cc $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES)
 	$(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
 
-.%.d: %.cpp $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX)
+.%.d: %.cpp $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES)
 	$(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
 
-.%.d: %.s  $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX)
+.%.d: %.s  $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES)
 	$(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
 
-.%.d: %.S  $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX)
+.%.d: %.S  $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES)
 	$(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
 
-.%.d: %.asm $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX)
+.%.d: %.asm $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES)
 	$(NASM_CMD) $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@