Update makefile.in dependencies. Add header wrappers.

9 files changed, 327 insertions, 237 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 820cce0..a032518 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,27 @@
 2001-10-21  Andrew Cagney  <ac131313@redhat.com>
 
+	* Makefile.in: Replace top.h with $(top_h). Replace expression.h
+	with $(expression_h).  Replace command.h with $(command_h).
+	(language_h): Define.  Replace language.h with $(language_h).
+	Replace call-cmds.h with $(call_cmds_h).  Replace varobj.h with
+	$(varobj_h).
+	(wrapper_h, valprint_h, objfiles_h, complaints_h): Ditto.
+	(serial_h, hpread_h, buildsym_h, stabsread_h): Ditto.
+	(xcoffsolib_h, gdb_stabs_h, linespec_h): Ditto.
+	(bcache_h, gdb_events_h, monitor_h): Ditto.
+	(ser_unix_h, source_h): Ditto.
+	(varobj_h): Update list.
+
+	* call-cmds.h: Add CALL_CMDS_H macro wrapper.
+	* solist.h: Add SOLIST_H macro wrapper.
+	* monitor.h: Add MONITOR_H macro wrapper.
+	* typeprint.h: Add TYPEPRINT_H macro wrapper.
+	* xcoffsolib.h: Add XCOFFSOLIB_H macro wrapper.
+	* valprint.h: Add VALPRINT_H macro wrapper.
+	* top.h: Add TOP_H macro wrapper.
+	
+2001-10-21  Andrew Cagney  <ac131313@redhat.com>
+
 	* config/a29k/tm-vx29k.h, i386-tdep.c: Include "value.h".
 	* arm-tdep.c, exec.c, ia64-tdep.c, infrun.c: Ditto.
 	* ppc-linux-tdep.c, remote-es.c, remote.c: Ditto.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index b94aff4..89d88f1 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -585,7 +585,9 @@ nm_h =		@nm_h@
 annotate_h =	annotate.h $(symtab_h) $(gdbtypes_h)
 arch_utils_h =	arch-utils.h
 ax_h = 		ax.h $(doublest_h)
+bcache_h =	bcache.h
 breakpoint_h =	breakpoint.h $(frame_h) $(value_h)
+buildsym_h =	buildsym.h
 call_cmds_h =	call-cmds.h
 cli_cmds_h =	$(srcdir)/cli/cli-cmds.h
 cli_decode_h =	$(srcdir)/cli/cli-decode.h
@@ -594,37 +596,59 @@ 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
+complaints_h =	complaints.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
+defs_h =	defs.h $(xm_h) $(tm_h) $(nm_h) config.status config.h \
+		gdbarch.h ui-file.h
 doublest_h =	doublest.h $(floatformat_h)
 event_loop_h =  event-loop.h
 event_top_h = 	event-top.h
 expression_h =	expression.h $(doublest_h) $(symtab_h)
 frame_h =	frame.h
 gdb_h =		gdb.h
+gdb_events_h =	gdb-events.h
+gdb_stabs_h =	gdb-stabs.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
+hpread_h =	hpread.h $(defs_h) $(bfd_h) $(gdb_string_h) $(hp_symtab_h) \
+		$(syms_h) $(symtab_h) $(symfile_h) $(objfiles_h) \
+		$(buildsym_h) $(complaints_h) $(gdb_stabs_h) $(gdbtypes_h) \
+		$(demangle_h)
 inf_loop_h =  	inf-loop.h
 inferior_h =	inferior.h $(breakpoint_h)
+language_h =	language.h
+linespec_h =	linespec.h
 memattr_h =     memattr.h
+monitor_h =	monitor.h
+objfiles_h =	objfiles.h
 parser_defs_h =	parser-defs.h $(doublest_h)
 regcache_h =	regcache.h
 remote_h =	remote.h
 remote_utils_h =  remote-utils.h $(target_h)
+ser_unix_h =	ser-unix.h
+serial_h =	serial.h
+solist_h =	solist.h
+source_h =	source.h
+stabsread_h =	stabsread.h
 symfile_h =	symfile.h
-symtab_h =	symtab.h bcache.h
+symtab_h =	symtab.h $(bcache_h)
 target_h =      target.h $(bfd_h) $(symtab_h) $(dcache_h) $(memattr_h)
+terminal_h =	terminal.h
 top_h =		top.h
 tracepoint_h =	tracepoint.h
+typeprint_h =	typeprint.h
 ui_out_h =      ui-out.h
+valprint_h =	valprint.h
 value_h =	value.h $(symtab_h) $(gdbtypes_h) $(expression_h) $(doublest_h)
