diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7d0e7e95636..721346a7b64 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-28  John Baldwin  <jhb@FreeBSD.org>
+
+	* fbsd-nat.c: Include "gdb_wait.h" instead of <sys/wait.h>.
+
 2015-04-28  Patrick Palka  <patrick@parcs.ath.cx>
 
 	* utils.c (init_page_info): Set rl_catch_sigwinch to zero.
diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c
index 066e2881837..9705d45a161 100644
--- a/gdb/fbsd-nat.c
+++ b/gdb/fbsd-nat.c
@@ -23,11 +23,11 @@
 #include "regcache.h"
 #include "regset.h"
 #include "gdbthread.h"
+#include "gdb_wait.h"
 #include <sys/types.h>
 #include <sys/procfs.h>
 #include <sys/ptrace.h>
 #include <sys/sysctl.h>
-#include <sys/wait.h>
 #ifdef HAVE_KINFO_GETVMMAP
 #include <sys/user.h>
 #include <libutil.h>