ui: 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: 1454089805-5470-2-git-send-email-peter.maydell@linaro.org

diff --git a/ui/console-gl.c b/ui/console-gl.c
index baf397b300aa628c7342e501b5dbc17c4790a941..74b1bed6ee4eac83087c7d8a424d2f150be59828 100644 (file)
--- a/ui/console-gl.c
+++ b/ui/console-gl.c
@@ -24,6 +24,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 "ui/console.h"
 #include "ui/shader.h"

diff --git a/ui/console.c b/ui/console.c
index 791b4fcea2c95cb787ed090b04cc4de8725304a4..b739ae9a055bdf7a4756442974ed0f7e162836a9 100644 (file)
--- a/ui/console.c
+++ b/ui/console.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 "ui/console.h"
 #include "hw/qdev-core.h"

diff --git a/ui/curses.c b/ui/curses.c
index 274e09b0becd4b3143620c5da674878afbaf734a..b47558956c1436b5cf26f4c77b9fa4d670a96b5b 100644 (file)
--- a/ui/curses.c
+++ b/ui/curses.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 <curses.h>
 
 #ifndef _WIN32

diff --git a/ui/cursor.c b/ui/cursor.c
index 2b8dd3fa50ab4f9c1d65a89d3823426d9fa6245c..a276e01f1cd52b6ebc5d42dbb31809a5d044e4dc 100644 (file)
--- a/ui/cursor.c
+++ b/ui/cursor.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "ui/console.h"
 

diff --git a/ui/egl-context.c b/ui/egl-context.c
index 40102e392e1f57d2f23545fe4df54ed9d9f010d2..3a02b68d1a6dc0bc0b305dddf12c39c7680724ab 100644 (file)
--- a/ui/egl-context.c
+++ b/ui/egl-context.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "ui/egl-context.h"
 

diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c
index 87d77afaa852bbd50e3269be8cf261be3ad359f0..4c838346156b77d8968995e6460a42897bfac282 100644 (file)
--- a/ui/egl-helpers.c
+++ b/ui/egl-helpers.c
@@ -1,11 +1,4 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
+#include "qemu/osdep.h"
 #include <glob.h>
 
 #include "ui/egl-helpers.h"

diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c
index 500c42c9fac05f29029329fae5ffb488a84d88ab..431457c746d1cb08295aad657b3208630709b2d2 100644 (file)
--- a/ui/gtk-egl.c
+++ b/ui/gtk-egl.c
@@ -11,6 +11,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#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 dec3edb29665c17d220e808bd46a709bd9eb46b4..b86ff3cbec2d98930a370ba1a97ca5c28c1a01e5 100644 (file)
--- a/ui/gtk-gl-area.c
+++ b/ui/gtk-gl-area.c
@@ -7,6 +7,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 
 #include "trace.h"

diff --git a/ui/gtk.c b/ui/gtk.c
index c8dbd5c7f0775f99741f6542d3016f9d439d513e..2b46965f8003f993d5220e84bbed07d055a96e43 100644 (file)
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -34,6 +34,7 @@
 #define GETTEXT_PACKAGE "qemu"
 #define LOCALEDIR "po"
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 
 #include "ui/console.h"

diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index 63d71d2632d9770c064a749df5a2fd32411285d2..fd2c09ddc214fc83b3abc721fdbaf8aa8762eb59 100644 (file)
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "ui/keymaps.h"
 #include "ui/input.h"

diff --git a/ui/input-legacy.c b/ui/input-legacy.c
index 3454055084c4957bfd0f1762cf130d5fd0cde851..c97eac17784f46e602f504e9ac6243b6215bf861 100644 (file)
--- a/ui/input-legacy.c
+++ b/ui/input-legacy.c
@@ -22,9 +22,9 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "ui/console.h"
-#include "qapi/error.h"
 #include "qmp-commands.h"
 #include "qapi-types.h"
 #include "ui/keymaps.h"

