net: do not include net.h everywhere

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

17 files changed, 1 insertions, 16 deletions

diff --git a/arch_init.c b/arch_init.c
index ef866cdea..e479a2566 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -40,7 +40,6 @@
 #include "hw/audiodev.h"
 #include "kvm.h"
 #include "migration.h"
-#include "net.h"
 #include "gdbstub.h"
 #include "hw/smbios.h"
 #include "exec-memory.h"
diff --git a/hw/alpha_sys.h b/hw/alpha_sys.h
index b1e52585b..348f55c27 100644
--- a/hw/alpha_sys.h
+++ b/hw/alpha_sys.h
@@ -6,7 +6,6 @@
 #include "pci/pci.h"
 #include "pci/pci_host.h"
 #include "ide.h"
-#include "net.h"
 #include "pc.h"
 #include "irq.h"
 
diff --git a/hw/device-hotplug.c b/hw/device-hotplug.c
index 839b9ea1d..336ffc227 100644
--- a/hw/device-hotplug.c
+++ b/hw/device-hotplug.c
@@ -24,7 +24,6 @@
 
 #include "hw.h"
 #include "boards.h"
-#include "net.h"
 #include "blockdev.h"
 #include "qemu-config.h"
 #include "sysemu.h"
diff --git a/hw/lm32_boards.c b/hw/lm32_boards.c
index 772cb8b05..f59d3bfef 100644
--- a/hw/lm32_boards.c
+++ b/hw/lm32_boards.c
@@ -19,7 +19,6 @@
 
 #include "sysbus.h"
 #include "hw.h"
-#include "net.h"
 #include "flash.h"
 #include "devices.h"
 #include "boards.h"
diff --git a/hw/milkymist-hw.h b/hw/milkymist-hw.h
index 96b2a7f86..0253b7ab2 100644
--- a/hw/milkymist-hw.h
+++ b/hw/milkymist-hw.h
@@ -3,6 +3,7 @@
 
 #include "qdev.h"
 #include "qdev-addr.h"
+#include "net.h"
 
 static inline DeviceState *milkymist_uart_create(hwaddr base,
         qemu_irq irq)
diff --git a/hw/milkymist.c b/hw/milkymist.c
index 4c8111a74..c26ea4aed 100644
--- a/hw/milkymist.c
+++ b/hw/milkymist.c
@@ -19,7 +19,6 @@
 
 #include "sysbus.h"
 #include "hw.h"
-#include "net.h"
 #include "flash.h"
 #include "sysemu.h"
 #include "devices.h"
diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
index e0ac2d1ec..169dd4683 100644
--- a/hw/s390-virtio-bus.c
+++ b/hw/s390-virtio-bus.c
@@ -20,7 +20,6 @@
 #include "hw.h"
 #include "block.h"
 #include "sysemu.h"
-#include "net.h"
 #include "boards.h"
 #include "monitor.h"
 #include "loader.h"
diff --git a/hw/spapr_vscsi.c b/hw/spapr_vscsi.c
index e3d4b237f..2d811320c 100644
--- a/hw/spapr_vscsi.c
+++ b/hw/spapr_vscsi.c
@@ -34,7 +34,6 @@
 #include "hw.h"
 #include "scsi.h"
 #include "scsi-defs.h"
-#include "net.h" /* Remove that when we can */
 #include "srp.h"
 #include "hw/qdev.h"
 #include "hw/spapr.h"
diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c
index 6ab8fee0c..1fdbc497c 100644
--- a/hw/virtex_ml507.c
+++ b/hw/virtex_ml507.c
@@ -25,7 +25,6 @@
 #include "sysbus.h"
 #include "hw.h"
 #include "serial.h"
-#include "net.h"
 #include "flash.h"
 #include "sysemu.h"
 #include "devices.h"
diff --git a/hw/virtio-net.h b/hw/virtio-net.h
index b13be7ccb..2566ea13e 100644
--- a/hw/virtio-net.h
+++ b/hw/virtio-net.h
@@ -15,7 +15,6 @@
 #define _QEMU_VIRTIO_NET_H
 
 #include "virtio.h"
-#include "net.h"
 #include "pci/pci.h"
 
 #define ETH_ALEN    6
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index d0d6a5e81..a2355dc86 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -26,7 +26,6 @@
 #include "qemu-error.h"
 #include "pci/msi.h"
 #include "pci/msix.h"
-#include "net.h"
 #include "loader.h"
 #include "kvm.h"
 #include "blockdev.h"
diff --git a/hw/virtio-scsi.h b/hw/virtio-scsi.h
index 7d7cba752..8d9d15f09 100644
--- a/hw/virtio-scsi.h
+++ b/hw/virtio-scsi.h
@@ -15,7 +15,6 @@
 #define _QEMU_VIRTIO_SCSI_H
 
 #include "virtio.h"
-#include "net.h"
 #include "pci/pci.h"
 
 /* The ID for virtio_scsi */
diff --git a/hw/xen_backend.h b/hw/xen_backend.h
index fea86dd78..330563090 100644
--- a/hw/xen_backend.h
+++ b/hw/xen_backend.h
@@ -4,7 +4,6 @@
 #include "xen_common.h"
 #include "sysemu.h"
 #include "net.h"
-#include "net/hub.h"
 
 /* ------------------------------------------------------------- */
 
diff --git a/hw/xen_platform.c b/hw/xen_platform.c
index 10bb56007..023499eb5 100644
--- a/hw/xen_platform.c
+++ b/hw/xen_platform.c
@@ -30,7 +30,6 @@
 #include "pci/pci.h"
 #include "irq.h"
 #include "xen_common.h"
-#include "net.h"
 #include "xen_backend.h"
 #include "trace.h"
 #include "exec-memory.h"
diff --git a/input.c b/input.c
index 25d3973e2..123bb237d 100644
--- a/input.c
+++ b/input.c
@@ -23,7 +23,6 @@
  */
 
 #include "sysemu.h"
-#include "net.h"
 #include "monitor.h"
 #include "console.h"
 #include "error.h"
diff --git a/qemu-char.c b/qemu-char.c
index 242b79990..f066ad065 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -22,7 +22,6 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#include "net.h"
 #include "monitor.h"
 #include "console.h"
 #include "sysemu.h"
diff --git a/qemu-timer.c b/qemu-timer.c
index 0d2bb9428..9b9585b25 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -23,7 +23,6 @@
  */
 
 #include "sysemu.h"
-#include "net.h"
 #include "monitor.h"
 #include "console.h"