Include qemu-common.h exactly where needed

No header includes qemu-common.h after this commit, as prescribed by
qemu-common.h's file comment.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190523143508.25387-5-armbru@redhat.com>
[Rebased with conflicts resolved automatically, except for
include/hw/arm/xlnx-zynqmp.h hw/arm/nrf51_soc.c hw/arm/msf2-soc.c
block/qcow2-refcount.c block/qcow2-cluster.c block/qcow2-cache.c
target/arm/cpu.h target/lm32/cpu.h target/m68k/cpu.h target/mips/cpu.h
target/moxie/cpu.h target/nios2/cpu.h target/openrisc/cpu.h
target/riscv/cpu.h target/tilegx/cpu.h target/tricore/cpu.h
target/unicore32/cpu.h target/xtensa/cpu.h; bsd-user/main.c and
net/tap-bsd.c fixed up]

16 files changed, 1 insertions, 15 deletions

diff --git a/ui/console-gl.c b/ui/console-gl.c
index c1cb3bd673..0a6478161f 100644
--- a/ui/console-gl.c
+++ b/ui/console-gl.c
@@ -25,7 +25,6 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "ui/console.h"
 #include "ui/shader.h"
 
diff --git a/ui/cursor.c b/ui/cursor.c
index 26ce69fe5e..1d62ddd4d0 100644
--- a/ui/cursor.c
+++ b/ui/cursor.c
@@ -1,5 +1,4 @@
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "ui/console.h"
 
 #include "cursor_hidden.xpm"
diff --git a/ui/egl-context.c b/ui/egl-context.c
index 78e6c7ab7c..4aa1cbb50c 100644
--- a/ui/egl-context.c
+++ b/ui/egl-context.c
@@ -1,5 +1,4 @@
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "ui/egl-context.h"
 
 QEMUGLContext qemu_egl_create_context(DisplayChangeListener *dcl,
diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c
index 42801b688b..99231a3597 100644
--- a/ui/gtk-egl.c
+++ b/ui/gtk-egl.c
@@ -12,7 +12,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 
 #include "trace.h"
 
diff --git a/ui/gtk-gl-area.c b/ui/gtk-gl-area.c
index 147ad6f9b5..85f9d14c51 100644
--- a/ui/gtk-gl-area.c
+++ b/ui/gtk-gl-area.c
@@ -8,7 +8,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 
 #include "trace.h"
 
diff --git a/ui/gtk.c b/ui/gtk.c
index e96e15435a..ad6963d4f5 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -31,7 +31,6 @@
 #define LOCALEDIR "po"
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-misc.h"
 #include "qemu/cutils.h"
diff --git a/ui/keymaps.c b/ui/keymaps.c
index 38fd22ed2b..6e8a321971 100644
--- a/ui/keymaps.c
+++ b/ui/keymaps.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu-common.h"
 #include "keymaps.h"
 #include "sysemu/sysemu.h"
 #include "trace.h"
diff --git a/ui/keymaps.h b/ui/keymaps.h
index b6d48aac40..6473405485 100644
--- a/ui/keymaps.h
+++ b/ui/keymaps.h
@@ -25,7 +25,6 @@
 #ifndef QEMU_KEYMAPS_H
 #define QEMU_KEYMAPS_H
 
-#include "qemu-common.h"
 #include "ui/kbd-state.h"
 
 typedef struct {
diff --git a/ui/qemu-pixman.c b/ui/qemu-pixman.c
index 1429cf08d5..85f2945e88 100644
--- a/ui/qemu-pixman.c
+++ b/ui/qemu-pixman.c
@@ -4,7 +4,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "ui/console.h"
 #include "standard-headers/drm/drm_fourcc.h"
 
diff --git a/ui/sdl2-2d.c b/ui/sdl2-2d.c
index 091ecfcc7f..db191aaa79 100644
--- a/ui/sdl2-2d.c
+++ b/ui/sdl2-2d.c
@@ -24,7 +24,6 @@
 /* Ported SDL 1.2 code to 2.0 by Dave Airlie. */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "ui/console.h"
 #include "ui/input.h"
 #include "ui/sdl2.h"
diff --git a/ui/sdl2-gl.c b/ui/sdl2-gl.c
index 1bf4542d8d..7a37e7c995 100644
--- a/ui/sdl2-gl.c
+++ b/ui/sdl2-gl.c
@@ -26,7 +26,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "ui/console.h"
 #include "ui/input.h"
 #include "ui/sdl2.h"
diff --git a/ui/sdl2-input.c b/ui/sdl2-input.c
index fb345f45fb..b1daae4111 100644
--- a/ui/sdl2-input.c
+++ b/ui/sdl2-input.c
@@ -24,7 +24,6 @@
 /* Ported SDL 1.2 code to 2.0 by Dave Airlie. */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "ui/console.h"
 #include "ui/input.h"
 #include "ui/sdl2.h"
diff --git a/ui/shader.c b/ui/shader.c
index 008458bf94..d78829f43b 100644
--- a/ui/shader.c
+++ b/ui/shader.c
@@ -25,7 +25,6 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "ui/shader.h"
 
 #include "shader/texture-blit-vert.h"
diff --git a/ui/spice-input.c b/ui/spice-input.c
index a426c03b5e..cd4bb0043f 100644
--- a/ui/spice-input.c
+++ b/ui/spice-input.c
@@ -20,7 +20,6 @@
 #include <spice.h>
 #include <spice/enums.h>
 
-#include "qemu-common.h"
 #include "ui/qemu-spice.h"
 #include "ui/console.h"
 #include "keymaps.h"
diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
index d20cd1d86d..9084c2201b 100644
--- a/ui/vnc-enc-tight.c
+++ b/ui/vnc-enc-tight.c
@@ -31,7 +31,6 @@
 /* This needs to be before jpeglib.h line because of conflict with
    INT32 definitions between jmorecfg.h (included by jpeglib.h) and
    Win32 basetsd.h (included by windows.h). */
-#include "qemu-common.h"
 
 #ifdef CONFIG_VNC_PNG
 /* The following define is needed by pngconf.h. Otherwise it won't compile,
diff --git a/ui/vnc.h b/ui/vnc.h
index ee3da08f4a..2f84db3142 100644
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -27,7 +27,6 @@
 #ifndef QEMU_VNC_H
 #define QEMU_VNC_H
 
-#include "qemu-common.h"
 #include "qapi/qapi-types-ui.h"
 #include "qemu/queue.h"
 #include "qemu/thread.h"