* config/alpha/nm-linux.h: Add "config/" prefix to tm, nm and xm

includes.
* config/tm-linux.h: Ditto.
* config/alpha/tm-alphalinux.h: Ditto.
* config/arm/nm-linux.h, config/arm/tm-linux.h: Ditto.
* config/arm/xm-nbsd.h, config/i386/nm-gnu.h: Ditto.
* config/i386/nm-i386lynx.h, config/i386/nm-i386sol2.h: Ditto.
* config/i386/nm-i386v4.h, config/i386/nm-i386v42mp.h: Ditto.
* config/i386/nm-linux.h, config/i386/nm-m3.h: Ditto.
* config/i386/nm-ptx4.h, config/i386/nm-x86-64.h: Ditto.
* config/i386/tm-i386gnu.h, config/i386/tm-i386lynx.h: Ditto.
* config/i386/tm-i386m3.h, config/i386/tm-i386sco5.h: Ditto.
* config/i386/tm-i386v4.h, config/i386/tm-linux.h: Ditto.
* config/i386/tm-ptx4.h, config/i386/tm-vxworks.h: Ditto.
* config/i386/xm-i386v4.h, config/i386/xm-nbsd.h: Ditto.
* config/i386/xm-ptx.h, config/i386/xm-ptx4.h: Ditto.
* config/i960/tm-vx960.h, config/ia64/nm-aix.h: Ditto.
* config/ia64/nm-linux.h, config/ia64/tm-aix.h: Ditto.
* config/ia64/tm-linux.h, config/ia64/xm-aix.h: Ditto.
* config/m68k/nm-linux.h, config/m68k/nm-m68klynx.h: Ditto.
* config/m68k/nm-sysv4.h, config/m68k/tm-linux.h: Ditto.
* config/m68k/tm-m68klynx.h, config/m68k/tm-m68kv4.h: Ditto.
* config/m68k/tm-sun2os4.h, config/m68k/tm-sun3os4.h: Ditto.
* config/m68k/tm-vx68.h, config/m68k/xm-m68kv4.h: Ditto.
* config/m68k/xm-nbsd.h, config/m88k/nm-delta88v4.h: Ditto.
* config/m88k/tm-delta88v4.h, config/m88k/xm-delta88v4.h: Ditto.
* config/mips/nm-irix5.h, config/mips/nm-linux.h: Ditto.
* config/mips/tm-linux.h, config/mips/tm-mips64.h: Ditto.
* config/mips/tm-mipsm3.h, config/mips/tm-mipsv4.h: Ditto.
* config/mips/tm-vxmips.h, config/mips/xm-irix5.h: Ditto.
* config/mips/xm-mipsv4.h, config/ns32k/xm-nbsd.h: Ditto.
* config/pa/nm-hppao.h, config/powerpc/nm-linux.h: Ditto.
* config/powerpc/tm-linux.h, config/powerpc/tm-vxworks.h: Ditto.
* config/powerpc/xm-aix.h, config/rs6000/nm-rs6000ly.h: Ditto.
* config/rs6000/tm-rs6000ly.h, config/rs6000/xm-aix4.h: Ditto.
* config/sh/tm-linux.h, config/sparc/nm-linux.h: Ditto.
* config/sparc/nm-sparclynx.h, config/sparc/nm-sun4sol2.h: Ditto.
* config/sparc/tm-linux.h, config/sparc/tm-sp64linux.h: Ditto.
* config/sparc/tm-sp64sim.h, config/sparc/tm-sparclynx.h: Ditto.
* config/sparc/tm-sun4os4.h, config/sparc/tm-sun4sol2.h: Ditto.
* config/sparc/tm-vxsparc.h, config/sparc/xm-sun4sol2.h: Ditto.

78 files changed, 125 insertions, 81 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8248a54d63f..5ca4741d398 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,47 @@
+2002-06-02  Andrew Cagney  <ac131313@redhat.com>
+
+	* config/alpha/nm-linux.h: Add "config/" prefix to tm, nm and xm
+	includes.
+	* config/tm-linux.h: Ditto.
+	* config/alpha/tm-alphalinux.h: Ditto.
+	* config/arm/nm-linux.h, config/arm/tm-linux.h: Ditto.
+	* config/arm/xm-nbsd.h, config/i386/nm-gnu.h: Ditto.
+	* config/i386/nm-i386lynx.h, config/i386/nm-i386sol2.h: Ditto.
+	* config/i386/nm-i386v4.h, config/i386/nm-i386v42mp.h: Ditto.
+	* config/i386/nm-linux.h, config/i386/nm-m3.h: Ditto.
+	* config/i386/nm-ptx4.h, config/i386/nm-x86-64.h: Ditto.
+	* config/i386/tm-i386gnu.h, config/i386/tm-i386lynx.h: Ditto.
+	* config/i386/tm-i386m3.h, config/i386/tm-i386sco5.h: Ditto.
+	* config/i386/tm-i386v4.h, config/i386/tm-linux.h: Ditto.
+	* config/i386/tm-ptx4.h, config/i386/tm-vxworks.h: Ditto.
+	* config/i386/xm-i386v4.h, config/i386/xm-nbsd.h: Ditto.
+	* config/i386/xm-ptx.h, config/i386/xm-ptx4.h: Ditto.
+	* config/i960/tm-vx960.h, config/ia64/nm-aix.h: Ditto.
+	* config/ia64/nm-linux.h, config/ia64/tm-aix.h: Ditto.
+	* config/ia64/tm-linux.h, config/ia64/xm-aix.h: Ditto.
+	* config/m68k/nm-linux.h, config/m68k/nm-m68klynx.h: Ditto.
+	* config/m68k/nm-sysv4.h, config/m68k/tm-linux.h: Ditto.
+	* config/m68k/tm-m68klynx.h, config/m68k/tm-m68kv4.h: Ditto.
+	* config/m68k/tm-sun2os4.h, config/m68k/tm-sun3os4.h: Ditto.
+	* config/m68k/tm-vx68.h, config/m68k/xm-m68kv4.h: Ditto.
+	* config/m68k/xm-nbsd.h, config/m88k/nm-delta88v4.h: Ditto.
+	* config/m88k/tm-delta88v4.h, config/m88k/xm-delta88v4.h: Ditto.
+	* config/mips/nm-irix5.h, config/mips/nm-linux.h: Ditto.
+	* config/mips/tm-linux.h, config/mips/tm-mips64.h: Ditto.
+	* config/mips/tm-mipsm3.h, config/mips/tm-mipsv4.h: Ditto.
+	* config/mips/tm-vxmips.h, config/mips/xm-irix5.h: Ditto.
+	* config/mips/xm-mipsv4.h, config/ns32k/xm-nbsd.h: Ditto.
+	* config/pa/nm-hppao.h, config/powerpc/nm-linux.h: Ditto.
+	* config/powerpc/tm-linux.h, config/powerpc/tm-vxworks.h: Ditto.
+	* config/powerpc/xm-aix.h, config/rs6000/nm-rs6000ly.h: Ditto.
+	* config/rs6000/tm-rs6000ly.h, config/rs6000/xm-aix4.h: Ditto.
+	* config/sh/tm-linux.h, config/sparc/nm-linux.h: Ditto.
+	* config/sparc/nm-sparclynx.h, config/sparc/nm-sun4sol2.h: Ditto.
+	* config/sparc/tm-linux.h, config/sparc/tm-sp64linux.h: Ditto.
+	* config/sparc/tm-sp64sim.h, config/sparc/tm-sparclynx.h: Ditto.
+	* config/sparc/tm-sun4os4.h, config/sparc/tm-sun4sol2.h: Ditto.
+	* config/sparc/tm-vxsparc.h, config/sparc/xm-sun4sol2.h: Ditto.
+
 2002-05-04  Aidan Skinner <aidan@velvet.net>
 
 	* ada-exp.tab.c: New file
