#include <sys/ioctl.h>
#include <sys/types.h>
+#if defined(__sun__) || defined(__SUNPRO_CC)
+#include <sys/file.h>
+#endif
#include <fcntl.h>
-#include <signal.h>
#include <unistd.h>
-#include "sim/async.hh"
-#include "sim/host.hh"
+#include <csignal>
+
#include "base/misc.hh"
#include "base/pollevent.hh"
-#include "sim/root.hh"
+#include "base/types.hh"
+#include "sim/async.hh"
+#include "sim/core.hh"
#include "sim/serialize.hh"
using namespace std;