diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 69015e90b533..57aa8ee8a600 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-11  Richard Henderson  <rth@redhat.com>
+
+	* Makefile.in (insn-recog.o): Depend on toplev.h.
+	(insn-emit.o, doloop.o): Likewise.
+	* genrecog.c, genemit.c: Include toplev.h in generated file.
+	* doloop.c: Include toplev.h.
+
 2001-04-11  Mark Mitchell  <mark@codesourcery.com>
 
 	* Makefile.in (gcse.o): Depend on params.h.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 04757de7bc32..33d0238f9a24 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1488,7 +1488,7 @@ loop.o : loop.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) flags.h $(LOOP_H) insn-config.h
    $(REGS_H) hard-reg-set.h $(RECOG_H) $(EXPR_H) real.h \
    $(BASIC_BLOCK_H) function.h toplev.h varray.h except.h cselib.h $(TM_P_H)
 doloop.o : doloop.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) flags.h $(LOOP_H) \
-   $(EXPR_H) hard-reg-set.h $(BASIC_BLOCK_H) $(TM_P_H)
+   $(EXPR_H) hard-reg-set.h $(BASIC_BLOCK_H) $(TM_P_H) toplev.h
 unroll.o : unroll.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) insn-config.h function.h \
    $(INTEGRATE_H) $(REGS_H) $(RECOG_H) flags.h $(EXPR_H) $(LOOP_H) toplev.h \
    hard-reg-set.h varray.h $(BASIC_BLOCK_H) $(TM_P_H)
@@ -1641,7 +1641,7 @@ s-codes : $(md_file) gencodes$(build_exeext) $(srcdir)/move-if-change
 	touch s-codes
 
 insn-emit.o : insn-emit.c $(CONFIG_H) $(RTL_H) $(EXPR_H) real.h output.h \
-  insn-config.h $(SYSTEM_H) reload.h $(RECOG_H) \
+  insn-config.h $(SYSTEM_H) reload.h $(RECOG_H) toplev.h \
   function.h flags.h hard-reg-set.h resource.h $(TM_P_H)
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c insn-emit.c
 
@@ -1653,7 +1653,7 @@ s-emit : $(md_file) genemit$(build_exeext) $(srcdir)/move-if-change
 
 insn-recog.o : insn-recog.c $(CONFIG_H) $(RTL_H) insn-config.h $(RECOG_H) \
   real.h output.h flags.h $(SYSTEM_H) function.h hard-reg-set.h resource.h \
-  $(TM_P_H)
+  $(TM_P_H) toplev.h
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c insn-recog.c
 
 insn-recog.c: s-recog ; @true
diff --git a/gcc/doloop.c b/gcc/doloop.c
index 7d474aa82cc4..b9e8d8c68fbe 100644
--- a/gcc/doloop.c
+++ b/gcc/doloop.c
@@ -27,6 +27,7 @@ Boston, MA 02111-1307, USA.  */
 #include "loop.h"
 #include "hard-reg-set.h"
 #include "basic-block.h"
+#include "toplev.h"
 #include "tm_p.h"
 
 
diff --git a/gcc/genemit.c b/gcc/genemit.c
index 254bc376bdf9..354b42dc257f 100644
--- a/gcc/genemit.c
+++ b/gcc/genemit.c
@@ -817,6 +817,7 @@ from the machine description file `md'.  */\n\n");
   printf ("#include \"recog.h\"\n");
   printf ("#include \"resource.h\"\n");
   printf ("#include \"reload.h\"\n");
+  printf ("#include \"toplev.h\"\n");
   printf ("#include \"ggc.h\"\n\n");
   printf ("#define FAIL return (end_sequence (), _val)\n");
   printf ("#define DONE return (_val = gen_sequence (), end_sequence (), _val)\n");
diff --git a/gcc/genrecog.c b/gcc/genrecog.c
index 2224f8036fe7..5d64378efd23 100644
--- a/gcc/genrecog.c
+++ b/gcc/genrecog.c
@@ -2368,6 +2368,7 @@ write_header ()
 #include \"flags.h\"\n\
 #include \"hard-reg-set.h\"\n\
 #include \"resource.h\"\n\
+#include \"toplev.h\"\n\
 \n");
 
   puts ("\n\