diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 22b2802ee8..0272d67eea 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-24  Pedro Alves  <palves@redhat.com>
+
+	* gdb_ptrace.h: Move ...
+	* nat/gdb_ptrace.h: ... here.
+	* inf-ptrace.c: Adjust.
+
 2015-07-24  Pedro Alves  <palves@redhat.com>
 
 	* acinclude.m4: Include ptrace.m4.
diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c
index cd58dfb83c..f3c510555f 100644
--- a/gdb/inf-ptrace.c
+++ b/gdb/inf-ptrace.c
@@ -24,7 +24,7 @@
 #include "terminal.h"
 #include "gdbcore.h"
 #include "regcache.h"
-#include "gdb_ptrace.h"
+#include "nat/gdb_ptrace.h"
 #include "gdb_wait.h"
 #include <signal.h>
 
diff --git a/gdb/gdb_ptrace.h b/gdb/nat/gdb_ptrace.h
similarity index 100%
rename from gdb/gdb_ptrace.h
rename to gdb/nat/gdb_ptrace.h