Changes due to include file renaming:

	* xcoffread.c:	internalcoff.h	->coff/internal.c,
	  		coff-rs6000.h	->coff/rs6000.h
	* mipsread.c:	coff-mips.h	->coff/mips.h
	* elfread.c:    elf-common.h	->elf/common.h
			elf-external.h	->elf/external.h,
			elf-internal.h	->elf/internal.h
	* dwarfread.c	dwarf.h		->elf/dwarf.h
	* dbxread.c:	aout64.h	->aout/aout64.h
			stab.gnu.h	->aout/stab_gnu.h

	* coffread.c:   internalcoff.h	->coff/internal.h
	* buildsym.c:   stab.gnu.h	->aout/stab_gnu.h
	* depend        Updated to take the above into account.

8 files changed, 323 insertions, 269 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3464fc7..2c4d650 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,20 @@
+Sat Nov 30 21:29:55 1991  Steve Chamberlain  (sac at cygnus.com)
+	Changes due to include file renaming:
+
+	* xcoffread.c:	internalcoff.h	->coff/internal.c,
+	  		coff-rs6000.h	->coff/rs6000.h
+	* mipsread.c:	coff-mips.h	->coff/mips.h
+	* elfread.c:    elf-common.h	->elf/common.h 
+			elf-external.h	->elf/external.h,
+			elf-internal.h	->elf/internal.h
+	* dwarfread.c	dwarf.h		->elf/dwarf.h
+	* dbxread.c:	aout64.h	->aout/aout64.h
+			stab.gnu.h	->aout/stab_gnu.h
+		   
+	* coffread.c:   internalcoff.h	->coff/internal.h
+	* buildsym.c:   stab.gnu.h	->aout/stab_gnu.h
+	* depend        Updated to take the above into account.
+
 Fri Nov 29 16:59:25 1991  Fred Fish  (fnf at cygnus.com)
 
 	* configure.in:  Add SVR4 i386 configurations.
diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index 5021bfe..86e726f 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -31,7 +31,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "breakpoint.h"
 #include "gdbcore.h"		/* for bfd stuff for symfile.h */
 #include "symfile.h"		/* Needed for "struct complaint" */
-#include "stab.gnu.h"		/* We always use GNU stabs, not native */
+#include "aout/stab_gnu.h"		/* We always use GNU stabs, not native */
 #include <string.h>
 #include <ctype.h>
 
diff --git a/gdb/coffread.c b/gdb/coffread.c
index f3447a5..21addf5 100644
--- a/gdb/coffread.c
+++ b/gdb/coffread.c
@@ -28,7 +28,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <obstack.h>
 #include <string.h>
 
-#include "internalcoff.h"	/* Internal format of COFF symbols in BFD */
+#include "coff/internal.h"	/* Internal format of COFF symbols in BFD */
 #include "libcoff.h"		/* FIXME secret internal data from BFD */
 
 static void add_symbol_to_list ();
