Merge branch 'build'

Reviewed-by: Olli Salli <olli.salli@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=53185

46 files changed, 205 insertions, 162 deletions

diff --git a/ytstenut/Makefile.am b/ytstenut/Makefile.am
index cc110a0..68cac9b 100644
--- a/ytstenut/Makefile.am
+++ b/ytstenut/Makefile.am
@@ -16,127 +16,133 @@ EXTRA_LTLIBRARIES = libsrc.la libhdr.la libprv.la
 
 # Public headers
 libhdr_la_SOURCES = \
-  $(srcdir)/yts-capability.h \
-  $(srcdir)/yts-client.h \
-  $(srcdir)/yts-contact.h \
-  $(srcdir)/yts-file-transfer.h \
-  $(srcdir)/yts-incoming-file.h \
-  $(srcdir)/yts-outgoing-file.h \
-  $(srcdir)/yts-roster.h \
-  $(srcdir)/yts-service.h \
-  $(srcdir)/yts-version.h \
+  yts-capability.h \
+  yts-client.h \
+  yts-contact.h \
+  yts-file-transfer.h \
+  yts-incoming-file.h \
+  yts-outgoing-file.h \
+  yts-roster.h \
+  yts-service.h \
   \
-  $(srcdir)/yts-proxy.h \
-  $(srcdir)/yts-proxy-service.h \
+  yts-proxy.h \
+  yts-proxy-service.h \
   \
-  $(srcdir)/video-profile/yts-vp-content.h \
-  $(srcdir)/video-profile/yts-vp-playable.h \
-  $(srcdir)/video-profile/yts-vp-player.h \
-  $(srcdir)/video-profile/yts-vp-query.h \
-  $(srcdir)/video-profile/yts-vp-transcript.h \
-  $(srcdir)/video-profile/yts-vp-transfer.h \
-  $(srcdir)/video-profile/yts-vp-transmission.h \
+  video-profile/yts-vp-content.h \
+  video-profile/yts-vp-playable.h \
+  video-profile/yts-vp-player.h \
+  video-profile/yts-vp-query.h \
+  video-profile/yts-vp-transcript.h \
+  video-profile/yts-vp-transfer.h \
+  video-profile/yts-vp-transmission.h \
+  $(NULL)
+
+nodist_libhdr_la_SOURCES = \
+  yts-version.h \
   $(NULL)
 
 # Sources
 libsrc_la_SOURCES = \
-  $(srcdir)/ytstenut.c \
+  ytstenut.c \
   \
-  $(srcdir)/yts-capability.c \
-  $(srcdir)/yts-client.c \
-  $(srcdir)/yts-client-status.c \
-  $(srcdir)/yts-contact.c \
-  $(srcdir)/yts-contact-impl.c \
-  $(srcdir)/yts-enum-types.c \
-  $(srcdir)/yts-error.c \
-  $(srcdir)/yts-marshal.c \
-  $(srcdir)/yts-message.c \
-  $(srcdir)/yts-metadata.c \
-  $(srcdir)/yts-roster.c \
-  $(srcdir)/yts-roster-impl.c \
-  $(srcdir)/yts-service.c \
-  $(srcdir)/yts-service-impl.c \
+  yts-capability.c \
+  yts-client.c \
+  yts-client-status.c \
+  yts-contact.c \
+  yts-contact-impl.c \
+  yts-error.c \
+  yts-message.c \
+  yts-metadata.c \
+  yts-roster.c \
+  yts-roster-impl.c \
+  yts-service.c \
+  yts-service-impl.c \
   \
-  $(srcdir)/yts-adapter-factory.c \
-  $(srcdir)/yts-error-message.c \
-  $(srcdir)/yts-event-message.c \
-  $(srcdir)/yts-factory.c \
-  $(srcdir)/yts-incoming-file.c \
-  $(srcdir)/yts-invocation-message.c \
-  $(srcdir)/yts-service-emitter.c \
-  $(srcdir)/yts-file-transfer.c \
-  $(srcdir)/yts-outgoing-file.c \
-  $(srcdir)/yts-proxy.c \
-  $(srcdir)/yts-proxy-factory.c \
-  $(srcdir)/yts-proxy-service.c \
-  $(srcdir)/yts-proxy-service-impl.c \
-  $(srcdir)/yts-response-message.c \
-  $(srcdir)/yts-service-adapter.c \
-  $(srcdir)/yts-service-factory.c \
+  yts-adapter-factory.c \
+  yts-error-message.c \
+  yts-event-message.c \
+  yts-factory.c \
+  yts-incoming-file.c \
+  yts-invocation-message.c \
+  yts-service-emitter.c \
+  yts-file-transfer.c \
+  yts-outgoing-file.c \
+  yts-proxy.c \
+  yts-proxy-factory.c \
+  yts-proxy-service.c \
+  yts-proxy-service-impl.c \
+  yts-response-message.c \
+  yts-service-adapter.c \
+  yts-service-factory.c \
   \
-  $(srcdir)/profile/yts-profile.c \
-  $(srcdir)/profile/yts-profile-impl.c \
-  $(srcdir)/profile/yts-profile-proxy.c \
-  $(srcdir)/profile/yts-profile-adapter.c \
+  profile/yts-profile.c \
+  profile/yts-profile-impl.c \
+  profile/yts-profile-proxy.c \
+  profile/yts-profile-adapter.c \
   \
