#include "frame.h" /* required by inferior.h */
#include "inferior.h"
#include "target.h"
-#include "wait.h"
+#include "gdb_wait.h"
#include "gdbcore.h"
#include "terminal.h"
#include "gdbthread.h"
+#include "command.h" /* for dont_repeat () */
#include <signal.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
/* This just gets used as a default if we can't find SHELL */
#ifndef SHELL_FILE