x86: 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-11-git-send-email-peter.maydell@linaro.org
2016-01-26 18:17:03 +00:00 · 2016-01-26 18:17:03 +00:00 · b6a0aa0537
parent d39594e9d9
commit b6a0aa0537
75 changed files with 75 additions and 24 deletions
--- a/hw/acpi/acpi_interface.c
+++ b/hw/acpi/acpi_interface.c
@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "hw/acpi/acpi_dev_interface.h"
 #include "qemu/module.h"

--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@ -19,12 +19,8 @@
 * with this program; if not, see <http://www.gnu.org/licenses/>.
 */

+#include "qemu/osdep.h"
 #include <glib/gprintf.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <stdbool.h>
-#include <string.h>
 #include "hw/acpi/aml-build.h"
 #include "qemu/bswap.h"
 #include "qemu/bitops.h"
--- a/hw/acpi/bios-linker-loader.c
+++ b/hw/acpi/bios-linker-loader.c
@ -18,6 +18,7 @@
 * with this program; if not, see <http://www.gnu.org/licenses/>.
 */

+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/acpi/bios-linker-loader.h"
 #include "hw/nvram/fw_cfg.h"
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@ -18,6 +18,7 @@
 * Contributions after 2012-01-13 are licensed under the terms of the
 * GNU GPL, version 2 or (at your option) any later version.
 */
+#include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
--- a/hw/acpi/cpu_hotplug.c
+++ b/hw/acpi/cpu_hotplug.c
@ -9,6 +9,7 @@
 * This work is licensed under the terms of the GNU GPL, version 2 or later.
 * See the COPYING file in the top-level directory.
 */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/acpi/cpu_hotplug.h"

--- a/hw/acpi/cpu_hotplug_acpi_table.c
+++ b/hw/acpi/cpu_hotplug_acpi_table.c
@ -13,6 +13,7 @@
 * with this program; if not, see <http://www.gnu.org/licenses/>.
 */

+#include "qemu/osdep.h"
 #include "hw/acpi/cpu_hotplug.h"

 void build_cpu_hotplug_aml(Aml *ctx)
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@ -23,6 +23,7 @@
 * Contributions after 2012-01-13 are licensed under the terms of the
 * GNU GPL, version 2 or (at your option) any later version.
 */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "qapi/visitor.h"
 #include "hw/i386/pc.h"
--- a/hw/acpi/memory_hotplug.c
+++ b/hw/acpi/memory_hotplug.c
@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "hw/acpi/memory_hotplug.h"
 #include "hw/acpi/pc-hotplug.h"
 #include "hw/mem/pc-dimm.h"
--- a/hw/acpi/memory_hotplug_acpi_table.c
+++ b/hw/acpi/memory_hotplug_acpi_table.c
@ -9,7 +9,7 @@
 * See the COPYING file in the top-level directory.
 */

-#include <stdbool.h>
+#include "qemu/osdep.h"
 #include "hw/acpi/memory_hotplug.h"
 #include "include/hw/acpi/pc-hotplug.h"
 #include "hw/boards.h"
--- a/hw/acpi/nvdimm.c
+++ b/hw/acpi/nvdimm.c
@ -26,6 +26,7 @@
 * License along with this library; if not, see <http://www.gnu.org/licenses/>
 */

+#include "qemu/osdep.h"
 #include "hw/acpi/acpi.h"
 #include "hw/acpi/aml-build.h"
 #include "hw/mem/nvdimm.h"
--- a/hw/acpi/pcihp.c
+++ b/hw/acpi/pcihp.c
@ -24,6 +24,7 @@
 * GNU GPL, version 2 or (at your option) any later version.
 */

+#include "qemu/osdep.h"
 #include "hw/acpi/pcihp.h"

 #include "hw/hw.h"
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@ -18,6 +18,7 @@
 * Contributions after 2012-01-13 are licensed under the terms of the
 * GNU GPL, version 2 or (at your option) any later version.
 */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/isa/apm.h"
--- a/hw/acpi/tco.c
+++ b/hw/acpi/tco.c
@ -6,6 +6,7 @@
 * This work is licensed under the terms of the GNU GPL, version 2 or later.
 * See the COPYING file in the top-level directory.
 */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/watchdog.h"
 #include "hw/i386/ich9.h"