-varobj_h =      varobj.h
+varobj_h =      varobj.h $(symtab_h) $(gdbtypes_h)
 version_h = 	version.h
+wrapper_h =	wrapper.h
+xcoffsolib_h =	xcoffsolib.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
@@ -1208,7 +1232,7 @@ 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) $(doublest_h)
 
 annotate.o: annotate.c $(defs_h) $(annotate_h) $(value_h) $(target_h) $(gdbtypes_h)
@@ -1222,62 +1246,63 @@ arm-linux-tdep.o: arm-linux-tdep.c $(defs_h) $(target_h) $(value_h) \
 arm-tdep.o: arm-tdep.c $(gdbcmd_h) $(gdbcore_h) $(inferior_h) $(defs_h) \
 	$(gdbcore_h) $(regcache_h) $(doublest_h) $(value_h)
 
-bcache.o: bcache.c bcache.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) \
-	gdb-events.h linespec.h $(ui_out_h) $(completer_h) $(gdb_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)
+buildsym.o: buildsym.c $(bfd_h) $(buildsym_h) $(complaints_h) $(defs_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)
+	$(gdbcmd_h) $(gdbcore_h) $(gdbtypes_h) $(language_h) $(symtab_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)
+	$(language_h) $(symtab_h) $(valprint_h) $(value_h) $(cp_abi_h)
 
 doublest.o: doublest.c $(defs_h) $(doublest_h) $(floatformat_h) \
 	gdb_assert.h gdb_string.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)
+	$(gdbcmd_h) $(gdbcore_h) $(gdbtypes_h) $(language_h) $(symtab_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)
+	$(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)
+	$(gdbcmd_h) $(gdbcore_h) $(gdbtypes_h) $(language_h) $(symtab_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
+	$(language_h) $(symtab_h) $(valprint_h) $(value_h) c-lang.h
 
 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) \
+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) \
 	$(gdb_string_h)
 
-complaints.o: complaints.c complaints.h $(defs_h) $(gdbcmd_h)
+complaints.o: complaints.c $(complaints_h) $(defs_h) $(gdbcmd_h)
 
 # Provide explicit rule/dependency - works for more makes.
 copying.o: $(srcdir)/copying.c $(defs_h) $(gdbcmd_h)
@@ -1293,8 +1318,8 @@ core-regset.o: core-regset.c $(command_h) $(defs_h) $(gdbcore_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)
+	$(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)
@@ -1307,55 +1332,56 @@ cp-valprint.o: cp-valprint.c $(defs_h) $(expression_h) $(gdbcmd_h) \
 dcache.o: dcache.c $(dcache_h) $(defs_h) $(gdbcmd_h) $(gdb_string_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)
+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)
 
 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) \
-	$(regcache_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) $(regcache_h)
 
 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) \
-	$(symtab_h) $(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) $(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) \
-	$(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) $(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) \
+elfread.o: elfread.c $(bfd_h) $(buildsym_h) $(complaints_h) $(defs_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 \
+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)
 
 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) $(value_h)
+	$(target_h) $(language_h) $(gdb_string_h) $(completer_h) $(value_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) \
 	$(gdb_string_h) $(regcache_h)
@@ -1366,7 +1392,7 @@ frame.o: frame.c $(defs_h) $(frame_h) $(target_h) $(value_h) $(inferior_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)
 
 install-gdbtk:
 	$(SHELL) $(srcdir)/../mkinstalldirs $(GDBTK_LIBRARY) ; \
@@ -1388,7 +1414,7 @@ gdbres.o: $(srcdir)/gdbtk/gdb.rc $(srcdir)/gdbtk/gdbtool.ico
 gdbtk.o: $(srcdir)/gdbtk/generic/gdbtk.c \
 	$(srcdir)/gdbtk/generic/gdbtk.h $(defs_h) \
 	$(symtab_h) $(inferior_h) $(command_h) \
-	$(bfd_h) $(symfile_h) objfiles.h $(target_h) $(gdb_string_h) \
+	$(bfd_h) $(symfile_h) $(objfiles_h) $(target_h) $(gdb_string_h) \
 	$(tracepoint_h) $(top_h) 
 	$(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \
         $(ITK_CFLAGS) $(TIX_CFLAGS) \
@@ -1407,8 +1433,8 @@ gdbtk-bp.o: $(srcdir)/gdbtk/generic/gdbtk-bp.c \
 gdbtk-cmds.o: $(srcdir)/gdbtk/generic/gdbtk-cmds.c \
 	$(srcdir)/gdbtk/generic/gdbtk.h $(srcdir)/gdbtk/generic/gdbtk-cmds.h \
 	$(defs_h) $(symtab_h) $(inferior_h)	\
-	$(command_h) $(bfd_h) $(top_h) $(symfile_h) objfiles.h $(target_h) \
-	$(gdb_string_h) $(tracepoint_h) source.h $(regcache_h)
+	$(command_h) $(bfd_h) $(top_h) $(symfile_h) $(objfiles_h) $(target_h) \
+	$(gdb_string_h) $(tracepoint_h) $(source_h) $(regcache_h)
 	$(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS)	\
 	$(TIX_CFLAGS) $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS)		\
 	$(GDBTK_CFLAGS) $(srcdir)/gdbtk/generic/gdbtk-cmds.c		\