diff --git a/gdb/depend b/gdb/depend
index 5a5c83f..0c7f0d3 100755
--- a/gdb/depend
+++ b/gdb/depend
@@ -1,155 +1,175 @@
-altos-xdep.o : altos-xdep.c defs.h tm.h config.status xm.h config.status frame.h inferior.h \
-  breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h gdbcore.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-am29k-pinsn.o : am29k-pinsn.c defs.h tm.h config.status xm.h config.status target.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h ${srcdir}/../include/obstack.h am29k-opcode.h 
-am29k-tdep.o : am29k-tdep.c defs.h tm.h config.status xm.h config.status gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h ${srcdir}/../include/obstack.h frame.h value.h symtab.h \
-  inferior.h breakpoint.h 
-arm-pinsn.o : arm-pinsn.c defs.h tm.h config.status xm.h config.status symtab.h ${srcdir}/../include/obstack.h \
-  arm-opcode.h 
-arm-tdep.o : arm-tdep.c defs.h tm.h config.status xm.h config.status frame.h inferior.h breakpoint.h \
-  value.h symtab.h ${srcdir}/../include/obstack.h arm-opcode.h gdbcore.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-arm-xdep.o : arm-xdep.c defs.h tm.h config.status xm.h config.status frame.h inferior.h breakpoint.h \
-  value.h symtab.h ${srcdir}/../include/obstack.h arm-opcode.h gdbcore.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-blockframe.o : blockframe.c defs.h tm.h config.status xm.h config.status symtab.h \
-  ${srcdir}/../include/obstack.h frame.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h value.h target.h 
-breakpoint.o : breakpoint.c defs.h tm.h config.status xm.h config.status symtab.h \
-  ${srcdir}/../include/obstack.h frame.h breakpoint.h value.h expression.h gdbcore.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h gdbcmd.h command.h inferior.h \
-  target.h language.h 
-buildsym.o : buildsym.c defs.h tm.h config.status xm.h config.status ${srcdir}/../include/obstack.h symtab.h \
-  breakpoint.h value.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h \
-  symfile.h ${srcdir}/../include/stab.gnu.h ${srcdir}/../include/stab.def buildsym.h 
-c-exp.tab.o : c-exp.tab.c ${srcdir}/defs.h tm.h config.status xm.h config.status ${srcdir}/symtab.h \
-  ${srcdir}/../include/obstack.h ${srcdir}/frame.h ${srcdir}/expression.h ${srcdir}/parser-defs.h ${srcdir}/value.h \
-  ${srcdir}/language.h 
-coffread.o : coffread.c defs.h tm.h config.status xm.h config.status symtab.h ${srcdir}/../include/obstack.h \
-  breakpoint.h value.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h symfile.h \
-  ${srcdir}/../include/internalcoff.h ${srcdir}/../bfd/libcoff.h 
-command.o : command.c defs.h tm.h config.status xm.h config.status command.h symtab.h \
-  ${srcdir}/../include/obstack.h value.h 
-convex-pinsn.o : convex-pinsn.c defs.h tm.h config.status xm.h config.status symtab.h \
-  ${srcdir}/../include/obstack.h convx-opcode.h 
-convex-tdep.o : convex-tdep.c defs.h tm.h config.status xm.h config.status command.h symtab.h \
-  ${srcdir}/../include/obstack.h value.h frame.h inferior.h breakpoint.h \
-  ${srcdir}/../include/wait.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h \
-  gdbcmd.h 
-convex-xdep.o : convex-xdep.c defs.h tm.h config.status xm.h config.status command.h symtab.h \
-  ${srcdir}/../include/obstack.h value.h frame.h inferior.h breakpoint.h \
+altos-xdep.o : altos-xdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  ${srcdir}/../include/obstack.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
+am29k-pinsn.o : am29k-pinsn.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h \
+  ${srcdir}/../include/obstack.h am29k-opcode.h 
+am29k-tdep.o : am29k-tdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h \
+  ${srcdir}/../include/obstack.h frame.h value.h symtab.h inferior.h breakpoint.h 
+arm-pinsn.o : arm-pinsn.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  symtab.h ${srcdir}/../include/obstack.h arm-opcode.h 
+arm-tdep.o : arm-tdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  frame.h inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h \
+  arm-opcode.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
+arm-xdep.o : arm-xdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  frame.h inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h \
+  arm-opcode.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
+blockframe.o : blockframe.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h symtab.h ${srcdir}/../include/obstack.h frame.h gdbcore.h \
+  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h value.h target.h 
+breakpoint.o : breakpoint.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h symtab.h ${srcdir}/../include/obstack.h frame.h breakpoint.h value.h \
+  expression.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h gdbcmd.h \
+  command.h inferior.h target.h language.h 
+buildsym.o : buildsym.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  ${srcdir}/../include/obstack.h symtab.h breakpoint.h value.h gdbcore.h \
+  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h symfile.h \
+  ${srcdir}/../include/aout/stab_gnu.h ${srcdir}/../include/aout/stab.def buildsym.h 
+c-exp.tab.o : c-exp.tab.c ${srcdir}/defs.h xm.h config.status ${srcdir}/xm-sparc.h tm.h config.status ${srcdir}/tm-sparc.h \
+  ${srcdir}/tm-sunos.h ${srcdir}/symtab.h ${srcdir}/../include/obstack.h ${srcdir}/frame.h ${srcdir}/expression.h \
+  ${srcdir}/parser-defs.h ${srcdir}/value.h ${srcdir}/language.h 
+coffread.o : coffread.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  symtab.h ${srcdir}/../include/obstack.h breakpoint.h value.h ${srcdir}/../include/bfd.h \
+  ${srcdir}/../include/ansidecl.h symfile.h ${srcdir}/../include/coff/internal.h \
+  ${srcdir}/../bfd/libcoff.h 
+command.o : command.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  command.h symtab.h ${srcdir}/../include/obstack.h value.h 
+convex-pinsn.o : convex-pinsn.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h symtab.h ${srcdir}/../include/obstack.h convx-opcode.h 
+convex-tdep.o : convex-tdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h command.h symtab.h ${srcdir}/../include/obstack.h value.h frame.h \
+  inferior.h breakpoint.h ${srcdir}/../include/wait.h gdbcore.h ${srcdir}/../include/bfd.h \
+  ${srcdir}/../include/ansidecl.h gdbcmd.h 
+convex-xdep.o : convex-xdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h command.h symtab.h ${srcdir}/../include/obstack.h value.h frame.h \
+  inferior.h breakpoint.h ${srcdir}/../include/wait.h gdbcore.h ${srcdir}/../include/bfd.h \
+  ${srcdir}/../include/ansidecl.h gdbcmd.h 
+core.o : core.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h frame.h \
+  inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h command.h \
+  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h target.h gdbcore.h 
+coredep.o : coredep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h ${srcdir}/../include/obstack.h 
+cplus-dem.o : cplus-dem.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h 
+dbxread.o : dbxread.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  symtab.h breakpoint.h value.h command.h target.h ${srcdir}/../include/bfd.h \
+  ${srcdir}/../include/ansidecl.h gdbcore.h ${srcdir}/../bfd/libaout.h symfile.h buildsym.h \
+  ${srcdir}/../include/aout/aout64.h ${srcdir}/../include/aout/stab_gnu.h \
+  ${srcdir}/../include/aout/stab.def 
+dwarfread.o : dwarfread.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h ${srcdir}/../include/obstack.h symtab.h \
+  symfile.h ${srcdir}/../include/elf/dwarf.h ansidecl.h 
+elfread.o : elfread.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  ${srcdir}/../include/elf/common.h ${srcdir}/../include/elf/external.h \
+  ${srcdir}/../include/elf/internal.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h \
+  ${srcdir}/../include/obstack.h symfile.h symtab.h ansidecl.h 
+environ.o : environ.c environ.h defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h 
+eval.o : eval.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h symtab.h \
+  ${srcdir}/../include/obstack.h value.h expression.h target.h ${srcdir}/../include/bfd.h \
+  ${srcdir}/../include/ansidecl.h frame.h 
+exec.o : exec.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h frame.h \
+  inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h target.h \
+  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h gdbcmd.h command.h gdbcore.h 
+expprint.o : expprint.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  symtab.h ${srcdir}/../include/obstack.h expression.h value.h language.h \
+  parser-defs.h 
+findvar.o : findvar.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  symtab.h ${srcdir}/../include/obstack.h frame.h value.h gdbcore.h \
+  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h inferior.h breakpoint.h target.h 
+gould-pinsn.o : gould-pinsn.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h symtab.h ${srcdir}/../include/obstack.h frame.h gdbcore.h \
+  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h np1-opcode.h 
+gould-xdep.o : gould-xdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  ${srcdir}/../include/obstack.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
+hp300ux-xdep.o : hp300ux-xdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  ${srcdir}/../include/obstack.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
+i386-pinsn.o : i386-pinsn.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h \
+  ${srcdir}/../include/obstack.h 
+i386-tdep.o : i386-tdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  frame.h inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h \
+  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
+i386-xdep.o : i386-xdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  frame.h inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h \
+  language.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h \
+  ieee-float.h target.h 
+i387-tdep.o : i387-tdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  frame.h inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h \
+  language.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h \
+  ieee-float.h 
+i960-pinsn.o : i960-pinsn.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  ${srcdir}/../include/obstack.h 
+i960-tdep.o : i960-tdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  symtab.h ${srcdir}/../include/obstack.h value.h frame.h signame.h ieee-float.h 
+ieee-float.o : ieee-float.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h ieee-float.h 
+infcmd.o : infcmd.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  symtab.h ${srcdir}/../include/obstack.h frame.h inferior.h breakpoint.h value.h \
+  environ.h gdbcmd.h command.h gdbcore.h ${srcdir}/../include/bfd.h \
+  ${srcdir}/../include/ansidecl.h target.h 
+inflow.o : inflow.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  frame.h inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h \
+  command.h signals.h terminal.h target.h ${srcdir}/../include/bfd.h \
+  ${srcdir}/../include/ansidecl.h 
+infptrace.o : infptrace.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  frame.h inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h \
+  target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h gdbcore.h 
+infrun.o : infrun.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  symtab.h ${srcdir}/../include/obstack.h frame.h inferior.h breakpoint.h value.h \
   ${srcdir}/../include/wait.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h \