-  $(srcdir)/video-profile/yts-vp-content.c \
-  $(srcdir)/video-profile/yts-vp-playable.c \
-  $(srcdir)/video-profile/yts-vp-playable-proxy.c \
-  $(srcdir)/video-profile/yts-vp-player.c \
-  $(srcdir)/video-profile/yts-vp-player-adapter.c \
-  $(srcdir)/video-profile/yts-vp-player-proxy.c \
-  $(srcdir)/video-profile/yts-vp-query.c \
-  $(srcdir)/video-profile/yts-vp-transcript.c \
-  $(srcdir)/video-profile/yts-vp-transcript-adapter.c \
-  $(srcdir)/video-profile/yts-vp-transcript-proxy.c \
-  $(srcdir)/video-profile/yts-vp-transfer.c \
-  $(srcdir)/video-profile/yts-vp-transmission.c \
+  video-profile/yts-vp-content.c \
+  video-profile/yts-vp-playable.c \
+  video-profile/yts-vp-playable-proxy.c \
+  video-profile/yts-vp-player.c \
+  video-profile/yts-vp-player-adapter.c \
+  video-profile/yts-vp-player-proxy.c \
+  video-profile/yts-vp-query.c \
+  video-profile/yts-vp-transcript.c \
+  video-profile/yts-vp-transcript-adapter.c \
+  video-profile/yts-vp-transcript-proxy.c \
+  video-profile/yts-vp-transfer.c \
+  video-profile/yts-vp-transmission.c \
+  $(NULL)
+
+nodist_libsrc_la_SOURCES = \
+  yts-enum-types.c \
+  yts-marshal.c \
   $(NULL)
 
 # Private headers
 libprv_la_SOURCES = \
-  $(srcdir)/ytstenut-internal.h \
+  ytstenut-internal.h \
   \
-  $(srcdir)/yts-adapter-factory.h \
-  $(srcdir)/yts-client-internal.h \
-  $(srcdir)/yts-client-status.h \
-  $(srcdir)/yts-contact-impl.h \
-  $(srcdir)/yts-contact-internal.h \
-  $(srcdir)/yts-error.h \
-  $(srcdir)/yts-factory.h \
-  $(srcdir)/yts-incoming-file-internal.h \
-  $(srcdir)/yts-metadata-internal.h \
-  $(srcdir)/yts-outgoing-file-internal.h \
-  $(srcdir)/yts-proxy-factory.h \
-  $(srcdir)/yts-proxy-internal.h \
-  $(srcdir)/yts-proxy-service-impl.h \
-  $(srcdir)/yts-proxy-service-internal.h \
-  $(srcdir)/yts-roster-impl.h \
-  $(srcdir)/yts-roster-internal.h \
-  $(srcdir)/yts-service-adapter.h \
-  $(srcdir)/yts-service-emitter.h \
-  $(srcdir)/yts-service-factory.h \
-  $(srcdir)/yts-service-impl.h \
-  $(srcdir)/yts-service-internal.h \
-  $(srcdir)/yts-xml.h \
+  yts-adapter-factory.h \
+  yts-client-internal.h \
+  yts-client-status.h \
+  yts-contact-impl.h \
+  yts-contact-internal.h \
+  yts-error.h \
+  yts-factory.h \
+  yts-incoming-file-internal.h \
+  yts-metadata-internal.h \
+  yts-outgoing-file-internal.h \
+  yts-proxy-factory.h \
+  yts-proxy-internal.h \
+  yts-proxy-service-impl.h \
+  yts-proxy-service-internal.h \
+  yts-roster-impl.h \
+  yts-roster-internal.h \
+  yts-service-adapter.h \
+  yts-service-emitter.h \
+  yts-service-factory.h \
+  yts-service-impl.h \
+  yts-service-internal.h \
+  yts-xml.h \
   \
-  $(srcdir)/yts-message.h \
-  $(srcdir)/yts-metadata.h \
-  $(srcdir)/yts-error-message.h \
-  $(srcdir)/yts-event-message.h \
-  $(srcdir)/yts-invocation-message.h \
-  $(srcdir)/yts-response-message.h \
+  yts-message.h \
+  yts-metadata.h \
+  yts-error-message.h \
+  yts-event-message.h \
+  yts-invocation-message.h \
+  yts-response-message.h \
   \
-  $(srcdir)/profile/yts-profile.h \
-  $(srcdir)/profile/yts-profile-impl.h \
-  $(srcdir)/profile/yts-profile-proxy.h \
-  $(srcdir)/profile/yts-profile-adapter.h \
+  profile/yts-profile.h \
+  profile/yts-profile-impl.h \
+  profile/yts-profile-proxy.h \
+  profile/yts-profile-adapter.h \
   \