@@ -1417,7 +1443,8 @@ gdbtk-cmds.o: $(srcdir)/gdbtk/generic/gdbtk-cmds.c \
 gdbtk-hooks.o: $(srcdir)/gdbtk/generic/gdbtk-hooks.c \
 	$(srcdir)/gdbtk/generic/gdbtk.h $(defs_h) \
 	$(symtab_h) $(inferior_h) $(command_h) \
-	$(bfd_h) $(symfile_h) objfiles.h $(target_h) $(gdb_string_h) $(tracepoint_h)
+	$(bfd_h) $(symfile_h) $(objfiles_h) $(target_h) $(gdb_string_h) \
+	$(tracepoint_h)
 	$(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) $(TIX_CFLAGS) \
 	$(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) $(GDBTK_CFLAGS)\
 		$(srcdir)/gdbtk/generic/gdbtk-hooks.c -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\"
@@ -1434,7 +1461,7 @@ gdbtk-stack.o: $(srcdir)/gdbtk/generic/gdbtk-stack.c \
 	$(srcdir)/gdbtk/generic/gdbtk.h $(srcdir)/gdbtk/generic/gdbtk-cmds.h \
 	$(srcdir)/gdbtk/generic/gdbtk-wrapper.h \
 	$(defs_h) $(frame_h) $(value_h) $(target_h) $(breakpoint_h) \
-	linespec.h
+	$(linespec_h)
 	$(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \
 	$(TIX_CFLAGS) $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS)   \
 	$(GDBTK_CFLAGS) $(srcdir)/gdbtk/generic/gdbtk-stack.c \
@@ -1454,7 +1481,7 @@ gdbtk-wrapper.o: $(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)
+	$(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
@@ -1465,17 +1492,17 @@ v850-tdep.o: v850-tdep.c $(defs_h) $(frame_h) $(inferior_h) $(obstack_h) \
 
 tracepoint.o: tracepoint.c $(defs_h) $(symtab_h) $(frame_h) $(tracepoint_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)
+	$(language_h) $(gdb_string_h) $(readline_headers) $(remote_h) \
+	$(linespec_h) $(regcache_h) $(completer_h)
 
 gdbarch.o: gdbarch.c $(defs_h) $(bfd_h) $(gdbcmd_h)
 
 arch-utils.o: arch-utils.c $(defs_h) $(bfd_h) $(gdbcmd_h) \
 	$(arch_utils_h) gdb_assert.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) \
-	$(value_h) $(gdb_string_h) wrapper.h $(cp_abi_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) $(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)
@@ -1500,7 +1527,7 @@ 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) \
 	$(regcache_h)
@@ -1518,7 +1545,7 @@ i386-tdep.o: i386-tdep.c $(defs_h) $(gdb_string_h) $(frame_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)
 
@@ -1541,10 +1568,10 @@ 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)
@@ -1552,7 +1579,7 @@ i386-linux-tdep.o: i386-linux-tdep.c $(defs_h) $(gdbcore_h) $(frame_h) \
 i386v4-nat.o: i386v4-nat.c $(defs_h) $(regcache_h)
 
 i387-tdep.o: i387-tdep.c $(floatformat_h) $(defs_h) $(gdbcore_h) \
-	$(inferior_h) language.h $(regcache_h) $(doublest_h) i386-tdep.h
+	$(inferior_h) $(language_h) $(regcache_h) $(doublest_h) i386-tdep.h
 
 i960-tdep.o: i960-tdep.c $(floatformat_h) $(defs_h) $(expression_h) \
 	$(frame_h) $(gdbtypes_h) $(symtab_h) $(value_h) $(gdbcore_h) \
@@ -1564,15 +1591,15 @@ 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) \
-	$(arch_utils_h) $(floatformat_h) objfiles.h $(value_h) \
+	$(arch_utils_h) $(floatformat_h) $(objfiles_h) $(value_h) \
 	$(INCLUDE_DIR)/elf/common.h $(regcache_h) $(doublest_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) \
 	$(gdb_string_h) gdb_wait.h $(command_h) $(regcache_h)