diff --git a/ui/input.c b/ui/input.c
index 006667b3d5db95f045d9f2f814c93ed9e57c5418..bdcb974a89a0e30636dedf5f85e18e9e1e2c5004 100644 (file)
--- a/ui/input.c
+++ b/ui/input.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "hw/qdev.h"
 #include "sysemu/sysemu.h"
 #include "qapi-types.h"

diff --git a/ui/keymaps.c b/ui/keymaps.c
index 1b9ba3fa24a0eb2e5f0e98d257e8742419db6c28..8899a0b31e3c0de22281ea0db449112daca75e4b 100644 (file)
--- a/ui/keymaps.c
+++ b/ui/keymaps.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "keymaps.h"
 #include "sysemu/sysemu.h"
 

diff --git a/ui/qemu-pixman.c b/ui/qemu-pixman.c
index 4116e1507b68d5e9e5a04e3020bce6bfb3502b8f..c9f8dce7f40801d6f961169b85a400ebb5846176 100644 (file)
--- a/ui/qemu-pixman.c
+++ b/ui/qemu-pixman.c
@@ -3,6 +3,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "ui/console.h"
 

diff --git a/ui/sdl.c b/ui/sdl.c
index f215fe140d5d96dd5affe328f571e4f329bbe9b5..9804ee8dfbf638a692d7f3ab0f8503cc3a679065 100644 (file)
--- a/ui/sdl.c
+++ b/ui/sdl.c
@@ -25,6 +25,7 @@
 /* Avoid compiler warning because macro is redefined in SDL_syswm.h. */
 #undef WIN32_LEAN_AND_MEAN
 
+#include "qemu/osdep.h"
 #include <SDL.h>
 #include <SDL_syswm.h>
 

diff --git a/ui/sdl2-2d.c b/ui/sdl2-2d.c
index 191ee3b52de5d29765986ac78801eec0c1ce943b..95930061eab9cc0b09ecbe6dd0183f61ee22c031 100644 (file)
--- a/ui/sdl2-2d.c
+++ b/ui/sdl2-2d.c
@@ -23,6 +23,7 @@
  */
 /* 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"

diff --git a/ui/sdl2-gl.c b/ui/sdl2-gl.c
index 2bb3d06babf48684f760dbfa5a73eb933f51889f..a324ecacac3ef50b26344ec9f8e7d09cb57c15ca 100644 (file)
--- a/ui/sdl2-gl.c
+++ b/ui/sdl2-gl.c
@@ -25,6 +25,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "ui/console.h"
 #include "ui/input.h"

diff --git a/ui/sdl2-input.c b/ui/sdl2-input.c
index ac5dc9476ba4c424d5a034a8962999afafa4efc1..6e315ae8006e7c39e2bfb16de2bb6beadec2441c 100644 (file)
--- a/ui/sdl2-input.c
+++ b/ui/sdl2-input.c
@@ -23,6 +23,7 @@
  */
 /* 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"

diff --git a/ui/sdl2.c b/ui/sdl2.c
index c0a76d7744e7fbb8d71c83758c48ac77c6d64586..e0128ad7558f60489b698aa69bf44ba065060714 100644 (file)
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -23,6 +23,7 @@
  */
 /* 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"

diff --git a/ui/sdl_zoom.c b/ui/sdl_zoom.c
index 2625c4557eccc36dd02d15b493558a1b5ab9e311..72622c2647a158189c77a3cb89b7cd15d5d97cf3 100644 (file)
--- a/ui/sdl_zoom.c
+++ b/ui/sdl_zoom.c
@@ -11,11 +11,9 @@
  *
  */
 
-#include "sdl_zoom.h"
 #include "qemu/osdep.h"
+#include "sdl_zoom.h"
 #include <glib.h>
-#include <stdint.h>
-#include <stdio.h>
 
 static void sdl_zoom_rgb16(SDL_Surface *src, SDL_Surface *dst, int smooth,
                            SDL_Rect *dst_rect);

