* Makefile.in (mn10300-tdep.o): New rule.

* Makefile.in (gdb_string_h): Define.  Use it throughout.
Some rules were already using this, even though it isn't defined.

1 files changed, 122 insertions, 117 deletions

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index e6fa45e..25be479 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -610,6 +610,7 @@ version_h = 	version.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
 
 cli_decode_h =	$(srcdir)/cli/cli-decode.h
 cli_cmds_h =	$(srcdir)/cli/cli-cmds.h
@@ -1198,13 +1199,13 @@ 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)
 
 arm-linux-nat.o: arm-linux-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) \
-	gdb_string.h $(regcache_h)
+	$(gdb_string_h) $(regcache_h)
 
 arm-linux-tdep.o: arm-linux-tdep.c $(defs_h) target.h $(value_h) \
 	$(gdbtypes_h) $(floatformat_h) $(regcache_h)
@@ -1218,31 +1219,31 @@ blockframe.o: blockframe.c $(defs_h) $(gdbcore_h) $(inferior_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
 
 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)
 
 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
+	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)
 
@@ -1251,7 +1252,7 @@ ch-lang.o: ch-lang.c ch-lang.h $(defs_h) $(expression_h) $(gdbtypes_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
@@ -1261,7 +1262,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 \
-	gdb_string.h
+	$(gdb_string_h)
 
 complaints.o: complaints.c complaints.h $(defs_h) $(gdbcmd_h)
 
@@ -1273,60 +1274,60 @@ 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 \
+	$(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)
 
 cp-valprint.o: cp-valprint.c $(defs_h) $(expression_h) $(gdbcmd_h) \
-	$(gdbtypes_h) $(symtab_h) $(value_h) gdb_string.h
+	$(gdbtypes_h) $(symtab_h) $(value_h) $(gdb_string_h)
 
-dcache.o: dcache.c $(dcache_h) $(defs_h) $(gdbcmd_h) gdb_string.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)
+	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
+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)
 
-dpx2-nat.o: dpx2-nat.c $(defs_h) $(gdbcore_h) gdb_string.h
+dpx2-nat.o: dpx2-nat.c $(defs_h) $(gdbcore_h) $(gdb_string_h)
 
-dstread.o: dstread.c 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
+	$(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
+	$(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
+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) \
-	gdb_string.h $(cp_abi_h)
+	$(gdb_string_h) $(cp_abi_h)
 
 event-loop.o: event-loop.c $(defs_h) $(top_h) $(event_loop_h) $(event_top_h)
 
@@ -1338,13 +1339,13 @@ 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)
 
 findvar.o: findvar.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h \
-	gdb_string.h $(regcache_h)
+	$(gdb_string_h) $(regcache_h)
 
 frame.o: frame.c $(defs_h) $(frame_h) $(target_h) $(value_h) $(inferior_h) \
 	$(regcache_h)
@@ -1352,7 +1353,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)
 
 # 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
@@ -1395,8 +1396,8 @@ 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 $(tracepoint_h) \
-	$(top_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) \
 	$(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) $(GDBTK_CFLAGS)\
@@ -1406,7 +1407,7 @@ gdbtk-cmds.o: $(srcdir)/gdbtk/generic/gdbtk-cmds.c \
 	$(srcdir)/gdbtk/generic/gdbtk.h \
 	$(defs_h) $(symtab_h) $(inferior_h)	\
 	$(command_h) $(bfd_h) $(top_h) symfile.h objfiles.h target.h	\