@@ -1583,60 +1610,62 @@ infrun.o: infrun.c gdb_wait.h $(defs_h) $(gdbcmd_h) $(cli_script_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) \
-	gdb_regex.h language.h $(gdb_string_h) $(regcache_h)
+	$(symtab_h) $(symfile_h) $(objfiles_h) $(command_h) $(frame_h) \
+	gdb_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 \
-	$(gdb_string_h) $(value_h) c-lang.h jv-lang.h $(gdbcore_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) \
 	$(value_h) $(demangle_h) jv-lang.h $(gdb_string_h) \
-	typeprint.h c-lang.h $(cp_abi_h)
+	$(typeprint_h) c-lang.h $(cp_abi_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)
+	$(expression_h) $(value_h) $(demangle_h) $(valprint_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) \
+	$(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)
 
 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) \
-	$(value_h) $(gdb_string_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
+	$(valprint_h) m2-lang.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)
+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)
+	$(gdbcmd_h) $(gdbcore_h) $(gdbtypes_h) $(language_h) $(symtab_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)
+	$(language_h) $(symtab_h) $(valprint_h) $(value_h) $(gdb_string_h)
 
 m68hc11-tdep.o: m68hc11-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(value_h) \
 	$(gdbcore_h) gdb_string.h
@@ -1655,47 +1684,47 @@ 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) \
+main.o: main.c $(top_h) $(defs_h) $(gdb_string_h) $(event_loop_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)
+maint.o: maint.c $(defs_h) $(gdbcmd_h) $(gdbtypes_h) $(symtab_h) \
+	$(language_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 \
-	$(gdb_string_h) $(regcache_h) serial.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) \
-	$(gdb_string_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) $(gdb_string_h)
 
 mipsm3-nat.o: mipsm3-nat.c $(defs_h) $(inferior_h) $(regcache_h)
 
 # os9kread assumes that sizeof(char*) <= sizeof(int).  This looses on
 # 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)
+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)
 	$(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 stabsread.h $(symfile_h) $(symtab_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) $(stabsread_h) $(symfile_h) $(symtab_h) \
 	$(gdb_string_h)
 
 mipsv4-nat.o: mipsv4-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) $(target_h) \
@@ -1705,8 +1734,9 @@ mn10300-tdep.o: mn10300-tdep.c $(defs_h) $(frame_h) $(inferior_h) \
 	$(obstack_h) $(target_h) $(value_h) $(bfd_h) gdb_string.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)
+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)
 
 news-xdep.o: news-xdep.c
 
@@ -1718,8 +1748,8 @@ nindy.o: nindy-share/nindy.c gdb_wait.h nindy-share/block_io.h \
 	nindy-share/env.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 \
+nlmread.o: nlmread.c $(bfd_h) $(buildsym_h) $(complaints_h) $(defs_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)
@@ -1731,14 +1761,14 @@ 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)
 
-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
+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)
+somread.o: somread.c $(bfd_h) $(buildsym_h) $(complaints_h) $(defs_h) \
+	$(gdb_stabs_h) $(objfiles_h) $(symfile_h) $(symtab_h) $(gdb_string_h)
 
 somsolib.o: somsolib.c $(defs_h) $(regcache_h)
 
@@ -1750,23 +1780,25 @@ hpux-thread.o: hpux-thread.c $(defs_h) $(gdbthread_h) $(target_h) inferior.h \
 	  -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)
+hpread.o: hpread.c $(bfd_h) $(buildsym_h) $(complaints_h) $(defs_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)
+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)
  
-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)
+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)
 # 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) \
-	$(gdb_string_h) linespec.h $(doublest_h)
+	$(gdbtypes_h) $(language_h) $(parser_defs_h) $(symtab_h) $(value_h) \
+	$(gdb_string_h) $(linespec_h) $(doublest_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) \
-	objfiles.h gdb-stabs.h serial.h ocd.h $(regcache_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)
@@ -1774,11 +1806,12 @@ ppc-linux-nat.o: ppc-linux-nat.c $(defs_h) $(gdbcore_h) $(frame_h) \
 ppc-linux-tdep.o: ppc-linux-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h) \
 	$(target_h) ppc-tdep.h $(regcache_h) $(value_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)
+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)
 
 printcmd.o: printcmd.c $(breakpoint_h) $(defs_h) $(expression_h) \