--- a/hw/char/debugcon.c
+++ b/hw/char/debugcon.c
@ -24,6 +24,7 @@
 * THE SOFTWARE.
 */

+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "sysemu/char.h"
 #include "hw/isa/isa.h"
--- a/hw/char/parallel.c
+++ b/hw/char/parallel.c
@ -22,6 +22,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "sysemu/char.h"
 #include "hw/isa/isa.h"
--- a/hw/char/serial-isa.c
+++ b/hw/char/serial-isa.c
@ -23,6 +23,7 @@
 * THE SOFTWARE.
 */

+#include "qemu/osdep.h"
 #include "hw/char/serial.h"
 #include "hw/isa/isa.h"

--- a/hw/char/serial-pci.c
+++ b/hw/char/serial-pci.c
@ -25,6 +25,7 @@

 /* see docs/specs/pci-serial.txt */

+#include "qemu/osdep.h"
 #include "hw/char/serial.h"
 #include "hw/pci/pci.h"

--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@ -23,6 +23,7 @@
 * THE SOFTWARE.
 */

+#include "qemu/osdep.h"
 #include "hw/char/serial.h"
 #include "sysemu/char.h"
 #include "qemu/timer.h"
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.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/hw.h"
 #include "hw/isa/isa.h"
 #include "qemu/main-loop.h"
--- a/hw/i2c/pm_smbus.c
+++ b/hw/i2c/pm_smbus.c
@ -17,6 +17,7 @@
 * License along with this library; if not, see
 * <http://www.gnu.org/licenses/>.
 */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/i2c/pm_smbus.h"
--- a/hw/i2c/smbus_ich9.c
+++ b/hw/i2c/smbus_ich9.c
@ -24,6 +24,7 @@
 * GNU GPL, version 2 or (at your option) any later version.
 *
 */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/i2c/pm_smbus.h"
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@ -20,12 +20,11 @@
 * with this program; if not, see <http://www.gnu.org/licenses/>.
 */

+#include "qemu/osdep.h"
 #include "acpi-build.h"
-#include <stddef.h>
 #include <glib.h>
 #include "qemu-common.h"
 #include "qemu/bitmap.h"
-#include "qemu/osdep.h"
 #include "qemu/error-report.h"
 #include "hw/pci/pci.h"
 #include "qom/cpu.h"
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@ -19,6 +19,7 @@
 * with this program; if not, see <http://www.gnu.org/licenses/>.
 */

+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "exec/address-spaces.h"
 #include "intel_iommu_internal.h"
--- a/hw/i386/kvm/apic.c
+++ b/hw/i386/kvm/apic.c
@ -9,6 +9,7 @@
 * This work is licensed under the terms of the GNU GPL version 2.
 * See the COPYING file in the top-level directory.
 */
+#include "qemu/osdep.h"
 #include "hw/i386/apic_internal.h"
 #include "hw/pci/msi.h"
 #include "sysemu/kvm.h"
--- a/hw/i386/kvm/clock.c
+++ b/hw/i386/kvm/clock.c
@ -13,6 +13,7 @@
 * GNU GPL, version 2 or (at your option) any later version.
 */

+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/host-utils.h"
 #include "sysemu/sysemu.h"
--- a/hw/i386/kvm/i8254.c
+++ b/hw/i386/kvm/i8254.c
@ -22,6 +22,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 */
+#include "qemu/osdep.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "hw/timer/i8254.h"
--- a/hw/i386/kvm/i8259.c
+++ b/hw/i386/kvm/i8259.c
@ -9,6 +9,7 @@
 * This work is licensed under the terms of the GNU GPL version 2.
 * See the COPYING file in the top-level directory.
 */
+#include "qemu/osdep.h"
 #include "hw/isa/i8259_internal.h"
 #include "hw/i386/apic_internal.h"
 #include "sysemu/kvm.h"
--- a/hw/i386/kvm/ioapic.c
+++ b/hw/i386/kvm/ioapic.c
@ -10,6 +10,7 @@
 * See the COPYING file in the top-level directory.
 */

+#include "qemu/osdep.h"
 #include "monitor/monitor.h"
 #include "hw/i386/pc.h"
 #include "hw/i386/ioapic_internal.h"
