Include qemu/module.h where needed, drop it from qemu-common.h

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190523143508.25387-4-armbru@redhat.com>
[Rebased with conflicts resolved automatically, except for
hw/usb/dev-hub.c hw/misc/exynos4210_rng.c hw/misc/bcm2835_rng.c
hw/misc/aspeed_scu.c hw/display/virtio-vga.c hw/arm/stm32f205_soc.c;
ui/cocoa.m fixed up]

9 files changed, 12 insertions, 1 deletions

diff --git a/hw/input/adb-kbd.c b/hw/input/adb-kbd.c
index b026e9d49f..da361f56df 100644
--- a/hw/input/adb-kbd.c
+++ b/hw/input/adb-kbd.c
@@ -21,8 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/input/adb.h"
+#include "qemu/module.h"
 #include "ui/input.h"
 #include "hw/input/adb-keys.h"
 #include "sysemu/sysemu.h"
diff --git a/hw/input/adb-mouse.c b/hw/input/adb-mouse.c
index 83833b0035..52526fddb7 100644
--- a/hw/input/adb-mouse.c
+++ b/hw/input/adb-mouse.c
@@ -21,9 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "ui/console.h"
 #include "hw/input/adb.h"
+#include "qemu/module.h"
 #include "adb-internal.h"
 #include "trace.h"
 
diff --git a/hw/input/adb.c b/hw/input/adb.c
index bbb40aeef1..1446f32521 100644
--- a/hw/input/adb.c
+++ b/hw/input/adb.c
@@ -21,8 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/input/adb.h"
+#include "qemu/module.h"
 #include "adb-internal.h"
 
 /* error codes */
diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c
index 1fc7b86f19..5203da2bcf 100644
--- a/hw/input/lm832x.c
+++ b/hw/input/lm832x.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i2c/i2c.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "ui/console.h"
 
diff --git a/hw/input/milkymist-softusb.c b/hw/input/milkymist-softusb.c
index 8766a17d9e..f779cd4370 100644
--- a/hw/input/milkymist-softusb.c
+++ b/hw/input/milkymist-softusb.c
@@ -29,6 +29,7 @@
 #include "ui/console.h"
 #include "hw/input/hid.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 enum {
     R_CTRL = 0,
diff --git a/hw/input/pl050.c b/hw/input/pl050.c
index 15bffbfcad..b79bf1647d 100644
--- a/hw/input/pl050.c
+++ b/hw/input/pl050.c
@@ -11,6 +11,7 @@
 #include "hw/sysbus.h"
 #include "hw/input/ps2.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define TYPE_PL050 "pl050"
 #define PL050(obj) OBJECT_CHECK(PL050State, (obj), TYPE_PL050)
diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c
index bc5f9a2ed2..f15a063fac 100644
--- a/hw/input/virtio-input-hid.c
+++ b/hw/input/virtio-input-hid.c
@@ -6,6 +6,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 
 #include "hw/qdev.h"
 #include "hw/virtio/virtio.h"
diff --git a/hw/input/virtio-input-host.c b/hw/input/virtio-input-host.c
index cb79e80024..a54c31eb09 100644
--- a/hw/input/virtio-input-host.c
+++ b/hw/input/virtio-input-host.c
@@ -6,7 +6,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "qemu/sockets.h"
 
 #include "hw/qdev.h"
diff --git a/hw/input/virtio-input.c b/hw/input/virtio-input.c
index 0e42f0d02c..9946394cf4 100644
--- a/hw/input/virtio-input.c
+++ b/hw/input/virtio-input.c
@@ -7,6 +7,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 #include "hw/qdev.h"