-	$(gdbcmd_h) $(gdbcore_h) $(gdbtypes_h) language.h objfiles.h \
+	$(gdbcmd_h) $(gdbcore_h) $(gdbtypes_h) $(language_h) $(objfiles_h) \
 	$(symfile_h) $(symtab_h) $(target_h) $(gdb_string_h) $(ui_out_h) \
 	$(completer_h)
 
@@ -1804,7 +1837,7 @@ linux-thread.o: linux-thread.c $(breakpoint_h) $(gdbcmd_h) gdb_wait.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) \
-	objfiles.h $(target_h) $(regcache_h)
+	$(objfiles_h) $(target_h) $(regcache_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)
@@ -1813,10 +1846,10 @@ proc-service.o: proc-service.c $(defs_h) $(inferior_h) gdb_proc_service.h \
 	$(symtab_h) $(target_h) gregset.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) \
-      $(gdb_string_h) $(command_h) serial.h monitor.h $(remote_utils_h) \
+      $(gdb_string_h) $(command_h) $(serial_h) $(monitor_h) $(remote_utils_h) \
 	$(version_h) $(regcache_h)
 
 remote-rdi.o: remote-rdi.c $(defs_h) $(gdbcore_h) \
@@ -1835,32 +1868,33 @@ rdi-share/libangsd.a:	force
 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) \
-	$(regcache_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) $(regcache_h)
 
 remote-e7000.o: remote-e7000.c $(defs_h) $(gdbcore_h) $(target_h) \
-	serial.h $(gdb_string_h) $(regcache_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 \
-	$(gdb_string_h) $(regcache_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) \
+	$(inferior_h) $(remote_utils_h) $(terminal_h) $(gdb_string_h) \
 	$(symfile_h) $(regcache_h) $(value_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) \
@@ -1868,117 +1902,118 @@ remote-nindy.o: remote-nindy.c $(floatformat_h) $(command_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) \
-	objfiles.h gdb-stabs.h $(gdb_string_h) $(regcache_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) \
-	$(regcache_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 \
+remote-st.o: remote-st.c $(defs_h) $(gdbcore_h) $(serial_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) \
+remote-vx.o: remote-vx.c $(complaints_h) $(defs_h) $(gdbcmd_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) \
+remote-vx29k.o: remote-vx29k.c $(complaints_h) $(defs_h) $(gdbcmd_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 \
-	gdb-stabs.h $(dcache_h) serial.h $(regcache_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) \
-	$(event_loop_h) $(event_top_h) $(remote_h) $(inf_loop_h) $(value_h)
+	$(inferior_h) $(remote_utils_h) $(symfile_h) $(terminal_h) \
+	$(gdb_string_h) $(event_loop_h) $(event_top_h) $(remote_h) \
+	$(inf_loop_h) $(value_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 \
+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) $(value_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)
+	$(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) $(value_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-lang.h valprint.h $(gdbcore_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 
+ser-go32.o: ser-go32.c $(defs_h) $(serial_h) 
 
-# OBSOLETE ser-mac.o: ser-mac.c $(defs_h) serial.h 
+# OBSOLETE ser-mac.o: ser-mac.c $(defs_h) $(serial_h) 
 
-ser-pipe.o: ser-pipe.c $(defs_h) serial.h $(gdb_string_h) ser-unix.h
+ser-pipe.o: ser-pipe.c $(defs_h) $(serial_h) $(gdb_string_h) $(ser_unix_h)
 
-ser-tcp.o: ser-tcp.c $(defs_h) serial.h $(gdb_string_h) ser-unix.h
+ser-tcp.o: ser-tcp.c $(defs_h) $(serial_h) $(gdb_string_h) $(ser_unix_h)
 
-ser-unix.o: ser-unix.c $(defs_h) serial.h ser-unix.h 
+ser-unix.o: ser-unix.c $(defs_h) $(serial_h) $(ser_unix_h) 
 
-serial.o: serial.c $(defs_h) serial.h $(gdb_string_h)
+serial.o: serial.c $(defs_h) $(serial_h) $(gdb_string_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) $(doublest_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) \
+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) \
 	$(regcache_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
+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)
 
 solib.o: solib.c $(command_h) $(defs_h) $(gdbcore_h) $(inferior_h) \
-	objfiles.h gdb_regex.h $(symfile_h) $(target_h) $(gdb_string_h) \
-	solist.h $(completer_h)
+	$(objfiles_h) gdb_regex.h $(symfile_h) $(target_h) $(gdb_string_h) \
+	$(solist_h) $(completer_h)
 
-solib-sunos.o: solib-sunos.c $(defs_h) $(symfile_h) objfiles.h $(gdbcore_h) \
-	$(inferior_h) solist.h
+solib-sunos.o: solib-sunos.c $(defs_h) $(symfile_h) $(objfiles_h) \
+	$(gdbcore_h) $(inferior_h) $(solist_h)
 
-solib-svr4.o: solib-svr4.c $(defs_h) $(gdbcore_h) $(inferior_h) objfiles.h \
-	$(symfile_h) $(target_h) solist.h solib-svr4.h
+solib-svr4.o: solib-svr4.c $(defs_h) $(gdbcore_h) $(inferior_h) $(objfiles_h) \
+	$(symfile_h) $(target_h) $(solist_h) solib-svr4.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 gdb_regex.h $(symfile_h) \
-	$(symtab_h) $(gdb_string_h) source.h $(completer_h) linespec.h \
+	$(gdbcore_h) $(language_h) $(objfiles_h) gdb_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)
 
 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)
@@ -1986,12 +2021,12 @@ 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) \
-	$(gdb_string_h) $(doublest_h)
+	$(INCLUDE_DIR)/aout/stab_gnu.h $(buildsym_h) $(complaints_h) \
+	$(defs_h) $(gdbtypes_h) $(objfiles_h) $(stabsread_h) $(symfile_h) \
+	$(symtab_h) $(gdb_string_h) $(doublest_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 \
@@ -2006,9 +2041,9 @@ sun3-nat.o: sun3-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) $(regcache_h)
 
 # OBSOLETE sun386-nat.o: sun386-nat.c $(defs_h) $(inferior_h) $(gdbcore_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) \
+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)
 
 symm-tdep.o: symm-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h)