-  gdbcmd.h 
-core.o : core.c defs.h tm.h config.status xm.h config.status frame.h inferior.h breakpoint.h value.h \
-  symtab.h ${srcdir}/../include/obstack.h command.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h target.h gdbcore.h 
-coredep.o : coredep.c defs.h tm.h config.status xm.h config.status gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h ${srcdir}/../include/obstack.h 
-cplus-dem.o : cplus-dem.c defs.h tm.h config.status xm.h config.status 
-dbxread.o : dbxread.c defs.h tm.h config.status xm.h config.status symtab.h breakpoint.h value.h \
-  command.h target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h gdbcore.h \
-  ${srcdir}/../bfd/libaout.h symfile.h buildsym.h ${srcdir}/../include/aout64.h \
-  ${srcdir}/../include/stab.gnu.h ${srcdir}/../include/stab.def 
-dwarfread.o : dwarfread.c defs.h tm.h config.status xm.h config.status ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h ${srcdir}/../include/obstack.h symtab.h symfile.h \
-  ${srcdir}/../include/dwarf.h ansidecl.h 
-elfread.o : elfread.c defs.h tm.h config.status xm.h config.status ${srcdir}/../include/elf-common.h \
-  ${srcdir}/../include/elf-external.h ${srcdir}/../include/elf-internal.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h ${srcdir}/../include/obstack.h symfile.h symtab.h \
-  ansidecl.h 
-environ.o : environ.c environ.h defs.h tm.h config.status xm.h config.status 
-eval.o : eval.c defs.h tm.h config.status xm.h config.status symtab.h ${srcdir}/../include/obstack.h value.h \
-  expression.h target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h frame.h 
-exec.o : exec.c defs.h tm.h config.status xm.h config.status frame.h inferior.h breakpoint.h value.h \
-  symtab.h ${srcdir}/../include/obstack.h target.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h gdbcmd.h command.h gdbcore.h 
-expprint.o : expprint.c defs.h tm.h config.status xm.h config.status symtab.h ${srcdir}/../include/obstack.h \
-  expression.h value.h language.h parser-defs.h 
-findvar.o : findvar.c defs.h tm.h config.status xm.h config.status symtab.h ${srcdir}/../include/obstack.h \
-  frame.h value.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h \
-  inferior.h breakpoint.h target.h 
-gould-pinsn.o : gould-pinsn.c defs.h tm.h config.status xm.h config.status symtab.h \
-  ${srcdir}/../include/obstack.h frame.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h np1-opcode.h 
-gould-xdep.o : gould-xdep.c defs.h tm.h config.status xm.h config.status frame.h inferior.h \
-  breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h gdbcore.h \
+  signame.h command.h terminal.h target.h 
+inftarg.o : inftarg.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  frame.h inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h \
+  target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h ${srcdir}/../include/wait.h \
+  gdbcore.h ieee-float.h 
+language.o : language.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  symtab.h ${srcdir}/../include/obstack.h value.h gdbcmd.h command.h frame.h \
+  language.h expression.h target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h \
+  parser-defs.h 
+m2-exp.tab.o : m2-exp.tab.c ${srcdir}/defs.h xm.h config.status ${srcdir}/xm-sparc.h tm.h config.status \
+  ${srcdir}/tm-sparc.h ${srcdir}/tm-sunos.h ${srcdir}/symtab.h ${srcdir}/../include/obstack.h ${srcdir}/frame.h \
+  ${srcdir}/expression.h ${srcdir}/language.h ${srcdir}/value.h ${srcdir}/parser-defs.h 
+m68k-pinsn.o : m68k-pinsn.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h symtab.h ${srcdir}/../include/obstack.h m68k-opcode.h gdbcore.h \
   ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-hp300ux-xdep.o : hp300ux-xdep.c defs.h tm.h config.status xm.h config.status frame.h inferior.h \
