diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fd3371d301..186d5944b9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 Fri May  8 07:48:27 1992  K. Richard Pixley  (rich@cygnus.com)
 
+	* Makefile.in, remote-udi.c, remote-vx.c, 29k-share/dfe/mini2udi.c,
+	29k-share/dfe/yank.c, vx-share/xdr_ptrace.c, vx-share/xdr_regs.c:
+	Remove -I29k-share, -Ivx-share from Makefile.in.  Make #includes
+	relative to each source file.
+
 	* Makefile.in: propogate INSTALL, INSTALL_DATA, INSTALL_PROGRAM on
 	  recursions.
 
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index b75489cddc..a5f9243355 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -129,7 +129,7 @@ RL_LIB = ./../readline${subdir}/libreadline.a
 # All the includes used for CFLAGS and for lint.
 # -I. for config files.
 # -I${srcdir} possibly for regex.h also.
-INCLUDE_CFLAGS = -I. -I${srcdir} -I$(INCLUDE_DIR) -I$(READLINE_DIR) -I${srcdir}/vx-share -I${srcdir}/29k-share/include -I${srcdir}/29k-share/udi
+INCLUDE_CFLAGS = -I. -I${srcdir} -I$(INCLUDE_DIR) -I$(READLINE_DIR)
 
 # {X,T}M_CFLAGS, if defined, has system-dependent CFLAGS.
 # CFLAGS for GDB
diff --git a/gdb/remote-udi.c b/gdb/remote-udi.c
index 0030047f47..68e8d37bb8 100644
--- a/gdb/remote-udi.c
+++ b/gdb/remote-udi.c
@@ -45,7 +45,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <string.h>
 #include "terminal.h"
 #include "target.h"
-#include "udiproc.h"
+#include "29k-share/udi/udiproc.h"
 
 /* access the register store directly, without going through
    the normal handler functions. This avoids an extra data copy
diff --git a/gdb/remote-vx.c b/gdb/remote-vx.c
index a8f382d19a..1b3bc4d8b3 100644
--- a/gdb/remote-vx.c
+++ b/gdb/remote-vx.c
@@ -40,11 +40,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #undef free
 #include <sys/time.h>		/* UTek's <rpc/rpc.h> doesn't #incl this */
 #include <netdb.h>
-#include <ptrace.h>
-#include "xdr_ptrace.h"
-#include "xdr_ld.h"
-#include "xdr_rdb.h"
-#include "dbgRpcLib.h"
+#include "vx-share/ptrace.h"
+#include "vx-share/xdr_ptrace.h"
+#include "vx-share/xdr_ld.h"
+#include "vx-share/xdr_rdb.h"
+#include "vx-share/dbgRpcLib.h"
 
 #include <symtab.h>
 
diff --git a/gdb/vx-share/xdr_ptrace.c b/gdb/vx-share/xdr_ptrace.c
index 0704665a58..9233137e9d 100644
--- a/gdb/vx-share/xdr_ptrace.c
+++ b/gdb/vx-share/xdr_ptrace.c
@@ -12,9 +12,9 @@ modification history
 01a,05jun90,llk  extracted from xdr_ptrace.h, version 01c.
 */
 
-#include <vxWorks.h>
+#include "vxWorks.h"
 #include <rpc/rpc.h>
-#include <xdr_ptrace.h>
+#include "xdr_ptrace.h"
 
 #define MAX_LEN 32000
 
diff --git a/gdb/vx-share/xdr_regs.c b/gdb/vx-share/xdr_regs.c
index 9152423142..b8c5111b7c 100644
--- a/gdb/vx-share/xdr_regs.c
+++ b/gdb/vx-share/xdr_regs.c
@@ -8,10 +8,10 @@ This module contains the eXternal Data Representation (XDR) routines
 for the GDB interface for VxWorks.
 */
 
-#include <vxWorks.h>
+#include "vxWorks.h"
 #include <rpc/rpc.h>
-#include <reg.h>
-#include <xdr_regs.h>
+#include "reg.h"
+#include "xdr_regs.h"
 
 
 #ifdef I80960