#include "server.h"
-#include "gdb_wait.h"
+#include "gdbsupport/gdb_wait.h"
#include <sys/ptrace.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/syscall.h>
-#include "filestuff.h"
+#include "gdbsupport/filestuff.h"
#include "hostio.h"
#include "nat/fork-inferior.h"