diff --git a/gdb/config/alpha/nm-linux.h b/gdb/config/alpha/nm-linux.h
index c59b88cb21e..990ccb45d97 100644
--- a/gdb/config/alpha/nm-linux.h
+++ b/gdb/config/alpha/nm-linux.h
@@ -23,7 +23,7 @@
 #ifndef NM_LINUX_H
 #define NM_LINUX_H
 
-#include "nm-linux.h"
+#include "config/nm-linux.h"
 
 /* ptrace register ``addresses'' are absolute.  */
 
diff --git a/gdb/config/alpha/tm-alphalinux.h b/gdb/config/alpha/tm-alphalinux.h
index 27ff45722af..4858b90eba2 100644
--- a/gdb/config/alpha/tm-alphalinux.h
+++ b/gdb/config/alpha/tm-alphalinux.h
@@ -40,6 +40,6 @@ extern LONGEST alpha_linux_sigtramp_offset (CORE_ADDR);
 #undef START_INFERIOR_TRAPS_EXPECTED
 #define START_INFERIOR_TRAPS_EXPECTED 2
 
-#include "tm-linux.h"
+#include "config/tm-linux.h"
 
 #endif /* TM_LINUXALPHA_H */
diff --git a/gdb/config/arm/nm-linux.h b/gdb/config/arm/nm-linux.h
index 2a0ebb3804b..7e0156db43c 100644
--- a/gdb/config/arm/nm-linux.h
+++ b/gdb/config/arm/nm-linux.h
@@ -21,7 +21,7 @@
 #ifndef NM_ARMLINUX_H
 #define NM_ARMLINUX_H
 
-#include "nm-linux.h"
+#include "config/nm-linux.h"
 
 /* ptrace register ``addresses'' are absolute.  */
 
diff --git a/gdb/config/arm/tm-linux.h b/gdb/config/arm/tm-linux.h
index 6a0d0e42c96..bbf566d2d83 100644
--- a/gdb/config/arm/tm-linux.h
+++ b/gdb/config/arm/tm-linux.h
@@ -28,7 +28,7 @@
 /* Include the common ARM target definitions.  */
 #include "arm/tm-arm.h"
 
-#include "tm-linux.h"
+#include "config/tm-linux.h"
 
 /* Use target-specific function to define link map offsets.  */
 extern struct link_map_offsets *arm_linux_svr4_fetch_link_map_offsets (void);
diff --git a/gdb/config/arm/xm-nbsd.h b/gdb/config/arm/xm-nbsd.h
index c5348d39629..d3f76a7dd01 100644
--- a/gdb/config/arm/xm-nbsd.h
+++ b/gdb/config/arm/xm-nbsd.h
@@ -19,4 +19,4 @@
    Boston, MA 02111-1307, USA.  */
 
 /* Get generic NetBSD host definitions. */
-#include "xm-nbsd.h"
+#include "config/xm-nbsd.h"
diff --git a/gdb/config/i386/nm-gnu.h b/gdb/config/i386/nm-gnu.h
index fa6d829345d..e721ce6478d 100644
--- a/gdb/config/i386/nm-gnu.h
+++ b/gdb/config/i386/nm-gnu.h
@@ -20,4 +20,4 @@
 
 /* Include the generic hurd definitions.  */
 
-#include "nm-gnu.h"
+#include "config/nm-gnu.h"
diff --git a/gdb/config/i386/nm-i386lynx.h b/gdb/config/i386/nm-i386lynx.h
index 5d0d41de267..bc6a23410f2 100644
--- a/gdb/config/i386/nm-i386lynx.h
+++ b/gdb/config/i386/nm-i386lynx.h
@@ -21,6 +21,6 @@
 #ifndef NM_I386LYNX_H
 #define NM_I386LYNX_H
 
-#include "nm-lynx.h"
+#include "config/nm-lynx.h"
 
 #endif /* NM_I386LYNX_H */
diff --git a/gdb/config/i386/nm-i386sol2.h b/gdb/config/i386/nm-i386sol2.h
index 0e6b3ef4c7f..8a51942791f 100644
--- a/gdb/config/i386/nm-i386sol2.h
+++ b/gdb/config/i386/nm-i386sol2.h
@@ -18,7 +18,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "nm-sysv4.h"
+#include "config/nm-sysv4.h"
 
 #ifdef NEW_PROC_API	/* Solaris 6 and above can do HW watchpoints */
 
diff --git a/gdb/config/i386/nm-i386v4.h b/gdb/config/i386/nm-i386v4.h
index 02d445e8bc3..356d3cba0ca 100644
--- a/gdb/config/i386/nm-i386v4.h
+++ b/gdb/config/i386/nm-i386v4.h
@@ -20,7 +20,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "nm-sysv4.h"
+#include "config/nm-sysv4.h"
 
 /* Poll causes GDB to hang, at least under Unixware 1.1.2.  */
 #define LOSING_POLL
