* monitor.c (#include "gdb_wait.h"): Removed.

* ocd.c: Likewise.
* ppc-bdm.c: Likewise.
* remote-adapt.c: Likewise.
* remote-array.c: Likewise.
* remote-bug.c: Likewise.
* remote-e7000.c: Likewise.
* remote-eb.c: Likewise.
* remote-es.c: Likewise.
* remote-mips.c: Likewise.
* remote-mm.c: Likewise.
* remote-nindy.c: Likewise.
* remote-os9k.c: Likewise.
* remote-rdi.c: Likewise.
* remote-rdp.c: Likewise.
* remote-sds.c: Likewise.
* remote-sim.c: Likewise.
* remote-st.c: Likewise.
* remote-udi.c: Likewise.
* remote-vx.c: Likewise.
* remote-vx29k.c: Likewise.
* remote-vx68.c: Likewise.
* remote-vx960.c: Likewise.
* remote-vxmips.c: Likewise.
* remote-vxsparc.c: Likewise.
* remote.c: Likewise.
* ser-pipe.c: Likewise.
* ser-unix.c: Likewise.
* Makefile.in: Updated dependencies.
-------------------------------------------------------------------

30 files changed, 61 insertions, 58 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5d52559ef35..fe92a3a8f27 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,35 @@
+2001-02-02  J.T. Conklin  <jtc@redback.com>
+
+	* monitor.c (#include "gdb_wait.h"): Removed.
+	* ocd.c: Likewise.
+	* ppc-bdm.c: Likewise.
+	* remote-adapt.c: Likewise.
+	* remote-array.c: Likewise.
+	* remote-bug.c: Likewise.
+	* remote-e7000.c: Likewise.
+	* remote-eb.c: Likewise.
+	* remote-es.c: Likewise.
+	* remote-mips.c: Likewise.
+	* remote-mm.c: Likewise.
+	* remote-nindy.c: Likewise.
+	* remote-os9k.c: Likewise.
+	* remote-rdi.c: Likewise.
+	* remote-rdp.c: Likewise.
+	* remote-sds.c: Likewise.
+	* remote-sim.c: Likewise.
+	* remote-st.c: Likewise.
+	* remote-udi.c: Likewise.
+	* remote-vx.c: Likewise.
+	* remote-vx29k.c: Likewise.
+	* remote-vx68.c: Likewise.
+	* remote-vx960.c: Likewise.
+	* remote-vxmips.c: Likewise.
+	* remote-vxsparc.c: Likewise.
+	* remote.c: Likewise.
+	* ser-pipe.c: Likewise.
+	* ser-unix.c: Likewise.
+	* Makefile.in: Updated dependencies.
+
 2001-01-31  David Smith  <dsmith@redhat.com>
 
 	* event-loop.c: Change inclusion of string.h to gdb_string.h and
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 1d987a82fea..549f86bf11a 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1639,7 +1639,7 @@ mipsread.o: mipsread.c buildsym.h complaints.h $(bfd_h) $(defs_h) \
 
 mipsv4-nat.o: mipsv4-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h
 
-monitor.o: monitor.c monitor.h $(bfd_h) gdb_wait.h $(defs_h) $(gdbcmd_h) \
+monitor.o: monitor.c monitor.h $(bfd_h) $(defs_h) $(gdbcmd_h) \
 	$(inferior_h) target.h serial.h terminal.h gdb_string.h
 
 news-xdep.o: news-xdep.c
@@ -1699,7 +1699,7 @@ parse.o: parse.c $(command_h) $(defs_h) $(expression_h) $(frame_h) \
 	gdb_string.h linespec.h
 
 ppc-bdm.o: ppc-bdm.c $(defs_h) $(gdbcore_h) gdb_string.h $(frame_h) \
-	$(inferior_h) $(bfd_h) symfile.h target.h gdb_wait.h $(gdbcmd_h) \
+	$(inferior_h) $(bfd_h) symfile.h target.h $(gdbcmd_h) \
 	objfiles.h gdb-stabs.h serial.h ocd.h
 
 ppc-linux-nat.o: ppc-linux-nat.c $(defs_h) $(gdbcore_h) $(frame_h) \
@@ -1741,14 +1741,14 @@ linux-thread.o: linux-thread.c $(breakpoint_h) $(gdbcmd_h) gdb_wait.h \
 
 gnu-regex.o: gnu-regex.c gnu-regex.h $(defs_h) gdb_string.h
 
-remote-adapt.o: remote-adapt.c gdb_wait.h $(defs_h) $(gdbcore_h) \
+remote-adapt.o: remote-adapt.c $(defs_h) $(gdbcore_h) \
 	$(inferior_h) target.h terminal.h gdb_string.h
 
-remote-array.o: remote-array.c gdb_wait.h $(defs_h) $(gdbcore_h) target.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) \
 	$(version_h)
 
-remote-rdi.o: remote-rdi.c gdb_wait.h $(defs_h) $(gdbcore_h) \
+remote-rdi.o: remote-rdi.c $(defs_h) $(gdbcore_h) \
 	$(inferior_h) gdb_string.h
 
 rdi-share/libangsd.a:	force
@@ -1761,13 +1761,10 @@ rdi-share/libangsd.a:	force
 	  true; \
 	fi
 
-remote-d10v.o: remote-d10v.c $(bfd_h) gdb_wait.h $(defs_h) $(gdbcmd_h) \
-	$(inferior_h) $(remote_utils_h) symfile.h terminal.h gdb_string.h
-
-remote-rdp.o: remote-rdp.c gdb_wait.h $(defs_h) $(gdbcore_h) \
+remote-rdp.o: remote-rdp.c $(defs_h) $(gdbcore_h) \
 	$(inferior_h) gdb_string.h
 
-remote-bug.o: remote-bug.c gdb_wait.h $(defs_h) $(gdbcore_h) \
+remote-bug.o: remote-bug.c $(defs_h) $(gdbcore_h) \
 	$(inferior_h) target.h terminal.h $(remote_utils_h) gdb_string.h
 
 # FIXME: For the SH target, remote-e7000 contains numerous -Wformat
@@ -1775,61 +1772,64 @@ remote-bug.o: remote-bug.c gdb_wait.h $(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 \
-	gdb_wait.h serial.h gdb_string.h
+	serial.h gdb_string.h
 	$(CC) -c $(INTERNAL_WARN_CFLAGS) $(NO_WERROR_CFLAGS) $<
 
-remote-eb.o: remote-eb.c gdb_wait.h $(srcdir)/config/a29k/tm-a29k.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
 
-remote-es.o: remote-es.c $(bfd_h) gdb_wait.h $(command_h) $(defs_h) \
+remote-es.o: remote-es.c $(bfd_h) $(command_h) $(defs_h) \
 	$(inferior_h) $(remote_utils_h) terminal.h gdb_string.h \
 	symfile.h
 
-remote-hms.o: remote-hms.c gdb_wait.h $(defs_h) $(gdbcore_h) \
-	$(inferior_h) serial.h target.h terminal.h gdb_string.h
+remote-est.o: remote-est.c $(defs_h) $(gdbcore_h) \
+	$(inferior_h) serial.h target.h terminal.h 
+
+remote-hms.o: remote-hms.c $(defs_h) $(gdbcore_h) \
+	$(inferior_h) serial.h target.h terminal.h
 
-remote-mips.o: remote-mips.c gdb_wait.h $(defs_h) $(gdbcmd_h) \
+remote-mips.o: remote-mips.c $(defs_h) $(gdbcmd_h) \
 	$(gdbcore_h) $(inferior_h) serial.h symfile.h target.h
 
-remote-mm.o: remote-mm.c $(bfd_h) gdb_wait.h $(defs_h) $(inferior_h) \
+remote-mm.o: remote-mm.c $(bfd_h) $(defs_h) $(inferior_h) \
 	minimon.h target.h terminal.h gdb_string.h
 
-remote-nindy.o: remote-nindy.c $(floatformat_h) gdb_wait.h $(command_h) \
+remote-nindy.o: remote-nindy.c $(floatformat_h) $(command_h) \
 	$(defs_h) $(gdbcore_h) $(inferior_h) \
 	nindy-share/env.h nindy-share/stop.h $(remote_utils_h) \
 	symfile.h
 
-remote-os9k.o: remote-os9k.c $(defs_h) $(gdbcore_h) gdb_wait.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
 
-remote-sds.o: remote-sds.c $(bfd_h) gdb_wait.h $(defs_h) $(gdbcmd_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
 
-remote-sim.o: remote-sim.c gdb_wait.h $(defs_h) $(gdbcore_h) \
+remote-sim.o: remote-sim.c $(defs_h) $(gdbcore_h) \
 	$(inferior_h) target.h terminal.h gdb_string.h \
 	$(INCLUDE_DIR)/callback.h
 
-remote-st.o: remote-st.c gdb_wait.h $(defs_h) $(gdbcore_h) serial.h \
+remote-st.o: remote-st.c $(defs_h) $(gdbcore_h) serial.h \
 	target.h gdb_string.h
 
-remote-udi.o: remote-udi.c $(bfd_h) gdb_wait.h $(defs_h) $(gdbcmd_h) \
+remote-udi.o: remote-udi.c $(bfd_h) $(defs_h) $(gdbcmd_h) \
 	$(inferior_h) target.h terminal.h $(udiheaders) gdb_string.h
 
-remote-vx.o: remote-vx.c gdb_wait.h 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) \
 	gdb_string.h
 
-remote-vx29k.o: remote-vx29k.c gdb_wait.h 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
 
 ocd.o: ocd.c ocd.h $(gdbcore_h) gdb_string.h $(frame_h) $(inferior_h) \
-	$(bfd_h) symfile.h target.h gdb_wait.h $(gdbcmd_h) objfiles.h \
+	$(bfd_h) symfile.h target.h $(gdbcmd_h) objfiles.h \
 	gdb-stabs.h $(dcache_h) serial.h
 
 remote-utils.o: remote-utils.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
diff --git a/gdb/monitor.c b/gdb/monitor.c
index 53dbfb36ee2..e70283d6881 100644
--- a/gdb/monitor.c
+++ b/gdb/monitor.c
@@ -40,7 +40,6 @@
 #include "defs.h"
 #include "gdbcore.h"
 #include "target.h"
-#include "gdb_wait.h"
 #include <signal.h>
 #include <ctype.h>
 #include "gdb_string.h"
diff --git a/gdb/ocd.c b/gdb/ocd.c
index eb831618541..ec4dc1d9dfd 100644
--- a/gdb/ocd.c
+++ b/gdb/ocd.c
@@ -1,5 +1,5 @@
 /* Target communications support for Macraigor Systems' On-Chip Debugging
-   Copyright 1996, 1997 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 2001 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -27,7 +27,6 @@
 #include "bfd.h"
 #include "symfile.h"
 #include "target.h"
-#include "gdb_wait.h"
 #include "gdbcmd.h"
 #include "objfiles.h"
 #include "gdb-stabs.h"
diff --git a/gdb/ppc-bdm.c b/gdb/ppc-bdm.c
index 5b8877f8457..d0eb2e5bcdf 100644
--- a/gdb/ppc-bdm.c
+++ b/gdb/ppc-bdm.c
@@ -1,6 +1,6 @@
 /* Remote target communications for the Macraigor Systems BDM Wiggler
    talking to a Motorola PPC 8xx ADS board
-   Copyright 1996, 1997 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 2001 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -28,7 +28,6 @@
 #include "bfd.h"
 #include "symfile.h"
 #include "target.h"
-#include "gdb_wait.h"
 #include "gdbcmd.h"
 #include "objfiles.h"
 #include "gdb-stabs.h"
diff --git a/gdb/remote-adapt.c b/gdb/remote-adapt.c
index 44342cbfee4..9ca6167ce02 100644
--- a/gdb/remote-adapt.c
+++ b/gdb/remote-adapt.c
@@ -35,7 +35,6 @@
 #include "defs.h"
 #include "gdb_string.h"
 #include "inferior.h"
-#include "gdb_wait.h"
 #include "value.h"
 #include <ctype.h>
 #include <fcntl.h>
diff --git a/gdb/remote-array.c b/gdb/remote-array.c
index 7f0a6d6d913..c22d39c0560 100644
--- a/gdb/remote-array.c
+++ b/gdb/remote-array.c
@@ -28,7 +28,6 @@
 #include "defs.h"
 #include "gdbcore.h"
 #include "target.h"
-#include "gdb_wait.h"
 #include <ctype.h>
 #include <signal.h>
 #include <sys/types.h>
diff --git a/gdb/remote-bug.c b/gdb/remote-bug.c
index df05975bd06..74b23f526a4 100644
--- a/gdb/remote-bug.c
+++ b/gdb/remote-bug.c
@@ -23,8 +23,6 @@
 
 #include "defs.h"
 #include "inferior.h"
-#include "gdb_wait.h"
-
 #include "gdb_string.h"
 #include <ctype.h>
 #include <fcntl.h>
diff --git a/gdb/remote-e7000.c b/gdb/remote-e7000.c
index b81df8a6c59..f31825fce9d 100644
--- a/gdb/remote-e7000.c
+++ b/gdb/remote-e7000.c
@@ -37,7 +37,6 @@
 #include "gdbarch.h"
 #include "inferior.h"
 #include "target.h"
-#include "gdb_wait.h"
 #include "value.h"
 #include "command.h"
 #include <signal.h>
diff --git a/gdb/remote-eb.c b/gdb/remote-eb.c
index 4db90712086..7246c909ee4 100644
--- a/gdb/remote-eb.c
+++ b/gdb/remote-eb.c
@@ -32,7 +32,6 @@
 #include "inferior.h"
 #include "bfd.h"
 #include "symfile.h"
-#include "gdb_wait.h"
 #include "value.h"
 #include <ctype.h>
 #include <fcntl.h>
diff --git a/gdb/remote-es.c b/gdb/remote-es.c
index 97b12633beb..0500a14bb6d 100644
--- a/gdb/remote-es.c
+++ b/gdb/remote-es.c
@@ -104,7 +104,6 @@
 #include "frame.h"
 #include "inferior.h"
 #include "target.h"
-#include "gdb_wait.h"
 #include "command.h"
 #include "symfile.h"
 #include "remote-utils.h"
diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c
index e2d431eab19..9848b0c19d3 100644
--- a/gdb/remote-mips.c
+++ b/gdb/remote-mips.c
@@ -24,7 +24,6 @@
 #include "inferior.h"
 #include "bfd.h"
 #include "symfile.h"
-#include "gdb_wait.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
 #include "serial.h"
diff --git a/gdb/remote-mm.c b/gdb/remote-mm.c
index ae4df944b43..f4680317cdb 100644
--- a/gdb/remote-mm.c
+++ b/gdb/remote-mm.c
@@ -32,7 +32,6 @@
 
 #include "defs.h"
 #include "inferior.h"
-#include "gdb_wait.h"
 #include "value.h"
 #include <ctype.h>
 #include <fcntl.h>
diff --git a/gdb/remote-nindy.c b/gdb/remote-nindy.c
index be6a6e96ea3..7902e0bcdf2 100644
--- a/gdb/remote-nindy.c
+++ b/gdb/remote-nindy.c
@@ -109,7 +109,6 @@
 #include "command.h"
 #include "floatformat.h"
 
-#include "gdb_wait.h"
 #include <sys/file.h>
 #include <ctype.h>
 #include "serial.h"
diff --git a/gdb/remote-os9k.c b/gdb/remote-os9k.c
index 57baf84dae9..9e930d4cece 100644
--- a/gdb/remote-os9k.c
+++ b/gdb/remote-os9k.c
@@ -40,7 +40,6 @@
 #include "defs.h"
 #include "gdbcore.h"
 #include "target.h"
-#include "gdb_wait.h"
 #include <signal.h>
 #include "gdb_string.h"
 #include <sys/types.h>
diff --git a/gdb/remote-rdi.c b/gdb/remote-rdi.c
index 386a0df96a5..a4b2428e425 100644
--- a/gdb/remote-rdi.c
+++ b/gdb/remote-rdi.c
@@ -26,7 +26,6 @@
 #include "bfd.h"
 #include "symfile.h"
 #include "target.h"
-#include "gdb_wait.h"
 #include "gdbcmd.h"
 #include "objfiles.h"
 #include "gdb-stabs.h"
diff --git a/gdb/remote-rdp.c b/gdb/remote-rdp.c
index ccce506537e..0aecc3826ef 100644
--- a/gdb/remote-rdp.c
+++ b/gdb/remote-rdp.c
@@ -38,7 +38,6 @@
 
 #include "defs.h"
 #include "inferior.h"
-#include "gdb_wait.h"
 #include "value.h"
 #include "callback.h"
 #include "command.h"
diff --git a/gdb/remote-sds.c b/gdb/remote-sds.c
index 56e61b65819..224032715b8 100644
--- a/gdb/remote-sds.c
+++ b/gdb/remote-sds.c
@@ -31,7 +31,6 @@
 #include "bfd.h"
 #include "symfile.h"
 #include "target.h"
-#include "gdb_wait.h"
 #include "gdbcmd.h"
 #include "objfiles.h"
 #include "gdb-stabs.h"
diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 8c2e75309e6..268f5f76f77 100644
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -22,7 +22,6 @@
 
 #include "defs.h"
 #include "inferior.h"
-#include "gdb_wait.h"
 #include "value.h"
 #include "gdb_string.h"
 #include <ctype.h>
diff --git a/gdb/remote-st.c b/gdb/remote-st.c
index 51e96b70d55..ea029dc77c7 100644
--- a/gdb/remote-st.c
+++ b/gdb/remote-st.c
@@ -38,7 +38,6 @@
 #include "defs.h"
 #include "gdbcore.h"
 #include "target.h"
-#include "gdb_wait.h"
 #include <signal.h>
 #include "gdb_string.h"
 #include <sys/types.h>
diff --git a/gdb/remote-udi.c b/gdb/remote-udi.c
index ced664e4f50..0edee95d86b 100644
--- a/gdb/remote-udi.c
+++ b/gdb/remote-udi.c
@@ -35,7 +35,6 @@
 #include "defs.h"
 #include "frame.h"
 #include "inferior.h"
-#include "gdb_wait.h"
 #include "value.h"
 #include <ctype.h>
 #include <fcntl.h>
diff --git a/gdb/remote-vx.c b/gdb/remote-vx.c
index 8f03268fae7..40b31a5475b 100644
--- a/gdb/remote-vx.c
+++ b/gdb/remote-vx.c
@@ -22,7 +22,6 @@
 #include "defs.h"
 #include "frame.h"
 #include "inferior.h"
-#include "gdb_wait.h"
 #include "target.h"
 #include "gdbcore.h"
 #include "command.h"
diff --git a/gdb/remote-vx29k.c b/gdb/remote-vx29k.c
index f99ce400324..b86b6bd93c1 100644
--- a/gdb/remote-vx29k.c
+++ b/gdb/remote-vx29k.c
@@ -26,7 +26,6 @@
 #include "vx-share/regPacket.h"
 #include "frame.h"
 #include "inferior.h"
-#include "gdb_wait.h"
 #include "target.h"
 #include "gdbcore.h"
 #include "command.h"
diff --git a/gdb/remote-vx68.c b/gdb/remote-vx68.c
index 6a72e92690b..cc82e9a9650 100644
--- a/gdb/remote-vx68.c
+++ b/gdb/remote-vx68.c
@@ -26,7 +26,6 @@
 #include "vx-share/regPacket.h"
 #include "frame.h"
 #include "inferior.h"
-#include "gdb_wait.h"
 #include "target.h"
 #include "gdbcore.h"
 #include "command.h"
diff --git a/gdb/remote-vx960.c b/gdb/remote-vx960.c
index ff0b21fa5ad..9e7ff188cc5 100644
--- a/gdb/remote-vx960.c
+++ b/gdb/remote-vx960.c
@@ -26,7 +26,6 @@
 #include "vx-share/regPacket.h"
 #include "frame.h"
 #include "inferior.h"
-#include "gdb_wait.h"
 #include "target.h"
 #include "gdbcore.h"
 #include "command.h"
diff --git a/gdb/remote-vxmips.c b/gdb/remote-vxmips.c
index b7da27ad973..d2043772579 100644
--- a/gdb/remote-vxmips.c
+++ b/gdb/remote-vxmips.c
@@ -26,7 +26,6 @@
 #include "vx-share/regPacket.h"
 #include "frame.h"
 #include "inferior.h"
-#include "gdb_wait.h"
 #include "target.h"
 #include "gdbcore.h"
 #include "command.h"
diff --git a/gdb/remote-vxsparc.c b/gdb/remote-vxsparc.c
index aeb241c7c41..2c0fdc6b96d 100644
--- a/gdb/remote-vxsparc.c
+++ b/gdb/remote-vxsparc.c
@@ -26,7 +26,6 @@
 #include "vx-share/regPacket.h"
 #include "frame.h"
 #include "inferior.h"
-#include "gdb_wait.h"
 #include "target.h"
 #include "gdbcore.h"
 #include "command.h"
diff --git a/gdb/remote.c b/gdb/remote.c
index 0140b12b9a9..2a000363937 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -29,7 +29,6 @@
 #include "bfd.h"
 #include "symfile.h"
 #include "target.h"
-#include "gdb_wait.h"
 /*#include "terminal.h" */
 #include "gdbcmd.h"
 #include "objfiles.h"
diff --git a/gdb/ser-pipe.c b/gdb/ser-pipe.c
index 41fb083d5ce..96e1556e8cf 100644
--- a/gdb/ser-pipe.c
+++ b/gdb/ser-pipe.c
@@ -27,7 +27,6 @@
 #include "gdb_vfork.h"
 
 #include <sys/types.h>
-#include "gdb_wait.h"
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <fcntl.h>
diff --git a/gdb/ser-unix.c b/gdb/ser-unix.c
index b75e3387e40..381bf33d529 100644
--- a/gdb/ser-unix.c
+++ b/gdb/ser-unix.c
@@ -1,5 +1,5 @@
 /* Serial interface for local (hardwired) serial ports on Un*x like systems
-   Copyright 1992-1994, 1998-2000 Free Software Foundation, Inc.
+   Copyright 1992-1994, 1998-2000, 2001 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -25,7 +25,6 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include "terminal.h"
-#include "gdb_wait.h"
 #include <sys/socket.h>
 #include <sys/time.h>