3 files changed, 10 insertions, 4 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 4dd5132af96..c4589c3c26f 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-13  Zack Weinberg  <zackw@panix.com>
+
+	* Make-lang.in (java/decl.o): Update dependencies.
+	* decl.c: Include libfuncs.h, don't include toplev.h.
+
 2001-08-12  David Edelsohn  <edelsohn@gnu.org>
 
 	Revert:
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index d0ae26c0516..67ae036b163 100644
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -248,11 +248,12 @@ java/class.o: java/class.c $(CONFIG_H) $(JAVA_TREE_H) $(RTL_H) java/jcf.h \
   java/parse.h toplev.h $(SYSTEM_H) output.h $(GGC_H) $(TARGET_H) function.h
 java/constants.o: java/constants.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \
   toplev.h $(SYSTEM_H) $(GGC_H)
-java/decl.o: java/decl.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \
-  toplev.h $(SYSTEM_H) function.h gcc.h
+java/decl.o: java/decl.c $(CONFIG_H) $(JAVA_TREE_H) $(RTL_H) java/jcf.h \
+  toplev.h flags.h $(SYSTEM_H) function.h expr.h libfuncs.h except.h \
+  java/java-except.h $(GGC_H)
 java/except.o: java/except.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h real.h \
   $(RTL_H) java/javaop.h java/java-opcodes.h except.h java/java-except.h \
-  toplev.h $(SYSTEM_H) function.h
+  toplev.h $(SYSTEM_H) function.h 
 java/expr.o: java/expr.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h real.h \
   $(RTL_H) $(EXPR_H) java/javaop.h java/java-opcodes.h except.h \
   java/java-except.h java/java-except.h java/parse.h toplev.h \
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index 4eb073933a9..abb49fa5acf 100644
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -34,9 +34,9 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "flags.h"
 #include "java-tree.h"
 #include "jcf.h"
-#include "toplev.h"
 #include "function.h"
 #include "expr.h"
+#include "libfuncs.h"
 #include "except.h"
 #include "java-except.h"
 #include "ggc.h"