39 files changed, 153 insertions, 142 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ea3e6619115..5d26fc53fe5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,54 @@
+Sat Nov  7 15:35:25 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* configure.in (host_xm_file, build_xm_file, xm_file, tm_file):
+	Arrange to include gansidecl.h in {ht}config.h & tm.h just
+	before the config/ directory headers.
+	(tm_file_list, host_xm_file_list, build_xm_file_list): Handle
+        gansidecl.h in the list of dependencies.
+
+	* Makefile.in (RTL_BASE_H): Don't depend on gansidecl.h.
+	(TREE_H, DEMANGLE_H, RECOG_H, REGS_H, libgcc2.a, stmp-multilib,
+ 	mbchar.o, collect2.o, pexecute.o, vfprintf.o, splay-tree.o, gcc.o,
+ 	gencheck.o, choose-temp.o, mkstemp.o, mkstemp.o, prefix.o,
+ 	dyn-string.o, cexp.o, cccp.o, cppmain.o, cpplib.o, cpperror.o,
+ 	cppexp.o, cppfiles.o, cpphash.o, cppalloc.o, scan-decls.o):
+ 	Likewise.
+
+	* cccp.c: Don't include gansidecl.h.
+	* cexp.y: Likewise.
+	* collect2.c: Likewise.
+	* config/c4x/c4x.c: Likewise.
+	* config/v850/v850.h: Likewise.
+	* cppalloc.c: Likewise.
+	* cpperror.c: Likewise.
+	* cppexp.c: Likewise.
+	* cppfiles.c: Likewise.
+	* cpphash.c: Likewise.
+	* cpplib.c: Likewise.
+	* cppmain.c: Likewise.
+	* cppulp.c: Likewise.
+	* demangle.h: Likewise.
+	* doprint.c: Likewise.
+	* dyn-string.c: Likewise.
+	* eh-common.h: Likewise.
+	* fix-header.c: Likewise.
+	* frame.c: Likewise.
+	* gcc.c: Likewise.
+	* gcov.c: Likewise.
+	* gen-protos.c: Likewise.
+	* gencheck.c: Likewise.
+	* halfpic.h: Likewise.
+	* hash.c: Likewise.
+	* machmode.h: Likewise.
+	* mbchar.c: Likewise.
+	* prefix.c: Likewise.
+	* protoize.c: Likewise.
+	* recog.h: Likewise.
+	* rtl.h: Likewise.
+	* scan-decls.c: Likewise.
+	* tree.h: Likewise.
+	* varray.h: Likewise.
+	
 Sat Nov  7 11:37:53 1998  Richard Henderson  <rth@cygnus.com>
 
 	* i386.md (call_value_pop): If we're not popping anything,
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 189e88edcd7..74dd38ce086 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -718,14 +718,14 @@ DPBIT_FUNCS = _pack_df _unpack_df _addsub_df _mul_df _div_df \
 # If it is, rm *.o is an easy way to do it.
 # CONFIG_H = $(host_xm_file) $(tm_file)
 CONFIG_H =
-RTL_BASE_H = rtl.h rtl.def gansidecl.h machmode.h machmode.def
+RTL_BASE_H = rtl.h rtl.def machmode.h machmode.def
 RTL_H = $(RTL_BASE_H) genrtl.h
-TREE_H = tree.h real.h tree.def gansidecl.h machmode.h machmode.def tree-check.h
+TREE_H = tree.h real.h tree.def machmode.h machmode.def tree-check.h
 BASIC_BLOCK_H = basic-block.h bitmap.h
-DEMANGLE_H = demangle.h gansidecl.h
-RECOG_H = recog.h gansidecl.h
+DEMANGLE_H = demangle.h
+RECOG_H = recog.h
 EXPR_H = expr.h insn-codes.h
-REGS_H = regs.h varray.h machmode.h machmode.def gansidecl.h
+REGS_H = regs.h varray.h machmode.h machmode.def
 #
 # Language makefile fragments.
 
@@ -1012,7 +1012,7 @@ libgcc2.ready: $(GCC_PASSES) $(LIBGCC2_DEPS) stmp-int-hdrs $(STMP_FIXPROTO)
 
 LIB2ADD = $(srcdir)/frame.c $(LIB2FUNCS_EXTRA) $(LANG_LIB2FUNCS)
 libgcc2.a: libgcc2.c libgcc2.ready $(CONFIG_H) $(FPBIT) $(DPBIT) $(LIB2ADD) \
-   machmode.h longlong.h frame.h gansidecl.h gbl-ctors.h config.status
+   machmode.h longlong.h frame.h gbl-ctors.h config.status
 # Actually build it in tmplibgcc2.a, then rename at end,
 # so that libgcc2.a itself remains nonexistent if compilation is aborted.
 	-rm -f tmplibgcc2.a
@@ -1139,7 +1139,7 @@ s-mlib: $(srcdir)/genmultilib Makefile
 
 # Build multiple copies of libgcc.a, one for each target switch.
 stmp-multilib: $(LIBGCC1) libgcc2.c libgcc2.ready $(CONFIG_H) \
-   frame.h gansidecl.h \
+   frame.h \
    $(LIB2ADD) machmode.h longlong.h gbl-ctors.h config.status
 	for i in `$(GCC_FOR_TARGET) --print-multi-lib`; do \
 	  dir=`echo $$i | sed -e 's/;.*$$//'`; \
