all: 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: 1454089805-5470-16-git-send-email-peter.maydell@linaro.org

diff --git a/accel.c b/accel.c
index 74e41daaa5d86de944ba1a913ce7d7fe5d878b6d..0510b90f679da6fb84ae28ddde33396a5a770552 100644 (file)
--- a/accel.c
+++ b/accel.c
@@ -23,6 +23,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/accel.h"
 #include "hw/boards.h"
 #include "qemu-common.h"

diff --git a/aio-posix.c b/aio-posix.c
index 482b31650203b3ab3e25cc2d652b64274030012c..fa7f8ab2a5a1c59f2aa72690c451ce6af53d6b51 100644 (file)
--- a/aio-posix.c
+++ b/aio-posix.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 "block/block.h"
 #include "qemu/queue.h"

diff --git a/aio-win32.c b/aio-win32.c
index cdc445608baddeea4ed1499a827052a454ddbced..6aaa32a147c1ab8df3d7634db38f36b3b808ce81 100644 (file)
--- a/aio-win32.c
+++ b/aio-win32.c
@@ -15,6 +15,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/block.h"
 #include "qemu/queue.h"

diff --git a/arch_init.c b/arch_init.c
index d1383b3c43d02e456313eeaa3c4a83e16e32c4bb..f6aba02cb259e7260d83b39ed275b39224027f0a 100644 (file)
--- a/arch_init.c
+++ b/arch_init.c
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <stdint.h>
+#include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/arch_init.h"
 #include "hw/pci/pci.h"

diff --git a/async.c b/async.c
index e106072a44dfea02c67fdf7f5943fab29e609ca5..d4dd2cc799283ecbbcad2ddd3a271e77685863dc 100644 (file)
--- a/async.c
+++ b/async.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/aio.h"
 #include "block/thread-pool.h"

diff --git a/balloon.c b/balloon.c
index 0f45d1b5c4cef4401062f1518144d404408e3c46..f2ef50cf77cb0d59e6902b3f77869eb5f5cfd3df 100644 (file)
--- a/balloon.c
+++ b/balloon.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "exec/cpu-common.h"
 #include "sysemu/kvm.h"

diff --git a/block.c b/block.c
index dff3a3a3f90e86ac0334a99e534964c73d7cac08..efc3c43f891111167bc527d4144535a947d2b9b4 100644 (file)
--- a/block.c
+++ b/block.c
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "config-host.h"
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "trace.h"
 #include "block/block_int.h"
@@ -42,8 +42,6 @@
 #include "block/throttle-groups.h"
 
 #ifdef CONFIG_BSD
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/queue.h>
 #ifndef __DragonFly__

diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index 9d6a21c33d9c6ccadb5ca2765c9f4604a4312d90..efc31a462ced70118eeddd825a160e8e970cef4f 100644 (file)
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@@ -9,6 +9,7 @@
  * later.  See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/block-backend.h"
 #include "hw/block/block.h"

diff --git a/blockdev.c b/blockdev.c
index be4ca44ab2463fc96089e6afdaf619e23bf7852a..e1b6b0f0e1fad9733201b2d887b23a953727b81a 100644 (file)
--- a/blockdev.c
+++ b/blockdev.c
@@ -30,6 +30,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "hw/block/block.h"

diff --git a/blockjob.c b/blockjob.c
index a69214254c7b8baa480b86a26e4882e6c9017d50..a4021818354c09635c4d086df4cd049a16b7d4e5 100644 (file)
--- a/blockjob.c
+++ b/blockjob.c
@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  */
 
-#include "config-host.h"
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "trace.h"
 #include "block/block.h"

diff --git a/bootdevice.c b/bootdevice.c
index 3cdc0d7b2249f73804055a767906462b6980532b..1ee7b117dee1188260ecc0ea2cdea792f492cc35 100644 (file)
--- a/bootdevice.c
+++ b/bootdevice.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "qapi/visitor.h"
 #include "qemu/error-report.h"

