diff -ur gdb-8.0.1/gdb/nat/gdb_ptrace.h gdb-8.0.1-fixed/gdb/nat/gdb_ptrace.h
--- gdb-8.0.1/gdb/nat/gdb_ptrace.h	2017-06-04 08:51:27.000000000 -0700
+++ gdb-8.0.1-fixed/gdb/nat/gdb_ptrace.h	2021-04-30 14:27:25.459780070 -0700
@@ -150,4 +150,5 @@
          ptrace ((PTRACE_TYPE_ARG1) request, pid, addr, data)
 #endif
 
+#include "gdb_wait.h"
 #endif /* gdb_ptrace.h */
diff -ur gdb-8.0.1/gdb/nat/linux-ptrace.c gdb-8.0.1-fixed/gdb/nat/linux-ptrace.c
--- gdb-8.0.1/gdb/nat/linux-ptrace.c	2017-09-07 07:28:11.000000000 -0700
+++ gdb-8.0.1-fixed/gdb/nat/linux-ptrace.c	2021-04-30 14:27:28.971812062 -0700
@@ -21,8 +21,6 @@
 #include "linux-procfs.h"
 #include "linux-waitpid.h"
 #include "buffer.h"
-#include "gdb_wait.h"
-#include "gdb_ptrace.h"
 #ifdef HAVE_SYS_PROCFS_H
 #include <sys/procfs.h>
 #endif