diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index b8c8bd7111e..0a6a71ca75e 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-13  Joel Brobecker  <brobecker@adacore.com>
+
+	* lynx-low.c, lynx-ppc-loc.c: Include <sys/ptrace.h> instead of
+	<ptrace.h>
+
 2010-09-09  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* configure.ac: Add --enable-inprocess-agent option.
diff --git a/gdb/gdbserver/lynx-low.c b/gdb/gdbserver/lynx-low.c
index 7a949c048ad..74d2bcde4b8 100644
--- a/gdb/gdbserver/lynx-low.c
+++ b/gdb/gdbserver/lynx-low.c
@@ -20,7 +20,7 @@
 #include "lynx-low.h"
 
 #include <limits.h>
-#include <ptrace.h>
+#include <sys/ptrace.h>
 #include <sys/piddef.h> /* Provides PIDGET, TIDGET, BUILDPID, etc.  */
 #include <unistd.h>
 #include <sys/ioctl.h>
diff --git a/gdb/gdbserver/lynx-ppc-low.c b/gdb/gdbserver/lynx-ppc-low.c
index 9caa8aca8ab..97d691a23cf 100644
--- a/gdb/gdbserver/lynx-ppc-low.c
+++ b/gdb/gdbserver/lynx-ppc-low.c
@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <limits.h>
-#include <ptrace.h>
+#include <sys/ptrace.h>
 
 /* The following two typedefs are defined in a .h file which is not
    in the standard include path (/sys/include/family/ppc/ucontext.h),