5 files changed, 35 insertions, 5 deletions
diff --git a/sim/arm/arm-sim.h b/sim/arm/arm-sim.h
new file mode 100644
index 0000000..65a1c67
--- /dev/null
+++ b/sim/arm/arm-sim.h
@@ -0,0 +1,26 @@
+/* Simulation code for the ARM processor.
+   Copyright (C) 2009-2022 Free Software Foundation, Inc.
+
+   This file is part of the GNU simulators.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef ARM_SIM_H
+#define ARM_SIM_H
+
+#include "armdefs.h"
+
+extern struct ARMul_State *state;
+
+#endif
diff --git a/sim/arm/armdefs.h b/sim/arm/armdefs.h
index 7df5d022..d87220b 100644
--- a/sim/arm/armdefs.h
+++ b/sim/arm/armdefs.h
@@ -14,6 +14,9 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, see <http://www.gnu.org/licenses/>. */
 
+#ifndef ARMDEFS_H
+#define ARMDEFS_H
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -183,6 +186,7 @@ struct ARMul_State
 *                   Macros to extract instruction fields                    *
 \***************************************************************************/
 
+#undef BIT /* common/sim-bits.h conflict :( */
 #define BIT(n) ( (ARMword)(instr>>(n))&1)	/* bit n of instruction */
 #define BITS(m,n) ( (ARMword)(instr<<(31-(n))) >> ((31-(n))+(m)) )	/* bits m to n of instr */
 #define TOPBITS(n) (instr >> (n))	/* bits 31 to n of instr */
@@ -418,3 +422,5 @@ extern void ARMul_FixSPSR         (ARMul_State *, ARMword, ARMword);
 extern void ARMul_ConsolePrint    (ARMul_State *, const char *, ...)
     ATTRIBUTE_PRINTF (2, 3);
 extern void ARMul_SelectProcessor (ARMul_State *, unsigned);
+
+#endif
diff --git a/sim/arm/armemu.h b/sim/arm/armemu.h
index 7f25b94d..318f1b7 100644
--- a/sim/arm/armemu.h
+++ b/sim/arm/armemu.h
@@ -14,6 +14,8 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, see <http://www.gnu.org/licenses/>. */
 
+#include "armdefs.h"
+
 extern ARMword isize;
 extern int trace;
 extern int disas;
diff --git a/sim/arm/sim-main.h b/sim/arm/sim-main.h
index 5ca01eb..a08729b 100644
--- a/sim/arm/sim-main.h
+++ b/sim/arm/sim-main.h
@@ -22,9 +22,4 @@
 #include "sim-basics.h"
 #include "sim-base.h"
 
-#undef BIT
-#include "armdefs.h"
-
-extern struct ARMul_State *state;
-
 #endif
diff --git a/sim/arm/wrapper.c b/sim/arm/wrapper.c
index 7b11532..5eb61df 100644
--- a/sim/arm/wrapper.c
+++ b/sim/arm/wrapper.c
@@ -41,6 +41,7 @@
 #include "libiberty.h"
 #include "iwmmxt.h"
 #include "maverick.h"
+#include "arm-sim.h"
 
 /* TODO: This should get pulled from the SIM_DESC.  */
 host_callback *sim_callback;