--- a/hw/i386/kvm/pci-assign.c
+++ b/hw/i386/kvm/pci-assign.c
@ -20,11 +20,8 @@
 *  Copyright (C) 2008, Red Hat, Amit Shah (amit.shah@redhat.com)
 *  Copyright (C) 2008, IBM, Muli Ben-Yehuda (muli@il.ibm.com)
 */
-#include <stdio.h>
-#include <unistd.h>
+#include "qemu/osdep.h"
 #include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "qemu/error-report.h"
--- a/hw/i386/kvmvapic.c
+++ b/hw/i386/kvmvapic.c
@ -8,6 +8,7 @@
 * (at your option) any later version. See the COPYING file in the
 * top-level directory.
 */
+#include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/cpus.h"
 #include "sysemu/kvm.h"
--- a/hw/i386/multiboot.c
+++ b/hw/i386/multiboot.c
@ -22,6 +22,7 @@
 * THE SOFTWARE.
 */

+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/nvram/fw_cfg.h"
 #include "multiboot.h"
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.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/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/char/serial.h"
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@ -22,6 +22,7 @@
 * THE SOFTWARE.
 */

+#include "qemu/osdep.h"
 #include <glib.h>

 #include "hw/hw.h"
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@ -27,6 +27,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/loader.h"
 #include "sysemu/arch_init.h"
--- a/hw/i386/pc_sysfw.c
+++ b/hw/i386/pc_sysfw.c
@ -23,6 +23,7 @@
 * THE SOFTWARE.
 */

+#include "qemu/osdep.h"
 #include "sysemu/block-backend.h"
 #include "qemu/error-report.h"
 #include "hw/sysbus.h"
--- a/hw/i386/pci-assign-load-rom.c
+++ b/hw/i386/pci-assign-load-rom.c
@ -1,10 +1,7 @@
 /*
 * This is splited from hw/i386/kvm/pci-assign.c
 */
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "qemu/error-report.h"
--- a/hw/i386/xen/xen_apic.c
+++ b/hw/i386/xen/xen_apic.c
@ -9,6 +9,7 @@
 * This work is licensed under the terms of the GNU GPL version 2 or
 * later. See the COPYING file in the top-level directory.
 */
+#include "qemu/osdep.h"
 #include "hw/i386/apic_internal.h"
 #include "hw/pci/msi.h"
 #include "hw/xen/xen.h"
--- a/hw/i386/xen/xen_platform.c
+++ b/hw/i386/xen/xen_platform.c
@ -23,6 +23,7 @@
 * THE SOFTWARE.
 */

+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/ide.h"
--- a/hw/i386/xen/xen_pvdevice.c
+++ b/hw/i386/xen/xen_pvdevice.c
@ -29,6 +29,7 @@
 * SUCH DAMAGE.
 */

+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "trace.h"
--- a/hw/intc/apic.c
+++ b/hw/intc/apic.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 "qemu/thread.h"
 #include "hw/i386/apic_internal.h"
 #include "hw/i386/apic.h"
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@ -17,6 +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 "qemu/osdep.h"
 #include "hw/i386/apic.h"
 #include "hw/i386/apic_internal.h"
 #include "trace.h"
--- a/hw/intc/ioapic.c
+++ b/hw/intc/ioapic.c
@ -20,6 +20,7 @@
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */

+#include "qemu/osdep.h"
 #include "monitor/monitor.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
--- a/hw/intc/ioapic_common.c
+++ b/hw/intc/ioapic_common.c
@ -19,6 +19,7 @@
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */

+#include "qemu/osdep.h"
 #include "monitor/monitor.h"
 #include "hw/i386/ioapic.h"
 #include "hw/i386/ioapic_internal.h"
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@ -27,6 +27,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/hw.h"
 #include "qapi/visitor.h"
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@ -22,6 +22,7 @@
 * THE SOFTWARE.
 */

+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
--- a/hw/misc/debugexit.c
+++ b/hw/misc/debugexit.c
@ -7,6 +7,7 @@
 * (at your option) any later version.
 */

+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/isa/isa.h"

--- a/hw/misc/pc-testdev.c
+++ b/hw/misc/pc-testdev.c
@ -35,7 +35,7 @@
 * git://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git
 */

-#include "config-host.h"
+#include "qemu/osdep.h"
 #if defined(CONFIG_POSIX)
 #include <sys/mman.h>
 #endif