diff --git a/gdb/config/i386/nm-i386v42mp.h b/gdb/config/i386/nm-i386v42mp.h
index 72e440d0cc4..7ded36148f2 100644
--- a/gdb/config/i386/nm-i386v42mp.h
+++ b/gdb/config/i386/nm-i386v42mp.h
@@ -20,4 +20,4 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "nm-sysv4.h"
+#include "config/nm-sysv4.h"
diff --git a/gdb/config/i386/nm-linux.h b/gdb/config/i386/nm-linux.h
index 8ae3eceec98..f751517d738 100644
--- a/gdb/config/i386/nm-linux.h
+++ b/gdb/config/i386/nm-linux.h
@@ -27,7 +27,7 @@
 #define I386_USE_GENERIC_WATCHPOINTS
 
 #include "i386/nm-i386.h"
-#include "nm-linux.h"
+#include "config/nm-linux.h"
 
 /* Support for the user area.  */
 
diff --git a/gdb/config/i386/nm-m3.h b/gdb/config/i386/nm-m3.h
index 00128cf9ce8..5ff74024942 100644
--- a/gdb/config/i386/nm-m3.h
+++ b/gdb/config/i386/nm-m3.h
@@ -20,4 +20,4 @@
 
 /* Include the generic Mach 3 definitions.  */
 
-#include "nm-m3.h"
+#include "config/nm-m3.h"
diff --git a/gdb/config/i386/nm-ptx4.h b/gdb/config/i386/nm-ptx4.h
index 32b76d24256..253b1944e9c 100644
--- a/gdb/config/i386/nm-ptx4.h
+++ b/gdb/config/i386/nm-ptx4.h
@@ -22,11 +22,11 @@
 
 #include "regcache.h"
 
-#include "nm-sysv4.h"
+#include "config/nm-sysv4.h"
 
 #undef USE_PROC_FS
 
-#include "nm-symmetry.h"
+#include "i386/nm-symmetry.h"
 
 #define PTRACE_READ_REGS(pid,regaddr) mptrace (XPT_RREGS, (pid), (regaddr), 0)
 #define PTRACE_WRITE_REGS(pid,regaddr) \
diff --git a/gdb/config/i386/nm-x86-64.h b/gdb/config/i386/nm-x86-64.h
index 30e37310222..4430fcba5db 100644
--- a/gdb/config/i386/nm-x86-64.h
+++ b/gdb/config/i386/nm-x86-64.h
@@ -23,7 +23,7 @@
 #ifndef NM_X86_64_H
 #define NM_X86_64_H
 
-#include "nm-linux.h"
+#include "config/nm-linux.h"
 
 #define I386_USE_GENERIC_WATCHPOINTS
 #include "i386/nm-i386.h"
diff --git a/gdb/config/i386/tm-i386gnu.h b/gdb/config/i386/tm-i386gnu.h
index 00cb5a9f100..f1835423a72 100644
--- a/gdb/config/i386/tm-i386gnu.h
+++ b/gdb/config/i386/tm-i386gnu.h
@@ -24,7 +24,7 @@
 /* Include common definitions for GNU systems.
    FIXME: This does not belong here since this is supposed to contain
    only native-dependent information.  */
-#include "nm-gnu.h"
+#include "config/nm-gnu.h"
 
 /* Thread flavors used in re-setting the T bit.
    FIXME: This is native-dependent.  */
@@ -51,6 +51,6 @@
 #define SIGCONTEXT_PC_OFFSET 68
 
 /* We need this file for the SOLIB_TRAMPOLINE stuff.  */
-#include "tm-sysv4.h"
+#include "config/tm-sysv4.h"
 
 #endif /* TM_I386GNU_H */
diff --git a/gdb/config/i386/tm-i386lynx.h b/gdb/config/i386/tm-i386lynx.h
index 842f9a7738d..2da0b7c8dee 100644
--- a/gdb/config/i386/tm-i386lynx.h
+++ b/gdb/config/i386/tm-i386lynx.h
@@ -21,7 +21,7 @@
 #ifndef TM_I386LYNX_H
 #define TM_I386LYNX_H
 
-#include "tm-lynx.h"
+#include "config/tm-lynx.h"
 
 /* Most definitions from sysv could be used. */
 #include "i386/tm-i386.h"
diff --git a/gdb/config/i386/tm-i386m3.h b/gdb/config/i386/tm-i386m3.h
index edc301da446..40f09016fbe 100644
--- a/gdb/config/i386/tm-i386m3.h
+++ b/gdb/config/i386/tm-i386m3.h
@@ -19,7 +19,7 @@
    Boston, MA 02111-1307, USA.  */
 
 /* Include common definitions for Mach3 systems */
-#include "nm-m3.h"
+#include "config/nm-m3.h"
 
 /* Define offsets to access CPROC stack when it does not have
  * a kernel thread.
diff --git a/gdb/config/i386/tm-i386sco5.h b/gdb/config/i386/tm-i386sco5.h
index e4cb014e990..dc1bb26ffa8 100644
--- a/gdb/config/i386/tm-i386sco5.h
+++ b/gdb/config/i386/tm-i386sco5.h
@@ -28,7 +28,7 @@
 
 /* Pick up more stuff from the generic SYSV and SVR4 host include files. */
 #include "i386/tm-i386v.h"
-#include "tm-sysv4.h"
+#include "config/tm-sysv4.h"
 
 #define KERNEL_U_SIZE kernel_u_size()
 
diff --git a/gdb/config/i386/tm-i386v4.h b/gdb/config/i386/tm-i386v4.h
index 2003b96de2e..010edb4d361 100644
--- a/gdb/config/i386/tm-i386v4.h
+++ b/gdb/config/i386/tm-i386v4.h
@@ -29,7 +29,7 @@
 
 /* Pick up more stuff from the generic SVR4 host include file. */
 
-#include "tm-sysv4.h"
+#include "config/tm-sysv4.h"
 
 /* Use the alternate method of determining valid frame chains. */
 
