target-s390x: Clean includes

The change in cpu.h is needed when HOST_LONG_BITS is defined in qemu-common.h.

Signed-off-by: Stefan Weil <sw@weilnetz.de>

diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index b8893b30271cd10975362db63a0a17f2508b9fdc..e892beca3bbd5821ddf2541be6cccdfd50990c10 100644 (file)
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -19,6 +19,9 @@
 #ifndef CPU_S390X_H
 #define CPU_S390X_H
 
+#include "config.h"
+#include "qemu-common.h"
+
 #define TARGET_LONG_BITS 64
 
 #define ELF_MACHINE    EM_S390

diff --git a/target-s390x/helper.c b/target-s390x/helper.c
index 10cc9dd5fa54c8c1dfca5747e36b611b8b6dcbc4..c0ec8908a674bb839267533ec17c21f070c6887e 100644 (file)
--- a/target-s390x/helper.c
+++ b/target-s390x/helper.c
@@ -18,13 +18,8 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "cpu.h"
 #include "gdbstub.h"
-#include "qemu-common.h"
 #include "qemu-timer.h"
 #ifndef CONFIG_USER_ONLY
 #include "sysemu.h"

diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index ee156721857d089e2538e20263e94450a4df4f38..71f9dcdff5de268f1098dc7a55826976a030e55d 100644 (file)
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -17,11 +17,6 @@
  * 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 <inttypes.h>
 
 /* #define DEBUG_ILLEGAL_INSTRUCTIONS */
 /* #define DEBUG_INLINE_BRANCHES */