sh4: 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.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1453832250-766-28-git-send-email-peter.maydell@linaro.org

diff --git a/disas/sh4.c b/disas/sh4.c
index 020f5ebb7bfb437300b1ffbd0f3cbd0360aa698e..8b0415dfe9b538fe5e61c77954444819e51abb15 100644 (file)
--- a/disas/sh4.c
+++ b/disas/sh4.c
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
-#include <stdio.h>
+#include "qemu/osdep.h"
 #include "disas/bfd.h"
 
 #define DEFINE_TABLE

diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index c1ff9a0cff0aaf368cb4cd3d819e936b229528ab..7d9a1cd822bc5a88f5ff78d25394d9c5b633229f 100644 (file)
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -23,6 +23,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/hw.h"
 #include "hw/sh4/sh.h"

diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c
index 5dda5de34e452a1e1e1388270cec80e3e5f3c136..a1ea760f68abba5d50587c0614c3d61700753faf 100644 (file)
--- a/hw/sh4/sh7750.c
+++ b/hw/sh4/sh7750.c
@@ -22,7 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <stdio.h>
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sh4/sh.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/sh4/sh7750_regnames.c b/hw/sh4/sh7750_regnames.c
index 52ac1cc781b5358d923d7bf02ed27cbf298e89a8..34b4f99b86aeefd77285a451b5856f663b7b854a 100644 (file)
--- a/hw/sh4/sh7750_regnames.c
+++ b/hw/sh4/sh7750_regnames.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sh4/sh.h"
 #include "sh7750_regs.h"

diff --git a/hw/sh4/sh_pci.c b/hw/sh4/sh_pci.c
index 4509053e1f8bf2d9cf7b0134f8afe981c5444d68..e820a323071ca034845541a0bffdc83c35d479c8 100644 (file)
--- a/hw/sh4/sh_pci.c
+++ b/hw/sh4/sh_pci.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/sh4/sh.h"
 #include "hw/pci/pci.h"

diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c
index d508be958846bab22cb0c36ffec198912ba6f03c..386a4854ea45b85d1845f1f5b4a39f4145f0f190 100644 (file)
--- a/hw/sh4/shix.c
+++ b/hw/sh4/shix.c
@@ -27,6 +27,7 @@
 
    More information in target-sh4/README.sh4
 */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sh4/sh.h"
 #include "sysemu/sysemu.h"

diff --git a/target-sh4/cpu.c b/target-sh4/cpu.c
index d7e2fbd0edcd769f2aa845d262143c22275c6a8d..8621d70d4dab5088e4f1c0be33e88cd0d48f3be3 100644 (file)
--- a/target-sh4/cpu.c
+++ b/target-sh4/cpu.c
@@ -19,6 +19,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-sh4/gdbstub.c b/target-sh4/gdbstub.c
index a365a27aad421691257729186a27e4823a47194e..1b59ea8c7393edc3e7c1a11fb7d59eb1dd6afc15 100644 (file)
--- a/target-sh4/gdbstub.c
+++ b/target-sh4/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-sh4/helper.c b/target-sh4/helper.c
index eaececd89494311fb01b9e84e4e20350fdbbad02..9d8b61cce6bff3e29a973bf3481d50fe80c8b138 100644 (file)
--- a/target-sh4/helper.c
+++ b/target-sh4/helper.c
@@ -16,11 +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 <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
+#include "qemu/osdep.h"
 
 #include "cpu.h"
 

diff --git a/target-sh4/monitor.c b/target-sh4/monitor.c
index a06f0d46d8b76bf49f2447ce3cdd07843a6b6c6d..426e5d491493e15310b41b741818985aa8fefa83 100644 (file)
--- a/target-sh4/monitor.c
+++ b/target-sh4/monitor.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "monitor/monitor.h"
 #include "monitor/hmp-target.h"

diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c
index a3121180dceca91718d27e8638ce082dbbf9f651..368e687d68577c8a66dd716b71e89bca9d9e4b44 100644 (file)
--- a/target-sh4/op_helper.c
+++ b/target-sh4/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 "exec/helper-proto.h"
 #include "exec/cpu_ldst.h"

diff --git a/target-sh4/translate.c b/target-sh4/translate.c
index 7bc621649a56d3392199e65fcb86ab516e345961..9de5659cf73f9f9e85fb379919cd63d6d863933c 100644 (file)
--- a/target-sh4/translate.c
+++ b/target-sh4/translate.c
@@ -19,6 +19,7 @@
 
 #define DEBUG_DISAS
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "disas/disas.h"
 #include "tcg-op.h"