[Qemu-devel] [PATCH 32/37] moxie: Clean up includes

[Peter Maydell]

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 <address@hidden>
---
 disas/moxie.c            | 2 +-
 hw/moxie/moxiesim.c      | 1 +
 target-moxie/cpu.c       | 1 +
 target-moxie/helper.c    | 4 +---
 target-moxie/machine.c   | 1 +
 target-moxie/mmu.c       | 5 +----
 target-moxie/translate.c | 6 +-----
 7 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/disas/moxie.c b/disas/moxie.c
index 4c5f180..70b49ed 100644
--- a/disas/moxie.c
+++ b/disas/moxie.c
@@ -14,7 +14,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"
 #define STATIC_TABLE
 #define DEFINE_TABLE
 
diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
index ada3d58..9191ae9 100644
--- a/hw/moxie/moxiesim.c
+++ b/hw/moxie/moxiesim.c
@@ -24,6 +24,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/hw.h"
 #include "hw/i386/pc.h"
diff --git a/target-moxie/cpu.c b/target-moxie/cpu.c
index 0c60c65..b33c2b3 100644
--- a/target-moxie/cpu.c
+++ b/target-moxie/cpu.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "qemu-common.h"
 #include "migration/vmstate.h"
diff --git a/target-moxie/helper.c b/target-moxie/helper.c
index f91ac28..d51e9b9 100644
--- a/target-moxie/helper.c
+++ b/target-moxie/helper.c
@@ -17,10 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <string.h>
+#include "qemu/osdep.h"
 
-#include "config.h"
 #include "cpu.h"
 #include "mmu.h"
 #include "exec/exec-all.h"
diff --git a/target-moxie/machine.c b/target-moxie/machine.c
index b9316f0..912b791 100644
--- a/target-moxie/machine.c
+++ b/target-moxie/machine.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/boards.h"
 #include "machine.h"
diff --git a/target-moxie/mmu.c b/target-moxie/mmu.c
index 5217eed..9203330 100644
--- a/target-moxie/mmu.c
+++ b/target-moxie/mmu.c
@@ -17,11 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include "qemu/osdep.h"
 
-#include "config.h"
 #include "cpu.h"
 #include "mmu.h"
 #include "exec/exec-all.h"
diff --git a/target-moxie/translate.c b/target-moxie/translate.c
index 6dedcb7..229ce3b 100644
--- a/target-moxie/translate.c
+++ b/target-moxie/translate.c
@@ -21,11 +21,7 @@
  *    http://moxielogic.org/wiki
  */
 
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
+#include "qemu/osdep.h"
 
 #include "cpu.h"
 #include "exec/exec-all.h"
-- 
1.9.1