-  breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h gdbcore.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-i386-pinsn.o : i386-pinsn.c defs.h tm.h config.status xm.h config.status gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h ${srcdir}/../include/obstack.h 
-i386-tdep.o : i386-tdep.c defs.h tm.h config.status xm.h config.status frame.h inferior.h breakpoint.h \
-  value.h symtab.h ${srcdir}/../include/obstack.h gdbcore.h ${srcdir}/../include/bfd.h \
+m68k-tdep.o : m68k-tdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  ieee-float.h frame.h symtab.h ${srcdir}/../include/obstack.h 
+m88k-pinsn.o : m88k-pinsn.c m88k-opcode.h defs.h xm.h config.status xm-sparc.h tm.h config.status \
+  tm-sparc.h tm-sunos.h symtab.h ${srcdir}/../include/obstack.h 
+m88k-tdep.o : m88k-tdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  frame.h inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h \
+  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h /usr/include/setjmp.h 
+m88k-xdep.o : m88k-xdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  frame.h inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h \
+  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h /usr/include/setjmp.h 
+mach386-xdep.o : mach386-xdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  ${srcdir}/../include/obstack.h signame.h gdbcore.h ${srcdir}/../include/bfd.h \
   ${srcdir}/../include/ansidecl.h 
-i386-xdep.o : i386-xdep.c defs.h tm.h config.status xm.h config.status frame.h inferior.h breakpoint.h \
-  value.h symtab.h ${srcdir}/../include/obstack.h language.h gdbcore.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h ieee-float.h target.h 
-i387-tdep.o : i387-tdep.c defs.h tm.h config.status xm.h config.status frame.h inferior.h breakpoint.h \
-  value.h symtab.h ${srcdir}/../include/obstack.h language.h gdbcore.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h ieee-float.h 
-i960-pinsn.o : i960-pinsn.c defs.h tm.h config.status xm.h config.status frame.h inferior.h \
-  breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h 
-i960-tdep.o : i960-tdep.c defs.h tm.h config.status xm.h config.status symtab.h ${srcdir}/../include/obstack.h \
-  value.h frame.h signame.h ieee-float.h 
-ieee-float.o : ieee-float.c defs.h tm.h config.status xm.h config.status ieee-float.h 
-infcmd.o : infcmd.c defs.h tm.h config.status xm.h config.status symtab.h ${srcdir}/../include/obstack.h \
-  frame.h inferior.h breakpoint.h value.h environ.h gdbcmd.h command.h \
-  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h target.h 
-inflow.o : inflow.c defs.h tm.h config.status xm.h config.status frame.h inferior.h breakpoint.h \
-  value.h symtab.h ${srcdir}/../include/obstack.h command.h signals.h terminal.h \
+main.o : main.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h gdbcmd.h \
+  command.h symtab.h ${srcdir}/../include/obstack.h inferior.h breakpoint.h value.h \
+  frame.h signals.h target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h \
+  language.h ${srcdir}/../include/getopt.h ${srcdir}/../readline/readline.h \
+  ${srcdir}/../readline/keymaps.h ${srcdir}/../readline/chardefs.h ${srcdir}/../readline/history.h 
+mem-break.o : mem-break.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h inferior.h frame.h \
   target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-infptrace.o : infptrace.c defs.h tm.h config.status xm.h config.status frame.h inferior.h breakpoint.h \
-  value.h symtab.h ${srcdir}/../include/obstack.h target.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h gdbcore.h 
-infrun.o : infrun.c defs.h tm.h config.status xm.h config.status symtab.h ${srcdir}/../include/obstack.h \
-  frame.h inferior.h breakpoint.h value.h ${srcdir}/../include/wait.h gdbcore.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h signame.h command.h terminal.h \
-  target.h 
-inftarg.o : inftarg.c defs.h tm.h config.status xm.h config.status frame.h inferior.h breakpoint.h \
-  value.h symtab.h ${srcdir}/../include/obstack.h target.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h ${srcdir}/../include/wait.h gdbcore.h ieee-float.h 
-language.o : language.c defs.h tm.h config.status xm.h config.status symtab.h ${srcdir}/../include/obstack.h \
-  value.h gdbcmd.h command.h frame.h language.h expression.h target.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h parser-defs.h 
-m2-exp.tab.o : m2-exp.tab.c ${srcdir}/defs.h tm.h config.status xm.h config.status ${srcdir}/symtab.h \
-  ${srcdir}/../include/obstack.h ${srcdir}/frame.h ${srcdir}/expression.h ${srcdir}/language.h ${srcdir}/value.h \
-  ${srcdir}/parser-defs.h 
-m68k-pinsn.o : m68k-pinsn.c defs.h tm.h config.status xm.h config.status symtab.h \
-  ${srcdir}/../include/obstack.h m68k-opcode.h gdbcore.h ${srcdir}/../include/bfd.h \
+mips-pinsn.o : mips-pinsn.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h symtab.h ${srcdir}/../include/obstack.h mips-opcode.h 
+mips-tdep.o : mips-tdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  frame.h inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h \
+  gdbcmd.h command.h language.h gdbcore.h ${srcdir}/../include/bfd.h \
   ${srcdir}/../include/ansidecl.h 