diff --git a/gdb/config/i386/tm-linux.h b/gdb/config/i386/tm-linux.h
index 60c4b1e3e39..9c11c896187 100644
--- a/gdb/config/i386/tm-linux.h
+++ b/gdb/config/i386/tm-linux.h
@@ -31,7 +31,7 @@
 #endif
 
 #include "i386/tm-i386.h"
-#include "tm-linux.h"
+#include "config/tm-linux.h"
 
 /* Register number for the "orig_eax" pseudo-register.  If this
    pseudo-register contains a value >= 0 it is interpreted as the
diff --git a/gdb/config/i386/tm-ptx4.h b/gdb/config/i386/tm-ptx4.h
index 1f221ba8e2b..a13d4a63a7f 100644
--- a/gdb/config/i386/tm-ptx4.h
+++ b/gdb/config/i386/tm-ptx4.h
@@ -23,4 +23,4 @@
 
 #define SEQUENT_PTX4
 
-#include "tm-ptx.h"
+#include "i386/tm-ptx.h"
diff --git a/gdb/config/i386/tm-vxworks.h b/gdb/config/i386/tm-vxworks.h
index 6434a6ea2f5..ffaea49306f 100644
--- a/gdb/config/i386/tm-vxworks.h
+++ b/gdb/config/i386/tm-vxworks.h
@@ -23,6 +23,6 @@
 #define TM_VXWORKS_H
 
 #include "i386/tm-i386v.h"
-#include "tm-vxworks.h"
+#include "config/tm-vxworks.h"
 
 #endif /* ifndef TM_VXWORKS_H */
diff --git a/gdb/config/i386/xm-i386v4.h b/gdb/config/i386/xm-i386v4.h
index c3241100bf7..154986c1880 100644
--- a/gdb/config/i386/xm-i386v4.h
+++ b/gdb/config/i386/xm-i386v4.h
@@ -25,4 +25,4 @@
 
 /* Pick up more stuff from the generic SVR4 host include file. */
 
-#include "xm-sysv4.h"
+#include "config/xm-sysv4.h"
diff --git a/gdb/config/i386/xm-nbsd.h b/gdb/config/i386/xm-nbsd.h
index 415d0fa4ffd..4a998cde4ee 100644
--- a/gdb/config/i386/xm-nbsd.h
+++ b/gdb/config/i386/xm-nbsd.h
@@ -19,6 +19,6 @@
    Boston, MA 02111-1307, USA.  */
 
 /* Get generic NetBSD host definitions. */
-#include "xm-nbsd.h"
+#include "config/xm-nbsd.h"
 
 #define HOST_LONG_DOUBLE_FORMAT &floatformat_i387_ext
diff --git a/gdb/config/i386/xm-ptx.h b/gdb/config/i386/xm-ptx.h
index 6dfb9d6d4e3..8987f297133 100644
--- a/gdb/config/i386/xm-ptx.h
+++ b/gdb/config/i386/xm-ptx.h
@@ -23,7 +23,7 @@
 /* Symmetry version by Jay Vosburgh (fubar@sequent.com) */
 
 #ifdef _SEQUENT_PTX4_
-#include "xm-sysv4.h"
+#include "config/xm-sysv4.h"
 #endif /* _SEQUENT_PTX4_ */
 
 /* This machine doesn't have the siginterrupt call.  */
diff --git a/gdb/config/i386/xm-ptx4.h b/gdb/config/i386/xm-ptx4.h
index 2f466e62d70..605941315c9 100644
--- a/gdb/config/i386/xm-ptx4.h
+++ b/gdb/config/i386/xm-ptx4.h
@@ -22,6 +22,6 @@
 
 /* Symmetry version by Jay Vosburgh (fubar@sequent.com) */
 
-#include "xm-sysv4.h"
+#include "config/xm-sysv4.h"
 
-#include "xm-ptx.h"
+#include "i386/xm-ptx.h"
diff --git a/gdb/config/i960/tm-vx960.h b/gdb/config/i960/tm-vx960.h
index 16fc62ac6bb..a2e07cc7b0d 100644
--- a/gdb/config/i960/tm-vx960.h
+++ b/gdb/config/i960/tm-vx960.h
@@ -21,7 +21,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "i960/tm-i960.h"
-#include "tm-vxworks.h"
+#include "config/tm-vxworks.h"
 
 /* Under VxWorks the IP isn't filled in.  Skip it, go with RIP, which has
    the real value.  */
diff --git a/gdb/config/ia64/nm-aix.h b/gdb/config/ia64/nm-aix.h
index 3f6764c3027..8a2d66f7c28 100644
--- a/gdb/config/ia64/nm-aix.h
+++ b/gdb/config/ia64/nm-aix.h
@@ -21,7 +21,7 @@
 #ifndef NM_AIX_H
 #define NM_AIX_H
 
-#include "nm-sysv4.h"
+#include "config/nm-sysv4.h"
 
 #ifndef AIX5
 #define AIX5 1
diff --git a/gdb/config/ia64/nm-linux.h b/gdb/config/ia64/nm-linux.h
index 2c980c0ad9a..e00d561b6a3 100644
--- a/gdb/config/ia64/nm-linux.h
+++ b/gdb/config/ia64/nm-linux.h
@@ -22,7 +22,7 @@
 #ifndef NM_LINUX_H
 #define NM_LINUX_H
 
-#include "nm-linux.h"
+#include "config/nm-linux.h"
 
 /* Note:  It seems likely that we'll have to eventually define
    FETCH_INFERIOR_REGISTERS.  But until that time, we'll make do
diff --git a/gdb/config/ia64/tm-aix.h b/gdb/config/ia64/tm-aix.h
index 0160140c680..b59d6dd11cd 100644
--- a/gdb/config/ia64/tm-aix.h
+++ b/gdb/config/ia64/tm-aix.h
@@ -22,7 +22,7 @@
 #define TM_AIX_H
 
 #include "ia64/tm-ia64.h"
-#include "tm-sysv4.h"
+#include "config/tm-sysv4.h"
 
 #define TARGET_ELF64
 
diff --git a/gdb/config/ia64/tm-linux.h b/gdb/config/ia64/tm-linux.h
index f716d83ae41..60517525467 100644
--- a/gdb/config/ia64/tm-linux.h
+++ b/gdb/config/ia64/tm-linux.h
@@ -24,7 +24,7 @@
 #define IA64_GNULINUX_TARGET
 
 #include "ia64/tm-ia64.h"
-#include "tm-linux.h"
+#include "config/tm-linux.h"
 
 #define TARGET_ELF64
 
diff --git a/gdb/config/ia64/xm-aix.h b/gdb/config/ia64/xm-aix.h
index 6ca026d493f..ad717d5c01c 100644
--- a/gdb/config/ia64/xm-aix.h
+++ b/gdb/config/ia64/xm-aix.h
@@ -23,6 +23,6 @@
 
 /* Pick up more stuff from the generic SVR4 host include file. */
 