-  $(srcdir)/video-profile/yts-vp-playable-proxy.h \
-  $(srcdir)/video-profile/yts-vp-player-adapter.h \
-  $(srcdir)/video-profile/yts-vp-player-proxy.h \
-  $(srcdir)/video-profile/yts-vp-transcript-adapter.h \
-  $(srcdir)/video-profile/yts-vp-transcript-proxy.h \
+  video-profile/yts-vp-playable-proxy.h \
+  video-profile/yts-vp-player-adapter.h \
+  video-profile/yts-vp-player-proxy.h \
+  video-profile/yts-vp-transcript-adapter.h \
+  video-profile/yts-vp-transcript-proxy.h \
   $(NULL)
 
 #
@@ -151,6 +157,11 @@ libytstenut_@YTS_API_VERSION@_la_SOURCES = \
   $(libsrc_la_SOURCES) \
   $(NULL)
 
+nodist_libytstenut_@YTS_API_VERSION@_la_SOURCES = \
+  $(nodist_libhdr_la_SOURCES) \
+  $(nodist_libsrc_la_SOURCES) \
+  $(NULL)
+
 libytstenut_@YTS_API_VERSION@_la_DEPENDENCIES = \
   ytstenut.sym \
   $(NULL)
@@ -166,11 +177,14 @@ libytstenut_@YTS_API_VERSION@_la_LIBADD = \
   $(NULL)
 
 libytstenut_@YTS_API_VERSION@_ladir = $(includedir)/ytstenut-$(YTS_API_VERSION)/ytstenut
-libytstenut_@YTS_API_VERSION@_la_HEADERS = \
+nobase_libytstenut_@YTS_API_VERSION@_la_HEADERS = \
   $(libhdr_la_SOURCES) \
-  $(srcdir)/yts-enum-types.h \
-  $(srcdir)/yts-marshal.h \
-  $(srcdir)/ytstenut.h \
+  ytstenut.h \
+  $(NULL)
+
+nodist_libytstenut_@YTS_API_VERSION@_la_HEADERS = \
+  yts-enum-types.h \
+  yts-marshal.h \
   $(NULL)
 
 BUILT_SOURCES = \
@@ -216,7 +230,7 @@ yts-enum-types.h: stamp-yts-enum-types.h
 	@true
 
 stamp-yts-enum-types.h: $(libhdr_la_SOURCES) Makefile
