/* Basic configuration */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "defs.h"
/* Basic host dependant mess - hopefully <stdio.h> + <stdarg.h> will
bring potential conflicts out in the open */
#include <setjmp.h>
-#ifndef NULL
-#define NULL 0
-#endif
-
-
#ifndef min
#define min(a, b) ((a) < (b) ? (a) : (b))
#endif
/* Basic definitions - ordered so that nothing calls what comes after it. */
#include "ansidecl.h"
-#include "gdb/callback.h"
-#include "gdb/remote-sim.h"
+#include "sim/callback.h"
+#include "sim/sim.h"
#include "sim-config.h"