diff --git a/bt-host.c b/bt-host.c
index 49205bf288cf2441b1a78486c1593c8c576c1967..2f8f631c2528a866e4fb9bbb5d7876b9889750d2 100644 (file)
--- a/bt-host.c
+++ b/bt-host.c
@@ -17,12 +17,12 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/bt.h"
 #include "qemu/main-loop.h"
 
 #ifndef _WIN32
-# include <errno.h>
 # include <sys/ioctl.h>
 # include <sys/uio.h>
 # ifdef CONFIG_BLUEZ

diff --git a/bt-vhci.c b/bt-vhci.c
index e267c8ad15a2140c6962f417ca0be6fb7d514dfe..9d277c32bf0c274f7340d53916337e9a43b9e276 100644 (file)
--- a/bt-vhci.c
+++ b/bt-vhci.c
@@ -17,6 +17,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/bt.h"
 #include "hw/bt.h"

diff --git a/device-hotplug.c b/device-hotplug.c
index 68b94967c52288a576dc944acfe8b3ad8c639498..9a7cd669d5bedbf7114fe8ab6715e0f0718410ed 100644 (file)
--- a/device-hotplug.c
+++ b/device-hotplug.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/boards.h"
 #include "sysemu/block-backend.h"

diff --git a/device_tree.c b/device_tree.c
index a9f5f8e598d334f796fe250742e967b6f9b34424..b1ad836073786c903dae631c6bccee685cf2ce08 100644 (file)
--- a/device_tree.c
+++ b/device_tree.c
@@ -11,12 +11,7 @@
  *
  */
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
+#include "qemu/osdep.h"
 
 #include "qemu-common.h"
 #include "qemu/error-report.h"

diff --git a/disas.c b/disas.c
index 4e119449e8d63c31289f72f19fa7f21babe4e8ba..05a7a1260acbf389e08521927fae8bcde420dcad 100644 (file)
--- a/disas.c
+++ b/disas.c
@@ -1,9 +1,8 @@
 /* General "disassemble this chunk" code.  Used for debugging. */
-#include "config.h"
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "disas/bfd.h"
 #include "elf.h"
-#include <errno.h>
 
 #include "cpu.h"
 #include "disas/disas.h"

diff --git a/dma-helpers.c b/dma-helpers.c
index 4faec5d0cac345400db06f3223ae5c846d60e5cc..4ad0bca67e7824582cc34975f2f8c159cde02ec5 100644 (file)
--- a/dma-helpers.c
+++ b/dma-helpers.c
@@ -7,6 +7,7 @@
  * (GNU GPL), version 2 or later.
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/dma.h"
 #include "trace.h"

diff --git a/dump.c b/dump.c
index 2d4892bec2672a33b68ffb02f9dab778d0398950..96e1fc15de01f730532845b5b03f7109de3da644 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "elf.h"
 #include "cpu.h"
@@ -22,7 +23,6 @@
 #include "sysemu/sysemu.h"
 #include "sysemu/memory_mapping.h"
 #include "sysemu/cpus.h"
-#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qmp-commands.h"
 

diff --git a/fpu/softfloat.c b/fpu/softfloat.c
index 162c21122cdccf69ddfc525edfca83839e7e83af..cfa9787d8d47b684f2902b9fd15d989ae5f098e6 100644 (file)
--- a/fpu/softfloat.c
+++ b/fpu/softfloat.c
@@ -82,12 +82,11 @@ this code that are retained.
 /* softfloat (and in particular the code in softfloat-specialize.h) is
  * target-dependent and needs the TARGET_* macros.
  */
-#include "config.h"
+#include "qemu/osdep.h"
 
 #include "fpu/softfloat.h"
 
 /* We only need stdlib for abort() */