@@ -1286,7 +1286,7 @@ c-pragma.o: c-pragma.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) except.h \
     function.h defaults.h c-pragma.h toplev.h
 c-iterate.o: c-iterate.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) c-tree.h \
     flags.h toplev.h $(EXPR_H)
-mbchar.o: mbchar.c $(CONFIG_H) system.h gansidecl.h mbchar.h
+mbchar.o: mbchar.c $(CONFIG_H) system.h mbchar.h
 
 collect2$(exeext): collect2.o tlink.o hash.o cplus-dem.o underscore.o \
 	version.o choose-temp.o mkstemp.o $(LIBDEPS)
@@ -1295,7 +1295,7 @@ collect2$(exeext): collect2.o tlink.o hash.o cplus-dem.o underscore.o \
 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ collect2.o tlink.o hash.o \
 	  cplus-dem.o underscore.o version.o choose-temp.o mkstemp.o $(LIBS)
 
-collect2.o : collect2.c $(CONFIG_H) system.h gansidecl.h gstab.h \
+collect2.o : collect2.c $(CONFIG_H) system.h gstab.h \
 	$(srcdir)/../include/obstack.h $(DEMANGLE_H)
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES)  \
 	-DTARGET_MACHINE=\"$(target_alias)\" $(MAYBE_USE_COLLECT2) \
@@ -1309,19 +1309,18 @@ cplus-dem.o: $(srcdir)/../libiberty/cplus-dem.c $(DEMANGLE_H)
 	$(LN_S) $(srcdir)/../libiberty/cplus-dem.c cplus-dem.c
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) cplus-dem.c
 
-pexecute.o: $(srcdir)/../libiberty/pexecute.c $(CONFIG_H) system.h gansidecl.h
+pexecute.o: $(srcdir)/../libiberty/pexecute.c $(CONFIG_H) system.h
 	rm -f pexecute.c
 	$(LN_S) $(srcdir)/../libiberty/pexecute.c pexecute.c
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) pexecute.c
 
-vfprintf.o: $(srcdir)/../libiberty/vfprintf.c $(CONFIG_H) system.h gansidecl.h
+vfprintf.o: $(srcdir)/../libiberty/vfprintf.c $(CONFIG_H) system.h
 	rm -f vfprintf.c
 	$(LN_S) $(srcdir)/../libiberty/vfprintf.c vfprintf.c
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) vfprintf.c
 
 splay-tree.o: $(srcdir)/../libiberty/splay-tree.c \
-  $(srcdir)/../include/splay-tree.h $(srcdir)/../include/libiberty.h \
-  gansidecl.h
+  $(srcdir)/../include/splay-tree.h $(srcdir)/../include/libiberty.h
 	rm -f splay-tree.c
 	$(LN_S) $(srcdir)/../libiberty/splay-tree.c splay-tree.c
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) splay-tree.c
@@ -1354,7 +1353,7 @@ DRIVER_DEFINES = \
   -DDEFAULT_TARGET_VERSION=\"$(version)\" \
   -DDEFAULT_TARGET_MACHINE=\"$(target_alias)\" \
   -DTOOLDIR_BASE_PREFIX=\"$(exec_prefix)/\"
-gcc.o: gcc.c $(CONFIG_H) system.h gansidecl.h multilib.h Makefile \
+gcc.o: gcc.c $(CONFIG_H) system.h multilib.h Makefile \
 	$(lang_specs_files)
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
   $(DRIVER_DEFINES) \
@@ -1370,7 +1369,7 @@ gencheck : gencheck.o tree.def $(lang_tree_files) $(HOST_LIBDEPS)
 	$(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ \
 	 gencheck.o $(HOST_LIBS)
 
-gencheck.o : gencheck.c hconfig.h system.h gansidecl.h
+gencheck.o : gencheck.c hconfig.h system.h
 	$(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/gencheck.c
 
 dumpvers: dumpvers.c
@@ -1381,18 +1380,17 @@ obstack.o: $(srcdir)/../libiberty/obstack.c $(CONFIG_H)
 	$(LN_S) $(srcdir)/../libiberty/obstack.c obstack.c
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) obstack.c
 
-choose-temp.o: $(srcdir)/../libiberty/choose-temp.c $(CONFIG_H) gansidecl.h \
-	system.h
+choose-temp.o: $(srcdir)/../libiberty/choose-temp.c $(CONFIG_H) system.h
 	rm -f choose-temp.c
 	$(LN_S) $(srcdir)/../libiberty/choose-temp.c choose-temp.c
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) choose-temp.c
 
-mkstemp.o: $(srcdir)/../libiberty/mkstemp.c $(CONFIG_H) gansidecl.h system.h
+mkstemp.o: $(srcdir)/../libiberty/mkstemp.c $(CONFIG_H) system.h
 	rm -f mkstemp.c
 	$(LN_S) $(srcdir)/../libiberty/mkstemp.c mkstemp.c
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) mkstemp.c
 
-prefix.o: prefix.c $(CONFIG_H) system.h gansidecl.h Makefile
+prefix.o: prefix.c $(CONFIG_H) system.h Makefile
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
 	-DPREFIX=\"$(prefix)\" \
 	  -c `echo $(srcdir)/prefix.c | sed 's,^\./,,'`
