* Makefile.in: Sort header definitions.

(parser_defs_h, dis_asm_h, annotate_h, gdbthread_h): Define.
Replace parser-defs.h with $(parser_defs_h).  Replace $(dis-asm_h)
and $(dis-asm.h) with $(dis_asm_h).  Replace annotate.h with
$(annotate_h).  Replace target.h with $(target_h).  Replace
gdbthread.h with $(gdb_thread_h).  Replace symfile.h with $(symfile_h).

1 files changed, 205 insertions, 209 deletions

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 80b8e9e..40a65fc 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -554,15 +554,11 @@ LINTFILES = $(SFILES) $(YYFILES) $(CONFIG_SRCS) init.c
 getopt_h =	$(INCLUDE_DIR)/getopt.h
 floatformat_h =	$(INCLUDE_DIR)/floatformat.h
 bfd_h =		$(BFD_DIR)/bfd.h
-dis-asm_h =	$(INCLUDE_DIR)/dis-asm.h 
+dis_asm_h =	$(INCLUDE_DIR)/dis-asm.h 
 remote-sim_h =	$(INCLUDE_DIR)/remote-sim.h
 demangle_h =    $(INCLUDE_DIR)/demangle.h
 obstack_h =     $(INCLUDE_DIR)/obstack.h
 
-dcache_h = dcache.h
-remote_utils_h =  remote-utils.h $(target_h)
-
-
 readline_headers = \
 	$(READLINE_SRC)/chardefs.h \
 	$(READLINE_SRC)/history.h \
@@ -577,52 +573,51 @@ udiheaders = \
 	$(srcdir)/29k-share/udi/udipt29k.h \
 	$(srcdir)/29k-share/udi/udisoc.h
 
-gdbcore_h =	gdbcore.h $(bfd_h)
-
-frame_h =	frame.h
-symtab_h =	symtab.h bcache.h
-symfile_h =	symfile.h
-gdbtypes_h =	gdbtypes.h
-expression_h =	expression.h
-value_h =	value.h $(symtab_h) $(gdbtypes_h) $(expression_h)
-
-breakpoint_h =	breakpoint.h $(frame_h) $(value_h)
-
-command_h =	command.h
-gdbcmd_h =	gdbcmd.h $(command_h) $(ui_out_h)
-call_cmds_h =	call-cmds.h
-regcache_h =	regcache.h
-
 xm_h =		@xm_h@
 tm_h =		@tm_h@
 nm_h =		@nm_h@
-defs_h =	defs.h $(xm_h) $(tm_h) $(nm_h) config.status config.h gdbarch.h ui-file.h
-gdb_h =		gdb.h
 
-top_h =		top.h
-inferior_h =	inferior.h $(breakpoint_h)
-target_h =      target.h $(bfd_h) $(symtab_h) $(dcache_h) $(memattr_h)
-memattr_h =     memattr.h
-tracepoint_h =	tracepoint.h
+annotate_h =	annotate.h $(symtab_h) $(gdbtypes_h)
+arch_utils_h =	arch-utils.h
 ax_h = 		ax.h
+breakpoint_h =	breakpoint.h $(frame_h) $(value_h)
+call_cmds_h =	call-cmds.h
+cli_cmds_h =	$(srcdir)/cli/cli-cmds.h
+cli_decode_h =	$(srcdir)/cli/cli-decode.h
+cli_out_h =	cli-out.h
+cli_script_h =	$(srcdir)/cli/cli-script.h
+cli_setshow_h =	$(srcdir)/cli/cli-setshow.h
+cli_utils_h =	$(srcdir)/cli/cli-utils.h
+command_h =	command.h
+completer_h =	completer.h
+cp_abi_h =	cp-abi.h
+dcache_h =	dcache.h
+defs_h =	defs.h $(xm_h) $(tm_h) $(nm_h) config.status config.h gdbarch.h ui-file.h
 event_loop_h =  event-loop.h
 event_top_h = 	event-top.h
+expression_h =	expression.h
+frame_h =	frame.h
+gdb_h =		gdb.h
+gdb_string_h =  gdb_string.h
+gdbcmd_h =	gdbcmd.h $(command_h) $(ui_out_h)
+gdbcore_h =	gdbcore.h $(bfd_h)
+gdbthread_h =	gdbthread.h $(breakpoint_h)
+gdbtypes_h =	gdbtypes.h
 inf_loop_h =  	inf-loop.h
+inferior_h =	inferior.h $(breakpoint_h)
+memattr_h =     memattr.h
+parser_defs_h =	parser-defs.h
+regcache_h =	regcache.h
 remote_h =	remote.h
-version_h = 	version.h
+remote_utils_h =  remote-utils.h $(target_h)
+symfile_h =	symfile.h
+symtab_h =	symtab.h bcache.h
+target_h =      target.h $(bfd_h) $(symtab_h) $(dcache_h) $(memattr_h)
+top_h =		top.h
+tracepoint_h =	tracepoint.h
 ui_out_h =      ui-out.h
-cli_out_h =	cli-out.h
-arch_utils_h =	arch-utils.h
-gdb_string_h =  gdb_string.h
-completer_h =	completer.h
-
-cli_decode_h =	$(srcdir)/cli/cli-decode.h
-cli_cmds_h =	$(srcdir)/cli/cli-cmds.h
-cli_script_h =	$(srcdir)/cli/cli-script.h
-cli_setshow_h =	$(srcdir)/cli/cli-setshow.h
-cli_utils_h =	$(srcdir)/cli/cli-utils.h
-
-cp_abi_h = cp-abi.h
+value_h =	value.h $(symtab_h) $(gdbtypes_h) $(expression_h)
+version_h = 	version.h
 
 # Header files that need to have srcdir added.  Note that in the cases
 # where we use a macro like $(gdbcmd_h), things are carefully arranged
@@ -1202,19 +1197,19 @@ a29k-tdep.o: a29k-tdep.c $(gdbcmd_h) $(gdbcore_h) $(inferior_h) $(defs_h) \
 a68v-nat.o: a68v-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) \
 	$(regcache_h)
 
-alpha-nat.o: alpha-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h \
+alpha-nat.o: alpha-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) $(target_h) \
 	$(regcache_h)
 
 alpha-tdep.o: alpha-tdep.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
-	$(inferior_h) $(symtab_h) $(dis-asm.h) $(gdb_string_h) linespec.h \
+	$(inferior_h) $(symtab_h) $(dis_asm_h) $(gdb_string_h) linespec.h \
 	$(regcache_h)
 
-annotate.o: annotate.c $(defs_h) annotate.h $(value_h) target.h $(gdbtypes_h)
+annotate.o: annotate.c $(defs_h) $(annotate_h) $(value_h) $(target_h) $(gdbtypes_h)
 
 arm-linux-nat.o: arm-linux-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) \
 	$(gdb_string_h) $(regcache_h)
 
-arm-linux-tdep.o: arm-linux-tdep.c $(defs_h) target.h $(value_h) \
+arm-linux-tdep.o: arm-linux-tdep.c $(defs_h) $(target_h) $(value_h) \
 	$(gdbtypes_h) $(floatformat_h) $(regcache_h)
 
 arm-tdep.o: arm-tdep.c $(gdbcmd_h) $(gdbcore_h) $(inferior_h) $(defs_h) \
@@ -1223,43 +1218,44 @@ arm-tdep.o: arm-tdep.c $(gdbcmd_h) $(gdbcore_h) $(inferior_h) $(defs_h) \
 bcache.o: bcache.c bcache.h $(defs_h)
 
 blockframe.o: blockframe.c $(defs_h) $(gdbcore_h) $(inferior_h) \
-	objfiles.h symfile.h target.h $(regcache_h)
+	objfiles.h $(symfile_h) $(target_h) $(regcache_h)
 
 breakpoint.o: breakpoint.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
-	$(inferior_h) language.h target.h gdbthread.h $(gdb_string_h) \
+	$(inferior_h) language.h $(target_h) $(gdbthread_h) $(gdb_string_h) \
 	gdb-events.h linespec.h $(ui_out_h) $(completer_h) $(gdb_h)
 
 buildsym.o: buildsym.c $(bfd_h) buildsym.h complaints.h $(defs_h) \
-	objfiles.h symfile.h $(symtab_h) $(gdb_string_h)
+	objfiles.h $(symfile_h) $(symtab_h) $(gdb_string_h)
 
 c-lang.o: c-lang.c c-lang.h $(defs_h) $(expression_h) $(gdbtypes_h) \
-	language.h parser-defs.h $(symtab_h)
+	language.h $(parser_defs_h) $(symtab_h)
 
 c-typeprint.o: c-typeprint.c c-lang.h $(defs_h) $(expression_h) \
 	$(gdbcmd_h) $(gdbcore_h) $(gdbtypes_h) language.h $(symtab_h) \