-#include <stdlib.h>
 
 /*----------------------------------------------------------------------------
 | Primitive arithmetic functions, including multi-word arithmetic, and

diff --git a/gdbstub.c b/gdbstub.c
index 59d16506c52c82bd9954231a893c517aab95ac6b..61c12b168e7e4cb3845e70055ececf963caa6550 100644 (file)
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -16,16 +16,9 @@
  * 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"
 #ifdef CONFIG_USER_ONLY
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
 
 #include "qemu.h"
 #else

diff --git a/hmp.c b/hmp.c
index 9c571f50a8ce6c758154cdea81973fef50f3c594..cb03a156d2adb8a4b2d1ecf48ebc9b42535ad9d7 100644 (file)
--- a/hmp.c
+++ b/hmp.c
@@ -13,6 +13,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "hmp.h"
 #include "net/net.h"
 #include "net/eth.h"

diff --git a/iohandler.c b/iohandler.c
index eb680835597532279de2e2d7e1464d699b6fafee..0abb4a7e7a5c4c298cdd686aba78094bbd3b98b4 100644 (file)
--- a/iohandler.c
+++ b/iohandler.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "config-host.h"
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/queue.h"
 #include "block/aio.h"

diff --git a/ioport.c b/ioport.c
index 193ef7685cf5233d41bb54d0915b31cfede5596f..7a84d5444ea72b9609ee043ad01b5b134e1b39ac 100644 (file)
--- a/ioport.c
+++ b/ioport.c
@@ -25,6 +25,7 @@
  * splitted out ioport related stuffs from vl.c.
  */
 
+#include "qemu/osdep.h"
 #include "exec/ioport.h"
 #include "trace.h"
 #include "exec/memory.h"

diff --git a/iothread.c b/iothread.c
index 1b8c2bbecbf61e6186027fedbe265b1ee097e1d8..f183d380e6a440e3c8846a1ac38fab5bc3c94866 100644 (file)
--- a/iothread.c
+++ b/iothread.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qom/object.h"
 #include "qom/object_interfaces.h"
 #include "qemu/module.h"

diff --git a/kvm-all.c b/kvm-all.c
index 914888992119783d47fa69db80a5251cf623028e..9cc9ba6ea6fdfaee58b56e84b7c5fee0068e1546 100644 (file)
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -13,10 +13,9 @@
  *
  */
 
-#include <sys/types.h>
+#include "qemu/osdep.h"
 #include <sys/ioctl.h>
 #include <sys/mman.h>
-#include <stdarg.h>
 
 #include <linux/kvm.h>
 

diff --git a/kvm-stub.c b/kvm-stub.c
index dc97a5edf1ce58c9284a7b43051e824880319595..b962b24831b7caef46c3d8e50c5703fb345486f4 100644 (file)
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -10,6 +10,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/hw.h"
 #include "cpu.h"

diff --git a/main-loop.c b/main-loop.c
index 58776153872a16c914b027dfeb95bd343289f689..19beae76ad1ab533febfac85d79bd46b9ec38a42 100644 (file)
--- a/main-loop.c
+++ b/main-loop.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "qemu/sockets.h"      // struct in_addr needed for libslirp.h

diff --git a/memory.c b/memory.c
index d2d0a928106672880bbc63f600b605b6586da69d..39c539cd59debe4f8ca791da1725c8f43bce6907 100644 (file)
--- a/memory.c
+++ b/memory.c
@@ -13,6 +13,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"
 #include "exec/ioport.h"
@@ -21,7 +22,6 @@
 #include "qemu/error-report.h"
 #include "qom/object.h"
 #include "trace.h"
-#include <assert.h>
 
 #include "exec/memory-internal.h"
 #include "exec/ram_addr.h"

diff --git a/memory_mapping.c b/memory_mapping.c
index 36d6b26046eef223125bcd2d76e6e360c96a8eb2..04db3ac7faf2caaec260959e7950400a993226d0 100644 (file)
--- a/memory_mapping.c
+++ b/memory_mapping.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
 
 #include "qemu-common.h"

diff --git a/module-common.c b/module-common.c
index 50c67500b11378bf29118cb1680e819aaa14946b..0a3cb8aeab35b78e7d2874a06ad54c7cd6395707 100644 (file)
--- a/module-common.c
+++ b/module-common.c
@@ -1,4 +1,4 @@
-#include "config-host.h"
+#include "qemu/osdep.h"
 #include "qemu/module.h"
 
 void qemu_module_dummy(void)

diff --git a/monitor.c b/monitor.c
index c53a453c7c48b989d44712cb695448f462acbed0..73eac179521c9160204d5b7403802782e53f91b8 100644 (file)
--- a/monitor.c
+++ b/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 <dirent.h>
 #include "hw/hw.h"
 #include "monitor/qdev.h"