-m68k-tdep.o : m68k-tdep.c defs.h tm.h config.status xm.h config.status ieee-float.h frame.h symtab.h \
-  ${srcdir}/../include/obstack.h 
-m88k-pinsn.o : m88k-pinsn.c m88k-opcode.h defs.h tm.h config.status xm.h config.status symtab.h \
-  ${srcdir}/../include/obstack.h 
-m88k-tdep.o : m88k-tdep.c defs.h tm.h config.status xm.h config.status frame.h inferior.h breakpoint.h \
-  value.h symtab.h ${srcdir}/../include/obstack.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h /usr/include/setjmp.h 
-m88k-xdep.o : m88k-xdep.c defs.h tm.h config.status xm.h config.status frame.h inferior.h breakpoint.h \
-  value.h symtab.h ${srcdir}/../include/obstack.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h /usr/include/setjmp.h 
-mach386-xdep.o : mach386-xdep.c defs.h tm.h config.status xm.h config.status frame.h inferior.h \
-  breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h signame.h gdbcore.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-main.o : main.c defs.h tm.h config.status xm.h config.status gdbcmd.h command.h symtab.h \
-  ${srcdir}/../include/obstack.h inferior.h breakpoint.h value.h frame.h signals.h \
-  target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h language.h \
-  ${srcdir}/../include/getopt.h ${srcdir}/../readline/readline.h \
-  ${srcdir}/../readline/keymaps.h ${srcdir}/../readline/chardefs.h ${srcdir}/../readline/history.h 
-mem-break.o : mem-break.c defs.h tm.h config.status xm.h config.status 
-mips-pinsn.o : mips-pinsn.c defs.h tm.h config.status xm.h config.status symtab.h \
-  ${srcdir}/../include/obstack.h mips-opcode.h 
-mips-tdep.o : mips-tdep.c defs.h tm.h config.status xm.h config.status frame.h inferior.h breakpoint.h \
-  value.h symtab.h ${srcdir}/../include/obstack.h gdbcmd.h command.h language.h \
+mips-xdep.o : mips-xdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  frame.h inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h \
   gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-mips-xdep.o : mips-xdep.c defs.h tm.h config.status xm.h config.status frame.h inferior.h breakpoint.h \
-  value.h symtab.h ${srcdir}/../include/obstack.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h 
-mipsread.o : mipsread.c defs.h tm.h config.status xm.h config.status symtab.h ${srcdir}/../include/obstack.h \
-  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h symfile.h \
-  ${srcdir}/../include/coff-mips.h 
+mipsread.o : mipsread.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  symtab.h ${srcdir}/../include/obstack.h gdbcore.h ${srcdir}/../include/bfd.h \
+  ${srcdir}/../include/ansidecl.h symfile.h ${srcdir}/../include/coff/mips.h 
 news-xdep.o : news-xdep.c 
 Onindy.o : ${srcdir}/nindy-share/Onindy.c ${srcdir}/nindy-share/ttycntl.h \
   ${srcdir}/nindy-share/block_io.h ${srcdir}/../include/wait.h ${srcdir}/nindy-share/env.h \