-	target.h typeprint.h $(value_h) $(gdb_string_h) $(cp_abi_h)
+	$(target_h) typeprint.h $(value_h) $(gdb_string_h) $(cp_abi_h)
 
 c-valprint.o: c-valprint.c $(defs_h) $(expression_h) $(gdbtypes_h) \
 	language.h $(symtab_h) valprint.h $(value_h) $(cp_abi_h)
 
 f-lang.o: f-lang.c f-lang.h $(defs_h) $(expression_h) $(gdbtypes_h) \
-	language.h parser-defs.h $(symtab_h) $(gdb_string_h)
+	language.h $(parser_defs_h) $(symtab_h) $(gdb_string_h)
 
 f-typeprint.o: f-typeprint.c f-lang.h $(defs_h) $(expression_h) \
 	$(gdbcmd_h) $(gdbcore_h) $(gdbtypes_h) language.h $(symtab_h) \
-	target.h typeprint.h $(value_h) $(gdb_string_h)
+	$(target_h) typeprint.h $(value_h) $(gdb_string_h)
 
 f-valprint.o: f-valprint.c $(defs_h) $(expression_h) $(gdbtypes_h) \
 	language.h $(symtab_h) valprint.h $(value_h) $(gdb_string_h)
 
-ch-exp.o: ch-exp.c ch-lang.h $(defs_h) language.h parser-defs.h $(bfd_h) symfile.h objfiles.h $(value_h)
+ch-exp.o: ch-exp.c ch-lang.h $(defs_h) language.h $(parser_defs_h) $(bfd_h) \
+	$(symfile_h) objfiles.h $(value_h)
 
 ch-lang.o: ch-lang.c ch-lang.h $(defs_h) $(expression_h) $(gdbtypes_h) \
-	language.h parser-defs.h $(symtab_h)
+	language.h $(parser_defs_h) $(symtab_h)
 
 ch-typeprint.o: ch-typeprint.c ch-lang.h $(defs_h) $(expression_h) \
 	$(gdbcmd_h) $(gdbcore_h) $(gdbtypes_h) language.h $(symtab_h) \
-	target.h $(value_h) typeprint.h $(gdb_string_h)
+	$(target_h) $(value_h) typeprint.h $(gdb_string_h)
 
 ch-valprint.o: ch-valprint.c $(defs_h) $(expression_h) $(gdbtypes_h) \
 	language.h $(symtab_h) valprint.h $(value_h) c-lang.h
@@ -1268,7 +1264,7 @@ coff-solib.o: coff-solib.c $(defs_h)
 
 coffread.o: coffread.c $(bfd_h) $(breakpoint_h) buildsym.h \
 	complaints.h $(defs_h) $(expression_h) $(gdbtypes_h) objfiles.h \
-	symfile.h $(symtab_h) gdb-stabs.h stabsread.h target.h \
+	$(symfile_h) $(symtab_h) gdb-stabs.h stabsread.h $(target_h) \
 	$(gdb_string_h)
 
 complaints.o: complaints.c complaints.h $(defs_h) $(gdbcmd_h)
@@ -1281,17 +1277,17 @@ core-aout.o: core-aout.c $(defs_h) $(gdbcore_h) $(value_h) $(inferior_h) \
 	$(regcache_h)
 
 core-sol2.o: core-sol2.c $(command_h) $(defs_h) $(gdbcore_h) \
-	$(inferior_h) target.h $(gdb_string_h) $(regcache_h)
+	$(inferior_h) $(target_h) $(gdb_string_h) $(regcache_h)
 
 core-regset.o: core-regset.c $(command_h) $(defs_h) $(gdbcore_h) \
-	$(inferior_h) target.h $(gdb_string_h)
+	$(inferior_h) $(target_h) $(gdb_string_h)
 
-corefile.o: corefile.c $(dis-asm_h) $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
-	$(inferior_h) target.h language.h $(gdb_string_h) $(completer_h) \
-	symfile.h
+corefile.o: corefile.c $(dis_asm_h) $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
+	$(inferior_h) $(target_h) language.h $(gdb_string_h) $(completer_h) \
+	$(symfile_h)
 
 corelow.o: corelow.c $(command_h) $(defs_h) $(gdbcore_h) $(inferior_h) \
-	target.h gdbthread.h $(gdb_string_h) $(regcache_h)
+	$(target_h) $(gdbthread_h) $(gdb_string_h) $(regcache_h)
 
 cp-abi.o: cp-abi.c $(defs_h) $(value_h) $(cp_abi_h)
 
@@ -1299,19 +1295,19 @@ cp-valprint.o: cp-valprint.c $(defs_h) $(expression_h) $(gdbcmd_h) \
 	$(gdbtypes_h) $(symtab_h) $(value_h) $(gdb_string_h)
 
 dcache.o: dcache.c $(dcache_h) $(defs_h) $(gdbcmd_h) $(gdb_string_h) \
-	$(gdbcore_h) target.h
+	$(gdbcore_h) $(target_h)
 
 dbxread.o: dbxread.c $(breakpoint_h) buildsym.h $(command_h) \
 	complaints.h $(defs_h) $(expression_h) gdb-stabs.h $(gdbcore_h) \
 	$(gdbtypes_h) language.h objfiles.h partial-stab.h stabsread.h \
-	symfile.h $(symtab_h) target.h $(gdb_string_h) $(cp_abi_h)
+	$(symfile_h) $(symtab_h) $(target_h) $(gdb_string_h) $(cp_abi_h)
 
 delta68-nat.o: delta68-nat.c $(defs_h)
 
 demangle.o: demangle.c $(defs_h) $(gdbcmd_h) $(gdb_string_h)
 
 dink32-rom.o: dink32-rom.c monitor.h $(bfd_h) gdb_wait.h $(defs_h) \
-	$(gdbcmd_h) $(inferior_h) target.h serial.h terminal.h symfile.h \
+	$(gdbcmd_h) $(inferior_h) $(target_h) serial.h terminal.h $(symfile_h) \
 	$(regcache_h)
 
 dpx2-nat.o: dpx2-nat.c $(defs_h) $(gdbcore_h) $(gdb_string_h)
@@ -1319,48 +1315,48 @@ dpx2-nat.o: dpx2-nat.c $(defs_h) $(gdbcore_h) $(gdb_string_h)
 dstread.o: dstread.c $(gdb_string_h)
 
 dwarfread.o: dwarfread.c $(bfd_h) buildsym.h complaints.h $(defs_h) \
-	$(expression_h) $(gdbtypes_h) language.h objfiles.h symfile.h \
+	$(expression_h) $(gdbtypes_h) language.h objfiles.h $(symfile_h) \
 	$(symtab_h) $(gdb_string_h)
 
 dwarf2read.o: dwarf2read.c $(bfd_h) buildsym.h $(defs_h) \
-	$(expression_h) $(gdbtypes_h) language.h objfiles.h symfile.h \
+	$(expression_h) $(gdbtypes_h) language.h objfiles.h $(symfile_h) \
 	$(symtab_h) $(gdb_string_h)
 
 elfread.o: elfread.c $(bfd_h) buildsym.h complaints.h $(defs_h) \
-	gdb-stabs.h objfiles.h symfile.h $(symtab_h) $(gdb_string_h) \
+	gdb-stabs.h objfiles.h $(symfile_h) $(symtab_h) $(gdb_string_h) \
 	$(BFD_SRC)/elf-bfd.h $(INCLUDE_DIR)/elf/mips.h
 
 environ.o: environ.c $(defs_h) environ.h $(gdbcore_h) $(gdb_string_h)
 
 eval.o: eval.c $(bfd_h) $(defs_h) $(expression_h) $(frame_h) \
-	$(gdbtypes_h) language.h $(symtab_h) target.h $(value_h) \
+	$(gdbtypes_h) language.h $(symtab_h) $(target_h) $(value_h) \
 	$(gdb_string_h) $(cp_abi_h)
 
 event-loop.o: event-loop.c $(defs_h) $(top_h) $(event_loop_h) $(event_top_h)
 
 event-top.o: event-top.c top.h $(readline_headers) \
       $(defs_h) $(inferior_h) $(event_loop_h) $(event_top_h) terminal.h \
-	$(gdbcmd_h) target.h
+	$(gdbcmd_h) $(target_h)
 
 inf-loop.o: inf-loop.c $(defs_h) $(inferior_h) $(inf_loop_h) $(event_loop_h) \
 	 $(event_top_h)
 
 exec.o: exec.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) $(inferior_h) \
-	target.h language.h $(gdb_string_h) $(completer_h)
+	$(target_h) language.h $(gdb_string_h) $(completer_h)
 
 expprint.o: expprint.c $(defs_h) $(expression_h) $(gdbtypes_h) \
-	language.h parser-defs.h $(symtab_h) $(value_h)
+	language.h $(parser_defs_h) $(symtab_h) $(value_h)
 
