audio: Clean up includes

Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.

This commit was created with scripts/clean-includes.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1453138432-8324-1-git-send-email-peter.maydell@linaro.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index 6315b2d7467c802410dea2efbaa09d939f28ca18..3652a7b5fa9f534c3680e4e3cb9e55c2e846e7b3 100644 (file)
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include <alsa/asoundlib.h>
 #include "qemu-common.h"
 #include "qemu/main-loop.h"

diff --git a/audio/audio.c b/audio/audio.c
index a0fc8b31ae7d2388c2139fc2104d762e3b1debee..e84153293ca05bb8e2cff64b3ce5527e61abea97 100644 (file)
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "audio.h"
 #include "monitor/monitor.h"

diff --git a/audio/audio_pt_int.c b/audio/audio_pt_int.c
index 9a9c306a9cd52d8de6ef1e9f7ee9548d7dfa0b65..21ff9c58032fe347f2805c77993d3cb813e952e4 100644 (file)
--- a/audio/audio_pt_int.c
+++ b/audio/audio_pt_int.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "audio.h"
 

diff --git a/audio/audio_win_int.c b/audio/audio_win_int.c
index e1324056a47949e5442e2300b597b8a560d3b9e2..6900008d0c47f2f536efdadcad5b162edc1c7bea 100644 (file)
--- a/audio/audio_win_int.c
+++ b/audio/audio_win_int.c
@@ -1,5 +1,6 @@
 /* public domain */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 
 #define AUDIO_CAP "win-int"

diff --git a/audio/coreaudio.c b/audio/coreaudio.c
index 7150604c535cafdde35da4faa0f4353de2ad7807..d4ad224590d40bb5daa76fedcc060d5f034c7f88 100644 (file)
--- a/audio/coreaudio.c
+++ b/audio/coreaudio.c
@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include <CoreAudio/CoreAudio.h>
-#include <string.h>             /* strerror */
 #include <pthread.h>            /* pthread_X */
 
 #include "qemu-common.h"

diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c
index e9472c105c86ec879feee8992cced40a8752fde5..516846eb804bb7284e3f0df2a3901d30fc74910d 100644 (file)
--- a/audio/dsoundaudio.c
+++ b/audio/dsoundaudio.c
@@ -26,6 +26,7 @@
  * SEAL 1.07 by Carlos 'pel' Hasan was used as documentation
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "audio.h"
 

diff --git a/audio/mixeng.c b/audio/mixeng.c
index 0e4976f271e5c180ebdfb7819034a31fab5ea5de..981b97a96485fd2460c29ebe1a7d6fc5951b26e6 100644 (file)
--- a/audio/mixeng.c
+++ b/audio/mixeng.c
@@ -22,6 +22,7 @@
  * 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 "audio.h"
 

diff --git a/audio/noaudio.c b/audio/noaudio.c
index 50db1f344b5ad342c917859410e11e006dfd1eb8..09588b9cd09ff851910fe5e7ee04c61d1ac7358b 100644 (file)
--- a/audio/noaudio.c
+++ b/audio/noaudio.c
@@ -21,6 +21,7 @@
  * 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 "audio.h"
 #include "qemu/timer.h"

diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index 7dbe3332d8e8d554edef07bcfa865a0559dbb68a..349e9dd53de86b83130496dec56ad251834c7662 100644 (file)
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -21,9 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <stdlib.h>
+#include "qemu/osdep.h"
 #include <sys/mman.h>
-#include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/soundcard.h>
 #include "qemu-common.h"

diff --git a/audio/paaudio.c b/audio/paaudio.c
index fea607166f02307455965f4b33ca3130f390d39c..57678e72e16b030cc4c5a077365caad61793cf3a 100644 (file)
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -1,4 +1,5 @@
 /* public domain */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "audio.h"
 

diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c
index 1140f2ea0aaf34314ce33d26f9ea72df6d541a90..db69fe141622bc90d5f28692984332e0757554f2 100644 (file)
--- a/audio/sdlaudio.c
+++ b/audio/sdlaudio.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include <SDL.h>
 #include <SDL_thread.h>
 #include "qemu-common.h"

diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c
index 42ae4a45f7bde246bfe99c15904a1a6e53ea407a..297fd416ed4bbbdbf0d065bc2324435de95bc0b7 100644 (file)
--- a/audio/spiceaudio.c
+++ b/audio/spiceaudio.c
@@ -17,6 +17,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"

diff --git a/audio/wavaudio.c b/audio/wavaudio.c
index c586020c59f98f77d814f8dd6f01685dfb61ba73..343b1a10b95629da585c20791488096cabc74b63 100644 (file)
--- a/audio/wavaudio.c
+++ b/audio/wavaudio.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "qemu/timer.h"
 #include "audio.h"

diff --git a/audio/wavcapture.c b/audio/wavcapture.c
index 86e905627aee1f7e173a01654ccaf36e1bc2eefe..8bfb9e765468936137a12e844ce578846f8b393d 100644 (file)
--- a/audio/wavcapture.c
+++ b/audio/wavcapture.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "monitor/monitor.h"
 #include "qemu/error-report.h"

diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c
index b17383555ee00a7f2f74ca8067aebd9c71297a92..cbd959e0bd0c0dd44d4802a65177ff5bbbbb80dc 100644 (file)
--- a/hw/audio/ac97.c
+++ b/hw/audio/ac97.c
@@ -17,6 +17,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/audio/audio.h"
 #include "audio/audio.h"

diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
index 334935f8d9e4941a68dbafb575c8434e2ad240b8..1270b19cc6941c3b133798873f96b1b04980b7e2 100644 (file)
--- a/hw/audio/adlib.c
+++ b/hw/audio/adlib.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/audio/audio.h"
 #include "audio/audio.h"

diff --git a/hw/audio/cs4231.c b/hw/audio/cs4231.c
index 6325a8cea7d77c75b0cb57d24cf20e059bd0f59a..caf97c1692726e24321835bd9ba830996d5a053c 100644 (file)
--- a/hw/audio/cs4231.c
+++ b/hw/audio/cs4231.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "trace.h"
 

diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c
index f96f561c7fa5bc839f43b4b4dcab96279867bbc6..b0c7c93e218f5dae5212a3a0705235f97a01c1cd 100644 (file)
--- a/hw/audio/cs4231a.c
+++ b/hw/audio/cs4231a.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/audio/audio.h"
 #include "audio/audio.h"

diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c
index 592578b14230840f0fda10cd39951e427698e6eb..96acbc6e2fba40560c0f998cb9cbe3d6c5828dee 100644 (file)
--- a/hw/audio/es1370.c
+++ b/hw/audio/es1370.c
@@ -26,6 +26,7 @@
 /* #define VERBOSE_ES1370 */
 #define SILENT_ES1370
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/audio/audio.h"
 #include "audio/audio.h"

diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c
index 81c0c1be2043971890eba0fe57e38f3475ab76e4..731110fe86ab1a167115d175332fb8eedddcd6fd 100644 (file)
--- a/hw/audio/fmopl.c
+++ b/hw/audio/fmopl.c
@@ -32,10 +32,7 @@
 
 #define HAS_YM3812     1
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
+#include "qemu/osdep.h"
 #include <math.h>
 //#include "driver.h"          /* use M.A.M.E. */
 #include "fmopl.h"

diff --git a/hw/audio/gus.c b/hw/audio/gus.c
index e0c8a4ee1eed547cb72bc3efefb3986ce32ed6b4..47c0fcfb4cd57df9849b02ef30d3f178e8a9f655 100644 (file)
--- a/hw/audio/gus.c
+++ b/hw/audio/gus.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/audio/audio.h"
 #include "audio/audio.h"

diff --git a/hw/audio/gusemu_hal.c b/hw/audio/gusemu_hal.c
index 60966907351c8590f262ca6079665a0516424c25..973d6b9f4f491586bd533c6919ccc4e8e8a3a782 100644 (file)
--- a/hw/audio/gusemu_hal.c
+++ b/hw/audio/gusemu_hal.c
@@ -26,6 +26,7 @@
  * TODO: check mixer: see 7.20 of sdk for panning pos (applies to all gus models?)?
  */
 
+#include "qemu/osdep.h"
 #include "gustate.h"
 #include "gusemu.h"
 

