diff --git a/sim/common/nrun.c b/sim/common/nrun.c
index abd821a74cf3..cbf7b5e2e147 100644
--- a/sim/common/nrun.c
+++ b/sim/common/nrun.c
@@ -20,6 +20,7 @@ along with this program. If not, see . */
#endif
#include
+#include
/* For strsignal. */
#ifdef HAVE_STRING_H
diff --git a/sim/common/sim-core.c b/sim/common/sim-core.c
index ce26dd3586e6..df46def27573 100644
--- a/sim/common/sim-core.c
+++ b/sim/common/sim-core.c
@@ -30,6 +30,8 @@
#include "sim-hw.h"
#endif
+#include
+
/* "core" module install handler.
This is called via sim_module_install to install the "core"
diff --git a/sim/common/sim-engine.c b/sim/common/sim-engine.c
index f9961f8cfb76..d6e091de30e8 100644
--- a/sim/common/sim-engine.c
+++ b/sim/common/sim-engine.c
@@ -17,11 +17,12 @@ 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 . */
-#include
-
#include "sim-main.h"
#include "sim-assert.h"
+#include
+#include
+
/* Get the run state.
REASON/SIGRC are the values returned by sim_stop_reason.
??? Should each cpu have its own copy? */
diff --git a/sim/common/sim-io.c b/sim/common/sim-io.c
index 05ba0180ffd8..989f9cfb35a7 100644
--- a/sim/common/sim-io.c
+++ b/sim/common/sim-io.c
@@ -33,6 +33,8 @@
#include
#endif
+#include
+
/* Define the rate at which the simulator should poll the host
for a quit. */
#ifndef POLL_QUIT_INTERVAL
diff --git a/sim/common/sim-module.c b/sim/common/sim-module.c
index 2ea54c1f653c..1b103b7763ae 100644
--- a/sim/common/sim-module.c
+++ b/sim/common/sim-module.c
@@ -36,6 +36,8 @@ along with this program. If not, see . */
#include "libiberty.h"
+#include
+
/* List of all modules. */
static MODULE_INSTALL_FN * const modules[] = {
standard_install,
diff --git a/sim/common/sim-reason.c b/sim/common/sim-reason.c
index d74496a46a29..83b24242235f 100644
--- a/sim/common/sim-reason.c
+++ b/sim/common/sim-reason.c
@@ -20,6 +20,8 @@ along with this program. If not, see . */
#include "sim-main.h"
#include "sim-assert.h"
+#include
+
/* Generic implementation of sim_stop_reason */
void