-#include "xm-sysv4.h"
+#include "config/xm-sysv4.h"
 
 #endif /* #ifndef XM_AIX_H */
diff --git a/gdb/config/m68k/nm-linux.h b/gdb/config/m68k/nm-linux.h
index 5c37af9ca12..26aa19768ad 100644
--- a/gdb/config/m68k/nm-linux.h
+++ b/gdb/config/m68k/nm-linux.h
@@ -21,7 +21,7 @@
 #ifndef NM_LINUX_H
 #define NM_LINUX_H
 
-#include "nm-linux.h"
+#include "config/nm-linux.h"
 
 /* Return sizeof user struct to callers in less machine dependent routines */
 
diff --git a/gdb/config/m68k/nm-m68klynx.h b/gdb/config/m68k/nm-m68klynx.h
index 49114fc4df9..9d95d3728dd 100644
--- a/gdb/config/m68k/nm-m68klynx.h
+++ b/gdb/config/m68k/nm-m68klynx.h
@@ -21,6 +21,6 @@
 #ifndef NM_M68KLYNX_H
 #define NM_M68KLYNX_H
 
-#include "nm-lynx.h"
+#include "config/nm-lynx.h"
 
 #endif /* NM_M68KLYNX_H */
diff --git a/gdb/config/m68k/nm-sysv4.h b/gdb/config/m68k/nm-sysv4.h
index a7d0bdd3bda..b9cb591f389 100644
--- a/gdb/config/m68k/nm-sysv4.h
+++ b/gdb/config/m68k/nm-sysv4.h
@@ -20,4 +20,4 @@
 
 /* Include the generic SVR4 definitions.  */
 
-#include "nm-sysv4.h"
+#include "config/nm-sysv4.h"
diff --git a/gdb/config/m68k/tm-linux.h b/gdb/config/m68k/tm-linux.h
index 94b2c2c3504..5e063f32141 100644
--- a/gdb/config/m68k/tm-linux.h
+++ b/gdb/config/m68k/tm-linux.h
@@ -76,7 +76,7 @@
     }									\
 }
 
-#include "tm-linux.h"
+#include "config/tm-linux.h"
 #include "m68k/tm-m68k.h"
 
 /* Extract from an array REGBUF containing the (raw) register state
diff --git a/gdb/config/m68k/tm-m68klynx.h b/gdb/config/m68k/tm-m68klynx.h
index cfc462f54a4..ed1f6f0f05e 100644
--- a/gdb/config/m68k/tm-m68klynx.h
+++ b/gdb/config/m68k/tm-m68klynx.h
@@ -21,7 +21,7 @@
 #ifndef TM_M68KLYNX_H
 #define TM_M68KLYNX_H
 
-#include "tm-lynx.h"
+#include "config/tm-lynx.h"
 
 /* If PC-2 contains this instruction, then we know what we are in a system
    call stub, and the return PC is is at SP+4, instead of SP. */
diff --git a/gdb/config/m68k/tm-m68kv4.h b/gdb/config/m68k/tm-m68kv4.h
index 18bf5a2187a..275ab62dd98 100644
--- a/gdb/config/m68k/tm-m68kv4.h
+++ b/gdb/config/m68k/tm-m68kv4.h
@@ -34,7 +34,7 @@
 
 #define FRAME_CHAIN_VALID(fp,fi) func_frame_chain_valid (fp, fi)
 
-#include "tm-sysv4.h"
+#include "config/tm-sysv4.h"
 #include "m68k/tm-m68k.h"
 
 /* Offsets (in target ints) into jmp_buf.  Not defined in any system header
diff --git a/gdb/config/m68k/tm-sun2os4.h b/gdb/config/m68k/tm-sun2os4.h
index 496c32955b3..d5fe5315267 100644
--- a/gdb/config/m68k/tm-sun2os4.h
+++ b/gdb/config/m68k/tm-sun2os4.h
@@ -18,4 +18,4 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "m68k/tm-sun2.h"
-#include "tm-sunos.h"
+#include "config/tm-sunos.h"
diff --git a/gdb/config/m68k/tm-sun3os4.h b/gdb/config/m68k/tm-sun3os4.h
index d4bc74fd8e7..ced43761b38 100644
--- a/gdb/config/m68k/tm-sun3os4.h
+++ b/gdb/config/m68k/tm-sun3os4.h
@@ -19,4 +19,4 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "m68k/tm-sun3.h"
-#include "tm-sunos.h"
+#include "config/tm-sunos.h"
diff --git a/gdb/config/m68k/tm-vx68.h b/gdb/config/m68k/tm-vx68.h
index 988b4bb4b9e..ea27ac45d02 100644
--- a/gdb/config/m68k/tm-vx68.h
+++ b/gdb/config/m68k/tm-vx68.h
@@ -30,7 +30,7 @@
 #define	DECR_PC_AFTER_BREAK	0
 
 #include "m68k/tm-m68k.h"
-#include "tm-vxworks.h"
+#include "config/tm-vxworks.h"
 
 /* Takes the current frame-struct pointer and returns the chain-pointer
    to get to the calling frame.
diff --git a/gdb/config/m68k/xm-m68kv4.h b/gdb/config/m68k/xm-m68kv4.h
index 11679a965eb..542cd106814 100644
--- a/gdb/config/m68k/xm-m68kv4.h
+++ b/gdb/config/m68k/xm-m68kv4.h
@@ -26,4 +26,4 @@
 
 /* Pick up more stuff from the generic SVR4 host include file. */
 