diff --git a/hw/audio/gusemu_mixer.c b/hw/audio/gusemu_mixer.c
index 6d8d9ced1178c2bcf0ec9ace96f4f6c200c77c2b..701e8fb0ede434afba9560d52ee9509046698f6c 100644 (file)
--- a/hw/audio/gusemu_mixer.c
+++ b/hw/audio/gusemu_mixer.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "gusemu.h"
 #include "gustate.h"
 

diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c
index 3c03ff566859a2f12fc65a6a3470d41be3d67f58..52d4640e60b7d489b0e9466cb92f7ba9315d515f 100644 (file)
--- a/hw/audio/hda-codec.c
+++ b/hw/audio/hda-codec.c
@@ -17,6 +17,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "intel-hda.h"

diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c
index 433463e9c5342aebaeab979e7f5a2955f6824add..d372d4ab98a5cd969bbf9f21e388764d7129715d 100644 (file)
--- a/hw/audio/intel-hda.c
+++ b/hw/audio/intel-hda.c
@@ -17,6 +17,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/msi.h"

diff --git a/hw/audio/lm4549.c b/hw/audio/lm4549.c
index 380ef603bd7c45a6999af369382aaf170ade7791..a46f2301af820490d23b704cff7c5b68bd21bc3b 100644 (file)
--- a/hw/audio/lm4549.c
+++ b/hw/audio/lm4549.c
@@ -13,6 +13,7 @@
  * It supports only one playback voice and no record voice.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "audio/audio.h"
 #include "lm4549.h"
@@ -33,7 +34,6 @@ do { printf("lm4549: " fmt , ## __VA_ARGS__); } while (0)
 #endif
 
 #if defined(LM4549_DUMP_DAC_INPUT)
-#include <stdio.h>
 static FILE *fp_dac_input;
 #endif
 

diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c
index 86992677e3717f823bfa15290e662dd7c9a80f67..a6ca1806be2b3d06d10b81783cbafbbc4ff84341 100644 (file)
--- a/hw/audio/marvell_88w8618.c
+++ b/hw/audio/marvell_88w8618.c
@@ -9,6 +9,7 @@
  * Contributions after 2012-01-13 are licensed under the terms of the
  * GNU GPL, version 2 or (at your option) any later version.
  */
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/hw.h"
 #include "hw/i2c/i2c.h"

diff --git a/hw/audio/milkymist-ac97.c b/hw/audio/milkymist-ac97.c
index 28f55e853526c4116a3603212af371b33169435e..6a3b53674e510989637d8c21505a9703f248a553 100644 (file)
--- a/hw/audio/milkymist-ac97.c
+++ b/hw/audio/milkymist-ac97.c
@@ -21,6 +21,7 @@
  *   http://www.milkymist.org/socdoc/ac97.pdf
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "trace.h"

diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c
index 5266fb5457e5bd91b05682a2b6dc05e3243dd3d8..f9afc8edad0d3c5c4dee9356ca600ace96a0e63e 100644 (file)
--- a/hw/audio/pcspk.c
+++ b/hw/audio/pcspk.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/isa/isa.h"

diff --git a/hw/audio/pl041.c b/hw/audio/pl041.c
index 19982f2477a48eb95339377b9f2452bf3ec016b3..4717bc9b9c9e6c4bdd526717acaa93302795bd9e 100644 (file)
--- a/hw/audio/pl041.c
+++ b/hw/audio/pl041.c
@@ -20,6 +20,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 
 #include "pl041.h"

diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c
index 995435f2404b5762ace4a09ae252471d6bcc1609..3b2dcfdad9d70e8bd1b61edd861183b543668ff4 100644 (file)
--- a/hw/audio/sb16.c
+++ b/hw/audio/sb16.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/audio/audio.h"
 #include "audio/audio.h"

diff --git a/hw/audio/wm8750.c b/hw/audio/wm8750.c
index b50b3314024c4c1d28893ffc73fe1600fc85ca7c..0c6500e96ac7c926fe48ad39b6b503421fe66429 100644 (file)
--- a/hw/audio/wm8750.c
+++ b/hw/audio/wm8750.c
@@ -7,6 +7,7 @@
  * This file is licensed under GNU GPL.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i2c/i2c.h"
 #include "audio/audio.h"