--- a/hw/misc/sga.c
+++ b/hw/misc/sga.c
@ -24,6 +24,7 @@
 * sgabios code originally available at code.google.com/p/sgabios
 *
 */
+#include "qemu/osdep.h"
 #include "hw/pci/pci.h"
 #include "hw/i386/pc.h"
 #include "hw/loader.h"
--- a/hw/pci-host/pam.c
+++ b/hw/pci-host/pam.c
@ -27,6 +27,7 @@
 * THE SOFTWARE.
 */

+#include "qemu/osdep.h"
 #include "qom/object.h"
 #include "sysemu/sysemu.h"
 #include "hw/pci-host/pam.h"
--- a/hw/pci-host/piix.c
+++ b/hw/pci-host/piix.c
@ -22,6 +22,7 @@
 * THE SOFTWARE.
 */

+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@ -27,6 +27,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci-host/q35.h"
 #include "qapi/visitor.h"
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@ -24,6 +24,7 @@
 * This driver attempts to emulate an HPET device in software.
 */

+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "ui/console.h"
--- a/hw/timer/i8254.c
+++ b/hw/timer/i8254.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/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/isa/isa.h"
--- a/hw/timer/i8254_common.c
+++ b/hw/timer/i8254_common.c
@ -22,6 +22,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/isa/isa.h"
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.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/hw.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
--- a/target-i386/arch_dump.c
+++ b/target-i386/arch_dump.c
@ -11,6 +11,7 @@
 *
 */

+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/cpu-all.h"
 #include "sysemu/dump.h"
--- a/target-i386/arch_memory_mapping.c
+++ b/target-i386/arch_memory_mapping.c
@ -11,6 +11,7 @@
 *
 */

+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/cpu-all.h"
 #include "sysemu/memory_mapping.h"
--- a/target-i386/bpt_helper.c
+++ b/target-i386/bpt_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"

--- a/target-i386/cc_helper.c
+++ b/target-i386/cc_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"

--- a/target-i386/excp_helper.c
+++ b/target-i386/excp_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 "qemu/log.h"
 #include "sysemu/sysemu.h"
--- a/target-i386/fpu_helper.c
+++ b/target-i386/fpu_helper.c
@ -17,6 +17,7 @@
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */

+#include "qemu/osdep.h"
 #include <math.h>
 #include "cpu.h"
 #include "exec/helper-proto.h"
--- a/target-i386/gdbstub.c
+++ b/target-i386/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"

--- a/target-i386/helper.c
+++ b/target-i386/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 "sysemu/kvm.h"
 #include "kvm_i386.h"
--- a/target-i386/hyperv.c
+++ b/target-i386/hyperv.c
@ -11,6 +11,7 @@
 *
 */

+#include "qemu/osdep.h"
 #include "hyperv.h"
 #include "standard-headers/asm-x86/hyperv.h"

--- a/target-i386/int_helper.c
+++ b/target-i386/int_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 "qemu/host-utils.h"
 #include "exec/helper-proto.h"
--- a/target-i386/kvm-stub.c
+++ b/target-i386/kvm-stub.c
@ -9,6 +9,7 @@
 * See the COPYING file in the top-level directory.
 *
 */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "kvm_i386.h"

--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@ -12,7 +12,7 @@
 *
 */

-#include <sys/types.h>
+#include "qemu/osdep.h"
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/utsname.h>
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/boards.h"
 #include "hw/i386/pc.h"
--- a/target-i386/mem_helper.c
+++ b/target-i386/mem_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 "exec/cpu_ldst.h"
--- a/target-i386/misc_helper.c
+++ b/target-i386/misc_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 "exec/cpu_ldst.h"
--- a/target-i386/monitor.c
+++ b/target-i386/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"
--- a/target-i386/seg_helper.c
+++ b/target-i386/seg_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 "qemu/log.h"
 #include "exec/helper-proto.h"
--- a/target-i386/smm_helper.c
+++ b/target-i386/smm_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"

--- a/target-i386/svm_helper.c
+++ b/target-i386/svm_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/cpu-all.h"
 #include "exec/helper-proto.h"
--- a/target-i386/translate.c
+++ b/target-i386/translate.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 "qemu/host-utils.h"
 #include "cpu.h"