@@ -2016,22 +2051,22 @@ 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) \
-	$(symtab_h) $(gdb_string_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 \
+symtab.o: symtab.c $(call_cmds_h) $(defs_h) $(expression_h) $(frame_h) \
+	$(gdbcmd_h) $(gdbcore_h) $(gdbtypes_h) $(language_h) $(objfiles_h) \
 	gdb_regex.h $(symfile_h) $(symtab_h) $(target_h) $(value_h) \
-	$(gdb_string_h) linespec.h $(cp_abi_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) \
-	$(demangle_h) command.h $(cp_abi_h)
+linespec.o: linespec.c $(linespec_h) $(defs_h) $(frame_h) $(value_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) \
 	$(regcache_h) $(ui_out_h) $(gdb_h)
@@ -2039,16 +2074,16 @@ thread.o: thread.c $(defs_h) $(gdbthread_h) $(gdbcmd_h) $(target_h) \
 completer.o: completer.c $(completer_h) $(gdbtypes_h) $(symtab_h) \
 	$(defs_h) $(gdbcmd_h) $(expression_h) $(readline_headers)
 
-top.o: top.c top.h $(bfd_h) $(getopt_h) $(readline_headers) call-cmds.h \
+top.o: top.c $(top_h) $(bfd_h) $(getopt_h) $(readline_headers) $(call_cmds_h) \
 	$(cli_cmds_h) $(cli_script_h) $(cli_setshow_h) \
-	$(defs_h) $(gdbcmd_h) $(inferior_h) language.h \
+	$(defs_h) $(gdbcmd_h) $(inferior_h) $(language_h) \
 	$(remote_utils_h) $(gdb_string_h) $(event_loop_h) $(event_top_h) \
 	$(completer_h) $(version_h) $(ui_out_h) $(doublest_h) \
-	serial.h
+	$(serial_h)
 
 typeprint.o: typeprint.c $(defs_h) $(expression_h) $(gdbcmd_h) \
-	$(gdbcore_h) $(gdbtypes_h) language.h $(symtab_h) $(target_h) \
-	$(value_h) $(gdb_string_h) $(cp_abi.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)
 
@@ -2057,19 +2092,19 @@ 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) $(doublest_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) \
-	$(value_h) $(gdb_string_h) valprint.h $(doublest_h)
+	$(gdbcore_h) $(gdbtypes_h) $(language_h) $(symtab_h) $(target_h) \
+	$(value_h) $(gdb_string_h) $(valprint_h) $(doublest_h)
 
 values.o: values.c $(defs_h) $(expression_h) $(frame_h) $(gdbcmd_h) \
 	$(gdbcore_h) $(gdbtypes_h) $(symtab_h) $(target_h) $(value_h) \
@@ -2079,15 +2114,15 @@ vax-tdep.o: vax-tdep.c $(OP_INCLUDE)/vax.h $(defs_h) $(symtab_h)
 
 w65-tdep.o : w65-tdep.c $(gdbcore_h) $(regcache_h)
 