@@ -59,7 +60,6 @@
 #include "qapi/qmp/json-streamer.h"
 #include "qapi/qmp/json-parser.h"
 #include <qom/object_interfaces.h>
-#include "qemu/osdep.h"
 #include "cpu.h"
 #include "trace.h"
 #include "trace/control.h"

diff --git a/nbd/client.c b/nbd/client.c
index 83df7ba3788965ea0455ed114cbe3e0ff8602780..f07cb4822da0bcf34cca34b6ddec45dd5df23d67 100644 (file)
--- a/nbd/client.c
+++ b/nbd/client.c
@@ -16,6 +16,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "nbd-internal.h"
 
 static int nbd_errno_to_system_errno(int err)

diff --git a/nbd/common.c b/nbd/common.c
index 7b089b0f3b494b4d5735a5e06c0d7635110b1c6a..178d4a7ff27b18f3c1297ff91bcafdc392f292df 100644 (file)
--- a/nbd/common.c
+++ b/nbd/common.c
@@ -16,6 +16,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "nbd-internal.h"
 
 ssize_t nbd_wr_sync(int fd, void *buffer, size_t size, bool do_read)

diff --git a/nbd/server.c b/nbd/server.c
index 1ec79cf411c0e2cf453bd9629988eb0087fde54a..43135306b4529377b667358b511d8afbeec659bf 100644 (file)
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -16,6 +16,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "nbd-internal.h"
 
 static int system_errno_to_nbd_errno(int err)

diff --git a/numa.c b/numa.c
index 23a5d830243ce1415c11c9158f1722134f13428b..e1a05698a9f8c6b098b01fdeaa7e6cbc0190bafc 100644 (file)
--- a/numa.c
+++ b/numa.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/numa.h"
 #include "exec/cpu-common.h"
 #include "qemu/bitmap.h"

diff --git a/os-posix.c b/os-posix.c
index 87e2a1696de5d29739d9d75551c85de2d37ba645..cce62ed92b37ae35f45809ceda4f160e56826d7a 100644 (file)
--- a/os-posix.c
+++ b/os-posix.c
@@ -23,10 +23,7 @@
  * THE SOFTWARE.
  */
 
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
+#include "qemu/osdep.h"
 #include <sys/wait.h>
 /*needed for MAP_POPULATE before including qemu-options.h */
 #include <sys/mman.h>
@@ -35,7 +32,6 @@
 #include <libgen.h>
 
 /* Needed early for CONFIG_BSD etc. */
-#include "config-host.h"
 #include "sysemu/sysemu.h"
 #include "net/slirp.h"
 #include "qemu-options.h"

diff --git a/os-win32.c b/os-win32.c
index cc09196d8bc17d8bfd8c98f2efe5d7a72b99edda..ae9857448f671e3ea353365f7c033079ace46a1e 100644 (file)
--- a/os-win32.c
+++ b/os-win32.c
@@ -22,14 +22,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include <windows.h>
 #include <mmsystem.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <time.h>
-#include <errno.h>
-#include <sys/time.h>
-#include "config-host.h"
 #include "sysemu/sysemu.h"
 #include "qemu-options.h"
 

diff --git a/page_cache.c b/page_cache.c
index a9eb0769b3077379b231e267bde53ea83cf0159e..cb8a69e964d74c8f847a94268e61dcb03511cec2 100644 (file)
--- a/page_cache.c
+++ b/page_cache.c
@@ -12,13 +12,7 @@
  *
  */
 
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <stdbool.h>
+#include "qemu/osdep.h"
 #include <glib.h>
 
 #include "qemu-common.h"

diff --git a/qdev-monitor.c b/qdev-monitor.c
index 3ce47109e3bd02410bbd80ee860b74f1558e792d..81e3ff34a9a4848f237cdaea6e9046e8d7875c98 100644 (file)
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/qdev.h"
 #include "hw/sysbus.h"
 #include "monitor/monitor.h"

diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c
index 36eb3bcfd6625be5f66ad6c9d1f29f3439edc386..830fb9e269d913adaa9784c7a0c6e1858bf1c253 100644 (file)
--- a/qemu-bridge-helper.c
+++ b/qemu-bridge-helper.c
@@ -13,19 +13,10 @@
  *
  */
 
-#include "config-host.h"
-
-#include <stdio.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <ctype.h>
+#include "qemu/osdep.h"
+
 #include <glib.h>
 
-#include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/un.h>

diff --git a/qemu-char.c b/qemu-char.c
index 1605b30c332205a91f4832f911f9564b0aa3d786..927c47e503c3d4c6e9420131f1cfa2c732223ca1 100644 (file)
--- a/qemu-char.c
+++ b/qemu-char.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 "qemu-common.h"
 #include "monitor/monitor.h"
 #include "sysemu/sysemu.h"
@@ -37,11 +38,6 @@
 #include "io/channel-file.h"
 #include "io/channel-tls.h"
 
-#include <unistd.h>
-#include <fcntl.h>
-#include <time.h>
-#include <errno.h>
-#include <sys/time.h>
 #include <zlib.h>
 
 #ifndef _WIN32
@@ -58,7 +54,6 @@
 #include <netdb.h>
 #include <sys/select.h>
 #ifdef CONFIG_BSD
-#include <sys/stat.h>
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <dev/ppbus/ppi.h>
 #include <dev/ppbus/ppbconf.h>
@@ -72,7 +67,6 @@
 #include <linux/parport.h>
 #endif
 #ifdef __sun__
-#include <sys/stat.h>
 #include <sys/ethernet.h>
 #include <sys/sockio.h>
 #include <netinet/arp.h>

diff --git a/qemu-nbd.c b/qemu-nbd.c
index ede4a54d4ed7f25fb2cedd1b6ac7f6a0b9379e3c..d374015125da1f39fc307bdf230ce0091beccf0f 100644 (file)
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -16,6 +16,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/block-backend.h"
 #include "block/block_int.h"
@@ -27,15 +28,11 @@
 #include "qapi/util.h"
 #include "qapi/qmp/qstring.h"
 
-#include <stdarg.h>
-#include <stdio.h>
 #include <getopt.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
-#include <signal.h>
 #include <libgen.h>
 #include <pthread.h>
 

diff --git a/qemu-seccomp.c b/qemu-seccomp.c
index c831fe83ad50031b96c3a68c9a9c3affcb42318f..2866e3c2a6605d8432d8e0156cd830fccdadaada 100644 (file)
--- a/qemu-seccomp.c
+++ b/qemu-seccomp.c
@@ -12,7 +12,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 <stdio.h>
+#include "qemu/osdep.h"
 #include <seccomp.h>
 #include "sysemu/seccomp.h"
 

diff --git a/qemu-timer.c b/qemu-timer.c
index f16e422837dd996c7dbc56140abfba9501996b7e..e98ecc973381bfd6595430d5f58404d58bb99411 100644 (file)
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qemu/main-loop.h"
 #include "qemu/timer.h"
 #include "sysemu/replay.h"

diff --git a/qjson.c b/qjson.c
index e478802a461f6b5556732d8a07b5066780c1c524..b65ca6ee5ec539fa7b4e0f3d40ebe235e89882af 100644 (file)
--- a/qjson.c
+++ b/qjson.c
@@ -11,8 +11,8 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include <qapi/qmp/qstring.h>
-#include <stdbool.h>
 #include <glib.h>
 #include <qjson.h>
 #include <qemu/module.h>

diff --git a/qmp.c b/qmp.c
index 53affe2cfd468ea93c1e3b5e6df6744d44db71d7..6ae723022eb6c0cf24b46c1f837dd49e3fa1b599 100644 (file)
--- a/qmp.c
+++ b/qmp.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 "monitor/monitor.h"
 #include "sysemu/sysemu.h"

diff --git a/qtest.c b/qtest.c
index 05cefd280072f631ac46a15d27e7732a4150f6e8..58a7732ef3e90c5bf850846054f60dba9e3e4ac2 100644 (file)
--- a/qtest.c
+++ b/qtest.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/qtest.h"
 #include "hw/qdev.h"
 #include "sysemu/char.h"

