#ifndef SIM_CORE_C
#define SIM_CORE_C
+/* This must come before any other includes. */
+#include "defs.h"
+
#include "sim-main.h"
#include "sim-assert.h"
+#include "sim-signal.h"
#include "libiberty.h"
#if (WITH_HW)
#if EXTERN_SIM_CORE_P
-/* See include/gdb/remote-sim.h. */
+/* See include/sim/sim.h. */
char *
sim_memory_map (SIM_DESC sd)
{