audio: remove some needless headers

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

diff --git a/audio/audio.c b/audio/audio.c
index bdaee7855ff3ab6ec1710db0b187c4a7690997eb..f334030d96bda186ba1d9c4dcad011ac618fa3af 100644 (file)
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "audio.h"
 #include "migration/vmstate.h"
-#include "monitor/monitor.h"
 #include "qemu/timer.h"
 #include "qapi/error.h"
 #include "qapi/clone-visitor.h"
@@ -33,7 +32,6 @@
 #include "qapi/qapi-visit-audio.h"
 #include "qapi/qapi-commands-audio.h"
 #include "qobject/qdict.h"
-#include "qemu/cutils.h"
 #include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
@@ -41,7 +39,6 @@
 #include "system/system.h"
 #include "system/replay.h"
 #include "system/runstate.h"
-#include "ui/qemu-spice.h"
 #include "trace.h"
 
 #define AUDIO_CAP "audio"

diff --git a/audio/audio.h b/audio/audio.h
index e41c5bc55a0f1d2c438785841097a6cf16b422ea..3be0c4f24fdb081fb24f3d0e5e8554b2584e21ec 100644 (file)
--- a/audio/audio.h
+++ b/audio/audio.h
@@ -27,7 +27,6 @@
 
 #include "qemu/queue.h"
 #include "qapi/qapi-types-audio.h"
-#include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 
 typedef void (*audio_callback_fn) (void *opaque, int avail);

diff --git a/audio/dbusaudio.c b/audio/dbusaudio.c
index b44fdd15111c5407650dcdbb33198f471b5bd7f8..908214a170894b72061d2f9e171ab759fb5b121b 100644 (file)
--- a/audio/dbusaudio.c
+++ b/audio/dbusaudio.c
@@ -24,9 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
-#include "qemu/host-utils.h"
 #include "qemu/module.h"
-#include "qemu/timer.h"
 #include "qemu/dbus.h"
 
 #ifdef G_OS_UNIX

diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c
index d476e9b44107d2884ec13d59ae89867075548dc9..bd00c50e80f2f8482abc6e56d1673f09a5ef5eb1 100644 (file)
--- a/audio/dsoundaudio.c
+++ b/audio/dsoundaudio.c
@@ -31,7 +31,6 @@
 
 #define AUDIO_CAP "dsound"
 #include "audio_int.h"
-#include "qemu/host-utils.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
 

diff --git a/audio/mixeng.c b/audio/mixeng.c
index 703ee5448fac2e46c4f2ee415045c9d78c04e832..be38617e9b1d96c9940226f85e2127668723c988 100644 (file)
--- a/audio/mixeng.c
+++ b/audio/mixeng.c
@@ -24,11 +24,13 @@
  */
 #include "qemu/osdep.h"
 #include "qemu/bswap.h"
-#include "qemu/error-report.h"
 #include "audio.h"
 
 #define AUDIO_CAP "mixeng"
 #include "audio_int.h"
+#ifdef FLOAT_MIXENG
+#include "qemu/error-report.h"
+#endif
 
 /* 8 bit */
 #define ENDIAN_CONVERSION natural

diff --git a/audio/noaudio.c b/audio/noaudio.c
index 1b60d8518a445c0f32f4fe0e2b50c7e6aac6d5d4..34ff1d2a27003fc8bcac67ea829b2588dbec087b 100644 (file)
--- a/audio/noaudio.c
+++ b/audio/noaudio.c
@@ -23,10 +23,8 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu/host-utils.h"
 #include "qemu/module.h"
 #include "audio.h"
-#include "qemu/timer.h"
 
 #define AUDIO_CAP "noaudio"
 #include "audio_int.h"

diff --git a/audio/wavaudio.c b/audio/wavaudio.c
index a8798a1c42555aa456203b1d1755811f32d65e21..a098b20cad41b5cd8a760915cb06c54f00a0d7de 100644 (file)
--- a/audio/wavaudio.c
+++ b/audio/wavaudio.c
@@ -23,10 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu/host-utils.h"
 #include "qemu/module.h"
-#include "qemu/timer.h"
-#include "qapi/opts-visitor.h"
 #include "audio.h"
 
 #define AUDIO_CAP "wav"

diff --git a/audio/wavcapture.c b/audio/wavcapture.c
index c60286e1628bc25ae7d1d329d455bb6e06e78e02..b990844d48495ddfd4e8ffecbab63045c76688aa 100644 (file)
--- a/audio/wavcapture.c
+++ b/audio/wavcapture.c
@@ -1,6 +1,5 @@
 #include "qemu/osdep.h"
 #include "qemu/qemu-print.h"
-#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "audio.h"