-x86-64-linux-tdep.o : x86-64-linux-tdep.c $(defs_h) $(inferior_h) $(gdbcore_h) \
-	$(regcache_h) x86-64-tdep.h i386-tdep.h
+x86-64-linux-tdep.o : x86-64-linux-tdep.c $(defs_h) $(inferior_h) \
+	$(gdbcore_h) $(regcache_h) x86-64-tdep.h i386-tdep.h
 
-x86-64-tdep.o : x86-64-tdep.c $(defs_h) $(inferior_h) $(gdbcore_h) $(gdbcmd_h) \
-	$(arch_utils_h) $(regcache_h) $(symfile_h) x86-64-tdep.h i386-tdep.h \
-	$(value_h)
+x86-64-tdep.o : x86-64-tdep.c $(defs_h) $(inferior_h) $(gdbcore_h) \
+	$(gdbcmd_h) $(arch_utils_h) $(regcache_h) $(symfile_h) x86-64-tdep.h \
+	i386-tdep.h $(value_h)
 
-x86-64-linux-tdep.o : x86-64-linux-tdep.c $(defs_h) $(inferior_h) $(gdbcore_h) \
-	$(regcache_h) i387-nat.h x86-64-tdep.h i386-tdep.h
+x86-64-linux-tdep.o : x86-64-linux-tdep.c $(defs_h) $(inferior_h) \
+	$(gdbcore_h) $(regcache_h) i387-nat.h x86-64-tdep.h i386-tdep.h
 
 win32-nat.o: win32-nat.c $(gdbcmd_h) $(gdbcore_h) $(inferior_h) $(defs_h) \
 	$(gdb_string_h) $(regcache_h) $(completer_h)
@@ -2106,11 +2141,11 @@ 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) \
-	$(symtab_h) $(gdb_string_h)
+	$(INCLUDE_DIR)/coff/rs6000.h $(BFD_SRC)/libcoff.h $(buildsym_h) \
+	$(complaints_h) $(defs_h) $(gdbtypes_h) $(objfiles_h) $(stabsread_h) \
+	$(symfile_h) $(symtab_h) $(gdb_string_h)
 
-xcoffsolib.o: xcoffsolib.c $(bfd_h) $(defs_h) xcoffsolib.h $(inferior_h) \
+xcoffsolib.o: xcoffsolib.c $(bfd_h) $(defs_h) $(xcoffsolib_h) $(inferior_h) \
 	$(gdbcmd_h) $(symfile_h) $(frame_h) gdb_regex.h
 
 # FIXME: z8k-tdep.c calls _initialize_gdbtypes().  Since that isn't
@@ -2122,33 +2157,34 @@ z8k-tdep.o: z8k-tdep.c $(bfd_h) $(dis_asm_h) $(defs_h) $(frame_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)
+gdb-events.o: gdb-events.c $(gdb_events_h) $(defs_h) $(gdbcmd_h)
 
-ui-out.o: ui-out.c $(defs_h) $(ui_out_h) expression.h language.h
+ui-out.o: ui-out.c $(defs_h) $(ui_out_h) $(expression_h) $(language_h)
 cli-out.o: cli-out.c $(defs_h) $(ui_out_h) $(cli_out_h)
 
 varobj.o: varobj.c $(defs_h) $(frame_h) $(value_h) \
-	$(language_h) valprint.h varobj.h wrapper.h
+	$(language_h) $(valprint_h) $(varobj_h) $(wrapper_h)
 
-wrapper.o: wrapper.c $(defs_h) $(frame_h) $(value_h) wrapper.h
+wrapper.o: wrapper.c $(defs_h) $(frame_h) $(value_h) $(wrapper_h)
 
 #
 # CLI dependencies
@@ -2162,7 +2198,7 @@ cli-decode.o: $(srcdir)/cli/cli-decode.c $(cli_decode_h) \
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-decode.c
 
 cli-cmds.o: $(srcdir)/cli/cli-cmds.c  $(cli_cmds_h) $(cli_decode_h) \
-		$(cli_script_h) $(cli_setshow_h) top.h $(completer_h) \
+		$(cli_script_h) $(cli_setshow_h) $(top_h) $(completer_h) \
 		 $(defs_h) $(target_h) gdb_wait.h gdb_regex.h $(ui_out_h)
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-cmds.c
 
@@ -2172,8 +2208,8 @@ cli-setshow.o: $(srcdir)/cli/cli-setshow.c $(cli_setshow_h) \
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-setshow.c
 
 cli-script.o: $(srcdir)/cli/cli-script.c $(cli_script_h) \