-findvar.o: findvar.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h \
+findvar.o: findvar.c $(defs_h) $(gdbcore_h) $(inferior_h) $(target_h) \
 	$(gdb_string_h) $(regcache_h)
 
 frame.o: frame.c $(defs_h) $(frame_h) $(target_h) $(value_h) $(inferior_h) \
 	$(regcache_h)
 
-regcache.o: regcache.c $(defs_h) $(inferior_h) target.h $(regcache_h)
+regcache.o: regcache.c $(defs_h) $(inferior_h) $(target_h) $(regcache_h)
 
 fork-child.o: fork-child.c gdb_wait.h $(defs_h) $(gdbcore_h) \
-	$(inferior_h) target.h terminal.h gdbthread.h $(gdb_string_h)
+	$(inferior_h) $(target_h) terminal.h $(gdbthread_h) $(gdb_string_h)
 
 # FIXME: cagney/2000-03-27: Post 5.0 this link code can be removed.
 # It should now be possible to run GDBtk from the build directory
@@ -1467,8 +1463,8 @@ gdbtk-wrapper.o: $(srcdir)/gdbtk/generic/gdbtk-wrapper.c \
 		$(srcdir)/gdbtk/generic/gdbtk-wrapper.c
 
 v850ice.o: v850ice.c $(defs_h) $(symtab_h) $(inferior_h) $(command_h) \
-	$(frame_h) $(breakpoint_h) $(gdbcore_h) $(value_h) symfile.h \
-	$(gdb_string_h) target.h objfiles.h $(regcache_h)
+	$(frame_h) $(breakpoint_h) $(gdbcore_h) $(value_h) $(symfile_h) \
+	$(gdb_string_h) $(target_h) objfiles.h $(regcache_h)
 	$(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) $(TIX_CFLAGS) \
 	$(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) $(GDBTK_CFLAGS)\
 		$(srcdir)/v850ice.c
@@ -1478,7 +1474,7 @@ v850-tdep.o: v850-tdep.c $(defs_h) $(frame_h) $(inferior_h) $(obstack_h) \
 	$(symfile_h) $(arch_utils_h) $(regcache_h)
 
 tracepoint.o: tracepoint.c $(defs_h) $(symtab_h) $(frame_h) $(tracepoint_h) \
-	$(gdbtypes_h) $(expression_h) $(gdbcmd_h) $(value_h) target.h \
+	$(gdbtypes_h) $(expression_h) $(gdbcmd_h) $(value_h) $(target_h) \
 	language.h $(gdb_string_h) $(readline_headers) $(remote_h) linespec.h \
 	$(regcache_h) $(completer_h)
 
@@ -1488,11 +1484,11 @@ arch-utils.o: arch-utils.c $(defs_h) $(bfd_h) $(gdbcmd_h) \
 	$(arch_utils_h)
 
 gdbtypes.o: gdbtypes.c $(bfd_h) complaints.h $(defs_h) $(expression_h) \
-	$(gdbtypes_h) language.h objfiles.h symfile.h $(symtab_h) target.h \
+	$(gdbtypes_h) language.h objfiles.h $(symfile_h) $(symtab_h) $(target_h) \
 	$(value_h) $(gdb_string_h) wrapper.h $(cp_abi_h)
 
 go32-nat.o: go32-nat.c $(defs_h) $(inferior_h) gdb_wait.h $(gdbcore_h) \
-	$(command_h) $(floatformat_h) target.h i387-nat.h $(regcache_h)
+	$(command_h) $(floatformat_h) $(target_h) i387-nat.h $(regcache_h)
 
 gnu-nat.o: process_reply_S.h exc_request_S.h notify_S.h msg_reply_S.h \
 	exc_request_U.h msg_U.h gnu-nat.h
@@ -1504,7 +1500,7 @@ gnu-v3-abi.o: gnu-v2-abi.c $(defs_h) $(value_h) $(cp_abi_h) $(demangle_h)
  
 h8300-tdep.o: h8300-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(regcache_h)
 
-h8500-tdep.o: h8500-tdep.c $(bfd_h) $(dis-asm_h) $(defs_h) \
+h8500-tdep.o: h8500-tdep.c $(bfd_h) $(dis_asm_h) $(defs_h) \
 	$(expression_h) $(frame_h) $(gdbcmd_h) $(gdbtypes_h) $(symtab_h) \
 	$(value_h) $(regcache_h)
 
@@ -1514,24 +1510,24 @@ hpacc-abi.o: hpacc-abi.c $(defs_h) $(cp_abi_h) $(gdb_string_h) $(gdbtypes_h) \
 	$(value_h) $(gdbcore_h)
 
 hppa-tdep.o: hppa-tdep.c gdb_wait.h $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
-	$(inferior_h) objfiles.h symfile.h target.h $(regcache_h)
+	$(inferior_h) objfiles.h $(symfile_h) $(target_h) $(regcache_h)
 
-hppab-nat.o: hppab-nat.c $(bfd_h) $(defs_h) $(inferior_h) target.h \
+hppab-nat.o: hppab-nat.c $(bfd_h) $(defs_h) $(inferior_h) $(target_h) \
 	$(regcache_h)
 
-hppah-nat.o: hppah-nat.c $(bfd_h) $(defs_h) $(inferior_h) target.h \
+hppah-nat.o: hppah-nat.c $(bfd_h) $(defs_h) $(inferior_h) $(target_h) \
 	$(regcache_h)
 
 i386gnu-nat.o: gnu-nat.h
 
 i386-tdep.o: i386-tdep.c $(defs_h) $(gdb_string_h) $(frame_h)	\
-	$(inferior_h) $(gdbcore_h) target.h $(floatformat_h)	\
+	$(inferior_h) $(gdbcore_h) $(target_h) $(floatformat_h)	\
 	$(symtab_h) $(gdbcmd_h) $(command_h) $(arch_utils_h) $(regcache_h)
 
 i386-nat.o: i386-nat.c $(defs_h) $(breakpoint_h) $(command_h) $(gdbcmd_h)
 
 i386aix-nat.o: i386aix-nat.c $(defs_h) $(frame_h) $(inferior_h) \
-	language.h $(gdbcore_h) $(floatformat_h) target.h $(regcache_h)
+	language.h $(gdbcore_h) $(floatformat_h) $(target_h) $(regcache_h)
 
 i386b-nat.o: i386b-nat.c $(defs_h) $(regcache_h)
 
@@ -1542,22 +1538,22 @@ i386bsd-nat.o: i386bsd-nat.c $(defs_h) $(inferior_h) $(regcache_h)
 
 i386fbsd-nat.o: i386fbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h)
 
-i386ly-nat.o: i386ly-nat.c $(defs_h) $(frame_h) $(inferior_h) target.h
+i386ly-nat.o: i386ly-nat.c $(defs_h) $(frame_h) $(inferior_h) $(target_h)
 
-i386ly-tdep.o: i386ly-tdep.c $(defs_h) $(inferior_h) target.h $(gdbcore_h) \
+i386ly-tdep.o: i386ly-tdep.c $(defs_h) $(inferior_h) $(target_h) $(gdbcore_h) \
 	$(regcache_h)
 
-i386m3-nat.o: i386m3-nat.c $(defs_h) $(inferior_h) $(floatformat_h) target.h \
+i386m3-nat.o: i386m3-nat.c $(defs_h) $(inferior_h) $(floatformat_h) $(target_h) \
 	$(regcache_h)
 
 i386mach-nat.o: i386mach-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) \
 	$(regcache_h)
 
 i386v-nat.o: i386v-nat.c $(floatformat_h) $(defs_h) $(gdbcore_h) \
-	$(inferior_h) language.h target.h
+	$(inferior_h) language.h $(target_h)
 
 i386-linux-nat.o: i386-linux-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) \
-	$(symtab_h) symfile.h objfiles.h $(regcache_h)
+	$(symtab_h) $(symfile_h) objfiles.h $(regcache_h)
 
 i386-linux-tdep.o: i386-linux-tdep.c $(defs_h) $(gdbcore_h) $(frame_h) \
 	$(value_h) $(regcache_h)
@@ -1576,37 +1572,37 @@ ia64-linux-nat.o: ia64-linux-nat.c  $(defs_h) $(inferior_h) $(target_h) \
 
 ia64-linux-tdep.o: ia64-linux-tdep.c $(defs_h) $(arch_utils_h)
 
-ia64-tdep.o: ia64-tdep.c $(defs_h) $(inferior_h) symfile.h $(gdbcore_h) \
+ia64-tdep.o: ia64-tdep.c $(defs_h) $(inferior_h) $(symfile_h) $(gdbcore_h) \
 	$(arch_utils_h) $(floatformat_h) objfiles.h \
 	$(INCLUDE_DIR)/elf/common.h $(regcache_h)
 
 infcmd.o: infcmd.c $(defs_h) environ.h $(gdbcmd_h) $(gdbcore_h) \