@@ -158,128 +178,145 @@ nindy.o : ${srcdir}/nindy-share/nindy.c ${srcdir}/nindy-share/ttycntl.h ${srcdir
   ${srcdir}/../include/wait.h ${srcdir}/nindy-share/env.h /usr/include/string.h 
 ttybreak.o : ${srcdir}/nindy-share/ttybreak.c ${srcdir}/nindy-share/ttycntl.h 
 ttyflush.o : ${srcdir}/nindy-share/ttyflush.c ${srcdir}/nindy-share/ttycntl.h 
-nindy-tdep.o : nindy-tdep.c defs.h tm.h config.status xm.h config.status symtab.h \
-  ${srcdir}/../include/obstack.h frame.h 
-ns32k-pinsn.o : ns32k-pinsn.c defs.h tm.h config.status xm.h config.status symtab.h \
-  ${srcdir}/../include/obstack.h ns32k-opcode.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h 
-parse.o : parse.c defs.h tm.h config.status xm.h config.status symtab.h ${srcdir}/../include/obstack.h frame.h \
-  expression.h value.h command.h language.h parser-defs.h 
-printcmd.o : printcmd.c defs.h tm.h config.status xm.h config.status frame.h symtab.h \
-  ${srcdir}/../include/obstack.h value.h language.h expression.h gdbcore.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h gdbcmd.h command.h target.h 
-procfs.o : procfs.c defs.h tm.h config.status xm.h config.status 
-pyr-pinsn.o : pyr-pinsn.c defs.h tm.h config.status xm.h config.status symtab.h ${srcdir}/../include/obstack.h \
-  pyr-opcode.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-pyr-tdep.o : pyr-tdep.c defs.h tm.h config.status xm.h config.status 
-pyr-xdep.o : pyr-xdep.c defs.h tm.h config.status xm.h config.status frame.h inferior.h breakpoint.h \
-  value.h symtab.h ${srcdir}/../include/obstack.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h 
-remote-adapt.o : remote-adapt.c defs.h tm.h config.status xm.h config.status inferior.h breakpoint.h \
-  value.h symtab.h ${srcdir}/../include/obstack.h frame.h ${srcdir}/../include/wait.h \
-  terminal.h target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h gdbcore.h 
-remote-eb.o : remote-eb.c defs.h xm.h config.status tm-29k.h inferior.h breakpoint.h \
-  value.h symtab.h ${srcdir}/../include/obstack.h frame.h ${srcdir}/../include/wait.h \
-  terminal.h target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-remote-mm.o : remote-mm.c defs.h tm.h config.status xm.h config.status inferior.h breakpoint.h value.h \
-  symtab.h ${srcdir}/../include/obstack.h frame.h ${srcdir}/../include/wait.h terminal.h \
-  minimon.h target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-remote-nindy.o : remote-nindy.c defs.h tm.h config.status xm.h config.status frame.h inferior.h \
-  breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h target.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h gdbcore.h command.h ieee-float.h \
-  ${srcdir}/../include/wait.h ${srcdir}/nindy-share/ttycntl.h ${srcdir}/nindy-share/demux.h \
-  ${srcdir}/nindy-share/env.h ${srcdir}/nindy-share/stop.h 
-remote-vx.o : remote-vx.c defs.h tm.h config.status xm.h config.status frame.h inferior.h breakpoint.h \
-  value.h symtab.h ${srcdir}/../include/obstack.h ${srcdir}/../include/wait.h target.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h gdbcore.h command.h symfile.h \
-  ${srcdir}/vx-share/xdr_ptrace.h ${srcdir}/vx-share/xdr_regs.h ${srcdir}/vx-share/reg.h \
-  ${srcdir}/vx-share/xdr_ld.h ${srcdir}/vx-share/xdr_rdb.h ${srcdir}/vx-share/dbgRpcLib.h 
-remote.o : remote.c defs.h tm.h config.status xm.h config.status frame.h inferior.h breakpoint.h \
-  value.h symtab.h ${srcdir}/../include/obstack.h target.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h ${srcdir}/../include/wait.h terminal.h 
-rs6000-pinsn.o : rs6000-pinsn.c defs.h tm.h config.status xm.h config.status rs6k-opcode.h 
-rs6000-tdep.o : rs6000-tdep.c defs.h tm.h config.status xm.h config.status frame.h inferior.h \
-  breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h target.h \
+nindy-tdep.o : nindy-tdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h symtab.h ${srcdir}/../include/obstack.h frame.h 
+ns32k-pinsn.o : ns32k-pinsn.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h symtab.h ${srcdir}/../include/obstack.h ns32k-opcode.h gdbcore.h \
   ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-rs6000-xdep.o : rs6000-xdep.c defs.h tm.h config.status xm.h config.status frame.h inferior.h \
-  breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h target.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-signame.o : signame.c signame.h defs.h tm.h config.status xm.h config.status 
-solib.o : solib.c defs.h tm.h config.status xm.h config.status symtab.h ${srcdir}/../include/obstack.h \
-  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h command.h target.h \
-  frame.h regex.h inferior.h breakpoint.h value.h 
-source.o : source.c defs.h tm.h config.status xm.h config.status symtab.h ${srcdir}/../include/obstack.h \
-  language.h command.h gdbcmd.h frame.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h regex.h 
-sparc-pinsn.o : sparc-pinsn.c defs.h tm.h config.status xm.h config.status symtab.h \
-  ${srcdir}/../include/obstack.h sparc-opcode.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h /usr/include/string.h target.h 
-sparc-tdep.o : sparc-tdep.c defs.h tm.h config.status xm.h config.status frame.h inferior.h \
-  breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h signame.h target.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h ieee-float.h gdbcore.h 
-sparc-xdep.o : sparc-xdep.c defs.h tm.h config.status xm.h config.status inferior.h breakpoint.h \
-  value.h symtab.h ${srcdir}/../include/obstack.h frame.h target.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h gdbcore.h 
-stack.o : stack.c defs.h tm.h config.status xm.h config.status language.h symtab.h \
-  ${srcdir}/../include/obstack.h frame.h gdbcmd.h command.h value.h gdbcore.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h target.h breakpoint.h 
-sun3-xdep.o : sun3-xdep.c defs.h tm.h config.status xm.h config.status inferior.h breakpoint.h value.h \
-  symtab.h ${srcdir}/../include/obstack.h frame.h gdbcore.h ${srcdir}/../include/bfd.h \
+parse.o : parse.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  symtab.h ${srcdir}/../include/obstack.h frame.h expression.h value.h command.h \
+  language.h parser-defs.h 
+printcmd.o : printcmd.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  frame.h symtab.h ${srcdir}/../include/obstack.h value.h language.h expression.h \
+  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h gdbcmd.h command.h \
+  target.h 
+procfs.o : procfs.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h 
+pyr-pinsn.o : pyr-pinsn.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  symtab.h ${srcdir}/../include/obstack.h pyr-opcode.h gdbcore.h ${srcdir}/../include/bfd.h \
   ${srcdir}/../include/ansidecl.h 
-sun386-xdep.o : sun386-xdep.c 
-symfile.o : symfile.c defs.h tm.h config.status xm.h config.status symtab.h ${srcdir}/../include/obstack.h \
-  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h frame.h target.h \
-  value.h symfile.h gdbcmd.h command.h breakpoint.h 
-symm-tdep.o : symm-tdep.c defs.h tm.h config.status xm.h config.status frame.h inferior.h breakpoint.h \
-  value.h symtab.h ${srcdir}/../include/obstack.h gdbcore.h ${srcdir}/../include/bfd.h \
+pyr-tdep.o : pyr-tdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h 
+pyr-xdep.o : pyr-xdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  frame.h inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h \
+  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
+remote-adapt.o : remote-adapt.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h \
+  frame.h ${srcdir}/../include/wait.h terminal.h target.h ${srcdir}/../include/bfd.h \
+  ${srcdir}/../include/ansidecl.h gdbcore.h 
+remote-eb.o : remote-eb.c defs.h xm.h config.status xm-sparc.h tm-29k.h inferior.h \
+  breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h frame.h \
+  ${srcdir}/../include/wait.h terminal.h target.h ${srcdir}/../include/bfd.h \
   ${srcdir}/../include/ansidecl.h 
-symm-xdep.o : symm-xdep.c defs.h tm.h config.status xm.h config.status frame.h inferior.h breakpoint.h \
-  value.h symtab.h ${srcdir}/../include/obstack.h gdbcore.h ${srcdir}/../include/bfd.h \
+remote-mm.o : remote-mm.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h frame.h \
+  ${srcdir}/../include/wait.h terminal.h minimon.h target.h ${srcdir}/../include/bfd.h \
   ${srcdir}/../include/ansidecl.h 
-symmisc.o : symmisc.c defs.h tm.h config.status xm.h config.status symtab.h ${srcdir}/../include/obstack.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h symfile.h breakpoint.h value.h \
-  command.h 
-symtab.o : symtab.c defs.h tm.h config.status xm.h config.status symtab.h ${srcdir}/../include/obstack.h \
-  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h frame.h target.h \
-  value.h symfile.h gdbcmd.h command.h regex.h language.h 
-tahoe-pinsn.o : tahoe-pinsn.c defs.h tm.h config.status xm.h config.status symtab.h \
-  ${srcdir}/../include/obstack.h tahoe-opcode.h 
-target.o : target.c defs.h tm.h config.status xm.h config.status target.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h ${srcdir}/../include/obstack.h gdbcmd.h command.h symtab.h \
-  inferior.h breakpoint.h value.h frame.h symfile.h 
-ultra3-xdep.o : ultra3-xdep.c defs.h tm.h config.status xm.h config.status frame.h inferior.h \
-  breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h gdbcore.h \
+remote-nindy.o : remote-nindy.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  ${srcdir}/../include/obstack.h target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h \
+  gdbcore.h command.h ieee-float.h ${srcdir}/../include/wait.h ${srcdir}/nindy-share/ttycntl.h \
+  ${srcdir}/nindy-share/demux.h ${srcdir}/nindy-share/env.h ${srcdir}/nindy-share/stop.h 
+remote-vx.o : remote-vx.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  frame.h inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h \
+  ${srcdir}/../include/wait.h target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h \
+  gdbcore.h command.h symfile.h ${srcdir}/vx-share/xdr_ptrace.h ${srcdir}/vx-share/xdr_regs.h \
+  ${srcdir}/vx-share/reg.h ${srcdir}/vx-share/xdr_ld.h ${srcdir}/vx-share/xdr_rdb.h \
+  ${srcdir}/vx-share/dbgRpcLib.h 
+remote.o : remote.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  frame.h inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h \
+  target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h ${srcdir}/../include/wait.h \
+  terminal.h 
+rs6000-pinsn.o : rs6000-pinsn.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h rs6k-opcode.h 
+rs6000-tdep.o : rs6000-tdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  ${srcdir}/../include/obstack.h target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
+rs6000-xdep.o : rs6000-xdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  ${srcdir}/../include/obstack.h target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
+signame.o : signame.c signame.h defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h 
+solib.o : solib.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  symtab.h ${srcdir}/../include/obstack.h gdbcore.h ${srcdir}/../include/bfd.h \
+  ${srcdir}/../include/ansidecl.h command.h target.h frame.h regex.h inferior.h \
+  breakpoint.h value.h 
+source.o : source.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  symtab.h ${srcdir}/../include/obstack.h language.h command.h gdbcmd.h frame.h \
+  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h regex.h 
+sparc-pinsn.o : sparc-pinsn.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h symtab.h ${srcdir}/../include/obstack.h sparc-opcode.h gdbcore.h \
+  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h /usr/include/string.h target.h 
+sparc-tdep.o : sparc-tdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  ${srcdir}/../include/obstack.h signame.h target.h ${srcdir}/../include/bfd.h \
+  ${srcdir}/../include/ansidecl.h ieee-float.h gdbcore.h 
+sparc-xdep.o : sparc-xdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h \
+  frame.h target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h gdbcore.h 
+stack.o : stack.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  language.h symtab.h ${srcdir}/../include/obstack.h frame.h gdbcmd.h command.h \
+  value.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h target.h \
+  breakpoint.h 
+sun3-xdep.o : sun3-xdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h frame.h \
+  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
+sun386-xdep.o : sun386-xdep.c 
+symfile.o : symfile.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  symtab.h ${srcdir}/../include/obstack.h gdbcore.h ${srcdir}/../include/bfd.h \
+  ${srcdir}/../include/ansidecl.h frame.h target.h value.h symfile.h gdbcmd.h \
+  command.h breakpoint.h 
+symm-tdep.o : symm-tdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  frame.h inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h \
+  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
+symm-xdep.o : symm-xdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  frame.h inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h \
+  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
+symmisc.o : symmisc.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  symtab.h ${srcdir}/../include/obstack.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h \
+  symfile.h breakpoint.h value.h command.h 
+symtab.o : symtab.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  symtab.h ${srcdir}/../include/obstack.h gdbcore.h ${srcdir}/../include/bfd.h \
+  ${srcdir}/../include/ansidecl.h frame.h target.h value.h symfile.h gdbcmd.h \
+  command.h regex.h language.h 
+tahoe-pinsn.o : tahoe-pinsn.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h symtab.h ${srcdir}/../include/obstack.h tahoe-opcode.h 
+target.o : target.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h ${srcdir}/../include/obstack.h \
+  gdbcmd.h command.h symtab.h inferior.h breakpoint.h value.h frame.h \
+  symfile.h 
+ultra3-xdep.o : ultra3-xdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h \
+  tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  ${srcdir}/../include/obstack.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
+umax-xdep.o : umax-xdep.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  frame.h inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h \
+  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
+utils.o : utils.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  signals.h gdbcmd.h command.h terminal.h ${srcdir}/../include/bfd.h \
+  ${srcdir}/../include/ansidecl.h ${srcdir}/../include/obstack.h target.h 
+valarith.o : valarith.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  value.h symtab.h ${srcdir}/../include/obstack.h expression.h target.h \
   ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-umax-xdep.o : umax-xdep.c defs.h tm.h config.status xm.h config.status frame.h inferior.h breakpoint.h \
-  value.h symtab.h ${srcdir}/../include/obstack.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h 
-utils.o : utils.c defs.h tm.h config.status xm.h config.status signals.h gdbcmd.h command.h terminal.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h ${srcdir}/../include/obstack.h target.h 
-valarith.o : valarith.c defs.h tm.h config.status xm.h config.status value.h symtab.h \
-  ${srcdir}/../include/obstack.h expression.h target.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h 
-valops.o : valops.c defs.h tm.h config.status xm.h config.status symtab.h ${srcdir}/../include/obstack.h \
-  value.h frame.h inferior.h breakpoint.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h target.h 
-valprint.o : valprint.c defs.h tm.h config.status xm.h config.status symtab.h ${srcdir}/../include/obstack.h \
-  value.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h gdbcmd.h \
-  command.h target.h language.h 
-values.o : values.c defs.h tm.h config.status xm.h config.status symtab.h ${srcdir}/../include/obstack.h \
-  value.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h frame.h \
-  command.h gdbcmd.h 
-vax-pinsn.o : vax-pinsn.c defs.h tm.h config.status xm.h config.status symtab.h ${srcdir}/../include/obstack.h \
-  vax-opcode.h 
+valops.o : valops.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  symtab.h ${srcdir}/../include/obstack.h value.h frame.h inferior.h breakpoint.h \
+  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h target.h 
+valprint.o : valprint.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  symtab.h ${srcdir}/../include/obstack.h value.h gdbcore.h ${srcdir}/../include/bfd.h \
+  ${srcdir}/../include/ansidecl.h gdbcmd.h command.h target.h language.h 
+values.o : values.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  symtab.h ${srcdir}/../include/obstack.h value.h gdbcore.h ${srcdir}/../include/bfd.h \
+  ${srcdir}/../include/ansidecl.h frame.h command.h gdbcmd.h 
+vax-pinsn.o : vax-pinsn.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  symtab.h ${srcdir}/../include/obstack.h vax-opcode.h 
 xdr_ld.o : ${srcdir}/vx-share/xdr_ld.c ${srcdir}/vx-share/vxWorks.h ${srcdir}/vx-share/vxTypes.h \
   /usr/include/rpc/rpc.h ${srcdir}/vx-share/xdr_ld.h 
 xdr_ptrace.o : ${srcdir}/vx-share/xdr_ptrace.c 
 xdr_rdb.o : ${srcdir}/vx-share/xdr_rdb.c ${srcdir}/vx-share/vxWorks.h ${srcdir}/vx-share/vxTypes.h \
   ${srcdir}/vx-share/xdr_rdb.h 
 xdr_regs.o : ${srcdir}/vx-share/xdr_regs.c 
-xcoffexec.o : xcoffexec.c defs.h tm.h config.status xm.h config.status frame.h inferior.h breakpoint.h \
-  value.h symtab.h ${srcdir}/../include/obstack.h target.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h gdbcmd.h command.h gdbcore.h symfile.h \
-  ${srcdir}/../bfd/libbfd.h 
-xcoffread.o : xcoffread.c defs.h tm.h config.status xm.h config.status ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h ${srcdir}/../include/obstack.h symtab.h symfile.h \
-  buildsym.h ${srcdir}/../include/internalcoff.h ${srcdir}/../bfd/libcoff.h \
-  ${srcdir}/../include/coff-rs6000.h 
+xcoffexec.o : xcoffexec.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  frame.h inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/obstack.h \
+  target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h gdbcmd.h command.h \
+  gdbcore.h symfile.h ${srcdir}/../bfd/libbfd.h 
+xcoffread.o : xcoffread.c defs.h xm.h config.status xm-sparc.h tm.h config.status tm-sparc.h tm-sunos.h \
+  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h ${srcdir}/../include/obstack.h symtab.h \
+  symfile.h buildsym.h ${srcdir}/../include/coff/internal.h ${srcdir}/../bfd/libcoff.h \
+  ${srcdir}/../include/coff/rs6000.h 
diff --git a/gdb/dwarfread.c b/gdb/dwarfread.c
index 4fb1ddb..f975c7f 100644
--- a/gdb/dwarfread.c
+++ b/gdb/dwarfread.c
@@ -75,7 +75,7 @@ other things to work on, if you get bored. :-)
 #include "bfd.h"
 #include "symtab.h"
 #include "symfile.h"