-	gdb_string.h $(tracepoint_h) $(frame_h) source.h $(regcache_h)
+	$(gdb_string_h) $(tracepoint_h) $(frame_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				\
@@ -1415,7 +1416,7 @@ 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=\"$(datadir)/gdbtcl\"
@@ -1434,7 +1435,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
@@ -1445,7 +1446,7 @@ 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 \
+	language.h $(gdb_string_h) $(readline_headers) $(remote_h) linespec.h \
 	$(regcache_h)
 
 gdbarch.o: gdbarch.c $(defs_h) $(bfd_h) $(gdbcmd_h)
@@ -1455,7 +1456,7 @@ arch-utils.o: arch-utils.c $(defs_h) $(bfd_h) $(gdbcmd_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)
+	$(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)
@@ -1463,7 +1464,7 @@ go32-nat.o: go32-nat.c $(defs_h) $(inferior_h) gdb_wait.h $(gdbcore_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
 
-gnu-v2-abi.o: gnu-v2-abi.c $(defs_h) $(cp_abi_h) gdb_string.h $(symtab_h) \
+gnu-v2-abi.o: gnu-v2-abi.c $(defs_h) $(cp_abi_h) $(gdb_string_h) $(symtab_h) \
 	$(gdbtypes_h) $(value_h)
 
 h8300-tdep.o: h8300-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(regcache_h)
@@ -1474,7 +1475,7 @@ h8500-tdep.o: h8500-tdep.c $(bfd_h) $(dis-asm_h) $(defs_h) \
 
 hp300ux-nat.o: hp300ux-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) $(regcache_h)
 
-hpacc-abi.o: hpacc-abi.c $(defs_h) $(cp_abi_h) gdb_string.h $(gdbtypes_h) \
+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) \
@@ -1488,7 +1489,7 @@ hppah-nat.o: hppah-nat.c $(bfd_h) $(defs_h) $(inferior_h) target.h \
 
 i386gnu-nat.o: gnu-nat.h
 
-i386-tdep.o: i386-tdep.c $(defs_h) gdb_string.h $(frame_h)	\
+i386-tdep.o: i386-tdep.c $(defs_h) $(gdb_string_h) $(frame_h)	\
 	$(inferior_h) $(gdbcore_h) target.h $(floatformat_h)	\
 	$(symtab_h) $(gdbcmd_h) $(command_h) $(arch_utils_h) $(regcache_h)
 
@@ -1538,16 +1539,16 @@ ia64-tdep.o: ia64-tdep.c $(defs_h) $(inferior_h) symfile.h $(gdbcore_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)
 
 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)
+	$(gdb_string_h) gdb_wait.h $(command_h) $(regcache_h)
 
 infrun.o: infrun.c gdb_wait.h $(defs_h) $(gdbcmd_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) \
@@ -1556,29 +1557,29 @@ inftarg.o: inftarg.c gdb_wait.h $(defs_h) $(gdbcore_h) $(inferior_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 \
-	language.h gdb_string.h $(regcache_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)
+	$(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 \
+	$(value_h) $(demangle_h) jv-lang.h $(gdb_string_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
 
-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
+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
+	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)
@@ -1588,7 +1589,7 @@ m2-lang.o: m2-lang.c $(defs_h) $(expression_h) $(gdbtypes_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
+	$(value_h) $(gdb_string_h)
 
 m2-valprint.o: m2-valprint.c $(defs_h) $(gdbtypes_h) $(symtab_h) \
 	valprint.h m2-lang.h
@@ -1597,17 +1598,17 @@ 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
+	language.h $(symtab_h) valprint.h $(value_h) $(gdb_string_h)
 
 m68k-tdep.o: m68k-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(value_h) \
-	$(gdbcore_h) gdb_string.h $(regcache_h)
+	$(gdbcore_h) $(gdb_string_h) $(regcache_h)
 
 m68kly-nat.o: m68kly-nat.c $(defs_h) $(frame_h) $(inferior_h) target.h
 
@@ -1618,9 +1619,9 @@ m88k-nat.o: m88k-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) $(regcache_h)
 
 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)
+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) $(srcdir)/tui/tui-file.h
 
 maint.o: maint.c $(defs_h) $(gdbcmd_h) $(gdbtypes_h) $(symtab_h) language.h \