-	$(inferior_h) target.h language.h symfile.h $(gdb_string_h) \
+	$(inferior_h) $(target_h) language.h $(symfile_h) $(gdb_string_h) \
 	$(ui_out_h) $(completer_h)
 
 inflow.o: inflow.c $(bfd_h) $(command_h) $(defs_h) $(inferior_h) \
-	target.h terminal.h gdbthread.h $(gdb_string_h)
+	$(target_h) terminal.h $(gdbthread_h) $(gdb_string_h)
 
-infptrace.o: infptrace.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h \
+infptrace.o: infptrace.c $(defs_h) $(gdbcore_h) $(inferior_h) $(target_h) \
 	$(gdb_string_h) gdb_wait.h $(command_h) $(regcache_h)
 
 infrun.o: infrun.c gdb_wait.h $(defs_h) $(gdbcmd_h) $(cli_script_h) \
 	$(gdbcore_h) \
-	$(inferior_h) target.h gdbthread.h $(gdb_string_h) $(event_loop_h) \
+	$(inferior_h) $(target_h) $(gdbthread_h) $(gdb_string_h) $(event_loop_h) \
 	$(event_top_h) $(regcache_h)
 
 inftarg.o: inftarg.c gdb_wait.h $(defs_h) $(gdbcore_h) $(inferior_h) \
-	target.h terminal.h $(command_h)
+	$(target_h) terminal.h $(command_h)
 
 irix4-nat.o: irix4-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) $(regcache_h)
-irix5-nat.o: irix5-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) target.h \
-	$(symtab_h) symfile.h objfiles.h $(command_h) $(frame_h) gnu-regex.h \
+irix5-nat.o: irix5-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) $(target_h) \
+	$(symtab_h) $(symfile_h) objfiles.h $(command_h) $(frame_h) gnu-regex.h \
 	language.h $(gdb_string_h) $(regcache_h)
 
 # OBSOLETE isi-xdep.o: isi-xdep.c
 
 jv-lang.o: jv-lang.c $(bfd_h) $(defs_h) $(symtab_h) $(gdbtypes_h) \
-	$(expression_h) parser-defs.h language.h symfile.h objfiles.h \
+	$(expression_h) $(parser_defs_h) language.h $(symfile_h) objfiles.h \
 	$(gdb_string_h) $(value_h) c-lang.h jv-lang.h $(gdbcore_h)
 
 jv-typeprint.o: jv-typeprint.c $(bfd_h) $(defs_h) $(symtab_h) $(gdbtypes_h) \
@@ -1615,38 +1611,38 @@ jv-typeprint.o: jv-typeprint.c $(bfd_h) $(defs_h) $(symtab_h) $(gdbtypes_h) \
 
 jv-valprint.o: jv-valprint.c $(bfd_h) $(defs_h) $(symtab_h) $(gdbtypes_h) \
 	$(expression_h) $(value_h) $(demangle_h) valprint.h \
-	language.h jv-lang.h c-lang.h gdbcore.h annotate.h
+	language.h jv-lang.h c-lang.h gdbcore.h $(annotate_h)
 
-kod.o: kod.c $(defs_h) $(command_h) $(gdbcmd_h) target.h $(gdb_string_h) kod.h
+kod.o: kod.c $(defs_h) $(command_h) $(gdbcmd_h) $(target_h) $(gdb_string_h) kod.h
 
 kod-cisco.o: kod-cisco.c $(defs_h) $(gdb_string_h) kod.h
 
 language.o: language.c $(bfd_h) $(defs_h) $(expression_h) $(frame_h) \
-	$(gdbcmd_h) $(gdbtypes_h) language.h parser-defs.h $(symtab_h) \
-	target.h $(value_h) $(gdb_string_h)
+	$(gdbcmd_h) $(gdbtypes_h) language.h $(parser_defs_h) $(symtab_h) \
+	$(target_h) $(value_h) $(gdb_string_h)
 
 lynx-nat.o: lynx-nat.c $(defs_h) $(frame_h) $(inferior_h) $(gdbcore_h) \
-	target.h $(regcache_h)
+	$(target_h) $(regcache_h)
 
 m2-lang.o: m2-lang.c $(defs_h) $(expression_h) $(gdbtypes_h) \
-	language.h m2-lang.h parser-defs.h $(symtab_h)
+	language.h m2-lang.h $(parser_defs_h) $(symtab_h)
 
 m2-typeprint.o: m2-typeprint.c $(defs_h) $(expression_h) $(gdbcmd_h) \
-	$(gdbcore_h) $(gdbtypes_h) language.h m2-lang.h $(symtab_h) target.h \
+	$(gdbcore_h) $(gdbtypes_h) language.h m2-lang.h $(symtab_h) $(target_h) \
 	$(value_h) $(gdb_string_h)
 
 m2-valprint.o: m2-valprint.c $(defs_h) $(gdbtypes_h) $(symtab_h) \
 	valprint.h m2-lang.h
 
-m3-nat.o: m3-nat.c $(defs_h) $(inferior_h) $(value_h) language.h target.h \
+m3-nat.o: m3-nat.c $(defs_h) $(inferior_h) $(value_h) language.h $(target_h) \
 	gdb_wait.h $(gdbcmd_h) $(gdbcore_h) $(regcache_h)
 
 p-lang.o: p-lang.c p-lang.h $(defs_h) $(expression_h) $(gdbtypes_h) \
-	language.h parser-defs.h $(symtab_h) $(gdb_string_h)
+	language.h $(parser_defs_h) $(symtab_h) $(gdb_string_h)
 
 p-typeprint.o: p-typeprint.c p-lang.h $(defs_h) $(expression_h) \
 	$(gdbcmd_h) $(gdbcore_h) $(gdbtypes_h) language.h $(symtab_h) \
-	target.h typeprint.h $(value_h) $(gdb_string_h)
+	$(target_h) typeprint.h $(value_h) $(gdb_string_h)
 
 p-valprint.o: p-valprint.c p-lang.h $(defs_h) $(expression_h) $(gdbtypes_h) \
 	language.h $(symtab_h) valprint.h $(value_h) $(gdb_string_h)
@@ -1657,10 +1653,10 @@ m68hc11-tdep.o: m68hc11-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(value_h) \
 m68k-tdep.o: m68k-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(value_h) \
 	$(gdbcore_h) $(gdb_string_h) $(regcache_h)
 
-m68kly-nat.o: m68kly-nat.c $(defs_h) $(frame_h) $(inferior_h) target.h
+m68kly-nat.o: m68kly-nat.c $(defs_h) $(frame_h) $(inferior_h) $(target_h)
 
 m68klinux-nat.o: m68klinux-nat.c $(defs_h) $(frame_h) $(inferior_h) \
-	$(language_h) $(gdbcore_h) $(floatformat_h) target.h $(regcache_h)
+	$(language_h) $(gdbcore_h) $(floatformat_h) $(target_h) $(regcache_h)
 
 m88k-nat.o: m88k-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) $(regcache_h)
 
@@ -1669,20 +1665,20 @@ m88k-tdep.o: m88k-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h) $(regcache_h)
 mac-nat.o: mac-nat.c $(defs_h) $(gdb_string_h) $(regcache_h)
 
 main.o: main.c top.h $(defs_h) $(gdb_string_h) $(event_loop_h) \
-	symfile.h  $(gdbcore_h) $(ui_out_h)
+	$(symfile_h)  $(gdbcore_h) $(ui_out_h)
 
 maint.o: maint.c $(defs_h) $(gdbcmd_h) $(gdbtypes_h) $(symtab_h) language.h \
-	$(expression_h) objfiles.h symfile.h
+	$(expression_h) objfiles.h $(symfile_h)
 
 mcore-tdep.o: mcore-tdep.c $(defs_h) $(frame_h) $(gdbcmd_h) $(value_h) \
 	$(symtab_h) $(symfile_h) $(gdbcore_h) $(inferior_h)
 
-mcore-rom.o: mcore-rom.c $(defs_h) $(gdbcore_h) target.h monitor.h \
+mcore-rom.o: mcore-rom.c $(defs_h) $(gdbcore_h) $(target_h) monitor.h \
 	$(gdb_string_h) $(regcache_h) serial.h
 
 mdebugread.o: mdebugread.c buildsym.h complaints.h $(bfd_h) $(defs_h) \
 	$(expression_h) gdb-stabs.h $(gdbcore_h) $(gdbtypes_h) language.h \
-	objfiles.h partial-stab.h stabsread.h symfile.h $(symtab_h) \
+	objfiles.h partial-stab.h stabsread.h $(symfile_h) $(symtab_h) \
 	$(gdb_string_h)
 
 mipsm3-nat.o: mipsm3-nat.c $(defs_h) $(inferior_h) $(regcache_h)
