21 files changed, 30 insertions, 7 deletions
diff --git a/chardev/baum.c b/chardev/baum.c
index 78b0c87625..3dc81d5c6c 100644
--- a/chardev/baum.c
+++ b/chardev/baum.c
@@ -21,10 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "chardev/char.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "hw/usb.h"
 #include "ui/console.h"
diff --git a/chardev/char-console.c b/chardev/char-console.c
index 535ed65136..6c4ce5dbce 100644
--- a/chardev/char-console.c
+++ b/chardev/char-console.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 "chardev/char-win.h"
+#include "qemu/module.h"
 
 static void qemu_chr_open_win_con(Chardev *chr,
                                   ChardevBackend *backend,
diff --git a/chardev/char-fd.c b/chardev/char-fd.c
index 2c9b2ce567..32092369bf 100644
--- a/chardev/char-fd.c
+++ b/chardev/char-fd.c
@@ -21,10 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
+#include "qemu/module.h"
 #include "qemu/sockets.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "chardev/char.h"
 #include "io/channel-file.h"
 
diff --git a/chardev/char-file.c b/chardev/char-file.c
index 87fb61088c..2fd80707e5 100644
--- a/chardev/char-file.c
+++ b/chardev/char-file.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "chardev/char.h"
 
diff --git a/chardev/char-mux.c b/chardev/char-mux.c
index 23aa82125d..200c62a0d0 100644
--- a/chardev/char-mux.c
+++ b/chardev/char-mux.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "chardev/char.h"
 #include "sysemu/block-backend.h"
diff --git a/chardev/char-null.c b/chardev/char-null.c
index 90bafe76f4..1c6a2900f9 100644
--- a/chardev/char-null.c
+++ b/chardev/char-null.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 "chardev/char.h"
+#include "qemu/module.h"
 
 static void null_chr_open(Chardev *chr,
                           ChardevBackend *backend,
diff --git a/chardev/char-parallel.c b/chardev/char-parallel.c
index ab82c72ac7..05e7efbd6c 100644
--- a/chardev/char-parallel.c
+++ b/chardev/char-parallel.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "chardev/char.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include <sys/ioctl.h>
 
diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c
index 8a51872e5e..cdaddb1e61 100644
--- a/chardev/char-pipe.c
+++ b/chardev/char-pipe.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "chardev/char.h"
 
diff --git a/chardev/char-pty.c b/chardev/char-pty.c
index 04759b0ef9..8b34ce985a 100644
--- a/chardev/char-pty.c
+++ b/chardev/char-pty.c
@@ -21,13 +21,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "chardev/char.h"
 #include "io/channel-file.h"
 #include "qemu/sockets.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/qemu-print.h"
 
 #include "chardev/char-io.h"
diff --git a/chardev/char-ringbuf.c b/chardev/char-ringbuf.c
index 87832e2792..67397a8ce9 100644
--- a/chardev/char-ringbuf.c
+++ b/chardev/char-ringbuf.c
@@ -27,6 +27,7 @@
 #include "qapi/error.h"
 #include "qapi/qapi-commands-char.h"
 #include "qemu/base64.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 
 /* Ring buffer chardev */
diff --git a/chardev/char-serial.c b/chardev/char-serial.c
index a8bae31b8d..5b833ea077 100644
--- a/chardev/char-serial.c
+++ b/chardev/char-serial.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/sockets.h"
 #include "io/channel-file.h"
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index b2cf593107..7ca5d97af3 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -29,6 +29,7 @@
 #include "io/channel-websock.h"
 #include "io/net-listener.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "qapi/error.h"
 #include "qapi/clone-visitor.h"
diff --git a/chardev/char-stdio.c b/chardev/char-stdio.c
index 9624220e6d..82eaebc1db 100644
--- a/chardev/char-stdio.c
+++ b/chardev/char-stdio.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/sockets.h"
 #include "qapi/error.h"
diff --git a/chardev/char-udp.c b/chardev/char-udp.c
index 097a2f0f42..bba4145f96 100644
--- a/chardev/char-udp.c
+++ b/chardev/char-udp.c
@@ -26,6 +26,7 @@
 #include "chardev/char.h"
 #include "io/channel-socket.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 
 #include "chardev/char-io.h"
diff --git a/chardev/char-win-stdio.c b/chardev/char-win-stdio.c
index efcf7827eb..92d34e85aa 100644
--- a/chardev/char-win-stdio.c
+++ b/chardev/char-win-stdio.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 "qapi/error.h"
+#include "qemu/module.h"
 #include "chardev/char-win.h"
 #include "chardev/char-win-stdio.h"
 
diff --git a/chardev/char-win.c b/chardev/char-win.c
index 05518e0958..0b8181339d 100644
--- a/chardev/char-win.c
+++ b/chardev/char-win.c
@@ -21,8 +21,9 @@
  * 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 "qemu/module.h"
 #include "qapi/error.h"
 #include "chardev/char-win.h"
 
diff --git a/chardev/char.c b/chardev/char.c
index 54724a56b1..e4887bcc82 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -35,6 +35,7 @@
 #include "qapi/qmp/qerror.h"
 #include "sysemu/replay.h"
 #include "qemu/help_option.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 
 #include "chardev/char-mux.h"
diff --git a/chardev/msmouse.c b/chardev/msmouse.c
index 0ffd137ce8..6d8f06fed4 100644
--- a/chardev/msmouse.c
+++ b/chardev/msmouse.c
@@ -21,8 +21,9 @@
  * 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 "qemu/module.h"
 #include "chardev/char.h"
 #include "ui/console.h"
 #include "ui/input.h"
diff --git a/chardev/spice.c b/chardev/spice.c
index 22c30ae833..241e2b7770 100644
--- a/chardev/spice.c
+++ b/chardev/spice.c
@@ -5,6 +5,7 @@
 #include "chardev/spice.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include <spice/protocol.h>
 
diff --git a/chardev/testdev.c b/chardev/testdev.c
index 031e9a23e8..368a8c041e 100644
--- a/chardev/testdev.c
+++ b/chardev/testdev.c
@@ -23,8 +23,9 @@
  * 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 "qemu/module.h"
 #include "chardev/char.h"
 
 #define BUF_SIZE 32
diff --git a/chardev/wctablet.c b/chardev/wctablet.c
index 35dbd29a33..e9cb7ca710 100644
--- a/chardev/wctablet.c
+++ b/chardev/wctablet.c
@@ -27,7 +27,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "chardev/char-serial.h"
 #include "ui/console.h"
 #include "ui/input.h"