-	$(AM_V_GEN)( $(GLIB_MKENUMS) \
+	$(AM_V_GEN)( cd $(srcdir) && $(GLIB_MKENUMS) \
 			--template $(srcdir)/yts-enum-types.h.in \
 		$(libhdr_la_SOURCES) ) >> xgen-ceth && \
 	(cmp -s xgen-ceth yts-enum-types.h || cp xgen-ceth yts-enum-types.h) && \
@@ -224,7 +238,7 @@ stamp-yts-enum-types.h: $(libhdr_la_SOURCES) Makefile
 	echo timestamp > $(@F)
 
 yts-enum-types.c: yts-enum-types.h
-	$(AM_V_GEN)( $(GLIB_MKENUMS) \
+	$(AM_V_GEN)( cd $(srcdir) && $(GLIB_MKENUMS) \
 			--template $(srcdir)/yts-enum-types.c.in \
 	  $(libhdr_la_SOURCES) ) >> xgen-cetc && \
 	cp xgen-cetc yts-enum-types.c && \
@@ -273,8 +287,11 @@ Ytstenut-@YTS_API_VERSION@.gir: $(G_IR_SCANNER) libytstenut-@YTS_API_VERSION@.la
 		--libtool="$(top_builddir)/libtool" \
 	        --pkg gobject-2.0 \
 	        --output $@ \
-		$(libhdr_la_SOURCES) \
-		$(libsrc_la_SOURCES)
+		$(patsubst %,$(srcdir)/%,$(libhdr_la_SOURCES)) \
+		$(nodist_libhdr_la_SOURCES) \
+		$(patsubst %,$(srcdir)/%,$(libsrc_la_SOURCES)) \
+		$(nodist_libsrc_la_SOURCES) \
+		$(NULL)
 
 BUILT_GIRSOURCES += Ytstenut-@YTS_API_VERSION@.gir
 
diff --git a/ytstenut/profile/yts-profile-adapter.c b/ytstenut/profile/yts-profile-adapter.c
index b80d7b4..16d02e5 100644
--- a/ytstenut/profile/yts-profile-adapter.c
+++ b/ytstenut/profile/yts-profile-adapter.c
@@ -18,11 +18,12 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include <stdbool.h>
 
 #include "yts-profile.h"
 #include "yts-profile-adapter.h"
-#include "config.h"
 
 G_DEFINE_TYPE (YtsProfileAdapter,
                yts_profile_adapter,
diff --git a/ytstenut/profile/yts-profile-impl.c b/ytstenut/profile/yts-profile-impl.c
index 6a5ecdc..787efa5 100644
--- a/ytstenut/profile/yts-profile-impl.c
+++ b/ytstenut/profile/yts-profile-impl.c
@@ -18,12 +18,13 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include "yts-capability.h"
 #include "yts-client-internal.h"
 #include "yts-profile.h"
 #include "yts-profile-impl.h"
 #include "yts-response-message.h"
-#include "config.h"
 
 static void
 _capability_interface_init (YtsCapability *interface);
diff --git a/ytstenut/profile/yts-profile-proxy.c b/ytstenut/profile/yts-profile-proxy.c
index b0cc9b4..7883ac4 100644
--- a/ytstenut/profile/yts-profile-proxy.c
+++ b/ytstenut/profile/yts-profile-proxy.c
@@ -18,9 +18,10 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include "yts-profile.h"
 #include "yts-profile-proxy.h"
-#include "config.h"
 
 static void
 _profile_interface_init (YtsProfileInterface *interface);
diff --git a/ytstenut/profile/yts-profile.c b/ytstenut/profile/yts-profile.c
index d081de7..f96775d 100644
--- a/ytstenut/profile/yts-profile.c
+++ b/ytstenut/profile/yts-profile.c
@@ -18,11 +18,12 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include "yts-capability.h"
 #include "yts-marshal.h"
 #include "yts-profile.h"
 #include "yts-proxy.h"
-#include "config.h"
 
 G_DEFINE_INTERFACE (YtsProfile,
                     yts_profile,
diff --git a/ytstenut/video-profile/yts-vp-content.c b/ytstenut/video-profile/yts-vp-content.c
index 80c4a33..1c94fdf 100644
--- a/ytstenut/video-profile/yts-vp-content.c
+++ b/ytstenut/video-profile/yts-vp-content.c
@@ -18,9 +18,10 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include "yts-capability.h"
 #include "yts-vp-content.h"
-#include "config.h"
 
 G_DEFINE_INTERFACE (YtsVPContent,
                     yts_vp_content,
diff --git a/ytstenut/video-profile/yts-vp-playable-proxy.c b/ytstenut/video-profile/yts-vp-playable-proxy.c
index 8b6d9a5..61196fa 100644
--- a/ytstenut/video-profile/yts-vp-playable-proxy.c
+++ b/ytstenut/video-profile/yts-vp-playable-proxy.c
@@ -18,11 +18,12 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include <math.h>
 
 #include "yts-vp-playable.h"
 #include "yts-vp-playable-proxy.h"
-#include "config.h"
 
 static void
 _playable_interface_init (YtsVPPlayableInterface *interface);
diff --git a/ytstenut/video-profile/yts-vp-playable.c b/ytstenut/video-profile/yts-vp-playable.c
index d76b8de..614579d 100644
--- a/ytstenut/video-profile/yts-vp-playable.c
+++ b/ytstenut/video-profile/yts-vp-playable.c
@@ -18,9 +18,10 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
-#include "yts-vp-playable.h"
 #include "config.h"
 
+#include "yts-vp-playable.h"
+
 G_DEFINE_INTERFACE (YtsVPPlayable,
                     yts_vp_playable,
                     G_TYPE_OBJECT)
diff --git a/ytstenut/video-profile/yts-vp-player-adapter.c b/ytstenut/video-profile/yts-vp-player-adapter.c
index c781137..2d806e7 100644
--- a/ytstenut/video-profile/yts-vp-player-adapter.c
+++ b/ytstenut/video-profile/yts-vp-player-adapter.c
@@ -18,12 +18,13 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include <stdbool.h>
 
 #include "yts-service-adapter.h"
 #include "yts-vp-player.h"
 #include "yts-vp-player-adapter.h"
-#include "config.h"
 
 G_DEFINE_TYPE (YtsVPPlayerAdapter,
                yts_vp_player_adapter,
diff --git a/ytstenut/video-profile/yts-vp-player-proxy.c b/ytstenut/video-profile/yts-vp-player-proxy.c
index cf97026..b7732a1 100644
--- a/ytstenut/video-profile/yts-vp-player-proxy.c
+++ b/ytstenut/video-profile/yts-vp-player-proxy.c
@@ -18,6 +18,8 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <math.h>
 
@@ -25,7 +27,6 @@
 #include "yts-vp-playable-proxy.h"
 #include "yts-vp-player.h"
 #include "yts-vp-player-proxy.h"
-#include "config.h"
 
 static void
 _player_interface_init (YtsVPPlayerInterface *interface);
diff --git a/ytstenut/video-profile/yts-vp-player.c b/ytstenut/video-profile/yts-vp-player.c
index a9f6fc4..19aea00 100644
--- a/ytstenut/video-profile/yts-vp-player.c
+++ b/ytstenut/video-profile/yts-vp-player.c
@@ -18,11 +18,12 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include "yts-capability.h"
 #include "yts-marshal.h"
 #include "yts-vp-playable.h"
 #include "yts-vp-player.h"
-#include "config.h"
 
 G_DEFINE_INTERFACE (YtsVPPlayer,
                     yts_vp_player,
diff --git a/ytstenut/video-profile/yts-vp-query.c b/ytstenut/video-profile/yts-vp-query.c
index 9991ec2..9ff5271 100644
--- a/ytstenut/video-profile/yts-vp-query.c
+++ b/ytstenut/video-profile/yts-vp-query.c
@@ -18,10 +18,11 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include "yts-enum-types.h"
 #include "yts-marshal.h"
 #include "yts-vp-query.h"
-#include "config.h"
 
 G_DEFINE_INTERFACE (YtsVPQuery,
                     yts_vp_query,
diff --git a/ytstenut/video-profile/yts-vp-transcript-adapter.c b/ytstenut/video-profile/yts-vp-transcript-adapter.c
index b2d9cff..e39f9ae 100644
--- a/ytstenut/video-profile/yts-vp-transcript-adapter.c
+++ b/ytstenut/video-profile/yts-vp-transcript-adapter.c
@@ -17,11 +17,11 @@
  *
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
+#include "config.h"
 
 #include "yts-service-adapter.h"
 #include "yts-vp-transcript.h"
 #include "yts-vp-transcript-adapter.h"
-#include "config.h"
 
 G_DEFINE_TYPE (YtsVPTranscriptAdapter,
                yts_vp_transcript_adapter,
diff --git a/ytstenut/video-profile/yts-vp-transcript-proxy.c b/ytstenut/video-profile/yts-vp-transcript-proxy.c
index 674cbf5..31e4dc1 100644
--- a/ytstenut/video-profile/yts-vp-transcript-proxy.c
+++ b/ytstenut/video-profile/yts-vp-transcript-proxy.c
@@ -17,12 +17,12 @@
  *
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
+#include "config.h"
 
 #include <stdbool.h>
 
 #include "yts-vp-transcript.h"
 #include "yts-vp-transcript-proxy.h"
-#include "config.h"
 
 static void
 _transcript_interface_init (YtsVPTranscriptInterface *interface);
diff --git a/ytstenut/video-profile/yts-vp-transcript.c b/ytstenut/video-profile/yts-vp-transcript.c
index a1cac80..223ea4f 100644
--- a/ytstenut/video-profile/yts-vp-transcript.c
+++ b/ytstenut/video-profile/yts-vp-transcript.c
@@ -17,10 +17,10 @@
  *
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
+#include "config.h"
 
 #include "yts-capability.h"
 #include "yts-vp-transcript.h"
-#include "config.h"
 
 G_DEFINE_INTERFACE (YtsVPTranscript,
                     yts_vp_transcript,
diff --git a/ytstenut/video-profile/yts-vp-transfer.c b/ytstenut/video-profile/yts-vp-transfer.c
index 3e15770..81a1857 100644
--- a/ytstenut/video-profile/yts-vp-transfer.c
+++ b/ytstenut/video-profile/yts-vp-transfer.c
@@ -17,10 +17,10 @@
  *
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
+#include "config.h"
 
 #include "yts-capability.h"
 #include "yts-vp-transfer.h"
-#include "config.h"
 
 G_DEFINE_INTERFACE (YtsVPTransfer,
                     yts_vp_transfer,
diff --git a/ytstenut/video-profile/yts-vp-transmission.c b/ytstenut/video-profile/yts-vp-transmission.c
index c81b9ff..e81b3f6 100644
--- a/ytstenut/video-profile/yts-vp-transmission.c
+++ b/ytstenut/video-profile/yts-vp-transmission.c
@@ -18,9 +18,10 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
-#include "yts-vp-transmission.h"
 #include "config.h"
 
+#include "yts-vp-transmission.h"
+
 G_DEFINE_INTERFACE (YtsVPTransmission,
                     yts_vp_transmission,
                     G_TYPE_OBJECT)
diff --git a/ytstenut/yts-adapter-factory.c b/ytstenut/yts-adapter-factory.c
index 52c5112..74c2e65 100644
--- a/ytstenut/yts-adapter-factory.c
+++ b/ytstenut/yts-adapter-factory.c
@@ -17,9 +17,9 @@
  *
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
+#include "config.h"
 
 #include "yts-adapter-factory.h"
-#include "config.h"
 
 G_DEFINE_TYPE (YtsAdapterFactory, yts_adapter_factory, YTS_TYPE_FACTORY)
 
diff --git a/ytstenut/yts-capability.c b/ytstenut/yts-capability.c
index 529ec83..32a039b 100644
--- a/ytstenut/yts-capability.c
+++ b/ytstenut/yts-capability.c
@@ -17,9 +17,9 @@
  *
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
+#include "config.h"
 
 #include "yts-capability.h"
-#include "config.h"
 
 G_DEFINE_INTERFACE (YtsCapability, yts_capability, G_TYPE_OBJECT)
 
diff --git a/ytstenut/yts-client-status.c b/ytstenut/yts-client-status.c
index a23e125..6a9c9c6 100644
--- a/ytstenut/yts-client-status.c
+++ b/ytstenut/yts-client-status.c
@@ -17,12 +17,11 @@
  *
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
+#include "config.h"
 
 #include "yts-client-status.h"
 #include "yts-xml.h"
 
-#include "config.h"
-
 G_DEFINE_TYPE (YtsClientStatus, yts_client_status, G_TYPE_OBJECT)
 
 #define GET_PRIVATE(o) \
@@ -252,6 +251,7 @@ yts_client_status_set (YtsClientStatus    *self,
   YtsClientStatusPrivate *priv = GET_PRIVATE (self);
   GString *attribs_str;
   char *status_xml;
+  unsigned i;
 
   g_return_val_if_fail (YTS_IS_CLIENT_STATUS (self), NULL);
   g_return_val_if_fail (capability, NULL);
@@ -260,7 +260,7 @@ yts_client_status_set (YtsClientStatus    *self,
                         NULL);
 
   attribs_str = g_string_new ("");
-  for (unsigned i = 0; attribs && attribs[i] && attribs[i+1]; i += 2) {
+  for (i = 0; attribs && attribs[i] && attribs[i+1]; i += 2) {
     g_string_append_printf (attribs_str, "%s='%s' ", attribs[i], attribs[i+1]);
   }
 
diff --git a/ytstenut/yts-client.c b/ytstenut/yts-client.c
index 2eb9101..916d508 100644
--- a/ytstenut/yts-client.c
+++ b/ytstenut/yts-client.c
@@ -18,6 +18,7 @@
  * Authored by: Tomas Frydrych <tf@linux.intel.com>
  *              Rob Staudinger <robsta@linux.intel.com>
  */
+#include "config.h"
 
 #include <string.h>
 #include <rest/rest-xml-parser.h>
@@ -57,8 +58,6 @@
 #include "profile/yts-profile-adapter.h"
 #include "profile/yts-profile-impl.h"
 
-#include "config.h"
-
 #define RECONNECT_DELAY 20 /* in seconds */
 
 static void yts_client_make_connection (YtsClient *client);
diff --git a/ytstenut/yts-contact-impl.c b/ytstenut/yts-contact-impl.c
index 3854f3b..448d82a 100644
--- a/ytstenut/yts-contact-impl.c
+++ b/ytstenut/yts-contact-impl.c
@@ -17,10 +17,10 @@
  *
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
+#include "config.h"
 
 #include "yts-contact-impl.h"
 #include "yts-marshal.h"
-#include "config.h"
 
 G_DEFINE_TYPE (YtsContactImpl, yts_contact_impl, YTS_TYPE_CONTACT)
 
diff --git a/ytstenut/yts-contact.c b/ytstenut/yts-contact.c
index f65a84a..24656a5 100644
--- a/ytstenut/yts-contact.c
+++ b/ytstenut/yts-contact.c
@@ -18,6 +18,7 @@
  * Authored by: Tomas Frydrych <tf@linux.intel.com>
  *              Rob Staudinger <robsta@linux.intel.com>
  */
+#include "config.h"
 
 #include <telepathy-glib/gtypes.h>
 #include <telepathy-glib/connection.h>
@@ -35,7 +36,6 @@
 #include "yts-marshal.h"
 #include "yts-proxy-service-internal.h"
 #include "yts-service-internal.h"
-#include "config.h"
 
 G_DEFINE_ABSTRACT_TYPE (YtsContact, yts_contact, G_TYPE_OBJECT)
 
diff --git a/ytstenut/yts-error-message.c b/ytstenut/yts-error-message.c
index 8e89a7a..07c51f7 100644
--- a/ytstenut/yts-error-message.c
+++ b/ytstenut/yts-error-message.c
@@ -17,11 +17,11 @@
  *
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
+#include "config.h"
 
 #include <stdbool.h>
 
 #include "yts-error-message.h"
-#include "config.h"
 
 G_DEFINE_TYPE (YtsErrorMessage, yts_error_message, YTS_TYPE_METADATA)
 
diff --git a/ytstenut/yts-error.c b/ytstenut/yts-error.c
index 718e255..b5adaa4 100644
--- a/ytstenut/yts-error.c
+++ b/ytstenut/yts-error.c
@@ -17,9 +17,9 @@
  *
  * Authored by: Tomas Frydrych <tf@linux.intel.com>
  */
+#include "config.h"
 
 #include "yts-error.h"
-#include "config.h"
 
 /**
  * yts_error_get_code:
diff --git a/ytstenut/yts-event-message.c b/ytstenut/yts-event-message.c
index e069e37..6747104 100644
--- a/ytstenut/yts-event-message.c
+++ b/ytstenut/yts-event-message.c
@@ -17,11 +17,11 @@
  *
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
+#include "config.h"
 
 #include <stdbool.h>
 
 #include "yts-event-message.h"
-#include "config.h"
 
 G_DEFINE_TYPE (YtsEventMessage, yts_event_message, YTS_TYPE_METADATA)
 
diff --git a/ytstenut/yts-factory.c b/ytstenut/yts-factory.c
index 059eeb3..9603634 100644
--- a/ytstenut/yts-factory.c
+++ b/ytstenut/yts-factory.c
@@ -17,6 +17,7 @@
  *
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -27,7 +28,6 @@
 #include "video-profile/yts-vp-player-proxy.h"
 #include "video-profile/yts-vp-transcript-adapter.h"
 #include "video-profile/yts-vp-transcript-proxy.h"
-#include "config.h"
 
 G_DEFINE_ABSTRACT_TYPE (YtsFactory, yts_factory, G_TYPE_OBJECT)
 
diff --git a/ytstenut/yts-file-transfer.c b/ytstenut/yts-file-transfer.c
index 9c105c1..2615250 100644
--- a/ytstenut/yts-file-transfer.c
+++ b/ytstenut/yts-file-transfer.c
@@ -17,6 +17,7 @@
  *
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
+#include "config.h"
 
 #include <stdbool.h>
 
@@ -27,8 +28,6 @@
 #include "yts-incoming-file-internal.h"
 #include "yts-outgoing-file-internal.h"
 
-#include "config.h"
-
 G_DEFINE_INTERFACE (YtsFileTransfer, yts_file_transfer, G_TYPE_OBJECT)
 
 /**
diff --git a/ytstenut/yts-incoming-file.c b/ytstenut/yts-incoming-file.c
index e4679a3..30151c0 100644
--- a/ytstenut/yts-incoming-file.c
+++ b/ytstenut/yts-incoming-file.c
@@ -19,6 +19,8 @@
  * Using portions from telepathy-ytstenut's server-file-transfer.c, © Intel.
  */
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <telepathy-glib/telepathy-glib.h>
@@ -26,8 +28,6 @@
 #include "yts-file-transfer.h"
 #include "yts-incoming-file-internal.h"
 
-#include "config.h"
-
 static void
 _initable_interface_init (GInitableIface *interface);
 
diff --git a/ytstenut/yts-invocation-message.c b/ytstenut/yts-invocation-message.c
index fc8d039..4ee5c6f 100644
--- a/ytstenut/yts-invocation-message.c
+++ b/ytstenut/yts-invocation-message.c
@@ -18,10 +18,11 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include <stdbool.h>
 
 #include "yts-invocation-message.h"
-#include "config.h"
 
 G_DEFINE_TYPE (YtsInvocationMessage, yts_invocation_message, YTS_TYPE_METADATA)
 
diff --git a/ytstenut/yts-message.c b/ytstenut/yts-message.c
index ca2e6cb..0e848d9 100644
--- a/ytstenut/yts-message.c
+++ b/ytstenut/yts-message.c
@@ -18,9 +18,10 @@
  * Authored by: Tomas Frydrych <tf@linux.intel.com>
  */
 
+#include "config.h"
+
 #include "yts-message.h"
 #include "yts-metadata-internal.h"
-#include "config.h"
 
 static void yts_message_dispose (GObject *object);
 static void yts_message_finalize (GObject *object);
diff --git a/ytstenut/yts-metadata.c b/ytstenut/yts-metadata.c
index 30c10fd..0bd4f29 100644
--- a/ytstenut/yts-metadata.c
+++ b/ytstenut/yts-metadata.c
@@ -18,12 +18,13 @@
  * Authored by: Tomas Frydrych <tf@linux.intel.com>
  */
 
+#include "config.h"
+
 #include <string.h>
 #include <rest/rest-xml-parser.h>
 
 #include "yts-metadata-internal.h"
 #include "yts-message.h"
-#include "config.h"
 
 static void yts_metadata_dispose (GObject *object);
 static void yts_metadata_finalize (GObject *object);
diff --git a/ytstenut/yts-outgoing-file.c b/ytstenut/yts-outgoing-file.c
index 3a1dfb2..8bd1048 100644
--- a/ytstenut/yts-outgoing-file.c
+++ b/ytstenut/yts-outgoing-file.c
@@ -19,6 +19,8 @@
  * Using portions from telepathy-ytstenut's server-file-transfer.c, © Intel.
  */
 
+#include "config.h"
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <telepathy-glib/telepathy-glib.h>
@@ -26,8 +28,6 @@
 #include "yts-file-transfer.h"
 #include "yts-outgoing-file-internal.h"
 
-#include "config.h"
-
 static void
 _initable_interface_init (GInitableIface *interface);
 
diff --git a/ytstenut/yts-proxy-factory.c b/ytstenut/yts-proxy-factory.c
index d16c4a7..d661d2e 100644
--- a/ytstenut/yts-proxy-factory.c
+++ b/ytstenut/yts-proxy-factory.c
@@ -18,9 +18,10 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
-#include "yts-proxy-factory.h"
 #include "config.h"
 
+#include "yts-proxy-factory.h"
+
 G_DEFINE_TYPE (YtsProxyFactory, yts_proxy_factory, YTS_TYPE_FACTORY)
 
 static GObject *
diff --git a/ytstenut/yts-proxy-service-impl.c b/ytstenut/yts-proxy-service-impl.c
index 69bfd11..7c87ad1 100644
--- a/ytstenut/yts-proxy-service-impl.c
+++ b/ytstenut/yts-proxy-service-impl.c
@@ -18,9 +18,10 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include "yts-service-emitter.h"
 #include "yts-proxy-service-impl.h"
-#include "config.h"
 
 static void
 _service_emitter_interface_init (YtsServiceEmitter *interface);
diff --git a/ytstenut/yts-proxy-service.c b/ytstenut/yts-proxy-service.c
index 44a9a1f..7fb8982 100644
--- a/ytstenut/yts-proxy-service.c
+++ b/ytstenut/yts-proxy-service.c
@@ -18,6 +18,8 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include <stdbool.h>
 
 #include "yts-capability.h"
@@ -31,7 +33,6 @@
 
 #include "profile/yts-profile.h"
 #include "profile/yts-profile-proxy.h"
-#include "config.h"
 
 G_DEFINE_ABSTRACT_TYPE (YtsProxyService, yts_proxy_service, YTS_TYPE_SERVICE)
 
diff --git a/ytstenut/yts-proxy.c b/ytstenut/yts-proxy.c
index f2ce7c1..14534ac 100644
--- a/ytstenut/yts-proxy.c
+++ b/ytstenut/yts-proxy.c
@@ -18,12 +18,13 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include <stdbool.h>
 
 #include "yts-capability.h"
 #include "yts-marshal.h"
 #include "yts-proxy-internal.h"
-#include "config.h"
 
 static void
 _capability_interface_init (YtsCapability *interface);
diff --git a/ytstenut/yts-response-message.c b/ytstenut/yts-response-message.c
index ab78510..1be688f 100644
--- a/ytstenut/yts-response-message.c
+++ b/ytstenut/yts-response-message.c
@@ -18,10 +18,11 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include <stdbool.h>
 
 #include "yts-response-message.h"
-#include "config.h"
 
 G_DEFINE_TYPE (YtsResponseMessage, yts_response_message, YTS_TYPE_METADATA)
 
diff --git a/ytstenut/yts-roster-impl.c b/ytstenut/yts-roster-impl.c
index 1182274..a796199 100644
--- a/ytstenut/yts-roster-impl.c
+++ b/ytstenut/yts-roster-impl.c
@@ -18,9 +18,10 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include "yts-roster-impl.h"
 #include "yts-marshal.h"
-#include "config.h"
 
 G_DEFINE_TYPE (YtsRosterImpl, yts_roster_impl, YTS_TYPE_ROSTER)
 
diff --git a/ytstenut/yts-roster.c b/ytstenut/yts-roster.c
index a7ebea5..02663b2 100644
--- a/ytstenut/yts-roster.c
+++ b/ytstenut/yts-roster.c
@@ -19,6 +19,8 @@
  *              Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include <gio/gio.h>
 #include <telepathy-ytstenut-glib/telepathy-ytstenut-glib.h>
 
@@ -30,7 +32,6 @@
 #include "yts-roster-impl.h"
 #include "yts-roster-internal.h"
 #include "yts-service-factory.h"
-#include "config.h"
 
 G_DEFINE_ABSTRACT_TYPE (YtsRoster, yts_roster, G_TYPE_OBJECT)
 
diff --git a/ytstenut/yts-service-adapter.c b/ytstenut/yts-service-adapter.c
index eeaa88f..9795463 100644
--- a/ytstenut/yts-service-adapter.c
+++ b/ytstenut/yts-service-adapter.c
@@ -18,10 +18,11 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include "yts-capability.h"
 #include "yts-marshal.h"
 #include "yts-service-adapter.h"
-#include "config.h"
 
 G_DEFINE_TYPE (YtsServiceAdapter, yts_service_adapter, G_TYPE_OBJECT)
 
diff --git a/ytstenut/yts-service-emitter.c b/ytstenut/yts-service-emitter.c
index b7595f3..8f3e69c 100644
--- a/ytstenut/yts-service-emitter.c
+++ b/ytstenut/yts-service-emitter.c
@@ -18,12 +18,13 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include <stdbool.h>
 
 #include "yts-marshal.h"
 #include "yts-service.h"
 #include "yts-service-emitter.h"
-#include "config.h"
 
 G_DEFINE_INTERFACE (YtsServiceEmitter, yts_service_emitter, YTS_TYPE_SERVICE)
 
diff --git a/ytstenut/yts-service-factory.c b/ytstenut/yts-service-factory.c
index 02cf55c..56b799a 100644
--- a/ytstenut/yts-service-factory.c
+++ b/ytstenut/yts-service-factory.c
@@ -18,10 +18,11 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include "yts-proxy-service-impl.h"
 #include "yts-service-factory.h"
 #include "yts-service-impl.h"
-#include "config.h"
 
 G_DEFINE_TYPE (YtsServiceFactory, yts_service_factory, YTS_TYPE_FACTORY)
 
diff --git a/ytstenut/yts-service-impl.c b/ytstenut/yts-service-impl.c
index 06c47e3..7c40819 100644
--- a/ytstenut/yts-service-impl.c
+++ b/ytstenut/yts-service-impl.c
@@ -18,9 +18,10 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include "yts-service-emitter.h"
 #include "yts-service-impl.h"
-#include "config.h"
 
 static void
 _service_emitter_interface_init (YtsServiceEmitter *interface);
diff --git a/ytstenut/yts-service.c b/ytstenut/yts-service.c
index 36d3b84..f92df02 100644
--- a/ytstenut/yts-service.c
+++ b/ytstenut/yts-service.c
@@ -19,13 +19,14 @@
  *              Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include "yts-capability.h"
 #include "yts-invocation-message.h"
 #include "yts-marshal.h"
 #include "yts-message.h"
 #include "yts-service-emitter.h"
 #include "yts-service-internal.h"
-#include "config.h"
 
 static void
 _capability_interface_init (YtsCapability *interface);
diff --git a/ytstenut/ytstenut.c b/ytstenut/ytstenut.c
index d5ebbd4..8606095 100644
--- a/ytstenut/ytstenut.c
+++ b/ytstenut/ytstenut.c
@@ -18,12 +18,13 @@
  * Authored by: Rob Staudinger <robsta@linux.intel.com>
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
 
 #include "ytstenut-internal.h"
-#include "config.h"
 
 #undef G_LOG_DOMAIN
 #define G_LOG_DOMAIN PACKAGE"\0main\0"G_STRLOC