Move gtk/ -> src/

For historical reasons, the code was placed under gtk/ subdirectory.
If it was always bugging you, bug no more!

155 files changed, 30 insertions, 29 deletions

diff --git a/Makefile.am b/Makefile.am
index e559c4d..3d7a174 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4
 NULL =
 
-SUBDIRS = spice-common gtk man po doc data
+SUBDIRS = spice-common src man po doc data
 
 if BUILD_TESTS
 SUBDIRS += tests
diff --git a/configure.ac b/configure.ac
index cf5a039..1d8f4d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,7 +88,7 @@ dnl =========================================================================
 dnl Chek optional features
 
 srcdir="$(dirname $0)"
-if test ! -e "$srcdir/gtk/vncdisplaykeymap_osx2xtkbd.c"; then
+if test ! -e "$srcdir/src/vncdisplaykeymap_osx2xtkbd.c"; then
   AC_MSG_CHECKING([for Text::CSV Perl module])
   perl -MText::CSV -e "" >/dev/null 2>&1
   if test $? -ne 0 ; then
@@ -708,7 +708,7 @@ dnl ===========================================================================
 dnl check compiler flags
 
 # We want to enable these, but need to sort out the
-# decl mess with  gtk/generated_*.c
+# decl mess with  src/generated_*.c
 dontwarn="-Wmissing-prototypes -Wmissing-declarations"
 
 # We want to enable these, but Gtk+2.0 has a bad decl
@@ -746,9 +746,9 @@ spice-controller.pc
 data/Makefile
 data/spicy.nsis
 po/Makefile.in
-gtk/Makefile
-gtk/spice-version.h
-gtk/controller/Makefile
+src/Makefile
+src/spice-version.h
+src/controller/Makefile
 doc/Makefile
 doc/reference/Makefile
 man/Makefile
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 76c7d34..0e4d5b3 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -7,7 +7,7 @@ DOC_MODULE = spice-gtk
 DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
 
 # Source code location
-DOC_SOURCE_DIR = $(top_srcdir)/gtk
+DOC_SOURCE_DIR = $(top_srcdir)/src
 
 # Extra options to supply to gtkdoc-scan.
 SCAN_OPTIONS = \
@@ -18,8 +18,8 @@ SCAN_OPTIONS = \
 MKDB_OPTIONS = --xml-mode --output-format=xml
 
 # Used for dependencies. The docs will be rebuilt if any of these change.
