[30/37] m68k: Clean up includes

Commit Message

Peter Maydell Jan. 26, 2016, 6:17 p.m. UTC

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.

Signed-off-by: Peter Maydell <[e-mail]>
---
 hw/m68k/an5206.c        |  1 +
 hw/m68k/dummy_m68k.c    |  1 +
 hw/m68k/mcf5206.c       |  1 +
 hw/m68k/mcf5208.c       |  1 +
 hw/m68k/mcf_intc.c      |  1 +
 target-m68k/cpu.c       |  1 +
 target-m68k/gdbstub.c   |  2 +-
 target-m68k/helper.c    |  1 +
 target-m68k/m68k-semi.c | 10 +---------
 target-m68k/op_helper.c |  1 +
 target-m68k/translate.c |  1 +
 11 files changed, 11 insertions(+), 10 deletions(-)

Patch

diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c
index 8d9ccaa..d87b945 100644
--- a/hw/m68k/an5206.c
+++ b/hw/m68k/an5206.c
@@ -6,6 +6,7 @@ 
  * This code is licensed under the GPL
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/m68k/mcf.h"
 #include "hw/boards.h"
diff --git a/hw/m68k/dummy_m68k.c b/hw/m68k/dummy_m68k.c
index 8b3b775..a213bcf 100644
--- a/hw/m68k/dummy_m68k.c
+++ b/hw/m68k/dummy_m68k.c
@@ -6,6 +6,7 @@ 
  * This code is licensed under the GPL
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/boards.h"
 #include "hw/loader.h"
diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c
index 1727a46..7fd3275 100644
--- a/hw/m68k/mcf5206.c
+++ b/hw/m68k/mcf5206.c
@@ -5,6 +5,7 @@ 
  *
  * This code is licensed under the GPL
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/m68k/mcf.h"
 #include "qemu/timer.h"
diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index ddeccc5..9597e86 100644
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -5,6 +5,7 @@ 
  *
  * This code is licensed under the GPL
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/m68k/mcf.h"
 #include "qemu/timer.h"
diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c
index f13c7f3..ff95513 100644
--- a/hw/m68k/mcf_intc.c
+++ b/hw/m68k/mcf_intc.c
@@ -5,6 +5,7 @@ 
  *
  * This code is licensed under the GPL
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/m68k/mcf.h"
 #include "exec/address-spaces.h"
diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c
index e8a4eed..6de74bf 100644
--- a/target-m68k/cpu.c
+++ b/target-m68k/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 "migration/vmstate.h"
diff --git a/target-m68k/gdbstub.c b/target-m68k/gdbstub.c
index ae8179c..f02bb5c 100644
--- a/target-m68k/gdbstub.c
+++ b/target-m68k/gdbstub.c
@@ -17,7 +17,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 "config.h"
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "exec/gdbstub.h"
 
diff --git a/target-m68k/helper.c b/target-m68k/helper.c
index 77225a2..a8f6d9d 100644
--- a/target-m68k/helper.c
+++ b/target-m68k/helper.c
@@ -18,6 +18,7 @@ 
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/gdbstub.h"
 
diff --git a/target-m68k/m68k-semi.c b/target-m68k/m68k-semi.c
index 9dffe8d..f360ef3 100644
--- a/target-m68k/m68k-semi.c
+++ b/target-m68k/m68k-semi.c
@@ -17,15 +17,7 @@ 
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/time.h>
-#include <time.h>
+#include "qemu/osdep.h"
 
 #include "cpu.h"
 #if defined(CONFIG_USER_ONLY)
diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c
index 1af0ca6..17d0a11 100644
--- a/target-m68k/op_helper.c
+++ b/target-m68k/op_helper.c
@@ -16,6 +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 "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "exec/cpu_ldst.h"
diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index 41ae2c6..342c040 100644
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -18,6 +18,7 @@ 
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "disas/disas.h"
 #include "tcg-op.h"