12 files changed, 17 insertions, 1 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 682696c..61da7e9 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,5 +1,12 @@
 2021-06-18  Mike Frysinger  <vapier@gentoo.org>
 
+	* cgen-run.c: Include sim-signal.h.
+	* cgen-utils.c, nrun.c, sim-core.c, sim-engine.c, sim-reason.c,
+	sim-resume.c, sim-signal.c, sim-stop.c, sim-watch.c: Likewise.
+	* sim-basics.h: Delete sim-signal.h include.
+
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
 	* sim-basics.h: Delete libiberty.h include.
 
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
diff --git a/sim/common/cgen-run.c b/sim/common/cgen-run.c
index 9420942..1b097e1 100644
--- a/sim/common/cgen-run.c
+++ b/sim/common/cgen-run.c
@@ -38,6 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "sim-main.h"
 #include "sim-assert.h"
+#include "sim-signal.h"
 
 #ifndef SIM_ENGINE_PREFIX_HOOK
 #define SIM_ENGINE_PREFIX_HOOK(sd)
diff --git a/sim/common/cgen-utils.c b/sim/common/cgen-utils.c
index 1310790..529d80d 100644
--- a/sim/common/cgen-utils.c
+++ b/sim/common/cgen-utils.c
@@ -22,6 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "bfd.h"
 #include "sim-main.h"
+#include "sim-signal.h"
 #include "dis-asm.h"
 
 #define MEMOPS_DEFINE_INLINE
diff --git a/sim/common/nrun.c b/sim/common/nrun.c
index ba293d1..3fd7834 100644
--- a/sim/common/nrun.c
+++ b/sim/common/nrun.c
@@ -23,6 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <string.h>
 
 #include "sim-main.h"
+#include "sim-signal.h"
 #include "sim/callback.h"
 
 #include "bfd.h"
diff --git a/sim/common/sim-basics.h b/sim/common/sim-basics.h
index a3dd5d9..32995a8 100644
--- a/sim/common/sim-basics.h
+++ b/sim/common/sim-basics.h
@@ -121,7 +121,6 @@ typedef enum {
 #include "sim-types.h"
 #include "sim-bits.h"
 #include "sim-endian.h"
-#include "sim-signal.h"
 
 #include "sim-utils.h"
 
diff --git a/sim/common/sim-core.c b/sim/common/sim-core.c
index 6604f31..2c568dc 100644
--- a/sim/common/sim-core.c
+++ b/sim/common/sim-core.c
@@ -28,6 +28,7 @@
 
 #include "sim-main.h"
 #include "sim-assert.h"
+#include "sim-signal.h"
 #include "libiberty.h"
 
 #if (WITH_HW)
diff --git a/sim/common/sim-engine.c b/sim/common/sim-engine.c
index a5f84af..83f41f0 100644
--- a/sim/common/sim-engine.c
+++ b/sim/common/sim-engine.c
@@ -22,6 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "sim-main.h"
 #include "sim-assert.h"
+#include "sim-signal.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/sim/common/sim-reason.c b/sim/common/sim-reason.c
index 73a5765..fa36837 100644
--- a/sim/common/sim-reason.c
+++ b/sim/common/sim-reason.c
@@ -22,6 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "sim-main.h"
 #include "sim-assert.h"
+#include "sim-signal.h"
 
 #include <stdlib.h>
 
diff --git a/sim/common/sim-resume.c b/sim/common/sim-resume.c
index 8f854da..93b198a 100644
--- a/sim/common/sim-resume.c
+++ b/sim/common/sim-resume.c
@@ -22,6 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "sim-main.h"
 #include "sim-assert.h"
+#include "sim-signal.h"
 
 /* Halt the simulator after just one instruction */
 
diff --git a/sim/common/sim-signal.c b/sim/common/sim-signal.c
index f9fef4c..d518604 100644
--- a/sim/common/sim-signal.c
+++ b/sim/common/sim-signal.c
@@ -22,6 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <signal.h>
 #include "sim-main.h"
+#include "sim-signal.h"
 
 /* Convert SIM_SIGFOO to SIGFOO.
    What to do when the host doesn't have SIGFOO is handled on a case by case
diff --git a/sim/common/sim-stop.c b/sim/common/sim-stop.c
index aa48fc3..076d43d 100644
--- a/sim/common/sim-stop.c
+++ b/sim/common/sim-stop.c
@@ -22,6 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "sim-main.h"
 #include "sim-assert.h"
+#include "sim-signal.h"
 
 /* Generic implementation of sim_stop.  */
 
diff --git a/sim/common/sim-watch.c b/sim/common/sim-watch.c
index fa035b3..bc6c44b 100644
--- a/sim/common/sim-watch.c
+++ b/sim/common/sim-watch.c
@@ -22,6 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "sim-main.h"
 #include "sim-options.h"
+#include "sim-signal.h"
 #include "libiberty.h"
 
 #include "sim-assert.h"