@@ -1630,12 +1631,12 @@ 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)
+	$(gdb_string_h) $(regcache_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
+	$(gdb_string_h)
 
 mipsm3-nat.o: mipsm3-nat.c $(defs_h) $(inferior_h) $(regcache_h)
 
@@ -1644,30 +1645,34 @@ mipsm3-nat.o: mipsm3-nat.c $(defs_h) $(inferior_h) $(regcache_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
+		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 \
-	$(symtab_h) gdb_string.h
+	$(symtab_h) $(gdb_string_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) \
-	gdb_string.h
+	$(gdb_string_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) \
+	$(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)
+	$(inferior_h) target.h serial.h terminal.h $(gdb_string_h) $(regcache_h)
 
 news-xdep.o: news-xdep.c
 
@@ -1681,7 +1686,7 @@ nindy.o: nindy-share/nindy.c gdb_wait.h nindy-share/block_io.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
+	$(gdb_string_h)
 
 # OBSOLETE ns32km3-nat.o: ns32km3-nat.c $(defs_h) $(inferior_h) $(regcache_h)
 
@@ -1693,13 +1698,13 @@ 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 \
-	$(symtab_h) gdb_string.h $(breakpoint_h)
+	$(symtab_h) $(gdb_string_h) $(breakpoint_h)
 
 osfsolib.o: osfsolib.c $(command_h) $(defs_h) $(gdbcore_h) $(inferior_h) \
-	objfiles.h gnu-regex.h symfile.h target.h language.h gdb_string.h
+	objfiles.h gnu-regex.h symfile.h target.h language.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
+	gdb-stabs.h objfiles.h symfile.h $(symtab_h) $(gdb_string_h)
 
 somsolib.o: somsolib.c $(defs_h) $(regcache_h)
 
@@ -1712,20 +1717,20 @@ hpux-thread.o: hpux-thread.c $(defs_h) gdbthread.h target.h inferior.h \
 
 # 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) \
-	gdb_string.h linespec.h
+	$(gdb_string_h) linespec.h
 
-ppc-bdm.o: ppc-bdm.c $(defs_h) $(gdbcore_h) gdb_string.h $(frame_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)
 
@@ -1740,12 +1745,12 @@ ppcbug-rom.o: ppcbug-rom.c monitor.h $(bfd_h) gdb_wait.h $(defs_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
+	symfile.h $(symtab_h) target.h $(gdb_string_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
@@ -1772,17 +1777,17 @@ lin-lwp.o: lin-lwp.c $(defs_h) gdb_assert.h gdb_wait.h gdbthread.h \
 proc-service.o: proc-service.c $(defs_h) $(inferior_h) gdb_proc_service.h \
 	$(symtab_h) $(target_h) gregset.h
 
-gnu-regex.o: gnu-regex.c gnu-regex.h $(defs_h) gdb_string.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 \
-      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) \
-	$(inferior_h) gdb_string.h
+	$(inferior_h) $(gdb_string_h)
 
 rdi-share/libangsd.a:	force
 	@dir=rdi-share; \
@@ -1795,10 +1800,10 @@ rdi-share/libangsd.a:	force
 	fi
 
 remote-rdp.o: remote-rdp.c $(defs_h) $(gdbcore_h) \
-	$(inferior_h) gdb_string.h
+	$(inferior_h) $(gdb_string_h)
 
 remote-bug.o: remote-bug.c $(defs_h) $(gdbcore_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)
 
 # FIXME: For the SH target, remote-e7000 contains numerous -Wformat
@@ -1806,15 +1811,15 @@ remote-bug.o: remote-bug.c $(defs_h) $(gdbcore_h) \
 # handles the SH remote protocol the changes need to be tested against
 # an SH board before they can be committed. cagney 1999-09-01.
 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)
 	$(CC) -c $(INTERNAL_WARN_CFLAGS) $(NO_WERROR_CFLAGS) $<
 
 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)
+	$(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)
 
 remote-est.o: remote-est.c $(defs_h) $(gdbcore_h) \
@@ -1827,7 +1832,7 @@ remote-mips.o: remote-mips.c $(defs_h) $(gdbcmd_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) \
@@ -1836,43 +1841,43 @@ remote-nindy.o: remote-nindy.c $(floatformat_h) $(command_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)
+	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 \
 	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) \
