diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 45dd532e02..d0de7a8cd0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -14,6 +14,10 @@ Thu Nov 21 10:23:52 1991  John Gilmore  (gnu at cygnus.com)
 	* exec.c (exec_files_info):  If `verbose' is set, show file offset
 	as well.
 
+	* main.c:  Use getcwd rather than getwd.
+	* standalone.c:  Fake getcwd rather than getwd.
+	* xm-*.h:  Remove fake values of MAXPATHLEN.
+
 	* xcoffexec.c:  Add /* */ to #if 0'd thing to help ANSI.
 
 Wed Nov 20 18:35:56 1991  John Gilmore  (gnu at cygnus.com)
diff --git a/gdb/main.c b/gdb/main.c
index e36d730510..0c186278b4 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -141,7 +141,7 @@ FILE *instream;
 char *current_directory;
 
 /* The directory name is actually stored here (usually).  */
-static char dirbuf[MAXPATHLEN];
+static char dirbuf[1024];
 
 /* Function to call before reading a command, if nonzero.
    The function receives two args: an input stream,
@@ -358,7 +358,7 @@ main (argc, argv)
   line[0] = '\0';		/* Terminate saved (now empty) cmd line */
   instream = stdin;
 
-  getwd (dirbuf);
+  getcwd (dirbuf, sizeof (dirbuf));
   current_directory = dirbuf;
 
 #ifdef SET_STACK_LIMIT_HUGE
@@ -1672,7 +1672,7 @@ pwd_command (args, from_tty)
      int from_tty;
 {
   if (args) error ("The \"pwd\" command does not take an argument: %s", args);
-  getwd (dirbuf);
+  getcwd (dirbuf, sizeof (dirbuf));
 
   if (strcmp (dirbuf, current_directory))
     printf ("Working directory %s\n (canonically %s).\n",
diff --git a/gdb/standalone.c b/gdb/standalone.c
index fa6d6fc44f..b91a1f8222 100644
--- a/gdb/standalone.c
+++ b/gdb/standalone.c
@@ -59,8 +59,9 @@ chdir ()
 {}
 
 char *
-getwd (buf)
+getcwd (buf, len)
      char *buf;
+     unsigned int len;
 {
   buf[0] = '/';
   buf[1] = 0;
diff --git a/gdb/xm-3b1.h b/gdb/xm-3b1.h
index e31e86fc24..cfd71e0f2e 100644
--- a/gdb/xm-3b1.h
+++ b/gdb/xm-3b1.h
@@ -22,8 +22,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define HAVE_TERMIO
 #define USG
 
-#define MAXPATHLEN 200
-
 /* This is the amount to subtract from u.u_ar0
    to get the offset in the core file of the register values.  */
 
diff --git a/gdb/xm-altos.h b/gdb/xm-altos.h
index cc501c0f94..ea840161b5 100644
--- a/gdb/xm-altos.h
+++ b/gdb/xm-altos.h
@@ -40,18 +40,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define F_OK 0
 #endif
 
-#ifndef MAXPATHLEN
-#define MAXPATHLEN (1024)
-#endif
-
 /* Get sys/wait.h ie. from a Sun and edit it a little (mc68000 to m68k) */
 /* Why bother?  */
 #if 0
 #define HAVE_WAIT_STRUCT
 #endif
 
-#define vfork fork
-
 /* This is the amount to subtract from u.u_ar0
    to get the offset in the core file of the register values. */
 
diff --git a/gdb/xm-delta88.h b/gdb/xm-delta88.h
index f408c8bb48..c4b02563be 100644
--- a/gdb/xm-delta88.h
+++ b/gdb/xm-delta88.h
@@ -23,8 +23,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define USG 1
 #endif
 
-#define MAXPATHLEN 1024
-
 #include <sys/param.h>
 #include <sys/time.h>
 
diff --git a/gdb/xm-i386v.h b/gdb/xm-i386v.h
index 589d709731..2fca95304a 100644
--- a/gdb/xm-i386v.h
+++ b/gdb/xm-i386v.h
@@ -40,10 +40,6 @@ on those where it does, it occurs quite reliably.  */
 /* define USG if you are using sys5 /usr/include's */
 #define USG
 
-/* USG systems need these */
-#define vfork() fork()
-#define MAXPATHLEN 500
-
 #define HAVE_TERMIO
 
 /* Get rid of any system-imposed stack limit if possible.  */
@@ -57,45 +53,3 @@ on those where it does, it occurs quite reliably.  */
 
 #define REGISTER_U_ADDR(addr, blockend, regno) \
 	(addr) = i386_register_u_addr ((blockend),(regno));
-
-#if 0
-/* Interface definitions for kernel debugger KDB.  */
-
-/* Map machine fault codes into signal numbers.
-   First subtract 0, divide by 4, then index in a table.
-   Faults for which the entry in this table is 0
-   are not handled by KDB; the program's own trap handler
-   gets to handle then.  */
-
-#define FAULT_CODE_ORIGIN 0
-#define FAULT_CODE_UNITS 4
-#define FAULT_TABLE    \
-{ 0, 0, 0, 0, 0, 0, 0, 0, \
-  0, 0, 0, 0, 0, 0, 0, 0, \
-  0, 0, 0, 0, 0, 0, 0, 0}
-
-/* Start running with a stack stretching from BEG to END.
-   BEG and END should be symbols meaningful to the assembler.
-   This is used only for kdb.  */
-
-#define INIT_STACK(beg, end)  {}
-
-/* Push the frame pointer register on the stack.  */
-#define PUSH_FRAME_PTR        {}
-
-/* Copy the top-of-stack to the frame pointer register.  */
-#define POP_FRAME_PTR  {}
-
-/* After KDB is entered by a fault, push all registers
-   that GDB thinks about (all NUM_REGS of them),
-   so that they appear in order of ascending GDB register number.
-   The fault code will be on the stack beyond the last register.  */
-
-#define PUSH_REGISTERS        {}
-
-/* Assuming the registers (including processor status) have been
-   pushed on the stack in order of ascending GDB register number,
-   restore them and return to the address in the saved PC register.  */
-
-#define POP_REGISTERS      {}
-#endif /* 0 */
diff --git a/gdb/xm-ultra3.h b/gdb/xm-ultra3.h
index 34bd2d2014..deafa23171 100644
--- a/gdb/xm-ultra3.h
+++ b/gdb/xm-ultra3.h
@@ -45,11 +45,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 # define F_OK 0
 #endif
 
-/* For dirbuf[] in main.c */
-#ifndef MAXPATHLEN
-#define MAXPATHLEN (1024)
-#endif
-
 /* Get rid of any system-imposed stack limit if possible */
 
 #define	SET_STACK_LIMIT_HUGE
@@ -69,6 +64,3 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* System uses a `short' to hold a process group ID.  */
 #define	SHORT_PGRP
-
-/* No vfork in this system.  */
-#define	vfork()	fork()