-#include "xm-sysv4.h"
+#include "config/xm-sysv4.h"
diff --git a/gdb/config/m68k/xm-nbsd.h b/gdb/config/m68k/xm-nbsd.h
index c266a99e628..6c735fa1a8c 100644
--- a/gdb/config/m68k/xm-nbsd.h
+++ b/gdb/config/m68k/xm-nbsd.h
@@ -19,4 +19,4 @@
    Boston, MA 02111-1307, USA.  */
 
 /* Get generic NetBSD host definitions. */
-#include "xm-nbsd.h"
+#include "config/xm-nbsd.h"
diff --git a/gdb/config/m88k/nm-delta88v4.h b/gdb/config/m88k/nm-delta88v4.h
index 90ee391b2b6..97f75f2c981 100644
--- a/gdb/config/m88k/nm-delta88v4.h
+++ b/gdb/config/m88k/nm-delta88v4.h
@@ -20,4 +20,4 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "m88k/nm-m88k.h"
-#include "nm-sysv4.h"
+#include "config/nm-sysv4.h"
diff --git a/gdb/config/m88k/tm-delta88v4.h b/gdb/config/m88k/tm-delta88v4.h
index 35a605d3536..44e488fb18f 100644
--- a/gdb/config/m88k/tm-delta88v4.h
+++ b/gdb/config/m88k/tm-delta88v4.h
@@ -22,7 +22,7 @@
 #define DELTA88
 
 #include "m88k/tm-m88k.h"
-#include "tm-sysv4.h"
+#include "config/tm-sysv4.h"
 
 /* If we don't define this, backtraces go on forever.  */
 #define FRAME_CHAIN_VALID(fp,fi) func_frame_chain_valid (fp, fi)
diff --git a/gdb/config/m88k/xm-delta88v4.h b/gdb/config/m88k/xm-delta88v4.h
index b09a02dd335..932b9022a89 100644
--- a/gdb/config/m88k/xm-delta88v4.h
+++ b/gdb/config/m88k/xm-delta88v4.h
@@ -19,4 +19,4 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "xm-sysv4.h"
+#include "config/xm-sysv4.h"
diff --git a/gdb/config/mips/nm-irix5.h b/gdb/config/mips/nm-irix5.h
index bed3144530d..8e31b592811 100644
--- a/gdb/config/mips/nm-irix5.h
+++ b/gdb/config/mips/nm-irix5.h
@@ -19,7 +19,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "nm-sysv4.h"
+#include "config/nm-sysv4.h"
 #undef IN_SOLIB_DYNSYM_RESOLVE_CODE
 
 #define TARGET_HAS_HARDWARE_WATCHPOINTS
diff --git a/gdb/config/mips/nm-linux.h b/gdb/config/mips/nm-linux.h
index c43ecd68393..426dd5523b6 100644
--- a/gdb/config/mips/nm-linux.h
+++ b/gdb/config/mips/nm-linux.h
@@ -24,7 +24,7 @@
 
 #define MIPS_GNULINUX_TARGET
 
-#include "nm-linux.h"
+#include "config/nm-linux.h"
 
 /* Return sizeof user struct to callers in less machine dependent
    routines.  Hard coded for cross-compilation friendliness. */
diff --git a/gdb/config/mips/tm-linux.h b/gdb/config/mips/tm-linux.h
index 0e9de3cbb26..4236ea8bec4 100644
--- a/gdb/config/mips/tm-linux.h
+++ b/gdb/config/mips/tm-linux.h
@@ -36,7 +36,7 @@
 #define REALTIME_LO 32
 #define REALTIME_HI 128
 
-#include "tm-linux.h"
+#include "config/tm-linux.h"
 
 /* There's an E_MIPS_ABI_O32 flag in e_flags, but we don't use it - in
    fact, using it may violate the o32 ABI.  */
diff --git a/gdb/config/mips/tm-mips64.h b/gdb/config/mips/tm-mips64.h
index 510ad05c0bc..13e62d2acf3 100644
--- a/gdb/config/mips/tm-mips64.h
+++ b/gdb/config/mips/tm-mips64.h
@@ -34,4 +34,4 @@
 #define OP_LDGPR 067		/* ld */
 
 /* Get the basic MIPS definitions.  */
-#include "tm-mips.h"
+#include "mips/tm-mips.h"
diff --git a/gdb/config/mips/tm-mipsm3.h b/gdb/config/mips/tm-mipsm3.h
index 19ae028c604..9e2f4901d7a 100644
--- a/gdb/config/mips/tm-mipsm3.h
+++ b/gdb/config/mips/tm-mipsm3.h
@@ -25,7 +25,7 @@
  */
 
 /* Include common definitions for Mach3 systems */
-#include "nm-m3.h"
+#include "config/nm-m3.h"
 
 /* Define offsets to access CPROC stack when it does not have
  * a kernel thread.
diff --git a/gdb/config/mips/tm-mipsv4.h b/gdb/config/mips/tm-mipsv4.h
index d1cc21ca1e8..3a362f05a3a 100644
--- a/gdb/config/mips/tm-mipsv4.h
+++ b/gdb/config/mips/tm-mipsv4.h
@@ -19,7 +19,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "mips/tm-bigmips.h"
-#include "tm-sysv4.h"
+#include "config/tm-sysv4.h"
 
 /* The signal handler trampoline is called _sigtramp.  */
 #undef IN_SIGTRAMP
diff --git a/gdb/config/mips/tm-vxmips.h b/gdb/config/mips/tm-vxmips.h
index e4ef2b6a2bd..5475fb57259 100644
--- a/gdb/config/mips/tm-vxmips.h
+++ b/gdb/config/mips/tm-vxmips.h
@@ -20,7 +20,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "mips/tm-mips.h"
-#include "tm-vxworks.h"
+#include "config/tm-vxworks.h"
 
 /* FIXME: These are almost certainly wrong. */
 
diff --git a/gdb/config/mips/xm-irix5.h b/gdb/config/mips/xm-irix5.h
index 78c3a071e10..7d61ff059cc 100644
--- a/gdb/config/mips/xm-irix5.h
+++ b/gdb/config/mips/xm-irix5.h
@@ -19,7 +19,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "xm-sysv4.h"
+#include "config/xm-sysv4.h"
 
 /* Override register locations in upage for SGI machines */
 #undef REGISTER_U_ADDR