-	gdb_string.h $(regcache_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 \
         vx-share/ptrace.h vx-share/xdr_ld.h vx-share/xdr_ptrace.h \
-        vx-share/xdr_rdb.h gdb_string.h $(regcache_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) \
+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)
 
 remote-utils.o: remote-utils.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
-	$(inferior_h) $(remote_utils_h) gdb_string.h $(regcache_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) \
@@ -1892,7 +1897,7 @@ 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.h scm-tags.h gdb_string.h $(gdbcore_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)
@@ -1901,15 +1906,15 @@ ser-go32.o: ser-go32.c $(defs_h) serial.h
 
 ser-mac.o: ser-mac.c $(defs_h) serial.h 
 
-ser-ocd.o: ser-ocd.c $(defs_h) serial.h gdb_string.h
+ser-ocd.o: ser-ocd.c $(defs_h) serial.h $(gdb_string_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 
 
-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) \
@@ -1924,23 +1929,23 @@ 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 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.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) \
-	gdb_string.h source.h completer.h linespec.h
+	$(gdb_string_h) source.h completer.h linespec.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)
@@ -1950,10 +1955,10 @@ 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
+	$(gdb_string_h)
 
 stack.o: stack.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) $(inferior_h) \
-	language.h target.h gdb_string.h
+	language.h target.h $(gdb_string_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
@@ -1970,7 +1975,7 @@ 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
+	target.h $(gdb_string_h) completer.h
 
 symm-tdep.o: symm-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h)
 
@@ -1978,12 +1983,12 @@ 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
+	$(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) \
-	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) \
@@ -1992,7 +1997,7 @@ linespec.o: linespec.c linespec.h $(defs_h) $(frame_h) $(value_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)
 
@@ -2001,12 +2006,12 @@ completer.o: completer.c completer.h $(gdbtypes_h) $(symtab_h) \
 
 top.o: top.c top.h $(bfd_h) $(getopt_h) $(readline_headers) call-cmds.h \
 	$(defs_h) $(gdbcmd_h) $(inferior_h) language.h \
-	$(remote_utils_h) gdb_string.h $(event_loop_h) $(event_top_h) \
+	$(remote_utils_h) $(gdb_string_h) $(event_loop_h) $(event_top_h) \
 	completer.h $(version_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)
+	$(value_h) $(gdb_string_h) $(cp_abi.h)
 
 # OBSOLETE ultra3-nat.o: ultra3-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) $(regcache_h)
 
@@ -2016,29 +2021,29 @@ typeprint.o: typeprint.c $(defs_h) $(expression_h) $(gdbcmd_h) \
 
 utils.o: utils.c $(bfd_h) $(defs_h) $(expression_h) $(gdbcmd_h) \
 	language.h target.h terminal.h $(readline_headers) \
-	gdb_string.h $(event_loop_h) $(event_top_h)
+	$(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) \
-	gdb_string.h
+	$(gdb_string_h)
 
 valops.o: valops.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h \
-	gdb_string.h $(regcache_h) $(cp_abi_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
+	$(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) \
-	gdb_string.h scm-lang.h
+	$(gdb_string_h) scm-lang.h
 
 vax-tdep.o: vax-tdep.c $(OP_INCLUDE)/vax.h $(defs_h) $(symtab_h)
 
 w65-tdep.o : w65-tdep.c $(gdbcore_h) $(regcache_h)
 
 win32-nat.o: win32-nat.c $(gdbcmd_h) $(gdbcore_h) $(inferior_h) $(defs_h) \
-	gdb_string.h $(regcache_h)
+	$(gdb_string_h) $(regcache_h)
 
 xdr_ld.o: vx-share/xdr_ld.c $(defs_h) vx-share/vxTypes.h \
 	vx-share/vxWorks.h vx-share/xdr_ld.h
@@ -2056,7 +2061,7 @@ 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) partial-stab.h gdb_string.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