@@ -1691,27 +1687,27 @@ mipsm3-nat.o: mipsm3-nat.c $(defs_h) $(inferior_h) $(regcache_h)
 # 64 bit targets where often, sizeof(int)=4 but sizeof(char*)=9.
 os9kread.o: os9kread.c buildsym.h complaints.h $(bfd_h) $(defs_h) \
 	        $(expression_h) gdb-stabs.h $(gdbcore_h) $(gdbtypes_h) \
-		language.h objfiles.h stabsread.h symfile.h $(symtab_h) \
-		target.h $(gdb_string_h)
+		language.h objfiles.h stabsread.h $(symfile_h) $(symtab_h) \
+		$(target_h) $(gdb_string_h)
 	$(CC) -c $(INTERNAL_WARN_CFLAGS) $(NO_WERROR_CFLAGS) $<
 
 mem-break.o: mem-break.c $(defs_h) 
 
-minsyms.o: minsyms.c $(bfd_h) $(defs_h) objfiles.h symfile.h \
+minsyms.o: minsyms.c $(bfd_h) $(defs_h) objfiles.h $(symfile_h) \
 	$(symtab_h) $(gdb_string_h) $(value_h) $(cp_abi_h)
 
 mips-nat.o: mips-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) $(regcache_h)
 
 mips-tdep.o: mips-tdep.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
 	$(arch_utils_h) $(regcache_h) \
-	$(inferior_h) language.h objfiles.h symfile.h $(gdb_string_h)
+	$(inferior_h) language.h objfiles.h $(symfile_h) $(gdb_string_h)
 
 mipsread.o: mipsread.c buildsym.h complaints.h $(bfd_h) $(defs_h) \
 	$(expression_h) gdb-stabs.h $(gdbcore_h) $(gdbtypes_h) language.h \
-	objfiles.h partial-stab.h stabsread.h symfile.h $(symtab_h) \
+	objfiles.h partial-stab.h stabsread.h $(symfile_h) $(symtab_h) \
 	$(gdb_string_h)
 
-mipsv4-nat.o: mipsv4-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h \
+mipsv4-nat.o: mipsv4-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) $(target_h) \
 	$(regcache_h)
 
 mn10300-tdep.o: mn10300-tdep.c $(defs_h) $(frame_h) $(inferior_h) \
@@ -1719,7 +1715,7 @@ mn10300-tdep.o: mn10300-tdep.c $(defs_h) $(frame_h) $(inferior_h) \
 	$(gdbcore_h) $(symfile_h) $(regcache_h) $(arch-utils.h)
 
 monitor.o: monitor.c monitor.h $(bfd_h) $(defs_h) $(gdbcmd_h) \
-	$(inferior_h) target.h serial.h terminal.h $(gdb_string_h) $(regcache_h)
+	$(inferior_h) $(target_h) serial.h terminal.h $(gdb_string_h) $(regcache_h)
 
 news-xdep.o: news-xdep.c
 
@@ -1732,7 +1728,7 @@ nindy.o: nindy-share/nindy.c gdb_wait.h nindy-share/block_io.h \
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/nindy-share/nindy.c
 
 nlmread.o: nlmread.c $(bfd_h) buildsym.h complaints.h $(defs_h) \
-	gdb-stabs.h objfiles.h symfile.h $(symtab_h) stabsread.h \
+	gdb-stabs.h objfiles.h $(symfile_h) $(symtab_h) stabsread.h \
 	$(gdb_string_h)
 
 # OBSOLETE ns32km3-nat.o: ns32km3-nat.c $(defs_h) $(inferior_h) $(regcache_h)
@@ -1742,63 +1738,63 @@ ttyflush.o: nindy-share/ttyflush.c
 
 nindy-tdep.o: nindy-tdep.c $(defs_h) $(frame_h) $(symtab_h)  $(gdbcore_h)
 
-ns32k-tdep.o: ns32k-tdep.c $(bfd_h) $(dis-asm_h) $(defs_h)
+ns32k-tdep.o: ns32k-tdep.c $(bfd_h) $(dis_asm_h) $(defs_h)
 
-objfiles.o: objfiles.c $(bfd_h) $(defs_h) objfiles.h symfile.h \
+objfiles.o: objfiles.c $(bfd_h) $(defs_h) objfiles.h $(symfile_h) \
 	$(symtab_h) $(gdb_string_h) $(breakpoint_h)
 
 solib-osf.o: solib-osf.c $(defs_h) $(inferior_h) $(symtab_h) objfiles.h \
 	$(symfile_h) $(target_h) $(gdb_string_h) solist.h
 
 somread.o: somread.c $(bfd_h) buildsym.h complaints.h $(defs_h) \
-	gdb-stabs.h objfiles.h symfile.h $(symtab_h) $(gdb_string_h)
+	gdb-stabs.h objfiles.h $(symfile_h) $(symtab_h) $(gdb_string_h)
 
 somsolib.o: somsolib.c $(defs_h) $(regcache_h)
 
 pa64solib.o: pa64solib.c $(defs_h) $(regcache_h)
 
-hpux-thread.o: hpux-thread.c $(defs_h) gdbthread.h target.h inferior.h \
+hpux-thread.o: hpux-thread.c $(defs_h) $(gdbthread_h) $(target_h) inferior.h \
 	$(regcache_h)
 	$(CC) -c $(INTERNAL_CFLAGS) -I$(srcdir)/osf-share \
 	  -I$(srcdir)/osf-share/HP800 -I/usr/include/dce $(srcdir)/hpux-thread.c
 
 # FIXME!!!
 hpread.o: hpread.c $(bfd_h) buildsym.h complaints.h $(defs_h) \
-	gdb-stabs.h objfiles.h symfile.h $(symtab_h) $(gdb_string_h)
+	gdb-stabs.h objfiles.h $(symfile_h) $(symtab_h) $(gdb_string_h)
 
 hp-psymtab-read.o: hp-psymtab-read.c hpread.h $(bfd_h) buildsym.h complaints.h \
-	$(defs_h) gdb-stabs.h objfiles.h symfile.h $(symtab_h) $(gdb_string_h)
+	$(defs_h) gdb-stabs.h objfiles.h $(symfile_h) $(symtab_h) $(gdb_string_h)
  
 hp-symtab-read.o: hp-symtab-read.c hpread.h $(bfd_h) buildsym.h complaints.h \
-	$(defs_h) gdb-stabs.h objfiles.h symfile.h $(symtab_h) $(gdb_string_h)
+	$(defs_h) gdb-stabs.h objfiles.h $(symfile_h) $(symtab_h) $(gdb_string_h)
 # END FIXME!!!  
 
 parse.o: parse.c $(command_h) $(defs_h) $(expression_h) $(frame_h) \
-	$(gdbtypes_h) language.h parser-defs.h $(symtab_h) $(value_h) \
+	$(gdbtypes_h) language.h $(parser_defs_h) $(symtab_h) $(value_h) \
 	$(gdb_string_h) linespec.h
 
 ppc-bdm.o: ppc-bdm.c $(defs_h) $(gdbcore_h) $(gdb_string_h) $(frame_h) \
-	$(inferior_h) $(bfd_h) symfile.h target.h $(gdbcmd_h) \
+	$(inferior_h) $(bfd_h) $(symfile_h) $(target_h) $(gdbcmd_h) \
 	objfiles.h gdb-stabs.h serial.h ocd.h $(regcache_h)
 
 ppc-linux-nat.o: ppc-linux-nat.c $(defs_h) $(gdbcore_h) $(frame_h) \
-	$(inferior_h) target.h $(regcache_h)
+	$(inferior_h) $(target_h) $(regcache_h)
 
 ppc-linux-tdep.o: ppc-linux-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h) \
-	target.h ppc-tdep.h $(regcache_h)
+	$(target_h) ppc-tdep.h $(regcache_h)
 
 ppcbug-rom.o: ppcbug-rom.c monitor.h $(bfd_h) gdb_wait.h $(defs_h) \
-	$(gdbcmd_h) $(inferior_h) target.h serial.h terminal.h $(regcache_h)
+	$(gdbcmd_h) $(inferior_h) $(target_h) serial.h terminal.h $(regcache_h)
 
 printcmd.o: printcmd.c $(breakpoint_h) $(defs_h) $(expression_h) \
 	$(gdbcmd_h) $(gdbcore_h) $(gdbtypes_h) language.h objfiles.h \
-	symfile.h $(symtab_h) target.h $(gdb_string_h) $(ui_out_h) \
+	$(symfile_h) $(symtab_h) $(target_h) $(gdb_string_h) $(ui_out_h) \
 	$(completer_h)
 
 # FIXME: Procfs.o gets -Wformat errors because things like pid_t don't
 # match output format strings.
 procfs.o: procfs.c $(command_h) $(defs_h) $(gdbcore_h) $(inferior_h) \