diff --git a/ui/shader.c b/ui/shader.c
index 0588655cfed8152cbd885f806396469ecb1ea60e..9264009b80117765956dbeb3aa88098030719568 100644 (file)
--- a/ui/shader.c
+++ b/ui/shader.c
@@ -24,6 +24,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 "ui/shader.h"
 

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 8f27768819311f4a37342632991fa90de9fc7035..4dbd99ab19f03c70f5d7c54ba7a5e159e98348bc 100644 (file)
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -15,6 +15,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include <spice.h>
 
 #include <netdb.h>

diff --git a/ui/spice-display.c b/ui/spice-display.c
index 0489131968dec91fc3f84563d413dec6db6a265a..8a5b3258bd2dfac0116eff1692ffcaa33a929e3b 100644 (file)
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -15,6 +15,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "ui/qemu-spice.h"
 #include "qemu/timer.h"

diff --git a/ui/spice-input.c b/ui/spice-input.c
index 2b3b9ed714e4f83c1e5281a4a45675aa881be671..72e406382fba90f2295ce5a8803672d1f138ddf6 100644 (file)
--- a/ui/spice-input.c
+++ b/ui/spice-input.c
@@ -15,10 +15,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
+#include "qemu/osdep.h"
 
 #include <spice.h>
 #include <spice/enums.h>

diff --git a/ui/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c
index de8abc96d48b8544e1aef96ae7cab406e6979fbc..13a59f500e839016a940f792e3424c50d3582612 100644 (file)
--- a/ui/vnc-auth-sasl.c
+++ b/ui/vnc-auth-sasl.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "vnc.h"
 
 /* Max amount of data we send/recv for SASL steps to prevent DOS */

diff --git a/ui/vnc-auth-vencrypt.c b/ui/vnc-auth-vencrypt.c
index 093dd2f4c2e2e6fae545b0d745a484941e9692f0..8f3bb11cea31fb05537ba57edc4540537813c950 100644 (file)
--- a/ui/vnc-auth-vencrypt.c
+++ b/ui/vnc-auth-vencrypt.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "vnc.h"
 #include "qemu/main-loop.h"
 

diff --git a/ui/vnc-enc-hextile.c b/ui/vnc-enc-hextile.c
index 2e768fd89984ac3af88bf6c70fa1a97a444b53f4..4215bd7daf51e8eab6375e5f1d34ca294e6a2aa8 100644 (file)
--- a/ui/vnc-enc-hextile.c
+++ b/ui/vnc-enc-hextile.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "vnc.h"
 
 static void hextile_enc_cord(uint8_t *ptr, int x, int y, int w, int h)

diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
index 9a9ddf2e3ca1f6e6d17391d7cb646a9ad9ce38ae..e5cba0e5a738144d48bf691de48350dfa8331d78 100644 (file)
--- a/ui/vnc-enc-tight.c
+++ b/ui/vnc-enc-tight.c
@@ -26,7 +26,7 @@
  * THE SOFTWARE.
  */
 
-#include "config-host.h"
+#include "qemu/osdep.h"
 
 /* This needs to be before jpeglib.h line because of conflict with
    INT32 definitions between jmorecfg.h (included by jpeglib.h) and
@@ -40,7 +40,6 @@
 #include <png.h>
 #endif
 #ifdef CONFIG_VNC_JPEG
-#include <stdio.h>
 #include <jpeglib.h>
 #endif
 

diff --git a/ui/vnc-enc-zlib.c b/ui/vnc-enc-zlib.c
index d1b97f2516fd6eb622bed13e90b22c8ef2df4a76..33e9df2f6adeef894742e9aadc0fdf258266b6b4 100644 (file)
--- a/ui/vnc-enc-zlib.c
+++ b/ui/vnc-enc-zlib.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "vnc.h"
 
 #define ZALLOC_ALIGNMENT 16

diff --git a/ui/vnc-enc-zrle-template.c b/ui/vnc-enc-zrle-template.c
index 70ae624ee94b84952721a1b6ae0acdd5acc93ef5..abf6b86e4eba92b76508e86fe91d0a094679049b 100644 (file)
--- a/ui/vnc-enc-zrle-template.c
+++ b/ui/vnc-enc-zrle-template.c
@@ -22,7 +22,7 @@
  */
 
 
