From 00cf2aaef2131006b9bcd1a61ad9e68c701f9e35 Mon Sep 17 00:00:00 2001
From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 19 Feb 2018 00:44:58 -0500
Subject: [PATCH] mips: Clean up includes

Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.

This commit was created with scripts/clean-includes.

Backports commit c684822ad29968af09735148f03a511bc514589d from qemu
---
 qemu/target-mips/cpu.c        | 1 +
 qemu/target-mips/dsp_helper.c | 1 +
 qemu/target-mips/helper.c     | 7 ++-----
 qemu/target-mips/lmi_helper.c | 1 +
 qemu/target-mips/msa_helper.c | 1 +
 qemu/target-mips/op_helper.c  | 2 +-
 qemu/target-mips/translate.c  | 1 +
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/qemu/target-mips/cpu.c b/qemu/target-mips/cpu.c
index ece97449..a7514e49 100644
--- a/qemu/target-mips/cpu.c
+++ b/qemu/target-mips/cpu.c
@@ -18,6 +18,7 @@
  * <http://www.gnu.org/licenses/lgpl-2.1.html>
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "qemu-common.h"
 #include "hw/mips/mips.h"
diff --git a/qemu/target-mips/dsp_helper.c b/qemu/target-mips/dsp_helper.c
index 46528de3..df7d2204 100644
--- a/qemu/target-mips/dsp_helper.c
+++ b/qemu/target-mips/dsp_helper.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "qemu/bitops.h"
diff --git a/qemu/target-mips/helper.c b/qemu/target-mips/helper.c
index 81415667..511b5be6 100644
--- a/qemu/target-mips/helper.c
+++ b/qemu/target-mips/helper.c
@@ -16,12 +16,9 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+
+#include "qemu/osdep.h"
 #include "unicorn/platform.h"
-#include <signal.h>
 
 #include "cpu.h"
 #include "exec/cpu_ldst.h"
diff --git a/qemu/target-mips/lmi_helper.c b/qemu/target-mips/lmi_helper.c
index bbfcd59c..fb1245b3 100644
--- a/qemu/target-mips/lmi_helper.c
+++ b/qemu/target-mips/lmi_helper.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
 
diff --git a/qemu/target-mips/msa_helper.c b/qemu/target-mips/msa_helper.c
index a9708c6e..2d34877e 100644
--- a/qemu/target-mips/msa_helper.c
+++ b/qemu/target-mips/msa_helper.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
 
diff --git a/qemu/target-mips/op_helper.c b/qemu/target-mips/op_helper.c
index f2259a4e..7809dcbb 100644
--- a/qemu/target-mips/op_helper.c
+++ b/qemu/target-mips/op_helper.c
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
-#include <stdlib.h>
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"
diff --git a/qemu/target-mips/translate.c b/qemu/target-mips/translate.c
index d8253e94..52b15241 100644
--- a/qemu/target-mips/translate.c
+++ b/qemu/target-mips/translate.c
@@ -21,6 +21,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "tcg-op.h"
 #include "exec/cpu_ldst.h"