diff --git a/gdb/config/mips/xm-mipsv4.h b/gdb/config/mips/xm-mipsv4.h
index 76fa5da19db..eccb2964d05 100644
--- a/gdb/config/mips/xm-mipsv4.h
+++ b/gdb/config/mips/xm-mipsv4.h
@@ -19,4 +19,4 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "xm-sysv4.h"
+#include "config/xm-sysv4.h"
diff --git a/gdb/config/ns32k/xm-nbsd.h b/gdb/config/ns32k/xm-nbsd.h
index 23a0650d280..962664b70b9 100644
--- a/gdb/config/ns32k/xm-nbsd.h
+++ b/gdb/config/ns32k/xm-nbsd.h
@@ -19,4 +19,4 @@
    Boston, MA 02111-1307, USA.  */
 
 /* Get generic NetBSD host definitions. */
-#include "xm-nbsd.h"
+#include "config/xm-nbsd.h"
diff --git a/gdb/config/pa/nm-hppao.h b/gdb/config/pa/nm-hppao.h
index 11e13e7dbca..6650a4bd19a 100644
--- a/gdb/config/pa/nm-hppao.h
+++ b/gdb/config/pa/nm-hppao.h
@@ -18,7 +18,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "nm-m3.h"
+#include "config/nm-m3.h"
 #define U_REGS_OFFSET 0
 
 #define KERNEL_U_ADDR 0
diff --git a/gdb/config/powerpc/nm-linux.h b/gdb/config/powerpc/nm-linux.h
index dee39b4efaf..6e3f3a0a5c2 100644
--- a/gdb/config/powerpc/nm-linux.h
+++ b/gdb/config/powerpc/nm-linux.h
@@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifndef NM_LINUX_H
 
-#include "nm-linux.h"
+#include "config/nm-linux.h"
 
 #define NM_LINUX_H
 
diff --git a/gdb/config/powerpc/tm-linux.h b/gdb/config/powerpc/tm-linux.h
index 5fe8d76bce0..d69dfc1f5bf 100644
--- a/gdb/config/powerpc/tm-linux.h
+++ b/gdb/config/powerpc/tm-linux.h
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "powerpc/tm-ppc-eabi.h"
 /* Avoid warning from redefinition in tm-sysv4.h (included from tm-linux.h) */
 #undef SKIP_TRAMPOLINE_CODE
-#include "tm-linux.h"
+#include "config/tm-linux.h"
 
 /* We can single step on linux */
 #undef  SOFTWARE_SINGLE_STEP
diff --git a/gdb/config/powerpc/tm-vxworks.h b/gdb/config/powerpc/tm-vxworks.h
index a31846a802f..69e2ddec3b0 100644
--- a/gdb/config/powerpc/tm-vxworks.h
+++ b/gdb/config/powerpc/tm-vxworks.h
@@ -23,6 +23,6 @@
 #define TM_VXWORKS_H
 
 #include "powerpc/tm-ppc-eabi.h"
-#include "tm-vxworks.h"
+#include "config/tm-vxworks.h"
 
 #endif /* ifndef TM_VXWORKS_H */
diff --git a/gdb/config/powerpc/xm-aix.h b/gdb/config/powerpc/xm-aix.h
index cc986502b77..e663453f40e 100644
--- a/gdb/config/powerpc/xm-aix.h
+++ b/gdb/config/powerpc/xm-aix.h
@@ -19,7 +19,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "xm-aix4.h"
+#include "config/xm-aix4.h"
 
 /* This doesn't seem to be declared in any header file I can find.  */
 char *termdef (int, int);
diff --git a/gdb/config/rs6000/nm-rs6000ly.h b/gdb/config/rs6000/nm-rs6000ly.h
index 7bc1267d266..51d12f8ac70 100644
--- a/gdb/config/rs6000/nm-rs6000ly.h
+++ b/gdb/config/rs6000/nm-rs6000ly.h
@@ -21,6 +21,6 @@
 #ifndef NM_RS6000LYNX_H
 #define NM_RS6000LYNX_H
 
-#include "nm-lynx.h"
+#include "config/nm-lynx.h"
 
 #endif /* NM_RS6000LYNX_H */
diff --git a/gdb/config/rs6000/tm-rs6000ly.h b/gdb/config/rs6000/tm-rs6000ly.h
index ca7dc0d41ee..73ef7f06337 100644
--- a/gdb/config/rs6000/tm-rs6000ly.h
+++ b/gdb/config/rs6000/tm-rs6000ly.h
@@ -21,7 +21,7 @@
 #ifndef TM_RS6000LYNX_H
 #define TM_RS6000LYNX_H
 
-#include "tm-lynx.h"
+#include "config/tm-lynx.h"
 
 /* Use generic RS6000 definitions. */
 #include "rs6000/tm-rs6000.h"
diff --git a/gdb/config/rs6000/xm-aix4.h b/gdb/config/rs6000/xm-aix4.h
index 5f7aa778f45..4ca0abb8cf1 100644
--- a/gdb/config/rs6000/xm-aix4.h
+++ b/gdb/config/rs6000/xm-aix4.h
@@ -20,7 +20,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "xm-aix4.h"
+#include "config/xm-aix4.h"
 
 /* AIX 4.x uses nonstandard "int *" as type of third argument to ptrace() */
 
diff --git a/gdb/config/sh/tm-linux.h b/gdb/config/sh/tm-linux.h
index ab1d4d86f21..e8272d02e37 100644
--- a/gdb/config/sh/tm-linux.h
+++ b/gdb/config/sh/tm-linux.h
@@ -21,7 +21,7 @@
    Boston, MA 02111-1307, USA.  */
 
 /* Pull in GNU/Linux generic defs.  */
-#include "tm-linux.h"
+#include "config/tm-linux.h"
 
 /* Pull in sh-target defs */
 #include "sh/tm-sh.h"
diff --git a/gdb/config/sparc/nm-linux.h b/gdb/config/sparc/nm-linux.h
index 80ab0423cd0..a156eba0707 100644
--- a/gdb/config/sparc/nm-linux.h
+++ b/gdb/config/sparc/nm-linux.h
@@ -20,8 +20,8 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <nm-sysv4.h>
-#include "nm-linux.h"
+#include "config/nm-sysv4.h"
+#include "config/nm-linux.h"
 #include "solib.h"
 
 #define FETCH_INFERIOR_REGISTERS