@@ -1529,7 +1527,7 @@ recog.o : recog.c $(CONFIG_H) system.h $(RTL_H)  \
    insn-flags.h insn-codes.h real.h toplev.h
 reg-stack.o : reg-stack.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) \
    $(REGS_H) hard-reg-set.h flags.h insn-config.h insn-flags.h toplev.h
-dyn-string.o: dyn-string.c dyn-string.h $(CONFIG_H) system.h gansidecl.h
+dyn-string.o: dyn-string.c dyn-string.h $(CONFIG_H) system.h
 
 $(out_object_file): $(out_file) $(CONFIG_H) $(TREE_H) \
    $(RTL_H) $(REGS_H) hard-reg-set.h real.h insn-config.h conditions.h \
@@ -1864,14 +1862,14 @@ cpp$(exeext): $(CCCP)$(exeext)
 cccp$(exeext): cccp.o cexp.o version.o prefix.o mbchar.o @extra_cpp_objs@ $(LIBDEPS)
 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ cccp.o cexp.o prefix.o mbchar.o \
 	  version.o @extra_cpp_objs@ $(LIBS)
-cexp.o: $(srcdir)/cexp.c $(CONFIG_H) system.h gansidecl.h
+cexp.o: $(srcdir)/cexp.c $(CONFIG_H) system.h
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c $(srcdir)/cexp.c
 $(srcdir)/cexp.c: $(srcdir)/cexp.y
 	cd $(srcdir); $(BISON) -o cexp.c cexp.y
 
 # We use $(libsubdir)/$(unlibsubdir) to match the
 # -iprefix argument which gcc will pass if GCC_EXEC_PREFIX is used.
-cccp.o: cccp.c $(CONFIG_H) pcp.h version.c config.status system.h gansidecl.h \
+cccp.o: cccp.c $(CONFIG_H) pcp.h version.c config.status system.h \
            mbchar.h
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
 	  -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
@@ -1892,10 +1890,9 @@ cppmain$(exeext): cppmain.o libcpp.a $(LIBDEPS)
 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o cppmain$(exeext) cppmain.o \
 	libcpp.a $(LIBS)
 
-cppmain.o: cppmain.c $(CONFIG_H) cpplib.h system.h gansidecl.h
+cppmain.o: cppmain.c $(CONFIG_H) cpplib.h system.h
 
-cpplib.o: cpplib.c $(CONFIG_H) cpplib.h cpphash.h config.status system.h \
-	gansidecl.h
+cpplib.o: cpplib.c $(CONFIG_H) cpplib.h cpphash.h config.status system.h
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
 	  -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
 	  -DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \
@@ -1904,15 +1901,15 @@ cpplib.o: cpplib.c $(CONFIG_H) cpplib.h cpphash.h config.status system.h \
 	  -DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \
 	  -c `echo $(srcdir)/cpplib.c | sed 's,^\./,,'`
 
-cpperror.o: cpperror.c $(CONFIG_H) cpplib.h system.h gansidecl.h
+cpperror.o: cpperror.c $(CONFIG_H) cpplib.h system.h
 
-cppexp.o: cppexp.c $(CONFIG_H) cpplib.h system.h gansidecl.h
+cppexp.o: cppexp.c $(CONFIG_H) cpplib.h system.h
 
-cppfiles.o: cppfiles.c $(CONFIG_H) cpplib.h system.h gansidecl.h
+cppfiles.o: cppfiles.c $(CONFIG_H) cpplib.h system.h
 
-cpphash.o: cpphash.c cpplib.h cpphash.h $(CONFIG_H) system.h gansidecl.h
+cpphash.o: cpphash.c cpplib.h cpphash.h $(CONFIG_H) system.h
 
-cppalloc.o: cppalloc.c $(CONFIG_H) cpplib.h system.h gansidecl.h
+cppalloc.o: cppalloc.c $(CONFIG_H) cpplib.h system.h
 
 # Note for the stamp targets, we run the program `true' instead of
 # having an empty command (nothing following the semicolon).