diff --git a/replay/replay-events.c b/replay/replay-events.c
index 402f644067b76612f7373348a0b0700616b59e88..2628109ed85f8d5e3e45dd78b878d74367767253 100644 (file)
--- a/replay/replay-events.c
+++ b/replay/replay-events.c
@@ -9,6 +9,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "sysemu/replay.h"

diff --git a/replay/replay-input.c b/replay/replay-input.c
index bc15f592dc8a0dc74029d68e702ca29aab00106b..4270ca183701f4a46c4915b9d003a3b941873595 100644 (file)
--- a/replay/replay-input.c
+++ b/replay/replay-input.c
@@ -9,6 +9,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/replay.h"
 #include "replay-internal.h"

diff --git a/replay/replay-internal.c b/replay/replay-internal.c
index 35cff44a36fc391b095bc546db1d2d3dcb146728..5835e8def3b48c353c17128ab5d2e445e30b34d9 100644 (file)
--- a/replay/replay-internal.c
+++ b/replay/replay-internal.c
@@ -9,6 +9,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/replay.h"
 #include "replay-internal.h"

diff --git a/replay/replay-time.c b/replay/replay-time.c
index 6d06951f5ec1570762e916d4c88301a12fd80c44..fffe072c555f641acb4795af890c8f72075b0d29 100644 (file)
--- a/replay/replay-time.c
+++ b/replay/replay-time.c
@@ -9,6 +9,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/replay.h"
 #include "replay-internal.h"

diff --git a/replay/replay.c b/replay/replay.c
index e4673b3d9299bc45848bb1d48f22dc0a3aa44ba5..9cac178697eb7ddc315b3c4d02eb02f3b385b48d 100644 (file)
--- a/replay/replay.c
+++ b/replay/replay.c
@@ -9,6 +9,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/replay.h"
 #include "replay-internal.h"

diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index 8951d7ca3751736bdb796b1d4b05fd3e6ba5bb6e..7c1f4385bf6c0244dfe13db44b02f409d6114ab8 100644 (file)
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -1,11 +1,10 @@
-#include "config-host.h"
+#include "qemu/osdep.h"
 #include "trace.h"
 #include "ui/qemu-spice.h"
 #include "sysemu/char.h"
 #include <spice.h>
 #include <spice/protocol.h>
 