-		$(cli_cmds_h) $(cli_decode_h) top.h \
-		$(defs_h) $(value_h) language.h $(ui_out_h)
+		$(cli_cmds_h) $(cli_decode_h) $(top_h) \
+		$(defs_h) $(value_h) $(language_h) $(ui_out_h)
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-script.c
 
 cli-utils.o: $(srcdir)/cli/cli-utils.c $(cli_utils_h) $(defs_h)
diff --git a/gdb/call-cmds.h b/gdb/call-cmds.h
index 10c3ac4..3d2cda1 100644
--- a/gdb/call-cmds.h
+++ b/gdb/call-cmds.h
@@ -23,8 +23,13 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#ifndef CALL_CMDS_H
+#define CALL_CMDS_H
+
 extern void initialize_all_files (void);
 
 extern void core_file_command (char *, int);
 
 extern void break_command (char *, int);
+
+#endif
diff --git a/gdb/monitor.h b/gdb/monitor.h
index afdc3b2..85a44ff 100644
--- a/gdb/monitor.h
+++ b/gdb/monitor.h
@@ -21,6 +21,9 @@
    Boston, MA 02111-1307, USA.
  */
 
+#ifndef MONITOR_H
+#define MONITOR_H
+
 struct serial;
 
 /* This structure describes the strings necessary to give small command
@@ -247,3 +250,5 @@ extern int monitor_readchar (void);
 extern char *monitor_get_dev_name (void);
 extern void init_monitor_ops (struct target_ops *);
 extern int monitor_dump_reg_block (char *dump_cmd);
+
+#endif
diff --git a/gdb/solist.h b/gdb/solist.h
index fa00aaf..dd1100c 100644
--- a/gdb/solist.h
+++ b/gdb/solist.h
@@ -20,6 +20,9 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#ifndef SOLIST_H
+#define SOLIST_H
+
 #define SO_NAME_MAX_PATH_SIZE 512	/* FIXME: Should be dynamic */
 
 /* Forward declaration for target specific link map information.  This
@@ -119,3 +122,5 @@ extern struct target_so_ops *current_target_so_ops;
   (current_target_so_ops->open_symbol_file_object)
 #define TARGET_SO_IN_DYNSYM_RESOLVE_CODE \
   (current_target_so_ops->in_dynsym_resolve_code)
+
+#endif
diff --git a/gdb/top.h b/gdb/top.h
index 0501519..49a32a9 100644
--- a/gdb/top.h
+++ b/gdb/top.h
@@ -19,6 +19,9 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#ifndef TOP_H
+#define TOP_H
+
 /* From top.c.  */
 extern char *line;
 extern int linesize;
@@ -67,3 +70,5 @@ extern char *source_error;
 extern char *source_pre_error;
 extern int history_expansion_p;
 extern int server_command;
+
+#endif
diff --git a/gdb/typeprint.h b/gdb/typeprint.h
index a0d4438..c57cc58 100644
--- a/gdb/typeprint.h
+++ b/gdb/typeprint.h
@@ -19,7 +19,11 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#ifndef TYPEPRINT_H
+#define TYPEPRINT_H
+
 void print_type_scalar (struct type * type, LONGEST, struct ui_file *);
 
 void c_type_print_varspec_suffix (struct type *, struct ui_file *, int,
 				  int, int);
+#endif
diff --git a/gdb/valprint.h b/gdb/valprint.h
index 5bea657..52314aa 100644
--- a/gdb/valprint.h
+++ b/gdb/valprint.h
@@ -18,6 +18,8 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#ifndef VALPRINT_H
+#define VALPRINT_H
 
 extern int prettyprint_arrays;	/* Controls pretty printing of arrays.  */
 extern int prettyprint_structs;	/* Controls pretty printing of structures */
@@ -55,3 +57,4 @@ extern void print_octal_chars (struct ui_file *, unsigned char *,
 
 extern void print_decimal_chars (struct ui_file *, unsigned char *,
 				 unsigned int);
+#endif
diff --git a/gdb/xcoffsolib.h b/gdb/xcoffsolib.h
index d7e8504..d8370fa 100644
--- a/gdb/xcoffsolib.h
+++ b/gdb/xcoffsolib.h
@@ -27,6 +27,9 @@
    shared libraries are loaded, or a "load" system call, followed by the
    user's issuance of a "load" command.  */
 
+#ifndef XCOFFSOLIB_H
+#define XCOFFSOLIB_H
+
 struct vmap
   {
     struct vmap *nxt;		/* ptr to next in chain                 */
@@ -59,3 +62,5 @@ extern struct vmap *vmap;
 
 /* Add symbols for a vmap.  */
 extern int vmap_add_symbols (struct vmap *vp);
+
+#endif