-	target.h $(gdb_string_h) gdbthread.h proc-utils.h
+	$(target_h) $(gdb_string_h) $(gdbthread_h) proc-utils.h
 	$(CC) -c $(INTERNAL_WARN_CFLAGS) $(NO_WERROR_CFLAGS) $<
 
 proc-api.o: proc-api.c $(defs_h) $(gdbcmd_h) proc-utils.h $(completer_h)
@@ -1809,17 +1805,17 @@ proc-flags.o: proc-flags.c $(defs_h)
 
 proc-why.o: proc-why.c $(defs_h) proc-utils.h
 
-sol-thread.o: sol-thread.c $(defs_h) gdbthread.h target.h $(inferior_h) \
+sol-thread.o: sol-thread.c $(defs_h) $(gdbthread_h) $(target_h) $(inferior_h) \
 	$(gdbcmd_h) $(regcache_h)
 
 linux-thread.o: linux-thread.c $(breakpoint_h) $(gdbcmd_h) gdb_wait.h \
-	gdbthread.h $(gdbcore_h) $(inferior_h) target.h $(defs_h)
+	$(gdbthread_h) $(gdbcore_h) $(inferior_h) $(target_h) $(defs_h)
 
 thread-db.o: thread-db.c $(defs_h) gdb_assert.h gdb_proc_service.h \
-	gdb_thread_db.h $(bfd_h) gdbthread.h $(inferior_h) $(symfile_h) \
+	gdb_thread_db.h $(bfd_h) $(gdbthread_h) $(inferior_h) $(symfile_h) \
 	objfiles.h $(target_h) $(regcache_h)
 
-lin-lwp.o: lin-lwp.c $(defs_h) gdb_assert.h gdb_wait.h gdbthread.h \
+lin-lwp.o: lin-lwp.c $(defs_h) gdb_assert.h gdb_wait.h $(gdbthread_h) \
 	$(inferior_h) $(target_h) $(gdbcmd_h) $(regcache_h)
 
 proc-service.o: proc-service.c $(defs_h) $(inferior_h) gdb_proc_service.h \
@@ -1828,9 +1824,9 @@ proc-service.o: proc-service.c $(defs_h) $(inferior_h) gdb_proc_service.h \
 gnu-regex.o: gnu-regex.c gnu-regex.h $(defs_h) $(gdb_string_h)
 
 remote-adapt.o: remote-adapt.c $(defs_h) $(gdbcore_h) \
-	$(inferior_h) target.h terminal.h $(gdb_string_h) $(regcache_h)
+	$(inferior_h) $(target_h) terminal.h $(gdb_string_h) $(regcache_h)
 
-remote-array.o: remote-array.c $(defs_h) $(gdbcore_h) target.h \
+remote-array.o: remote-array.c $(defs_h) $(gdbcore_h) $(target_h) \
       $(gdb_string_h) $(command_h) serial.h monitor.h $(remote_utils_h) \
 	$(version_h) $(regcache_h)
 
@@ -1851,98 +1847,98 @@ remote-rdp.o: remote-rdp.c $(defs_h) $(gdbcore_h) \
 	$(inferior_h) $(gdb_string_h)
 
 remote-bug.o: remote-bug.c $(defs_h) $(gdbcore_h) serial.h \
-	$(inferior_h) target.h terminal.h $(remote_utils_h) $(gdb_string_h) \
+	$(inferior_h) $(target_h) terminal.h $(remote_utils_h) $(gdb_string_h) \
 	$(regcache_h)
 
-remote-e7000.o: remote-e7000.c $(defs_h) $(gdbcore_h) target.h \
+remote-e7000.o: remote-e7000.c $(defs_h) $(gdbcore_h) $(target_h) \
 	serial.h $(gdb_string_h) $(regcache_h)
 
 remote-eb.o: remote-eb.c $(srcdir)/config/a29k/tm-a29k.h \
-	$(defs_h) $(gdbcore_h) $(inferior_h) symfile.h target.h terminal.h \
+	$(defs_h) $(gdbcore_h) $(inferior_h) $(symfile_h) $(target_h) terminal.h \
 	$(gdb_string_h) $(regcache_h)
 
 remote-es.o: remote-es.c $(bfd_h) $(command_h) $(defs_h) \
 	$(inferior_h) $(remote_utils_h) terminal.h $(gdb_string_h) \
-	symfile.h $(regcache_h)
+	$(symfile_h) $(regcache_h)
 
 remote-est.o: remote-est.c $(defs_h) $(gdbcore_h) \
-	$(inferior_h) serial.h target.h terminal.h $(regcache_h)
+	$(inferior_h) serial.h $(target_h) terminal.h $(regcache_h)
 
 remote-hms.o: remote-hms.c $(defs_h) $(gdbcore_h) \
-	$(inferior_h) serial.h target.h terminal.h $(regcache_h)
+	$(inferior_h) serial.h $(target_h) terminal.h $(regcache_h)
 
 remote-mips.o: remote-mips.c $(defs_h) $(gdbcmd_h) \
-	$(gdbcore_h) $(inferior_h) serial.h symfile.h target.h $(regcache_h)
+	$(gdbcore_h) $(inferior_h) serial.h $(symfile_h) $(target_h) $(regcache_h)
 
 remote-mm.o: remote-mm.c $(bfd_h) $(defs_h) $(inferior_h) \
-	minimon.h target.h terminal.h $(gdb_string_h) $(regcache_h)
+	minimon.h $(target_h) terminal.h $(gdb_string_h) $(regcache_h)
 
 remote-nindy.o: remote-nindy.c $(floatformat_h) $(command_h) \
 	$(defs_h) $(gdbcore_h) $(inferior_h) \
 	nindy-share/env.h nindy-share/stop.h $(remote_utils_h) \
-	symfile.h $(regcache_h)
+	$(symfile_h) $(regcache_h)
 
 remote-os9k.o: remote-os9k.c $(defs_h) $(gdbcore_h) \
-	$(command_h) monitor.h $(remote_utils_h) $(symtab_h) symfile.h \
+	$(command_h) monitor.h $(remote_utils_h) $(symtab_h) $(symfile_h) \
 	objfiles.h gdb-stabs.h $(gdb_string_h) $(regcache_h)
 
 remote-sds.o: remote-sds.c $(bfd_h) $(defs_h) $(gdbcmd_h) \
-	$(inferior_h) $(remote_utils_h) symfile.h terminal.h $(gdb_string_h) \
+	$(inferior_h) $(remote_utils_h) $(symfile_h) terminal.h $(gdb_string_h) \
 	$(regcache_h)
 
 remote-sim.o: remote-sim.c $(defs_h) $(gdbcore_h) \
-	$(inferior_h) target.h terminal.h $(gdb_string_h) \
+	$(inferior_h) $(target_h) terminal.h $(gdb_string_h) \
 	$(INCLUDE_DIR)/callback.h $(regcache_h)
 
 remote-st.o: remote-st.c $(defs_h) $(gdbcore_h) serial.h \
-	target.h $(gdb_string_h) $(regcache_h)
+	$(target_h) $(gdb_string_h) $(regcache_h)
 
 remote-udi.o: remote-udi.c $(bfd_h) $(defs_h) $(gdbcmd_h) \
-	$(inferior_h) target.h terminal.h $(udiheaders) $(gdb_string_h) \
+	$(inferior_h) $(target_h) terminal.h $(udiheaders) $(gdb_string_h) \
 	$(regcache_h)
 
 remote-vx.o: remote-vx.c complaints.h $(defs_h) $(gdbcmd_h) \
-	$(gdbcore_h) $(inferior_h) target.h vx-share/dbgRpcLib.h \
+	$(gdbcore_h) $(inferior_h) $(target_h) vx-share/dbgRpcLib.h \
 	vx-share/ptrace.h vx-share/xdr_ld.h vx-share/xdr_ptrace.h \
-	vx-share/xdr_rdb.h gdb-stabs.h objfiles.h symfile.h $(bfd_h) \
+	vx-share/xdr_rdb.h gdb-stabs.h objfiles.h $(symfile_h) $(bfd_h) \
 	$(gdb_string_h) $(regcache_h)
 
 remote-vx29k.o: remote-vx29k.c complaints.h $(defs_h) $(gdbcmd_h) \
-        $(gdbcore_h) $(inferior_h) target.h vx-share/dbgRpcLib.h \
+        $(gdbcore_h) $(inferior_h) $(target_h) vx-share/dbgRpcLib.h \
         vx-share/ptrace.h vx-share/xdr_ld.h vx-share/xdr_ptrace.h \
         vx-share/xdr_rdb.h $(gdb_string_h) $(regcache_h)
 
 ocd.o: ocd.c ocd.h $(gdbcore_h) $(gdb_string_h) $(frame_h) $(inferior_h) \