-#include <assert.h>
+#include "qemu/osdep.h"
 
 #undef ZRLE_ENDIAN_SUFFIX
 

diff --git a/ui/vnc-enc-zrle.c b/ui/vnc-enc-zrle.c
index ed3b48465d7d43182d911841fa53faa8a039f17f..5489870e700d6d8b246de8d0bc5595d3c955e67d 100644 (file)
--- a/ui/vnc-enc-zrle.c
+++ b/ui/vnc-enc-zrle.c
@@ -26,6 +26,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "vnc.h"
 #include "vnc-enc-zrle.h"
 

diff --git a/ui/vnc-enc-zywrle-template.c b/ui/vnc-enc-zywrle-template.c
index 561f7bfabb898d9490f81852b44364ff0c887034..b446380a7a3fcbcc5b2b11ad70f2f2a00658bb48 100644 (file)
--- a/ui/vnc-enc-zywrle-template.c
+++ b/ui/vnc-enc-zywrle-template.c
@@ -100,6 +100,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #define ZYWRLE_QUANTIZE
+#include "qemu/osdep.h"
 #include "vnc-enc-zywrle.h"
 
 #ifndef ZRLE_COMPACT_PIXEL

diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c
index 546635aabe587a88975ba3fd3c4c14141130ebab..98ca978b062fa209d8e2ecdeffc3081167ba97b3 100644 (file)
--- a/ui/vnc-jobs.c
+++ b/ui/vnc-jobs.c
@@ -26,6 +26,7 @@
  */
 
 
+#include "qemu/osdep.h"
 #include "vnc.h"
 #include "vnc-jobs.h"
 #include "qemu/sockets.h"

diff --git a/ui/vnc-palette.c b/ui/vnc-palette.c
index c130deee9d41c69f02af8b67cf3fa440abfa2056..3b89d1af25c049fd74f64d3689115d3b4cbe6479 100644 (file)
--- a/ui/vnc-palette.c
+++ b/ui/vnc-palette.c
@@ -26,9 +26,9 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "vnc-palette.h"
 #include <glib.h>
-#include <string.h>
 
 static VncPaletteEntry *palette_find(const VncPalette *palette,
                                      uint32_t color, unsigned int hash)

diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c
index 80182334ef4788ac9f4e92d32402e8492999d891..1d3ecc23303cfd0841bfb058ed1bedd06c34c1cc 100644 (file)
--- a/ui/vnc-ws.c
+++ b/ui/vnc-ws.c
@@ -18,6 +18,7 @@
  * along with this software; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "vnc.h"
 #include "io/channel-websock.h"
 

diff --git a/ui/vnc.c b/ui/vnc.c
index 339f8c35b2e1a4330c94abfe3739ef30c33d48fc..b6bbea5f4452f82a608831eaff7829d9fc301021 100644 (file)
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "vnc.h"
 #include "vnc-jobs.h"
 #include "trace.h"
@@ -37,7 +38,6 @@
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/types.h"
 #include "qmp-commands.h"
-#include "qemu/osdep.h"
 #include "ui/input.h"
 #include "qapi-event.h"
 #include "crypto/hash.h"

diff --git a/ui/x_keymap.c b/ui/x_keymap.c
index 1a773174f601208ec8ae43f4f6f3971c4567f2ef..27884851de0729ad90070e4c6887bf15abe6a793 100644 (file)
--- a/ui/x_keymap.c
+++ b/ui/x_keymap.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 "x_keymap.h"