--- a/src/make-src-depend	Wed Feb 24 01:58:04 2010 -0600
+++ b/src/make-src-depend	Wed Feb 24 19:04:27 2010 -0600
@@ -3,6 +3,7 @@
 ### make-src-depend --- update the Makefile dependency information for XEmacs
 
 # Copyright (C) 1998 Free Software Foundation, Inc.
+# Copyright (C) 2010 Ben Wing.
 
 ## Author: Martin Buchholz <martin@xemacs.org>
 ## Maintainer: XEmacs Development Team
@@ -114,16 +115,16 @@
 sub PrintDeps {
   my $file = shift;
   my $ofile = $file; $ofile =~ s/c$/o/; print "$ofile: ";
-  if (exists $uses{$file}{'lisp.h'}) {
-    delete $uses{$file}{@LISP_H};
-    $uses{$file}{'$(LISP_H)'} = 1;
-  }
-  # Note: If both config.h and lisp.h are dependencies, config.h got deleted
-  # by the last clause.
   if (exists $uses{$file}{'config.h'}) {
     delete $uses{$file}{'config.h'};
     $uses{$file}{'$(CONFIG_H)'} = 1;
   }
+  if (exists $uses{$file}{'lisp.h'}) {
+    for my $x (@LISP_H) {
+      delete $uses{$file}{$x};
+    }
+    $uses{$file}{'$(LISP_H)'} = 1;
+  }
   # Huge hack.  With QUICK_BUILD, general.c has no dependence on
   # general-slots.h but really should.
   $uses{$file}{'general-slots.h'} = 1 if $file eq "general.c";