-#include "qemu/osdep.h"
 
 typedef struct SpiceCharDriver {
     CharDriverState*      chr;

diff --git a/tcg-runtime.c b/tcg-runtime.c
index 9daba6945ef01109a43d4e0055211f86a420d42a..ea2ad649cbb51cde2b9ff9c09f8b865e8ab321e5 100644 (file)
--- a/tcg-runtime.c
+++ b/tcg-runtime.c
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <stdint.h>
+#include "qemu/osdep.h"
 #include "qemu/host-utils.h"
 
 /* This file is compiled once, and thus we can't include the standard

diff --git a/tci.c b/tci.c
index b5ed7b1f7acc48157f1effcd55c164fbe95de02b..7cbb39ed4b6a23ff21304da718cae6bfdb204026 100644 (file)
--- a/tci.c
+++ b/tci.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
+#include "qemu/osdep.h"
 
 /* Defining NDEBUG disables assertions (which makes the code faster). */
 #if !defined(CONFIG_DEBUG_TCG) && !defined(NDEBUG)

diff --git a/thread-pool.c b/thread-pool.c
index 402c778b47ac07137c9ea631b79f254e9e3f8266..03ba0b02a4d4e8d98c13282cfe1b6439071e98f7 100644 (file)
--- a/thread-pool.c
+++ b/thread-pool.c
@@ -14,10 +14,10 @@
  * 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 "qemu-common.h"
 #include "qemu/queue.h"
 #include "qemu/thread.h"
-#include "qemu/osdep.h"
 #include "qemu/coroutine.h"
 #include "trace.h"
 #include "block/thread-pool.h"

diff --git a/thunk.c b/thunk.c
index f501fd72fcbb2d9c159b6937f664e2dd0bf4f18f..f057d86d9497011818a9f11252110cca14560e55 100644 (file)
--- a/thunk.c
+++ b/thunk.c
@@ -16,9 +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 <stdio.h>
-#include <stdarg.h>
+#include "qemu/osdep.h"
 
 #include "qemu.h"
 #include "exec/user/thunk.h"

diff --git a/tpm.c b/tpm.c
index 0a3e3d503238b9121d12f7fa1eb9a2ce709bf50a..9ed708e22b632a5cc2ca1fd6c78b1889621602f5 100644 (file)
--- a/tpm.c
+++ b/tpm.c
@@ -11,7 +11,7 @@
  *
  * Based on net.c
  */
-#include "config-host.h"
+#include "qemu/osdep.h"
 
 #include "qapi/qmp/qerror.h"
 #include "sysemu/tpm_backend.h"

diff --git a/trace/control.c b/trace/control.c
index 84ea8408922054edf655915bd1d70d656bbbf528..20d3370bf86a766352ed1cc995640f6550c252ca 100644 (file)
--- a/trace/control.c
+++ b/trace/control.c
@@ -7,6 +7,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "trace/control.h"
 #ifdef CONFIG_TRACE_SIMPLE
 #include "trace/simple.h"

diff --git a/trace/ftrace.c b/trace/ftrace.c
index a7ae371e6fac2ec20bb5dff4115112a3c3bc69ec..e953922f5bd71360a3fe418a60dc2a4072fcffda 100644 (file)
--- a/trace/ftrace.c
+++ b/trace/ftrace.c
@@ -9,10 +9,7 @@
  *
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <fcntl.h>
-#include <limits.h>
+#include "qemu/osdep.h"
 #include "trace.h"
 #include "trace/control.h"
 

diff --git a/trace/qmp.c b/trace/qmp.c
index 0b19489528d6daa9e53f47db2feaadc51f0f142b..6320b4b3b102d49753ba6f23ec9f9987e9d1d50b 100644 (file)
--- a/trace/qmp.c
+++ b/trace/qmp.c
@@ -7,6 +7,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu/typedefs.h"
 #include "qmp-commands.h"
 #include "trace/control.h"

diff --git a/trace/simple.c b/trace/simple.c
index e8594cd00daa277c604df6884443033e73e8a4ff..3fdcc82263b6f27ce9c105edc9b2220947ed6732 100644 (file)
--- a/trace/simple.c
+++ b/trace/simple.c
@@ -8,12 +8,8 @@
  *
  */
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <time.h>
+#include "qemu/osdep.h"
 #ifndef _WIN32
-#include <signal.h>
 #include <pthread.h>
 #endif
 #include "qemu/timer.h"

diff --git a/user-exec.c b/user-exec.c
index 8ad89a466b1b557d2a89d66030c04000c8e20395..d8d597bafea11adc873e526026bdc2bd4d53c997 100644 (file)
--- a/user-exec.c
+++ b/user-exec.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 "config.h"
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "disas/disas.h"
 #include "tcg.h"
@@ -33,7 +33,6 @@
 #undef ESI
 #undef EDI
 #undef EIP
-#include <signal.h>
 #ifdef __linux__
 #include <sys/ucontext.h>
 #endif

diff --git a/util/log.c b/util/log.c
index 46c88c93e2f75f486a4ff11f64acdf86c988280f..2709e98f98bb40d91b1bafb91d028d5a7b7c0523 100644 (file)
--- a/util/log.c
+++ b/util/log.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/log.h"
 #include "trace/control.h"

diff --git a/vl.c b/vl.c
index 2743ab91399b92a29371390c1065b44c41d02151..c581e3978b94f4ce27a77963353c41665e8ffdfc 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -21,14 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <time.h>
-#include <errno.h>
-#include <sys/time.h>
+#include "qemu/osdep.h"
 
-#include "config-host.h"
 
 #ifdef CONFIG_SECCOMP
 #include "sysemu/seccomp.h"
@@ -113,7 +107,6 @@ int main(int argc, char **argv)
 #include "qemu/queue.h"
 #include "sysemu/cpus.h"
 #include "sysemu/arch_init.h"
-#include "qemu/osdep.h"
 
 #include "ui/qemu-spice.h"
 #include "qapi/string-input-visitor.h"