clean-includes: run it once more

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/hw/net/net_tx_pkt.c b/hw/net/net_tx_pkt.c
index e4478bead8240098c5ad8146c6122ebf8242e19d..efd43b47b8a7c18d83ab14c4355a7de08f63492d 100644 (file)
--- a/hw/net/net_tx_pkt.c
+++ b/hw/net/net_tx_pkt.c
@@ -15,6 +15,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "net_tx_pkt.h"
 #include "net/eth.h"
 #include "net/checksum.h"

diff --git a/hw/net/net_tx_pkt.h b/hw/net/net_tx_pkt.h
index 07b9a2098bfc72fd91e7a19cd90f3acf1402538d..212ecc62fc465a02c8ea59975b96734dbf648497 100644 (file)
--- a/hw/net/net_tx_pkt.h
+++ b/hw/net/net_tx_pkt.h
@@ -18,7 +18,6 @@
 #ifndef NET_TX_PKT_H
 #define NET_TX_PKT_H
 
-#include "qemu/osdep.h"
 #include "net/eth.h"
 #include "exec/hwaddr.h"
 

diff --git a/include/qemu/qdist.h b/include/qemu/qdist.h
index f30050c2d1c2462c6125e4494afd3aa91bad78d9..54ece760d620eec201682e6dbb57d4f1fb5e664d 100644 (file)
--- a/include/qemu/qdist.h
+++ b/include/qemu/qdist.h
@@ -7,7 +7,6 @@
 #ifndef QEMU_QDIST_H
 #define QEMU_QDIST_H
 
-#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/bitops.h"
 

diff --git a/include/qemu/qht.h b/include/qemu/qht.h
index aec60aa53479baa288dcbfcb29b78e1463f2ef8a..70bfc68b8d67a67f714f2f1a4ca82c0db154cd18 100644 (file)
--- a/include/qemu/qht.h
+++ b/include/qemu/qht.h
@@ -7,7 +7,6 @@
 #ifndef QEMU_QHT_H
 #define QEMU_QHT_H
 
-#include "qemu/osdep.h"
 #include "qemu/seqlock.h"
 #include "qemu/thread.h"
 #include "qemu/qdist.h"

diff --git a/tests/e1000e-test.c b/tests/e1000e-test.c
index dbf4859f88e18dbcd306fd4ffcafc48def547e69..d497b0857c7f3c0140d7b5801444163cd84e2531 100644 (file)
--- a/tests/e1000e-test.c
+++ b/tests/e1000e-test.c
@@ -25,7 +25,6 @@
 
 
 #include "qemu/osdep.h"
-#include <glib.h>
 #include "libqtest.h"
 #include "qemu-common.h"
 #include "libqos/pci-pc.h"

diff --git a/tests/postcopy-test.c b/tests/postcopy-test.c
index a35efb3969e18da6c1d4e9f5a495934acf7e20ad..35d5180173892b3b90ca56cf4068ae25785d221c 100644 (file)
--- a/tests/postcopy-test.c
+++ b/tests/postcopy-test.c
@@ -11,7 +11,6 @@
  */
 
 #include "qemu/osdep.h"
-#include <glib.h>
 
 #include "libqtest.h"
 #include "qemu/option.h"

diff --git a/tests/qht-bench.c b/tests/qht-bench.c
index ad8efbca95a22e15c209c48bb4ac0d042e2ee5d1..76360a0cf598fc9fab394a5aa4f6d45f3c2e4af1 100644 (file)
--- a/tests/qht-bench.c
+++ b/tests/qht-bench.c
@@ -5,7 +5,6 @@
  *   See the COPYING file in the top-level directory.
  */
 #include "qemu/osdep.h"
-#include <glib.h>
 #include "qemu/processor.h"
 #include "qemu/atomic.h"
 #include "qemu/qht.h"

diff --git a/tests/test-qdist.c b/tests/test-qdist.c
index a67f26057e9b8a4ed1dbe4b3900673b3e048c38a..0298986ac94fb8d0a0051402df89d22ddf56d52a 100644 (file)
--- a/tests/test-qdist.c
+++ b/tests/test-qdist.c
@@ -5,7 +5,6 @@
  *   See the COPYING file in the top-level directory.
  */
 #include "qemu/osdep.h"
-#include <glib.h>
 #include "qemu/qdist.h"
 
 #include <math.h>

diff --git a/tests/test-qht-par.c b/tests/test-qht-par.c
index f09e004ec6f02d0203007b7d5d32c6a359d377ff..d8a83caf5cc05d3f8fa1761dd85346c1d75700f3 100644 (file)
--- a/tests/test-qht-par.c
+++ b/tests/test-qht-par.c
@@ -5,7 +5,6 @@
  *   See the COPYING file in the top-level directory.
  */
 #include "qemu/osdep.h"
-#include <glib.h>
 
 #define TEST_QHT_STRING "tests/qht-bench 1>/dev/null 2>&1 -R -S0.1 -D10000 -N1 "
 

diff --git a/tests/test-qht.c b/tests/test-qht.c
index c8eb9305ede2246f06171918bfaa867380c2e010..f1d628371d5f0bbe622e11f6fa6aeebc3c4e5aa2 100644 (file)
--- a/tests/test-qht.c
+++ b/tests/test-qht.c
@@ -5,7 +5,6 @@
  *   See the COPYING file in the top-level directory.
  */
 #include "qemu/osdep.h"
-#include <glib.h>
 #include "qemu/qht.h"
 
 #define N 5000

diff --git a/util/qdist.c b/util/qdist.c
index 4ea2e34fc264de7de5a5a1872fc5bf00ec7cab56..56f573837d49affb4c50d1f124a545deeed029b1 100644 (file)
--- a/util/qdist.c
+++ b/util/qdist.c
@@ -6,6 +6,7 @@
  * License: GNU GPL, version 2 or later.
  *   See the COPYING file in the top-level directory.
  */
+#include "qemu/osdep.h"
 #include "qemu/qdist.h"
 
 #include <math.h>

diff --git a/util/qht.c b/util/qht.c
index 6f749098f471dd8d819ffd52bfea6a9f4e32d3a4..40d6e218f75912e8c72e9c79e9e5d20071da4ac7 100644 (file)
--- a/util/qht.c
+++ b/util/qht.c
@@ -65,6 +65,7 @@
  *   + Corbet, "Relativistic hash tables, part 1: Algorithms", @ lwn.net, 2014.
  *     https://lwn.net/Articles/612021/
  */
+#include "qemu/osdep.h"
 #include "qemu/qht.h"
 #include "qemu/atomic.h"
 #include "qemu/rcu.h"