@@ -2132,7 +2129,7 @@ fix-header.o: fix-header.c $(srcdir)/../include/obstack.h scan.h \
 	xsys-protos.h $(build_xm_file) system.h cpplib.h cpphash.h
 	$(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/fix-header.c
 
-scan-decls.o: scan-decls.c scan.h cpplib.h $(build_xm_file) system.h gansidecl.h
+scan-decls.o: scan-decls.c scan.h cpplib.h $(build_xm_file) system.h
 	$(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/scan-decls.c
 
 # stmp-fixproto depends on this, not on fix-header directly.
diff --git a/gcc/cccp.c b/gcc/cccp.c
index 293317e0e7f..40e966385f9 100644
--- a/gcc/cccp.c
+++ b/gcc/cccp.c
@@ -37,7 +37,6 @@ Boston, MA 02111-1307, USA. */
 
 typedef unsigned char U_CHAR;
 
-#include "gansidecl.h"
 #include "pcp.h"
 
 #ifdef MULTIBYTE_CHARS
diff --git a/gcc/cexp.c b/gcc/cexp.c
index a577b24b2d1..ac5c2020c0d 100644
--- a/gcc/cexp.c
+++ b/gcc/cexp.c
@@ -30,7 +30,6 @@
 #include "system.h"
 #include <setjmp.h>
 /* #define YYDEBUG 1 */
-#include "gansidecl.h"
 
 #ifdef MULTIBYTE_CHARS
 #include "mbchar.h"
diff --git a/gcc/cexp.y b/gcc/cexp.y
index c7d25c19658..00e439cb498 100644
--- a/gcc/cexp.y
+++ b/gcc/cexp.y
@@ -34,7 +34,6 @@ Boston, MA 02111-1307, USA.
 #include "system.h"
 #include <setjmp.h>
 /* #define YYDEBUG 1 */
-#include "gansidecl.h"
 
 #ifdef MULTIBYTE_CHARS
 #include "mbchar.h"
diff --git a/gcc/collect2.c b/gcc/collect2.c
index 5fdd08bedf5..7f855f2a621 100644
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -47,7 +47,6 @@ Boston, MA 02111-1307, USA.  */
 
 #include "demangle.h"
 #include "obstack.h"
-#include "gansidecl.h"
 #ifdef __CYGWIN32__
 #include <process.h>
 #endif
diff --git a/gcc/config/c4x/c4x.c b/gcc/config/c4x/c4x.c
index 8de1fc0dc43..6e6aacd12e4 100644
--- a/gcc/config/c4x/c4x.c
+++ b/gcc/config/c4x/c4x.c
@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include "config.h"
-#include "gansidecl.h"
 #include "toplev.h"
 #include "rtl.h"
 #include "regs.h"
diff --git a/gcc/config/v850/v850.h b/gcc/config/v850/v850.h
index 6b9a9e2f62e..fe3f7ae535c 100644
--- a/gcc/config/v850/v850.h
+++ b/gcc/config/v850/v850.h
@@ -20,7 +20,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 #include "svr4.h"	/* Automatically does #undef CPP_PREDEFINES */
-#include "gansidecl.h"	/* For the PROTO macro  */
 
 #undef ASM_SPEC
 #define ASM_SPEC "%{mv*:-mv%*}"
diff --git a/gcc/configure b/gcc/configure
index ee384fc57a1..2236b0a896b 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -1971,11 +1971,7 @@ intmax_t i = -1;
 EOF
 if { (eval echo configure:1973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  cat >> confdefs.h <<EOF
-#define HAVE_INTTYPES_H 1
-EOF
-
-   gcc_cv_header_inttypes_h=yes
+  gcc_cv_header_inttypes_h=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
@@ -1986,18 +1982,24 @@ rm -f conftest*
 fi
 
 echo "$ac_t""$gcc_cv_header_inttypes_h" 1>&6
+if test $gcc_cv_header_inttypes_h = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_INTTYPES_H 1
+EOF
+
+fi
 
 for ac_func in strtoul bsearch strerror putenv popen bcopy bzero bcmp \
 	index rindex strchr strrchr kill getrlimit setrlimit atoll atoq \
 	sysconf isascii gettimeofday strsignal
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1996: checking for $ac_func" >&5
+echo "configure:1998: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2001 "configure"
+#line 2003 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2020,7 +2022,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2049,12 +2051,12 @@ done
 #AC_CHECK_TYPE(wchar_t, unsigned int)
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:2053: checking for vprintf" >&5
+echo "configure:2055: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2058 "configure"
+#line 2060 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -2077,7 +2079,7 @@ vprintf();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -2101,12 +2103,12 @@ fi
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:2105: checking for _doprnt" >&5
+echo "configure:2107: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2110 "configure"
+#line 2112 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -2129,7 +2131,7 @@ _doprnt();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
@@ -2165,7 +2167,7 @@ fi
 
 
 echo $ac_n "checking whether the printf functions support %p""... $ac_c" 1>&6
-echo "configure:2169: checking whether the printf functions support %p" >&5
+echo "configure:2171: checking whether the printf functions support %p" >&5
 if eval "test \"`echo '$''{'gcc_cv_func_printf_ptr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2173,7 +2175,7 @@ else
   gcc_cv_func_printf_ptr=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2177 "configure"
+#line 2179 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 
@@ -2186,7 +2188,7 @@ main()
   exit (p != q);
 }
 EOF
-if { (eval echo configure:2190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   gcc_cv_func_printf_ptr=yes
 else
@@ -2210,12 +2212,12 @@ EOF
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:2214: checking for pid_t" >&5
+echo "configure:2216: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2219 "configure"
+#line 2221 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2244,17 +2246,17 @@ fi
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:2248: checking for vfork.h" >&5
+echo "configure:2250: checking for vfork.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2253 "configure"
+#line 2255 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2260: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2279,18 +2281,18 @@ else
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:2283: checking for working vfork" >&5
+echo "configure:2285: checking for working vfork" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test "$cross_compiling" = yes; then
   echo $ac_n "checking for vfork""... $ac_c" 1>&6
-echo "configure:2289: checking for vfork" >&5
+echo "configure:2291: checking for vfork" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2294 "configure"
+#line 2296 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vfork(); below.  */
@@ -2313,7 +2315,7 @@ vfork();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_vfork=yes"
 else
@@ -2335,7 +2337,7 @@ fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 else
   cat > conftest.$ac_ext <<EOF
-#line 2339 "configure"
+#line 2341 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -2430,7 +2432,7 @@ main() {
   }
 }
 EOF
-if { (eval echo configure:2434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_vfork_works=yes
 else
@@ -2458,12 +2460,12 @@ for ac_func in malloc realloc calloc free bcopy bzero bcmp \
 	strsignal
 do
 echo $ac_n "checking whether $ac_func must be declared""... $ac_c" 1>&6
-echo "configure:2462: checking whether $ac_func must be declared" >&5
+echo "configure:2464: checking whether $ac_func must be declared" >&5
 if eval "test \"`echo '$''{'gcc_cv_decl_needed_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2467 "configure"
+#line 2469 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -2496,7 +2498,7 @@ int main() {
 char *(*pfn) = (char *(*)) $ac_func
 ; return 0; }
 EOF
-if { (eval echo configure:2500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "gcc_cv_decl_needed_$ac_func=no"
 else
@@ -2525,12 +2527,12 @@ done
 for ac_func in getrlimit setrlimit
 do
 echo $ac_n "checking whether $ac_func must be declared""... $ac_c" 1>&6
-echo "configure:2529: checking whether $ac_func must be declared" >&5
+echo "configure:2531: checking whether $ac_func must be declared" >&5
 if eval "test \"`echo '$''{'gcc_cv_decl_needed_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2534 "configure"
+#line 2536 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -2567,7 +2569,7 @@ int main() {
 char *(*pfn) = (char *(*)) $ac_func
 ; return 0; }
 EOF
-if { (eval echo configure:2571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "gcc_cv_decl_needed_$ac_func=no"
 else
@@ -2594,12 +2596,12 @@ done
 
 
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:2598: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:2600: checking for sys_siglist declaration in signal.h or unistd.h" >&5
 if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2603 "configure"
+#line 2605 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -2611,7 +2613,7 @@ int main() {
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:2615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -5585,14 +5587,14 @@ fi
 # auto-host.h is the file containing items generated by autoconf and is
 # the first file included by config.h.
 null_defines=
-host_xm_file="auto-host.h ${host_xm_file}"
+host_xm_file="auto-host.h gansidecl.h ${host_xm_file}"
 
 # If host=build, it is correct to have hconfig include auto-host.h
 # as well.  If host!=build, we are in error and need to do more 
 # work to find out the build config parameters.
 if test x$host = x$build
 then
-	build_xm_file="auto-host.h ${build_xm_file}"
+	build_xm_file="auto-host.h gansidecl.h ${build_xm_file}"
 else
 	# We create a subdir, then run autoconf in the subdir.
 	# To prevent recursion we set host and build for the new
@@ -5614,9 +5616,12 @@ else
 	mv auto-host.h ../auto-build.h
 	cd ..
 	rm -rf $tempdir
-	build_xm_file="auto-build.h ${build_xm_file}"
+	build_xm_file="auto-build.h gansidecl.h ${build_xm_file}"
 fi
 
+xm_file="gansidecl.h ${xm_file}"
+tm_file="gansidecl.h ${tm_file}"
+
 vars="host_xm_file tm_file xm_file build_xm_file"
 links="config.h tm.h tconfig.h hconfig.h"
 defines="host_xm_defines null_defines xm_defines build_xm_defines"
@@ -5721,28 +5726,28 @@ out_object_file=`basename $out_file .c`.o
 
 tm_file_list=
 for f in $tm_file; do
-	tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
+	if test $f != "gansidecl.h" ; then
+		tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
+	else
+		tm_file_list="${tm_file_list} $f"
+	fi
 done
 
 host_xm_file_list=
 for f in $host_xm_file; do
-	if test $f != "auto-host.h"; then
+	if test $f != "auto-host.h" -a $f != "gansidecl.h" ; then
 		host_xm_file_list="${host_xm_file_list} \$(srcdir)/config/$f"
 	else
-		host_xm_file_list="${host_xm_file_list} auto-host.h"
+		host_xm_file_list="${host_xm_file_list} $f"
 	fi
 done
 
 build_xm_file_list=
 for f in $build_xm_file; do
-	if test $f != "auto-build.h"; then
-		if test $f != "auto-host.h"; then
-			build_xm_file_list="${build_xm_file_list} \$(srcdir)/config/$f"
-		else
-			build_xm_file_list="${build_xm_file_list} auto-host.h"
-		fi
+	if test $f != "auto-build.h" -a $f != "auto-host.h" -a $f != "gansidecl.h" ; then
+		build_xm_file_list="${build_xm_file_list} \$(srcdir)/config/$f"
 	else
-		build_xm_file_list="${build_xm_file_list} auto-build.h"
+		build_xm_file_list="${build_xm_file_list} $f"
 	fi
 done
 
@@ -5830,7 +5835,7 @@ fi
 
 # Figure out what assembler alignment features are present.
 echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6
-echo "configure:5834: checking assembler alignment features" >&5
+echo "configure:5839: checking assembler alignment features" >&5
 gcc_cv_as=
 gcc_cv_as_alignment_features=
 gcc_cv_as_gas_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/gas
@@ -5903,7 +5908,7 @@ fi
 echo "$ac_t""$gcc_cv_as_alignment_features" 1>&6
 
 echo $ac_n "checking assembler subsection support""... $ac_c" 1>&6
-echo "configure:5907: checking assembler subsection support" >&5
+echo "configure:5912: checking assembler subsection support" >&5
 gcc_cv_as_subsections=
 if test x$gcc_cv_as != x; then
 	# Check if we have .subsection
@@ -6139,7 +6144,7 @@ fi
 
 # Warn if using init_priority.
 echo $ac_n "checking whether to enable init_priority by default""... $ac_c" 1>&6
-echo "configure:6143: checking whether to enable init_priority by default" >&5
+echo "configure:6148: checking whether to enable init_priority by default" >&5
 if test x$enable_init_priority != xyes; then
   enable_init_priority=no
 fi
diff --git a/gcc/configure.in b/gcc/configure.in
index 1dd3dd977fb..e0c3fbcb809 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -3467,14 +3467,14 @@ fi
 # auto-host.h is the file containing items generated by autoconf and is
 # the first file included by config.h.
 null_defines=
-host_xm_file="auto-host.h ${host_xm_file}"
+host_xm_file="auto-host.h gansidecl.h ${host_xm_file}"
 
 # If host=build, it is correct to have hconfig include auto-host.h
 # as well.  If host!=build, we are in error and need to do more 
 # work to find out the build config parameters.
 if test x$host = x$build
 then
-	build_xm_file="auto-host.h ${build_xm_file}"
+	build_xm_file="auto-host.h gansidecl.h ${build_xm_file}"
 else
 	# We create a subdir, then run autoconf in the subdir.
 	# To prevent recursion we set host and build for the new
@@ -3496,9 +3496,12 @@ else
 	mv auto-host.h ../auto-build.h
 	cd ..
 	rm -rf $tempdir
-	build_xm_file="auto-build.h ${build_xm_file}"
+	build_xm_file="auto-build.h gansidecl.h ${build_xm_file}"
 fi
 
+xm_file="gansidecl.h ${xm_file}"
+tm_file="gansidecl.h ${tm_file}"
+
 vars="host_xm_file tm_file xm_file build_xm_file"
 links="config.h tm.h tconfig.h hconfig.h"
 defines="host_xm_defines null_defines xm_defines build_xm_defines"
@@ -3605,28 +3608,28 @@ out_object_file=`basename $out_file .c`.o
 
 tm_file_list=
 for f in $tm_file; do
-	tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
+	if test $f != "gansidecl.h" ; then
+		tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
+	else
+		tm_file_list="${tm_file_list} $f"
+	fi
 done
 
 host_xm_file_list=
 for f in $host_xm_file; do
-	if test $f != "auto-host.h"; then
+	if test $f != "auto-host.h" -a $f != "gansidecl.h" ; then
 		host_xm_file_list="${host_xm_file_list} \$(srcdir)/config/$f"
 	else
-		host_xm_file_list="${host_xm_file_list} auto-host.h"
+		host_xm_file_list="${host_xm_file_list} $f"
 	fi
 done
 
 build_xm_file_list=
 for f in $build_xm_file; do
-	if test $f != "auto-build.h"; then
-		if test $f != "auto-host.h"; then
-			build_xm_file_list="${build_xm_file_list} \$(srcdir)/config/$f"
-		else
-			build_xm_file_list="${build_xm_file_list} auto-host.h"
-		fi
+	if test $f != "auto-build.h" -a $f != "auto-host.h" -a $f != "gansidecl.h" ; then
+		build_xm_file_list="${build_xm_file_list} \$(srcdir)/config/$f"
 	else
-		build_xm_file_list="${build_xm_file_list} auto-build.h"
+		build_xm_file_list="${build_xm_file_list} $f"
 	fi
 done
 
diff --git a/gcc/cppalloc.c b/gcc/cppalloc.c
index 8f77cc7025b..46581c781a1 100644
--- a/gcc/cppalloc.c
+++ b/gcc/cppalloc.c
@@ -24,7 +24,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include "config.h"
 #include "system.h"
-#include "gansidecl.h"
 #include "cpplib.h"
 
 static void memory_full PROTO ((void)) ATTRIBUTE_NORETURN;
diff --git a/gcc/cpperror.c b/gcc/cpperror.c
index 308ef299a18..92b10465c68 100644
--- a/gcc/cpperror.c
+++ b/gcc/cpperror.c
@@ -25,7 +25,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef EMACS
 #include "config.h"
 #include "system.h"
-#include "gansidecl.h"
 #else
 #include <stdio.h>
 #endif /* not EMACS */
diff --git a/gcc/cppexp.c b/gcc/cppexp.c
index 8fc5f04a948..b77c3d7559d 100644
--- a/gcc/cppexp.c
+++ b/gcc/cppexp.c
@@ -26,7 +26,6 @@ Written by Per Bothner 1994.  */
    
 #include "config.h"
 #include "system.h"
-#include "gansidecl.h"
 #include "cpplib.h"
 
 extern char *xmalloc PARAMS ((unsigned));
diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c
index 559cc118985..94562ab9acb 100644
--- a/gcc/cppfiles.c
+++ b/gcc/cppfiles.c
@@ -25,7 +25,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include "config.h"
 #include "system.h"
-#include "gansidecl.h"
 #include "cpplib.h"
 
 /* The entry points to this file are: find_include_file, finclude,
diff --git a/gcc/cpphash.c b/gcc/cpphash.c
index d20f7bbe79d..85883e35137 100644
--- a/gcc/cpphash.c
+++ b/gcc/cpphash.c
@@ -24,7 +24,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include "config.h"
 #include "system.h"
-#include "gansidecl.h"
 #include "cpplib.h"
 #include "cpphash.h"
 
diff --git a/gcc/cpplib.c b/gcc/cpplib.c
index e8d2e09d1c6..38aeacf6fa8 100644
--- a/gcc/cpplib.c
+++ b/gcc/cpplib.c
@@ -35,7 +35,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # include <sys/resource.h>
 #endif
 
-#include "gansidecl.h"
 #include "cpplib.h"
 #include "cpphash.h"
 #include "output.h"
diff --git a/gcc/cppmain.c b/gcc/cppmain.c
index 0a45e86907b..b39df34f055 100644
--- a/gcc/cppmain.c
+++ b/gcc/cppmain.c
@@ -23,7 +23,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef EMACS
 #include "config.h"
 #include "system.h"
-#include "gansidecl.h"
 #else
 #include <stdio.h>
 
diff --git a/gcc/cppulp.c b/gcc/cppulp.c
index 4e218d9a144..eb6e7f6922f 100644
--- a/gcc/cppulp.c
+++ b/gcc/cppulp.c
@@ -21,7 +21,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "config.h"
 #include "system.h"
 
-#include "gansidecl.h"
 #include "output.h"
 
 char *user_label_prefix = 0;
diff --git a/gcc/demangle.h b/gcc/demangle.h
index 9fdd80df95e..570b05718cf 100644
--- a/gcc/demangle.h
+++ b/gcc/demangle.h
@@ -21,7 +21,6 @@
 #define DEMANGLE_H
 
 #ifdef IN_GCC
-#include "gansidecl.h"
 #define PARAMS(ARGS) PROTO(ARGS)
 #else /* ! IN_GCC */
 #include <ansidecl.h>
diff --git a/gcc/doprint.c b/gcc/doprint.c
index e09e1988122..843c8474c4c 100644
--- a/gcc/doprint.c
+++ b/gcc/doprint.c
@@ -5,7 +5,6 @@
 
 #include "config.h"
 #include "system.h"
-#include "gansidecl.h"
 #undef _doprnt
 
 #ifdef TEST /* Make sure to use the internal one. */
diff --git a/gcc/dyn-string.c b/gcc/dyn-string.c
index cfcace95584..a5f40cc0ec1 100644
--- a/gcc/dyn-string.c
+++ b/gcc/dyn-string.c
@@ -20,7 +20,6 @@
 
 #include "config.h"
 #include "system.h"
-#include "gansidecl.h"
 #include "dyn-string.h"
 
 extern char *xmalloc ();
diff --git a/gcc/eh-common.h b/gcc/eh-common.h
index 143ddff10d7..a4e07bcbd14 100644
--- a/gcc/eh-common.h
+++ b/gcc/eh-common.h
@@ -15,8 +15,6 @@
    checking of runtime conditions. If the handler wasn't suppose to
    get the exception, it performs a re-throw. */
 
-#include "gansidecl.h"
-
 
 /* The handler_label field MUST be the first field in this structure. The 
    __throw()  library routine expects uses __eh_stub() from except.c, which
diff --git a/gcc/fix-header.c b/gcc/fix-header.c
index e1a9956a18c..d515a32de75 100644
--- a/gcc/fix-header.c
+++ b/gcc/fix-header.c
@@ -72,7 +72,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "hconfig.h"
 #include "system.h"
-#include "gansidecl.h"
 #include "obstack.h"
 #include "scan.h"
 #include "cpplib.h"
diff --git a/gcc/frame.c b/gcc/frame.c
index ab803c90168..b5f643e7043 100644
--- a/gcc/frame.c
+++ b/gcc/frame.c
@@ -46,7 +46,6 @@ Boston, MA 02111-1307, USA.  */
 #include "defaults.h"
 
 #ifdef DWARF2_UNWIND_INFO
-#include "gansidecl.h"
 #include "dwarf2.h"
 #include <stddef.h>
 #include "frame.h"
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 3182f6876cc..15e0fe6c7a7 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -36,7 +36,6 @@ compilation is specified by a string called a "spec".  */
 #include <signal.h>
 #include <sys/stat.h>
 
-#include "gansidecl.h"
 #include "obstack.h"
 
 
diff --git a/gcc/gcov.c b/gcc/gcov.c
index bbf91127f43..2a093c621fb 100644
--- a/gcc/gcov.c
+++ b/gcc/gcov.c
@@ -44,7 +44,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "config.h"
 #include "system.h"
 #include <sys/stat.h>
-#include "gansidecl.h"
 
 #include "gcov-io.h"
 
diff --git a/gcc/gen-protos.c b/gcc/gen-protos.c
index f6533e7bed3..d950257b49d 100644
--- a/gcc/gen-protos.c
+++ b/gcc/gen-protos.c
@@ -17,7 +17,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "hconfig.h"
 #include "system.h"
-#include "gansidecl.h"
 #include "scan.h"
 #include "cpplib.h"
 #include "cpphash.h"
diff --git a/gcc/gencheck.c b/gcc/gencheck.c
index fdbe3ec7889..915f3080292 100644
--- a/gcc/gencheck.c
+++ b/gcc/gencheck.c
@@ -20,7 +20,6 @@ Boston, MA 02111-1307, USA.  */
 
 #include "hconfig.h"
 #include "system.h"
-#include "gansidecl.h"
 
 #define DEFTREECODE(SYM, NAME, TYPE, LEN)   STRINGIFY(SYM),
 
diff --git a/gcc/halfpic.h b/gcc/halfpic.h
index 80e6543de07..96f62d45b86 100644
--- a/gcc/halfpic.h
+++ b/gcc/halfpic.h
@@ -20,8 +20,6 @@ Boston, MA 02111-1307, USA.  */
 
 #ifndef NO_HALF_PIC
 
-#include "gansidecl.h"
-
 #if defined (USE_PROTOTYPES) ? USE_PROTOTYPES : defined (__STDC__)
 union tree_node;		/* forward reference */
 struct rtx_def;
diff --git a/gcc/hash.c b/gcc/hash.c
index 1428ae1c26b..f367fc07314 100644
--- a/gcc/hash.c
+++ b/gcc/hash.c
@@ -22,7 +22,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "system.h"
 #include "hash.h"
 #include "obstack.h"
-#include "gansidecl.h"
 #include "toplev.h"
 
 /* Obstack allocation and deallocation routines.  */
diff --git a/gcc/machmode.h b/gcc/machmode.h
index 399e1b2f0df..8f2ed9539e1 100644
--- a/gcc/machmode.h
+++ b/gcc/machmode.h
@@ -21,8 +21,6 @@ Boston, MA 02111-1307, USA.  */
 #ifndef HAVE_MACHINE_MODES
 #define HAVE_MACHINE_MODES
 
-#include "gansidecl.h"
-
 /* Strictly speaking, this isn't the proper place to include these definitions,
    but this file is included by every GCC file.
 
diff --git a/gcc/mbchar.c b/gcc/mbchar.c
index d54a49749ce..89604361cf2 100644
--- a/gcc/mbchar.c
+++ b/gcc/mbchar.c
@@ -34,7 +34,6 @@ Boston, MA 02111-1307, USA.  */
 #ifdef MULTIBYTE_CHARS
 #include "config.h"
 #include "system.h"
-#include "gansidecl.h"
 #include "mbchar.h"
 #include <locale.h>
 
diff --git a/gcc/prefix.c b/gcc/prefix.c
index 778600bff8d..b949fce4e41 100644
--- a/gcc/prefix.c
+++ b/gcc/prefix.c
@@ -69,8 +69,6 @@ Boston, MA 02111-1307, USA.  */
 #include <windows.h>
 #endif
 
-#include "gansidecl.h"
-
 static char *std_prefix = PREFIX;
 
 static char *get_key_value	PROTO((char *));
diff --git a/gcc/protoize.c b/gcc/protoize.c
index 1e2944e48c3..8a47b2f6815 100644
--- a/gcc/protoize.c
+++ b/gcc/protoize.c
@@ -67,7 +67,6 @@ Boston, MA 02111-1307, USA.  */
 #endif
 #endif
 #include <setjmp.h>
-#include "gansidecl.h"
 
 /* Some systems like Linux don't declare rindex if _POSIX_SOURCE is declared,
    but it normally does declare it.  This means that configure thinks we don't
diff --git a/gcc/recog.h b/gcc/recog.h
index d96da77fccc..bbed6c18d23 100644
--- a/gcc/recog.h
+++ b/gcc/recog.h
@@ -18,8 +18,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "gansidecl.h"
-
 /* Types of operands.  */
 enum op_type {
   OP_IN,
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 7826135c803..4c558bfd1e6 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -173,8 +173,6 @@ typedef struct rtx_def
   rtunion fld[1];
 } *rtx;
 
-#include "gansidecl.h"
-
 #define NULL_RTX (rtx) 0
 
 /* Define macros to access the `code' field of the rtx.  */
diff --git a/gcc/scan-decls.c b/gcc/scan-decls.c
index d2f32a86cf9..5b947a412e3 100644
--- a/gcc/scan-decls.c
+++ b/gcc/scan-decls.c
@@ -19,7 +19,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include "hconfig.h"
 #include "system.h"
-#include "gansidecl.h"
 #include "cpplib.h"
 #include "scan.h"
 
diff --git a/gcc/tree.h b/gcc/tree.h
index 8dd784316df..513c3825ab0 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -1372,8 +1372,6 @@ union tree_node
   struct tree_block block;
  };
 
-#include "gansidecl.h"
-
 #define NULL_TREE (tree) NULL
 
 /* The following functions accept a wide integer argument.  Rather than
diff --git a/gcc/varray.h b/gcc/varray.h
index eb5a44e1a8b..bf744fc402d 100644
--- a/gcc/varray.h
+++ b/gcc/varray.h
@@ -22,10 +22,6 @@
 #ifndef _VARRAY_H_
 #define _VARRAY_H_
 
-#ifndef PROTO
-#include "gansidecl.h"
-#endif
-
 #ifndef HOST_WIDE_INT
 #include "machmode.h"
 #endif