-HFILE_GLOB = $(top_srcdir)/gtk/*.h
-CFILE_GLOB = $(top_srcdir)/gtk/*.c
+HFILE_GLOB = $(top_srcdir)/src/*.h
+CFILE_GLOB = $(top_srcdir)/src/*.c
 
 # Header files to ignore when scanning. Use base file name, no paths
 IGNORE_HFILES=					\
@@ -54,8 +54,8 @@ IGNORE_HFILES=					\
 	$(NULL)
 
 # CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
-GTKDOC_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/gtk -I$(top_builddir)/gtk $(SPICE_GLIB_CFLAGS) $(SPICE_GTK_CFLAGS) $(COMMON_CFLAGS)
-GTKDOC_LIBS = $(top_builddir)/gtk/libspice-client-glib-2.0.la $(top_builddir)/gtk/libspice-client-gtk-$(SPICE_GTK_API_VERSION).la
+GTKDOC_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/src -I$(top_builddir)/src $(SPICE_GLIB_CFLAGS) $(SPICE_GTK_CFLAGS) $(COMMON_CFLAGS)
+GTKDOC_LIBS = $(top_builddir)/src/libspice-client-glib-2.0.la $(top_builddir)/src/libspice-client-gtk-$(SPICE_GTK_API_VERSION).la
 
 include $(top_srcdir)/gtk-doc.make
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d7bf614..f629270 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,11 +1,11 @@
-gtk/channel-usbredir.c
-gtk/desktop-integration.c
-gtk/spice-channel.c
-gtk/spice-cmdline.c
-gtk/spice-option.c
-gtk/spicy-screenshot.c
-gtk/spicy-stats.c
-gtk/spicy.c
-gtk/usb-device-manager.c
-gtk/usb-device-widget.c
-gtk/usbutil.c
+src/channel-usbredir.c
+src/desktop-integration.c
+src/spice-channel.c
+src/spice-cmdline.c
+src/spice-option.c
+src/spicy-screenshot.c
+src/spicy-stats.c
+src/spicy.c
+src/usb-device-manager.c
+src/usb-device-widget.c
+src/usbutil.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 971470e..646ac25 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,2 +1,3 @@
 data/spicy.desktop.in
-gtk/phodav/libphodav/chezdav.c
+spice-common/python_modules/spice_parser.py
+spice-common/spice_codegen.py
diff --git a/gtk/Makefile.am b/src/Makefile.am
index 25e2255..25e2255 100644
--- a/gtk/Makefile.am
+++ b/src/Makefile.am
diff --git a/gtk/bio-gio.c b/src/bio-gio.c
index 108ac1a..108ac1a 100644
--- a/gtk/bio-gio.c
+++ b/src/bio-gio.c
diff --git a/gtk/bio-gio.h b/src/bio-gio.h
index 31fd369..31fd369 100644
--- a/gtk/bio-gio.h
+++ b/src/bio-gio.h
diff --git a/gtk/channel-base.c b/src/channel-base.c
index 77d339c..77d339c 100644
--- a/gtk/channel-base.c
+++ b/src/channel-base.c
diff --git a/gtk/channel-cursor.c b/src/channel-cursor.c
index e6514a2..e6514a2 100644
--- a/gtk/channel-cursor.c
+++ b/src/channel-cursor.c
diff --git a/gtk/channel-cursor.h b/src/channel-cursor.h
index 5b5ed47..5b5ed47 100644
--- a/gtk/channel-cursor.h
+++ b/src/channel-cursor.h
diff --git a/gtk/channel-display-mjpeg.c b/src/channel-display-mjpeg.c
index 95d5b33..95d5b33 100644
--- a/gtk/channel-display-mjpeg.c
+++ b/src/channel-display-mjpeg.c
diff --git a/gtk/channel-display-priv.h b/src/channel-display-priv.h
index 71f5d17..71f5d17 100644
--- a/gtk/channel-display-priv.h
+++ b/src/channel-display-priv.h
diff --git a/gtk/channel-display.c b/src/channel-display.c
index efe2259..efe2259 100644
--- a/gtk/channel-display.c
+++ b/src/channel-display.c
diff --git a/gtk/channel-display.h b/src/channel-display.h
index 88e60d9..88e60d9 100644
--- a/gtk/channel-display.h
+++ b/src/channel-display.h
diff --git a/gtk/channel-inputs.c b/src/channel-inputs.c
index df1ffe1..df1ffe1 100644
--- a/gtk/channel-inputs.c
+++ b/src/channel-inputs.c
diff --git a/gtk/channel-inputs.h b/src/channel-inputs.h
index 3179a76..3179a76 100644
--- a/gtk/channel-inputs.h
+++ b/src/channel-inputs.h
diff --git a/gtk/channel-main.c b/src/channel-main.c
index c55d097..c55d097 100644
--- a/gtk/channel-main.c
+++ b/src/channel-main.c
diff --git a/gtk/channel-main.h b/src/channel-main.h
index 3e4fc42..3e4fc42 100644
--- a/gtk/channel-main.h
+++ b/src/channel-main.h
diff --git a/gtk/channel-playback-priv.h b/src/channel-playback-priv.h
index aa33d2c..aa33d2c 100644
--- a/gtk/channel-playback-priv.h
+++ b/src/channel-playback-priv.h
diff --git a/gtk/channel-playback.c b/src/channel-playback.c
index d8a181e..d8a181e 100644
--- a/gtk/channel-playback.c
+++ b/src/channel-playback.c
diff --git a/gtk/channel-playback.h b/src/channel-playback.h
index 9cf68cf..9cf68cf 100644
--- a/gtk/channel-playback.h
+++ b/src/channel-playback.h
diff --git a/gtk/channel-port.c b/src/channel-port.c
index f0b6d1e..f0b6d1e 100644
--- a/gtk/channel-port.c
+++ b/src/channel-port.c
diff --git a/gtk/channel-port.h b/src/channel-port.h
index 08c15dc..08c15dc 100644
--- a/gtk/channel-port.h
+++ b/src/channel-port.h
diff --git a/gtk/channel-record.c b/src/channel-record.c
index d07d84e..d07d84e 100644
--- a/gtk/channel-record.c
+++ b/src/channel-record.c
diff --git a/gtk/channel-record.h b/src/channel-record.h
index 20a9ad3..20a9ad3 100644
--- a/gtk/channel-record.h
+++ b/src/channel-record.h
diff --git a/gtk/channel-smartcard.c b/src/channel-smartcard.c
index d91c9a0..d91c9a0 100644
--- a/gtk/channel-smartcard.c
+++ b/src/channel-smartcard.c
diff --git a/gtk/channel-smartcard.h b/src/channel-smartcard.h
index 28c8b88..28c8b88 100644
--- a/gtk/channel-smartcard.h
+++ b/src/channel-smartcard.h
diff --git a/gtk/channel-usbredir-priv.h b/src/channel-usbredir-priv.h
index 2c4c6f7..2c4c6f7 100644
--- a/gtk/channel-usbredir-priv.h
+++ b/src/channel-usbredir-priv.h
diff --git a/gtk/channel-usbredir.c b/src/channel-usbredir.c
index 292b82f..292b82f 100644
--- a/gtk/channel-usbredir.c
+++ b/src/channel-usbredir.c
diff --git a/gtk/channel-usbredir.h b/src/channel-usbredir.h
index 0cc4fbf..0cc4fbf 100644
--- a/gtk/channel-usbredir.h
+++ b/src/channel-usbredir.h
diff --git a/gtk/channel-webdav.c b/src/channel-webdav.c
index bde728e..bde728e 100644
--- a/gtk/channel-webdav.c
+++ b/src/channel-webdav.c
diff --git a/gtk/channel-webdav.h b/src/channel-webdav.h
index 7940706..7940706 100644
--- a/gtk/channel-webdav.h
+++ b/src/channel-webdav.h
diff --git a/gtk/client_sw_canvas.c b/src/client_sw_canvas.c
index a69abe0..a69abe0 100644
--- a/gtk/client_sw_canvas.c
+++ b/src/client_sw_canvas.c
diff --git a/gtk/client_sw_canvas.h b/src/client_sw_canvas.h
index 1180c5b..1180c5b 100644
--- a/gtk/client_sw_canvas.h
+++ b/src/client_sw_canvas.h
diff --git a/gtk/continuation.c b/src/continuation.c
index adce858..adce858 100644
--- a/gtk/continuation.c
+++ b/src/continuation.c
diff --git a/gtk/continuation.h b/src/continuation.h
index 675a257..675a257 100644
--- a/gtk/continuation.h
+++ b/src/continuation.h
diff --git a/gtk/controller/Makefile.am b/src/controller/Makefile.am
index 00552e8..00552e8 100644
--- a/gtk/controller/Makefile.am
+++ b/src/controller/Makefile.am
diff --git a/gtk/controller/controller.vala b/src/controller/controller.vala
index 84b4527..84b4527 100644
--- a/gtk/controller/controller.vala
+++ b/src/controller/controller.vala
diff --git a/gtk/controller/custom.h b/src/controller/custom.h
index 7f849fc..7f849fc 100644
--- a/gtk/controller/custom.h
+++ b/src/controller/custom.h
diff --git a/gtk/controller/custom.vapi b/src/controller/custom.vapi
index a12fdec..a12fdec 100644
--- a/gtk/controller/custom.vapi
+++ b/src/controller/custom.vapi
diff --git a/gtk/controller/dump.c b/src/controller/dump.c
index 831a1d7..831a1d7 100644
--- a/gtk/controller/dump.c
+++ b/src/controller/dump.c
diff --git a/gtk/controller/foreign-menu.vala b/src/controller/foreign-menu.vala
index 005955a..005955a 100644
--- a/gtk/controller/foreign-menu.vala
+++ b/src/controller/foreign-menu.vala
diff --git a/gtk/controller/gio-windows-2.0.vapi b/src/controller/gio-windows-2.0.vapi
index a09cfe8..a09cfe8 100644
--- a/gtk/controller/gio-windows-2.0.vapi
+++ b/src/controller/gio-windows-2.0.vapi
diff --git a/gtk/controller/menu.vala b/src/controller/menu.vala
index 7e8fc16..7e8fc16 100644
--- a/gtk/controller/menu.vala
+++ b/src/controller/menu.vala
diff --git a/gtk/controller/namedpipe.c b/src/controller/namedpipe.c
index 5312218..5312218 100644
--- a/gtk/controller/namedpipe.c
+++ b/src/controller/namedpipe.c
diff --git a/gtk/controller/namedpipe.h b/src/controller/namedpipe.h
index e0e873b..e0e873b 100644
--- a/gtk/controller/namedpipe.h
+++ b/src/controller/namedpipe.h
diff --git a/gtk/controller/namedpipeconnection.c b/src/controller/namedpipeconnection.c
index 3173b61..3173b61 100644
--- a/gtk/controller/namedpipeconnection.c
+++ b/src/controller/namedpipeconnection.c
diff --git a/gtk/controller/namedpipeconnection.h b/src/controller/namedpipeconnection.h
index 86f0be6..86f0be6 100644
--- a/gtk/controller/namedpipeconnection.h
+++ b/src/controller/namedpipeconnection.h
diff --git a/gtk/controller/namedpipelistener.c b/src/controller/namedpipelistener.c
index 820c606..820c606 100644
--- a/gtk/controller/namedpipelistener.c
+++ b/src/controller/namedpipelistener.c
diff --git a/gtk/controller/namedpipelistener.h b/src/controller/namedpipelistener.h
index c2dbd0a..c2dbd0a 100644
--- a/gtk/controller/namedpipelistener.h
+++ b/src/controller/namedpipelistener.h
diff --git a/gtk/controller/spice-controller-listener.c b/src/controller/spice-controller-listener.c
index 98baf33..98baf33 100644
--- a/gtk/controller/spice-controller-listener.c
+++ b/src/controller/spice-controller-listener.c
diff --git a/gtk/controller/spice-controller-listener.h b/src/controller/spice-controller-listener.h
index a50bdea..a50bdea 100644
--- a/gtk/controller/spice-controller-listener.h
+++ b/src/controller/spice-controller-listener.h
diff --git a/gtk/controller/spice-foreign-menu-listener.c b/src/controller/spice-foreign-menu-listener.c
index 5e62606..5e62606 100644
--- a/gtk/controller/spice-foreign-menu-listener.c
+++ b/src/controller/spice-foreign-menu-listener.c
diff --git a/gtk/controller/spice-foreign-menu-listener.h b/src/controller/spice-foreign-menu-listener.h
index 1071528..1071528 100644
--- a/gtk/controller/spice-foreign-menu-listener.h
+++ b/src/controller/spice-foreign-menu-listener.h
diff --git a/gtk/controller/test.c b/src/controller/test.c
index c08fe21..c08fe21 100644
--- a/gtk/controller/test.c
+++ b/src/controller/test.c
diff --git a/gtk/controller/util.vala b/src/controller/util.vala
index acd677e..acd677e 100644
--- a/gtk/controller/util.vala
+++ b/src/controller/util.vala
diff --git a/gtk/controller/win32-util.c b/src/controller/win32-util.c
index c3e0400..c3e0400 100644
--- a/gtk/controller/win32-util.c
+++ b/src/controller/win32-util.c
diff --git a/gtk/controller/win32-util.h b/src/controller/win32-util.h
index b24ac77..b24ac77 100644
--- a/gtk/controller/win32-util.h
+++ b/src/controller/win32-util.h
diff --git a/gtk/coroutine.h b/src/coroutine.h
index 78dc467..78dc467 100644
--- a/gtk/coroutine.h
+++ b/src/coroutine.h
diff --git a/gtk/coroutine_gthread.c b/src/coroutine_gthread.c
index b0098fa..b0098fa 100644
--- a/gtk/coroutine_gthread.c
+++ b/src/coroutine_gthread.c
diff --git a/gtk/coroutine_ucontext.c b/src/coroutine_ucontext.c
index d709a33..d709a33 100644
--- a/gtk/coroutine_ucontext.c
+++ b/src/coroutine_ucontext.c
diff --git a/gtk/coroutine_winfibers.c b/src/coroutine_winfibers.c
index a56d33d..a56d33d 100644
--- a/gtk/coroutine_winfibers.c
+++ b/src/coroutine_winfibers.c
diff --git a/gtk/decode-glz-tmpl.c b/src/decode-glz-tmpl.c
index b337a8b..b337a8b 100644
--- a/gtk/decode-glz-tmpl.c
+++ b/src/decode-glz-tmpl.c
diff --git a/gtk/decode-glz.c b/src/decode-glz.c
index 34a7185..34a7185 100644
--- a/gtk/decode-glz.c
+++ b/src/decode-glz.c
diff --git a/gtk/decode-jpeg.c b/src/decode-jpeg.c
index 697d0de..697d0de 100644
--- a/gtk/decode-jpeg.c
+++ b/src/decode-jpeg.c
diff --git a/gtk/decode-zlib.c b/src/decode-zlib.c
index a5325c0..a5325c0 100644
--- a/gtk/decode-zlib.c
+++ b/src/decode-zlib.c
diff --git a/gtk/decode.h b/src/decode.h
index b274d67..b274d67 100644
--- a/gtk/decode.h
+++ b/src/decode.h
diff --git a/gtk/desktop-integration.c b/src/desktop-integration.c
index 5868d48..5868d48 100644
--- a/gtk/desktop-integration.c
+++ b/src/desktop-integration.c
diff --git a/gtk/desktop-integration.h b/src/desktop-integration.h
index 3716089..3716089 100644
--- a/gtk/desktop-integration.h
+++ b/src/desktop-integration.h
diff --git a/gtk/gio-coroutine.c b/src/gio-coroutine.c
index c866e15..c866e15 100644
--- a/gtk/gio-coroutine.c
+++ b/src/gio-coroutine.c
diff --git a/gtk/gio-coroutine.h b/src/gio-coroutine.h
index b3a6d78..b3a6d78 100644
--- a/gtk/gio-coroutine.h
+++ b/src/gio-coroutine.h
diff --git a/gtk/giopipe.c b/src/giopipe.c
index d91c4d9..d91c4d9 100644
--- a/gtk/giopipe.c
+++ b/src/giopipe.c
diff --git a/gtk/giopipe.h b/src/giopipe.h
index 46c2c9c..46c2c9c 100644
--- a/gtk/giopipe.h
+++ b/src/giopipe.h
diff --git a/gtk/glib-compat.c b/src/glib-compat.c
index 49edf73..49edf73 100644
--- a/gtk/glib-compat.c
+++ b/src/glib-compat.c
diff --git a/gtk/glib-compat.h b/src/glib-compat.h
index 5491fe4..5491fe4 100644
--- a/gtk/glib-compat.h
+++ b/src/glib-compat.h
diff --git a/gtk/gtk-compat.h b/src/gtk-compat.h
index be143b2..be143b2 100644
--- a/gtk/gtk-compat.h
+++ b/src/gtk-compat.h
diff --git a/gtk/keymap-gen.pl b/src/keymap-gen.pl
index 56953f8..56953f8 100755
--- a/gtk/keymap-gen.pl
+++ b/src/keymap-gen.pl
diff --git a/gtk/keymaps.csv b/src/keymaps.csv
index 9052e3b..9052e3b 100644
--- a/gtk/keymaps.csv
+++ b/src/keymaps.csv
diff --git a/gtk/map-file b/src/map-file
index d5a073f..d5a073f 100644
--- a/gtk/map-file
+++ b/src/map-file
diff --git a/gtk/smartcard-manager-priv.h b/src/smartcard-manager-priv.h
index 409c1c5..409c1c5 100644
--- a/gtk/smartcard-manager-priv.h
+++ b/src/smartcard-manager-priv.h
diff --git a/gtk/smartcard-manager.c b/src/smartcard-manager.c
index 9e228e9..9e228e9 100644
--- a/gtk/smartcard-manager.c
+++ b/src/smartcard-manager.c
diff --git a/gtk/smartcard-manager.h b/src/smartcard-manager.h
index 4811083..4811083 100644
--- a/gtk/smartcard-manager.h
+++ b/src/smartcard-manager.h
diff --git a/gtk/spice-audio-priv.h b/src/spice-audio-priv.h
index f108059..f108059 100644
--- a/gtk/spice-audio-priv.h
+++ b/src/spice-audio-priv.h
diff --git a/gtk/spice-audio.c b/src/spice-audio.c
index ce191e1..ce191e1 100644
--- a/gtk/spice-audio.c
+++ b/src/spice-audio.c
diff --git a/gtk/spice-audio.h b/src/spice-audio.h
index 0bf625b..0bf625b 100644
--- a/gtk/spice-audio.h
+++ b/src/spice-audio.h
diff --git a/gtk/spice-channel-cache.h b/src/spice-channel-cache.h
index 17775e6..17775e6 100644
--- a/gtk/spice-channel-cache.h
+++ b/src/spice-channel-cache.h
diff --git a/gtk/spice-channel-enums.h b/src/spice-channel-enums.h
index 02df762..02df762 100644
--- a/gtk/spice-channel-enums.h
+++ b/src/spice-channel-enums.h
diff --git a/gtk/spice-channel-priv.h b/src/spice-channel-priv.h
index d70cf86..d70cf86 100644
--- a/gtk/spice-channel-priv.h
+++ b/src/spice-channel-priv.h
diff --git a/gtk/spice-channel.c b/src/spice-channel.c
index 4e7d8b7..4e7d8b7 100644
--- a/gtk/spice-channel.c
+++ b/src/spice-channel.c
diff --git a/gtk/spice-channel.h b/src/spice-channel.h
index 7f132f6..7f132f6 100644
--- a/gtk/spice-channel.h
+++ b/src/spice-channel.h
diff --git a/gtk/spice-client-glib-usb-acl-helper.c b/src/spice-client-glib-usb-acl-helper.c
index bc09776..bc09776 100644
--- a/gtk/spice-client-glib-usb-acl-helper.c
+++ b/src/spice-client-glib-usb-acl-helper.c
diff --git a/gtk/spice-client-gtk-manual.defs b/src/spice-client-gtk-manual.defs
index 9631b74..9631b74 100644
--- a/gtk/spice-client-gtk-manual.defs
+++ b/src/spice-client-gtk-manual.defs
diff --git a/gtk/spice-client-gtk-module.c b/src/spice-client-gtk-module.c
index b82f1e3..b82f1e3 100644
--- a/gtk/spice-client-gtk-module.c
+++ b/src/spice-client-gtk-module.c
diff --git a/gtk/spice-client-gtk.override b/src/spice-client-gtk.override
index 41aeee3..41aeee3 100644
--- a/gtk/spice-client-gtk.override
+++ b/src/spice-client-gtk.override
diff --git a/gtk/spice-client.c b/src/spice-client.c
index 5fd511f..5fd511f 100644
--- a/gtk/spice-client.c
+++ b/src/spice-client.c
diff --git a/gtk/spice-client.h b/src/spice-client.h
index e4e1763..e4e1763 100644
--- a/gtk/spice-client.h
+++ b/src/spice-client.h
diff --git a/gtk/spice-cmdline.c b/src/spice-cmdline.c
index 8619b57..8619b57 100644
--- a/gtk/spice-cmdline.c
+++ b/src/spice-cmdline.c
diff --git a/gtk/spice-cmdline.h b/src/spice-cmdline.h
index 11a8086..11a8086 100644
--- a/gtk/spice-cmdline.h
+++ b/src/spice-cmdline.h
diff --git a/gtk/spice-common.h b/src/spice-common.h
index 8554f4c..8554f4c 100644
--- a/gtk/spice-common.h
+++ b/src/spice-common.h
diff --git a/gtk/spice-glib-sym-file b/src/spice-glib-sym-file
index 3a8da93..3a8da93 100644
--- a/gtk/spice-glib-sym-file
+++ b/src/spice-glib-sym-file
diff --git a/gtk/spice-grabsequence.c b/src/spice-grabsequence.c
index 39adfb0..39adfb0 100644
--- a/gtk/spice-grabsequence.c
+++ b/src/spice-grabsequence.c
diff --git a/gtk/spice-grabsequence.h b/src/spice-grabsequence.h
index fe58fc1..fe58fc1 100644
--- a/gtk/spice-grabsequence.h
+++ b/src/spice-grabsequence.h
diff --git a/gtk/spice-gstaudio.c b/src/spice-gstaudio.c
index 1623421..1623421 100644
--- a/gtk/spice-gstaudio.c
+++ b/src/spice-gstaudio.c
diff --git a/gtk/spice-gstaudio.h b/src/spice-gstaudio.h
index b605f1c..b605f1c 100644
--- a/gtk/spice-gstaudio.h
+++ b/src/spice-gstaudio.h
diff --git a/gtk/spice-gtk-session-priv.h b/src/spice-gtk-session-priv.h
index 91304b2..91304b2 100644
--- a/gtk/spice-gtk-session-priv.h
+++ b/src/spice-gtk-session-priv.h
diff --git a/gtk/spice-gtk-session.c b/src/spice-gtk-session.c
index 0937434..0937434 100644
--- a/gtk/spice-gtk-session.c
+++ b/src/spice-gtk-session.c
diff --git a/gtk/spice-gtk-session.h b/src/spice-gtk-session.h
index 3b4eac6..3b4eac6 100644
--- a/gtk/spice-gtk-session.h
+++ b/src/spice-gtk-session.h
diff --git a/gtk/spice-gtk-sym-file b/src/spice-gtk-sym-file
index 1574e07..1574e07 100644
--- a/gtk/spice-gtk-sym-file
+++ b/src/spice-gtk-sym-file
diff --git a/gtk/spice-marshal.txt b/src/spice-marshal.txt
index 9c76054..9c76054 100644
--- a/gtk/spice-marshal.txt
+++ b/src/spice-marshal.txt
diff --git a/gtk/spice-option.c b/src/spice-option.c
index 958e03c..958e03c 100644
--- a/gtk/spice-option.c
+++ b/src/spice-option.c
diff --git a/gtk/spice-option.h b/src/spice-option.h
index ce24f65..ce24f65 100644
--- a/gtk/spice-option.h
+++ b/src/spice-option.h
diff --git a/gtk/spice-pulse.c b/src/spice-pulse.c
index 22db893..22db893 100644
--- a/gtk/spice-pulse.c
+++ b/src/spice-pulse.c
diff --git a/gtk/spice-pulse.h b/src/spice-pulse.h
index 819647e..819647e 100644
--- a/gtk/spice-pulse.h
+++ b/src/spice-pulse.h
diff --git a/gtk/spice-session-priv.h b/src/spice-session-priv.h
index 049973a..049973a 100644
--- a/gtk/spice-session-priv.h
+++ b/src/spice-session-priv.h
diff --git a/gtk/spice-session.c b/src/spice-session.c
index 778d82a..778d82a 100644
--- a/gtk/spice-session.c
+++ b/src/spice-session.c
diff --git a/gtk/spice-session.h b/src/spice-session.h
index 750af29..750af29 100644
--- a/gtk/spice-session.h
+++ b/src/spice-session.h
diff --git a/gtk/spice-types.h b/src/spice-types.h
index f149094..f149094 100644
--- a/gtk/spice-types.h
+++ b/src/spice-types.h
diff --git a/gtk/spice-uri-priv.h b/src/spice-uri-priv.h
index 54351de..54351de 100644
--- a/gtk/spice-uri-priv.h
+++ b/src/spice-uri-priv.h
diff --git a/gtk/spice-uri.c b/src/spice-uri.c
index 82aefdb..82aefdb 100644
--- a/gtk/spice-uri.c
+++ b/src/spice-uri.c
diff --git a/gtk/spice-uri.h b/src/spice-uri.h
index 9e8d590..9e8d590 100644
--- a/gtk/spice-uri.h
+++ b/src/spice-uri.h
diff --git a/gtk/spice-util-priv.h b/src/spice-util-priv.h
index c0ea8d9..c0ea8d9 100644
--- a/gtk/spice-util-priv.h
+++ b/src/spice-util-priv.h
diff --git a/gtk/spice-util.c b/src/spice-util.c
index bec237b..bec237b 100644
--- a/gtk/spice-util.c
+++ b/src/spice-util.c
diff --git a/gtk/spice-util.h b/src/spice-util.h
index 3f429a0..3f429a0 100644
--- a/gtk/spice-util.h
+++ b/src/spice-util.h
diff --git a/gtk/spice-version.h.in b/src/spice-version.h.in
index 4276a23..4276a23 100644
--- a/gtk/spice-version.h.in
+++ b/src/spice-version.h.in
diff --git a/gtk/spice-widget-cairo.c b/src/spice-widget-cairo.c
index 96af076..96af076 100644
--- a/gtk/spice-widget-cairo.c
+++ b/src/spice-widget-cairo.c
diff --git a/gtk/spice-widget-priv.h b/src/spice-widget-priv.h
index 0e1f661..0e1f661 100644
--- a/gtk/spice-widget-priv.h
+++ b/src/spice-widget-priv.h
diff --git a/gtk/spice-widget-x11.c b/src/spice-widget-x11.c
index 3f2ce94..3f2ce94 100644
--- a/gtk/spice-widget-x11.c
+++ b/src/spice-widget-x11.c
diff --git a/gtk/spice-widget.c b/src/spice-widget.c
index b9c4972..b9c4972 100644
--- a/gtk/spice-widget.c
+++ b/src/spice-widget.c
diff --git a/gtk/spice-widget.h b/src/spice-widget.h
index d239ed2..d239ed2 100644
--- a/gtk/spice-widget.h
+++ b/src/spice-widget.h
diff --git a/gtk/spicy-screenshot.c b/src/spicy-screenshot.c
index e7835bf..e7835bf 100644
--- a/gtk/spicy-screenshot.c
+++ b/src/spicy-screenshot.c
diff --git a/gtk/spicy-stats.c b/src/spicy-stats.c
index c98148d..c98148d 100644
--- a/gtk/spicy-stats.c
+++ b/src/spicy-stats.c
diff --git a/gtk/spicy.c b/src/spicy.c
index 9cd6ee5..9cd6ee5 100644
--- a/gtk/spicy.c
+++ b/src/spicy.c
diff --git a/gtk/usb-acl-helper.c b/src/usb-acl-helper.c
index 6a49627..6a49627 100644
--- a/gtk/usb-acl-helper.c
+++ b/src/usb-acl-helper.c
diff --git a/gtk/usb-acl-helper.h b/src/usb-acl-helper.h
index 2d41b68..2d41b68 100644
--- a/gtk/usb-acl-helper.h
+++ b/src/usb-acl-helper.h
diff --git a/gtk/usb-device-manager-priv.h b/src/usb-device-manager-priv.h
index b6fa9c9..b6fa9c9 100644
--- a/gtk/usb-device-manager-priv.h
+++ b/src/usb-device-manager-priv.h
diff --git a/gtk/usb-device-manager.c b/src/usb-device-manager.c
index 12ad4ba..12ad4ba 100644
--- a/gtk/usb-device-manager.c
+++ b/src/usb-device-manager.c
diff --git a/gtk/usb-device-manager.h b/src/usb-device-manager.h
index 5b4cfbe..5b4cfbe 100644
--- a/gtk/usb-device-manager.h
+++ b/src/usb-device-manager.h
diff --git a/gtk/usb-device-widget.c b/src/usb-device-widget.c
index 1ec30e3..1ec30e3 100644
--- a/gtk/usb-device-widget.c
+++ b/src/usb-device-widget.c
diff --git a/gtk/usb-device-widget.h b/src/usb-device-widget.h
index b68cc6b..b68cc6b 100644
--- a/gtk/usb-device-widget.h
+++ b/src/usb-device-widget.h
diff --git a/gtk/usbutil.c b/src/usbutil.c
index 16d757b..16d757b 100644
--- a/gtk/usbutil.c
+++ b/src/usbutil.c
diff --git a/gtk/usbutil.h b/src/usbutil.h
index de5e92a..de5e92a 100644
--- a/gtk/usbutil.h
+++ b/src/usbutil.h
diff --git a/gtk/vmcstream.c b/src/vmcstream.c
index 483dd5a..483dd5a 100644
--- a/gtk/vmcstream.c
+++ b/src/vmcstream.c
diff --git a/gtk/vmcstream.h b/src/vmcstream.h
index 1316b77..1316b77 100644
--- a/gtk/vmcstream.h
+++ b/src/vmcstream.h
diff --git a/gtk/vncdisplaykeymap.c b/src/vncdisplaykeymap.c
index 6bf351f..6bf351f 100644
--- a/gtk/vncdisplaykeymap.c
+++ b/src/vncdisplaykeymap.c
diff --git a/gtk/vncdisplaykeymap.h b/src/vncdisplaykeymap.h
index 3ec55d5..3ec55d5 100644
--- a/gtk/vncdisplaykeymap.h
+++ b/src/vncdisplaykeymap.h
diff --git a/gtk/win-usb-clerk.h b/src/win-usb-clerk.h
index 24da3b4..24da3b4 100644
--- a/gtk/win-usb-clerk.h
+++ b/src/win-usb-clerk.h
diff --git a/gtk/win-usb-dev.c b/src/win-usb-dev.c
index 1e4b2d6..1e4b2d6 100644
--- a/gtk/win-usb-dev.c
+++ b/src/win-usb-dev.c
diff --git a/gtk/win-usb-dev.h b/src/win-usb-dev.h
index b5c4fce..b5c4fce 100644
--- a/gtk/win-usb-dev.h
+++ b/src/win-usb-dev.h
diff --git a/gtk/win-usb-driver-install.c b/src/win-usb-driver-install.c
index 54e9b14..54e9b14 100644
--- a/gtk/win-usb-driver-install.c
+++ b/src/win-usb-driver-install.c
diff --git a/gtk/win-usb-driver-install.h b/src/win-usb-driver-install.h
index f9afedc..f9afedc 100644
--- a/gtk/win-usb-driver-install.h
+++ b/src/win-usb-driver-install.h
diff --git a/gtk/wocky-http-proxy.c b/src/wocky-http-proxy.c
index ce23b0e..ce23b0e 100644
--- a/gtk/wocky-http-proxy.c
+++ b/src/wocky-http-proxy.c
diff --git a/gtk/wocky-http-proxy.h b/src/wocky-http-proxy.h
index 9484b51..9484b51 100644
--- a/gtk/wocky-http-proxy.h
+++ b/src/wocky-http-proxy.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0a839e4..19c02b6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -14,15 +14,15 @@ TESTS = $(noinst_PROGRAMS)
 
 AM_CPPFLAGS =					\
 	$(GIO_CFLAGS)				\
-	-I$(top_srcdir)/gtk			\
-	-I$(top_builddir)/gtk			\
+	-I$(top_srcdir)/src			\
+	-I$(top_builddir)/src			\
 	-DG_LOG_DOMAIN=\"GSpice\"		\
 	$(NULL)
 
 AM_LDFLAGS = $(GIO_LIBS) -static
 
 LDADD =							\
-	$(top_builddir)/gtk/libspice-client-glib-2.0.la	\
+	$(top_builddir)/src/libspice-client-glib-2.0.la	\
 	$(NULL)
 
 util_SOURCES = util.c
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 5325aaa..c66b1db 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -22,17 +22,17 @@ EXTRA_DIST =						\
 
 CLEANFILES += $(vapi_DATA)
 
-spice-client-glib-2.0.vapi: $(top_builddir)/gtk/SpiceClientGLib-2.0.gir SpiceClientGLib-2.0.metadata
+spice-client-glib-2.0.vapi: $(top_builddir)/src/SpiceClientGLib-2.0.gir SpiceClientGLib-2.0.metadata
 	$(AM_V_GEN)$(VAPIGEN) -q		\
 		--metadatadir=$(srcdir)		\
 		--library spice-client-glib-2.0	\
 		--pkg gio-2.0			\
 		$<
 
-spice-client-gtk-$(SPICE_GTK_API_VERSION).vapi: $(top_builddir)/gtk/SpiceClientGtk-$(SPICE_GTK_API_VERSION).gir spice-client-glib-2.0.vapi
+spice-client-gtk-$(SPICE_GTK_API_VERSION).vapi: $(top_builddir)/src/SpiceClientGtk-$(SPICE_GTK_API_VERSION).gir spice-client-glib-2.0.vapi
 	$(AM_V_GEN)$(VAPIGEN) -q					\
 		--vapidir=$(builddir)					\
-		--girdir=$(top_builddir)/gtk				\
+		--girdir=$(top_builddir)/src				\
 		--pkg spice-client-glib-2.0				\
 		--pkg gtk+-$(GTK_API_VERSION)				\
 		--library spice-client-gtk-$(SPICE_GTK_API_VERSION)	\