diff --git a/gdb/config/sparc/nm-sparclynx.h b/gdb/config/sparc/nm-sparclynx.h
index 74304be36d3..a231ba4cce1 100644
--- a/gdb/config/sparc/nm-sparclynx.h
+++ b/gdb/config/sparc/nm-sparclynx.h
@@ -21,6 +21,6 @@
 #ifndef NM_SPARCLYNX_H
 #define NM_SPARCLYNX_H
 
-#include "nm-lynx.h"
+#include "config/nm-lynx.h"
 
 #endif /* NM_SPARCLYNX_H */
diff --git a/gdb/config/sparc/nm-sun4sol2.h b/gdb/config/sparc/nm-sun4sol2.h
index adc8231f8e8..f8aeda07ccc 100644
--- a/gdb/config/sparc/nm-sun4sol2.h
+++ b/gdb/config/sparc/nm-sun4sol2.h
@@ -22,7 +22,7 @@
 
 /* Include the generic SVR4 definitions.  */
 
-#include <nm-sysv4.h>
+#include "config/nm-sysv4.h"
 
 /* Before storing, we need to read all the registers.  */
 
diff --git a/gdb/config/sparc/tm-linux.h b/gdb/config/sparc/tm-linux.h
index 34d901f5f9b..31eeff9e206 100644
--- a/gdb/config/sparc/tm-linux.h
+++ b/gdb/config/sparc/tm-linux.h
@@ -29,6 +29,6 @@
 
 #define SIGCONTEXT_PC_OFFSET 12
 
-#include "tm-linux.h"
+#include "config/tm-linux.h"
 
 #endif /* TM_SPARCLINUX_H */
diff --git a/gdb/config/sparc/tm-sp64linux.h b/gdb/config/sparc/tm-sp64linux.h
index 56b56208652..c7ba03d3fbb 100644
--- a/gdb/config/sparc/tm-sp64linux.h
+++ b/gdb/config/sparc/tm-sp64linux.h
@@ -31,6 +31,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define GDB_PTRACE_REGS64
 
-#include "tm-sysv4.h"
+#include "config/tm-sysv4.h"
 
 #endif TM_SPARC_LIN64_H
diff --git a/gdb/config/sparc/tm-sp64sim.h b/gdb/config/sparc/tm-sp64sim.h
index c8d115cd635..bb1263b40db 100644
--- a/gdb/config/sparc/tm-sp64sim.h
+++ b/gdb/config/sparc/tm-sp64sim.h
@@ -22,7 +22,7 @@
    but it's a good start.  */
 
 #include "sparc/tm-sp64.h"
-#include "tm-sunos.h"
+#include "config/tm-sunos.h"
 
 /* Offsets into jmp_buf.  Not defined by Sun, but at least documented in a
    comment in <machine/setjmp.h>! */
diff --git a/gdb/config/sparc/tm-sparclynx.h b/gdb/config/sparc/tm-sparclynx.h
index 1a28621c065..3d196539beb 100644
--- a/gdb/config/sparc/tm-sparclynx.h
+++ b/gdb/config/sparc/tm-sparclynx.h
@@ -21,7 +21,7 @@
 #ifndef TM_SPARCLYNX_H
 #define TM_SPARCLYNX_H
 
-#include "tm-lynx.h"
+#include "config/tm-lynx.h"
 
 /* Use generic Sparc definitions. */
 #include "sparc/tm-sparc.h"
diff --git a/gdb/config/sparc/tm-sun4os4.h b/gdb/config/sparc/tm-sun4os4.h
index b561b13adc7..e080904d927 100644
--- a/gdb/config/sparc/tm-sun4os4.h
+++ b/gdb/config/sparc/tm-sun4os4.h
@@ -20,7 +20,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "sparc/tm-sparc.h"
-#include "tm-sunos.h"
+#include "config/tm-sunos.h"
 
 /* Redefine SKIP_TRAMPOLINE_CODE to handle PIC compiled modules
    in main executables.  */
diff --git a/gdb/config/sparc/tm-sun4sol2.h b/gdb/config/sparc/tm-sun4sol2.h
index e3c59f630de..eb253b1c29f 100644
--- a/gdb/config/sparc/tm-sun4sol2.h
+++ b/gdb/config/sparc/tm-sun4sol2.h
@@ -22,7 +22,7 @@
 #define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL
 
 #include "sparc/tm-sparc.h"
-#include "tm-sysv4.h"
+#include "config/tm-sysv4.h"
 
 /* With Sol2 it is no longer necessary to enable software single-step,
    since the /proc interface can take care of it for us in hardware.  */
diff --git a/gdb/config/sparc/tm-vxsparc.h b/gdb/config/sparc/tm-vxsparc.h
index b6529f75b7f..f32f70daf73 100644
--- a/gdb/config/sparc/tm-vxsparc.h
+++ b/gdb/config/sparc/tm-vxsparc.h
@@ -20,7 +20,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "sparc/tm-spc-em.h"
-#include "tm-vxworks.h"
+#include "config/tm-vxworks.h"
 
 /* FIXME: These are almost certainly wrong. */
 
diff --git a/gdb/config/sparc/xm-sun4sol2.h b/gdb/config/sparc/xm-sun4sol2.h
index b775f7cdba0..490962d4495 100644
--- a/gdb/config/sparc/xm-sun4sol2.h
+++ b/gdb/config/sparc/xm-sun4sol2.h
@@ -21,7 +21,7 @@
 
 /* Pick up more stuff from the generic SVR4 host include file. */
 
-#include "xm-sysv4.h"
+#include "config/xm-sysv4.h"
 
 /* These are not currently used in SVR4 (but should be, FIXME!).  */
 #undef	DO_DEFERRED_STORES
diff --git a/gdb/config/tm-linux.h b/gdb/config/tm-linux.h
index 938987270b7..caf008a9cb1 100644
--- a/gdb/config/tm-linux.h
+++ b/gdb/config/tm-linux.h
@@ -30,7 +30,7 @@
 
 /* We need this file for the SOLIB_TRAMPOLINE stuff. */
 
-#include "tm-sysv4.h"
+#include "config/tm-sysv4.h"
 
 /* We define SVR4_SHARED_LIBS unconditionally, on the assumption that
    link.h is available on all linux platforms.  For I386 and SH3/4,