-#include "dwarf.h"
+#include "elf/dwarf.h"
 #include "ansidecl.h"
 
 #ifdef MAINTENANCE	/* Define to 1 to compile in some maintenance stuff */
diff --git a/gdb/elfread.c b/gdb/elfread.c
index 5b4294a..5de3cd7 100644
--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -39,9 +39,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <stdio.h>
 
 #include "defs.h"
-#include "elf-common.h"
-#include "elf-external.h"
-#include "elf-internal.h"
+#include "elf/common.h"
+#include "elf/external.h"
+#include "elf/internal.h"
 #include "bfd.h"
 #include "symfile.h"
 #include "symtab.h"
diff --git a/gdb/mipsread.c b/gdb/mipsread.c
index 09c81a5..f77ec4a 100644
--- a/gdb/mipsread.c
+++ b/gdb/mipsread.c
@@ -49,7 +49,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sym.h>
 #endif /* not CMUCS */
 
-#include "coff-mips.h"
+#include "coff/mips.h"
 
 struct coff_exec {
 	struct external_filehdr f;
diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index 7956d9d..68dcd96 100644
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -39,9 +39,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "symfile.h"
 #include "buildsym.h"
 
-#include "internalcoff.h"	/* FIXME, internal data from BFD */
+#include "coff/internal.h"	/* FIXME, internal data from BFD */
 #include "libcoff.h"		/* FIXME, internal data from BFD */
-#include "coff-rs6000.h"	/* FIXME, raw file-format guts of xcoff */
+#include "coff/rs6000.h"	/* FIXME, raw file-format guts of xcoff */
 
 extern char *index();