1 files changed, 8 insertions, 14 deletions
diff --git a/sim/tic80/sim-main.h b/sim/tic80/sim-main.h
index a01ad42..fc78cb3 100644
--- a/sim/tic80/sim-main.h
+++ b/sim/tic80/sim-main.h
@@ -24,32 +24,26 @@
 #define _SIM_MAIN_H_
 
 #include "sim-basics.h"
-#include "sim-inline.h"
-#include "sim-types.h"
-#include "sim-bits.h"
-#include "sim-endian.h"
+
+#include <signal.h>
 
 /* These are generated files.  */
 #include "itable.h"
 #include "idecode.h"
 #include "idecode.h"
 
+typedef instruction_address sim_cia;
+static const sim_cia null_cia = {0}; /* Dummy */
+#define NULL_CIA null_cia
+
+#include "sim-base.h"
+
 #include "cpu.h"
 #include "alu.h"
 
-#include "sim-core.h"
-#include "sim-events.h"
-#include "sim-io.h"
-
 
 struct sim_state {
 
-  /* real time */
-  sim_events events;
-
-  /* memory and IO */
-  sim_core core;
-
   /* escape route for inner functions */
   int halt_ok;
   jmp_buf path_to_halt;