-	$(bfd_h) symfile.h target.h $(gdbcmd_h) objfiles.h \
+	$(bfd_h) $(symfile_h) $(target_h) $(gdbcmd_h) objfiles.h \
 	gdb-stabs.h $(dcache_h) serial.h $(regcache_h)
 
 remote-utils.o: remote-utils.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
 	$(inferior_h) $(remote_utils_h) $(gdb_string_h) $(regcache_h)
 
 remote.o: remote.c $(bfd_h) gdb_wait.h $(defs_h) $(gdbcmd_h) \
-	$(inferior_h) $(remote_utils_h) symfile.h terminal.h $(gdb_string_h) \
+	$(inferior_h) $(remote_utils_h) $(symfile_h) terminal.h $(gdb_string_h) \
 	$(event_loop_h) $(event_top_h) $(remote_h) $(inf_loop_h)
 
 remote-nrom.o: remote-nrom.c $(bfd_h) gdb_wait.h $(defs_h) $(gdbcmd_h) \
-	$(inferior_h) $(remote_utils_h) symfile.h terminal.h
+	$(inferior_h) $(remote_utils_h) $(symfile_h) terminal.h
 
 rom68k-rom.o: rom68k-rom.c monitor.h $(bfd_h) gdb_wait.h $(defs_h) \
-	$(gdbcmd_h) $(inferior_h) target.h serial.h terminal.h $(regcache_h)
+	$(gdbcmd_h) $(inferior_h) $(target_h) serial.h terminal.h $(regcache_h)
 
-rs6000-nat.o: rs6000-nat.c $(bfd_h) $(defs_h) $(inferior_h) target.h \
-	$(gdbcore_h) xcoffsolib.h symfile.h objfiles.h gdb-stabs.h \
+rs6000-nat.o: rs6000-nat.c $(bfd_h) $(defs_h) $(inferior_h) $(target_h) \
+	$(gdbcore_h) xcoffsolib.h $(symfile_h) objfiles.h gdb-stabs.h \
 	$(regcache_h)
 
 rs6000-tdep.o: rs6000-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h) \
-	target.h ppc-tdep.h $(regcache_h)
+	$(target_h) ppc-tdep.h $(regcache_h)
 
-scm-exp.o: $(defs_h) $(value_h) parser-defs.h language.h c-lang.h \
+scm-exp.o: $(defs_h) $(value_h) $(parser_defs_h) language.h c-lang.h \
 	scm-lang.h scm-tags.h
 
-scm-lang.o: $(defs_h) $(value_h) parser-defs.h language.h c-lang.h \
+scm-lang.o: $(defs_h) $(value_h) $(parser_defs_h) language.h c-lang.h \
 	scm-lang.h scm-tags.h $(gdb_string_h) $(gdbcore_h)
 
-scm-valprint.o: $(defs_h) $(value_h) parser-defs.h language.h  \
+scm-valprint.o: $(defs_h) $(value_h) $(parser_defs_h) language.h  \
 	scm-lang.h valprint.h $(gdbcore_h)
 
 ser-go32.o: ser-go32.c $(defs_h) serial.h 
@@ -1957,52 +1953,52 @@ ser-unix.o: ser-unix.c $(defs_h) serial.h ser-unix.h
 
 serial.o: serial.c $(defs_h) serial.h $(gdb_string_h)
 
-sh-tdep.o: sh-tdep.c $(bfd_h) $(dis-asm_h) \
+sh-tdep.o: sh-tdep.c $(bfd_h) $(dis_asm_h) \
 	$(srcdir)/../opcodes/sh-opc.h $(defs_h) $(expression_h) $(frame_h) \
 	$(gdbcmd_h) $(gdbtypes_h) $(symtab_h) $(value_h) $(arch_utils_h) \
 	$(regcache_h)
 
 sh3-rom.o: sh3-rom.c monitor.h $(bfd_h) gdb_wait.h $(defs_h) $(gdbcmd_h) \
-	$(inferior_h) target.h serial.h terminal.h $(arch_utils_h) \
+	$(inferior_h) $(target_h) serial.h terminal.h $(arch_utils_h) \
 	$(regcache_h)
 
-signals.o: signals.c $(defs_h) target.h
+signals.o: signals.c $(defs_h) $(target_h)
 
 mon960-rom.o: mon960-rom.c monitor.h $(bfd_h) gdb_wait.h $(defs_h) $(gdbcmd_h) \
-	$(inferior_h) target.h serial.h terminal.h
+	$(inferior_h) $(target_h) serial.h terminal.h
 
 solib.o: solib.c $(command_h) $(defs_h) $(gdbcore_h) $(inferior_h) \
-	objfiles.h gnu-regex.h symfile.h target.h $(gdb_string_h) solist.h \
+	objfiles.h gnu-regex.h $(symfile_h) $(target_h) $(gdb_string_h) solist.h \
 	$(completer_h)
 
 solib-svr4.o: solib-svr4.c $(command_h) $(defs_h) $(gdbcore_h) $(inferior_h) \
-	objfiles.h gnu-regex.h symfile.h target.h $(gdb_string_h) solist.h \
+	objfiles.h gnu-regex.h $(symfile_h) $(target_h) $(gdb_string_h) solist.h \
 	solib-svr4.h $(regcache_h)
 
 solib-legacy.o: solib-legacy.c $(defs_h) $(gdbcore_h) solib-svr4.h
 
 source.o: source.c $(defs_h) $(expression_h) $(frame_h) $(gdbcmd_h) \
-	$(gdbcore_h) language.h objfiles.h gnu-regex.h symfile.h $(symtab_h) \
+	$(gdbcore_h) language.h objfiles.h gnu-regex.h $(symfile_h) $(symtab_h) \
 	$(gdb_string_h) source.h $(completer_h) linespec.h $(ui_out_h)
 
 sparc-nat.o: sparc-nat.c $(bfd_h) $(defs_h) $(inferior_h) $(gdbcore_h) \
-	target.h $(regcache_h)
+	$(target_h) $(regcache_h)
 
 sparc-tdep.o: sparc-tdep.c $(floatformat_h) $(defs_h) $(gdbcore_h) \
-	$(inferior_h) objfiles.h symfile.h target.h $(gdb_string_h) \
+	$(inferior_h) objfiles.h $(symfile_h) $(target_h) $(gdb_string_h) \
 	$(arch_utils_h) $(regcache_h)
 
-sparcl-tdep.o: sparcl-tdep.c $(defs_h) $(gdbcore_h) target.h $(regcache_h)
+sparcl-tdep.o: sparcl-tdep.c $(defs_h) $(gdbcore_h) $(target_h) $(regcache_h)
 
 dsrec.o: dsrec.c $(defs_h) srec.h
 
 stabsread.o: stabsread.c $(bfd_h) $(INCLUDE_DIR)/aout/stab.def \
 	$(INCLUDE_DIR)/aout/stab_gnu.h buildsym.h complaints.h $(defs_h) \
-	$(gdbtypes_h) objfiles.h stabsread.h symfile.h $(symtab_h) \
+	$(gdbtypes_h) objfiles.h stabsread.h $(symfile_h) $(symtab_h) \
 	$(gdb_string_h)
 
 stack.o: stack.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) $(inferior_h) \
-	language.h target.h $(gdb_string_h) $(ui_out_h)
+	language.h $(target_h) $(gdb_string_h) $(ui_out_h)
 
 ui-file.o: ui-file.c $(defs_h) ui-file.h
 tui-file.o: $(srcdir)/tui/tui-file.c $(defs_h) $(srcdir)/tui/tui-file.h \
@@ -2010,7 +2006,7 @@ tui-file.o: $(srcdir)/tui/tui-file.c $(defs_h) $(srcdir)/tui/tui-file.h \
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tui-file.c
 
 ax-general.o: ax-general.c $(ax_h) $(defs_h) $(value_h)
-ax-gdb.o: ax-gdb.c $(defs_h) $(symtab_h) symfile.h $(gdbtypes_h) \
+ax-gdb.o: ax-gdb.c $(defs_h) $(symtab_h) $(symfile_h) $(gdbtypes_h) \
 	$(value_h) $(expression_h) $(command_h) $(ax_h) $(gdbcmd_h) ax-gdb.h
 
 sun3-nat.o: sun3-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) $(regcache_h)
@@ -2019,32 +2015,32 @@ sun3-nat.o: sun3-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) $(regcache_h)
 
 symfile.o: symfile.c $(breakpoint_h) complaints.h $(defs_h) \
 	$(expression_h) gdb-stabs.h $(gdbcmd_h) $(gdbcore_h) \
-	$(gdbtypes_h) language.h objfiles.h symfile.h $(symtab_h) \
-	target.h $(gdb_string_h) $(completer_h)
+	$(gdbtypes_h) language.h objfiles.h $(symfile_h) $(symtab_h) \
+	$(target_h) $(gdb_string_h) $(completer_h)
 
 symm-tdep.o: symm-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h)
 
 symm-nat.o: symm-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) $(regcache_h)
 
 symmisc.o: symmisc.c $(bfd_h) $(breakpoint_h) $(command_h) $(defs_h) \
-	$(expression_h) $(gdbtypes_h) language.h objfiles.h symfile.h \
+	$(expression_h) $(gdbtypes_h) language.h objfiles.h $(symfile_h) \
 	$(symtab_h) $(gdb_string_h)
 
 symtab.o: symtab.c call-cmds.h $(defs_h) $(expression_h) $(frame_h) \
 	$(gdbcmd_h) $(gdbcore_h) $(gdbtypes_h) language.h objfiles.h \
-	gnu-regex.h symfile.h $(symtab_h) target.h $(value_h) \
+	gnu-regex.h $(symfile_h) $(symtab_h) $(target_h) $(value_h) \
 	$(gdb_string_h) linespec.h $(cp_abi_h)
 
 linespec.o: linespec.c linespec.h $(defs_h) $(frame_h) $(value_h) \
-	objfiles.h symfile.h $(completer_h) $(symtab_h) \
+	objfiles.h $(symfile_h) $(completer_h) $(symtab_h) \
 	$(demangle_h) command.h $(cp_abi_h)
 
 tic80-tdep.o: tic80-tdep.c $(defs_h) $(regcache_h)
 
 target.o: target.c $(bfd_h) $(defs_h) $(gdbcmd_h) $(inferior_h) \
-	objfiles.h symfile.h target.h $(gdb_string_h) $(regcache_h)
+	objfiles.h $(symfile_h) $(target_h) $(gdb_string_h) $(regcache_h)
 
-thread.o: thread.c $(defs_h) gdbthread.h $(gdbcmd_h) target.h \
+thread.o: thread.c $(defs_h) $(gdbthread_h) $(gdbcmd_h) $(target_h) \
 	$(regcache_h) $(ui_out_h) $(gdb_h)
 
 completer.o: completer.c $(completer_h) $(gdbtypes_h) $(symtab_h) \
@@ -2058,7 +2054,7 @@ top.o: top.c top.h $(bfd_h) $(getopt_h) $(readline_headers) call-cmds.h \
 	serial.h
 
 typeprint.o: typeprint.c $(defs_h) $(expression_h) $(gdbcmd_h) \
-	$(gdbcore_h) $(gdbtypes_h) language.h $(symtab_h) target.h \
+	$(gdbcore_h) $(gdbtypes_h) language.h $(symtab_h) $(target_h) \
 	$(value_h) $(gdb_string_h) $(cp_abi.h)
 
 # OBSOLETE ultra3-nat.o: ultra3-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) $(regcache_h)
@@ -2068,22 +2064,22 @@ typeprint.o: typeprint.c $(defs_h) $(expression_h) $(gdbcmd_h) \
 # OBSOLETE umax-xdep.o: umax-xdep.c $(defs_h) $(gdbcore_h) $(inferior_h) $(regcache_h)
 
 utils.o: utils.c $(bfd_h) $(defs_h) $(expression_h) $(gdbcmd_h) \
-	language.h target.h terminal.h $(readline_headers) \
+	language.h $(target_h) terminal.h $(readline_headers) \
 	$(gdb_string_h) $(event_loop_h) $(event_top_h)
 
 valarith.o: valarith.c $(bfd_h) $(defs_h) $(expression_h) \
-	$(gdbtypes_h) language.h $(symtab_h) target.h $(value_h) \
+	$(gdbtypes_h) language.h $(symtab_h) $(target_h) $(value_h) \
 	$(gdb_string_h)
 
-valops.o: valops.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h \
+valops.o: valops.c $(defs_h) $(gdbcore_h) $(inferior_h) $(target_h) \
 	$(gdb_string_h) $(regcache_h) $(cp_abi_h)
 
 valprint.o: valprint.c $(defs_h) $(expression_h) $(gdbcmd_h) \
-	$(gdbcore_h) $(gdbtypes_h) language.h $(symtab_h) target.h \
+	$(gdbcore_h) $(gdbtypes_h) language.h $(symtab_h) $(target_h) \
 	$(value_h) $(gdb_string_h) valprint.h
 
 values.o: values.c $(defs_h) $(expression_h) $(frame_h) $(gdbcmd_h) \
-	$(gdbcore_h) $(gdbtypes_h) $(symtab_h) target.h $(value_h) \
+	$(gdbcore_h) $(gdbtypes_h) $(symtab_h) $(target_h) $(value_h) \
 	$(gdb_string_h) scm-lang.h
 
 vax-tdep.o: vax-tdep.c $(OP_INCLUDE)/vax.h $(defs_h) $(symtab_h)
@@ -2108,38 +2104,38 @@ xdr_rdb.o: vx-share/xdr_rdb.c $(defs_h) vx-share/vxTypes.h \
 xcoffread.o: xcoffread.c $(bfd_h) $(INCLUDE_DIR)/aout/stab.def \
 	$(INCLUDE_DIR)/aout/stab_gnu.h $(INCLUDE_DIR)/coff/internal.h \
 	$(INCLUDE_DIR)/coff/rs6000.h $(BFD_SRC)/libcoff.h buildsym.h \
-	complaints.h $(defs_h) $(gdbtypes_h) objfiles.h stabsread.h symfile.h \
+	complaints.h $(defs_h) $(gdbtypes_h) objfiles.h stabsread.h $(symfile_h) \
 	$(symtab_h) partial-stab.h $(gdb_string_h)
 
 xcoffsolib.o: xcoffsolib.c $(bfd_h) $(defs_h) xcoffsolib.h $(inferior_h) \
-	$(gdbcmd_h) symfile.h $(frame_h) gnu-regex.h
+	$(gdbcmd_h) $(symfile_h) $(frame_h) gnu-regex.h
 
 # FIXME: z8k-tdep.c calls _initialize_gdbtypes().  Since that isn't
 # declared -Wimplicit fails. It should be using the GDBARCH framework.
 # cagney 1999-09-02.
-z8k-tdep.o: z8k-tdep.c $(bfd_h) $(dis-asm_h) $(defs_h) $(frame_h) \
+z8k-tdep.o: z8k-tdep.c $(bfd_h) $(dis_asm_h) $(defs_h) $(frame_h) \
 	$(gdbcmd_h) $(gdbtypes_h) $(symtab_h) $(gdbcore_h) $(value_h) \
 	$(regcache_h)
 	$(CC) -c $(INTERNAL_WARN_CFLAGS) $(NO_WERROR_CFLAGS) $<
 
 c-exp.tab.o: c-exp.tab.c c-lang.h $(defs_h) $(expression_h) \
-	$(gdbtypes_h) language.h parser-defs.h $(symtab_h) $(value_h) \
-	$(bfd_h) objfiles.h symfile.h
+	$(gdbtypes_h) language.h $(parser_defs_h) $(symtab_h) $(value_h) \
+	$(bfd_h) objfiles.h $(symfile_h)
 
 jv-exp.tab.o: jv-exp.tab.c jv-lang.h $(defs_h) $(expression_h) \
-	$(gdbtypes_h) language.h parser-defs.h $(symtab_h) $(value_h) \
-	$(bfd_h) objfiles.h symfile.h
+	$(gdbtypes_h) language.h $(parser_defs_h) $(symtab_h) $(value_h) \
+	$(bfd_h) objfiles.h $(symfile_h)
 
 f-exp.tab.o: f-exp.tab.c f-lang.h $(defs_h) $(expression_h) \
-	language.h parser-defs.h $(value_h) $(bfd_h) objfiles.h symfile.h
+	language.h $(parser_defs_h) $(value_h) $(bfd_h) objfiles.h $(symfile_h)
 
 m2-exp.tab.o: m2-exp.tab.c $(defs_h) $(expression_h) $(gdbtypes_h) \
-	language.h m2-lang.h parser-defs.h $(symtab_h) $(value_h) \
-	$(bfd_h) objfiles.h symfile.h
+	language.h m2-lang.h $(parser_defs_h) $(symtab_h) $(value_h) \
+	$(bfd_h) objfiles.h $(symfile_h)
 
 p-exp.tab.o: p-exp.tab.c $(defs_h) $(expression_h) $(gdbtypes_h) \
-	language.h p-lang.h parser-defs.h $(symtab_h) $(value_h) \
-	$(bfd_h) objfiles.h symfile.h
+	language.h p-lang.h $(parser_defs_h) $(symtab_h) $(value_h) \
+	$(bfd_h) objfiles.h $(symfile_h)
 
 gdb-events.o: gdb-events.c gdb-events.h $(defs_h) $(gdbcmd_h)