obexd: Fix cross includes from client and plugins

27 files changed, 91 insertions, 93 deletions

diff --git a/obexd/client/bluetooth.c b/obexd/client/bluetooth.c
index 1857c65e3..be007de61 100644
--- a/obexd/client/bluetooth.c
+++ b/obexd/client/bluetooth.c
@@ -39,7 +39,7 @@
 #include "gdbus/gdbus.h"
 #include "btio/btio.h"
 
-#include "log.h"
+#include "obexd/src/log.h"
 #include "transport.h"
 #include "bluetooth.h"
 
diff --git a/obexd/client/dbus.c b/obexd/client/dbus.c
index 323202099..bfe5c4974 100644
--- a/obexd/client/dbus.c
+++ b/obexd/client/dbus.c
@@ -27,7 +27,7 @@
 
 #include "gdbus/gdbus.h"
 
-#include "log.h"
+#include "obexd/src/log.h"
 #include "dbus.h"
 
 static void append_variant(DBusMessageIter *iter,
diff --git a/obexd/client/driver.c b/obexd/client/driver.c
index 0e1421aa4..27857b571 100644
--- a/obexd/client/driver.c
+++ b/obexd/client/driver.c
@@ -31,10 +31,10 @@
 
 #include "gdbus/gdbus.h"
 
+#include "obexd/src/log.h"
 #include "transfer.h"
 #include "session.h"
 #include "driver.h"
-#include "log.h"
 
 static GSList *drivers = NULL;
 
diff --git a/obexd/client/ftp.c b/obexd/client/ftp.c
index 02465809a..3628657d3 100644
--- a/obexd/client/ftp.c
+++ b/obexd/client/ftp.c
@@ -30,9 +30,8 @@
 
 #include "gdbus/gdbus.h"
 
+#include "obexd/src/log.h"
 #include "dbus.h"
-#include "log.h"
-
 #include "transfer.h"
 #include "session.h"
 #include "driver.h"
diff --git a/obexd/client/manager.c b/obexd/client/manager.c
index e47c861fa..fbcad6da4 100644
--- a/obexd/client/manager.c
+++ b/obexd/client/manager.c
@@ -35,17 +35,17 @@
 
 #include "gdbus/gdbus.h"
 
-#include "log.h"
+#include "obexd/src/log.h"
+#include "obexd/src/manager.h"
 #include "transfer.h"
 #include "session.h"
-#include "manager.h"
 #include "bluetooth.h"
 #include "opp.h"
 #include "ftp.h"
 #include "pbap.h"
 #include "sync.h"
 #include "map.h"
-#include "obexd/src/manager.h"
+#include "manager.h"
 
 #define CLIENT_INTERFACE	"org.bluez.obex.Client1"
 #define ERROR_INTERFACE		"org.bluez.obex.Error"
diff --git a/obexd/client/map-event.c b/obexd/client/map-event.c
index 5a16ad26d..e164e863c 100644
--- a/obexd/client/map-event.c
+++ b/obexd/client/map-event.c
@@ -32,7 +32,7 @@
 
 #include "gdbus/gdbus.h"
 
-#include "log.h"
+#include "obexd/src/log.h"
 #include "map-event.h"
 
 #include "transfer.h"
diff --git a/obexd/client/map.c b/obexd/client/map.c
index 10e2285ad..4c6d67629 100644
--- a/obexd/client/map.c
+++ b/obexd/client/map.c
@@ -38,9 +38,9 @@
 #include "gobex/gobex-apparam.h"
 #include "gdbus/gdbus.h"
 
+#include "obexd/src/log.h"
+#include "obexd/src/map_ap.h"
 #include "dbus.h"
-#include "log.h"
-#include "map_ap.h"
 #include "map-event.h"
 
 #include "map.h"
diff --git a/obexd/client/mns.c b/obexd/client/mns.c
index 015f6ad46..14b184811 100644
--- a/obexd/client/mns.c
+++ b/obexd/client/mns.c
@@ -36,13 +36,13 @@
 #include "gobex/gobex.h"
 #include "gobex/gobex-apparam.h"
 
-#include "obexd.h"
-#include "plugin.h"
-#include "log.h"
-#include "obex.h"
-#include "service.h"
-#include "mimetype.h"
-#include "map_ap.h"
+#include "obexd/src/obexd.h"
+#include "obexd/src/plugin.h"
+#include "obexd/src/log.h"
+#include "obexd/src/obex.h"
+#include "obexd/src/service.h"
+#include "obexd/src/mimetype.h"
+#include "obexd/src/map_ap.h"
 #include "map-event.h"
 
 #include "obexd/src/manager.h"
diff --git a/obexd/client/opp.c b/obexd/client/opp.c
index eb001e003..3c2801a5a 100644
--- a/obexd/client/opp.c
+++ b/obexd/client/opp.c
@@ -29,7 +29,7 @@
 
 #include "gdbus/gdbus.h"
 
-#include "log.h"
+#include "obexd/src/log.h"
 
 #include "transfer.h"
 #include "session.h"
diff --git a/obexd/client/pbap.c b/obexd/client/pbap.c
index 6b93ed004..1ab34a7db 100644
--- a/obexd/client/pbap.c
+++ b/obexd/client/pbap.c
@@ -38,7 +38,7 @@
 #include "gobex/gobex-apparam.h"
 #include "gdbus/gdbus.h"
 
-#include "log.h"
+#include "obexd/src/log.h"
 
 #include "transfer.h"
 #include "session.h"
diff --git a/obexd/client/session.c b/obexd/client/session.c
index ba01ea4f8..39c82e631 100644
--- a/obexd/client/session.c
+++ b/obexd/client/session.c
@@ -39,8 +39,8 @@
 #include "gdbus/gdbus.h"
 #include "gobex/gobex.h"
 
+#include "obexd/src/log.h"
 #include "dbus.h"
-#include "log.h"
 #include "transfer.h"
 #include "session.h"
 #include "driver.h"
diff --git a/obexd/client/sync.c b/obexd/client/sync.c
index a9f560544..548c318c3 100644
--- a/obexd/client/sync.c
+++ b/obexd/client/sync.c
@@ -33,7 +33,7 @@
 
 #include "gdbus/gdbus.h"
 
-#include "log.h"
+#include "obexd/src/log.h"
 
 #include "transfer.h"
 #include "session.h"
diff --git a/obexd/client/transfer.c b/obexd/client/transfer.c
index 5716a3f85..092e72fe2 100644
--- a/obexd/client/transfer.c
+++ b/obexd/client/transfer.c
@@ -40,8 +40,8 @@
 #include "gdbus/gdbus.h"
 #include "gobex/gobex.h"
 
+#include "obexd/src/log.h"
 #include "dbus.h"
-#include "log.h"
 #include "transfer.h"
 
 #define TRANSFER_INTERFACE "org.bluez.obex.Transfer1"
diff --git a/obexd/client/transport.c b/obexd/client/transport.c
index 77e52f702..aae6780a2 100644
--- a/obexd/client/transport.c
+++ b/obexd/client/transport.c
@@ -30,8 +30,8 @@
 #include <glib.h>
 #include <inttypes.h>
 
+#include "obexd/src/log.h"
 #include "transport.h"
-#include "log.h"
 
 static GSList *transports = NULL;
 
diff --git a/obexd/plugins/bluetooth.c b/obexd/plugins/bluetooth.c
index c3f23573f..d8b872a3d 100644
--- a/obexd/plugins/bluetooth.c
+++ b/obexd/plugins/bluetooth.c
@@ -41,13 +41,13 @@
 #include "gdbus/gdbus.h"
 
 #include "btio/btio.h"
-#include "obexd.h"
-#include "plugin.h"
-#include "server.h"
-#include "obex.h"
-#include "transport.h"
-#include "service.h"
-#include "log.h"
+#include "obexd/src/obexd.h"
+#include "obexd/src/plugin.h"
+#include "obexd/src/server.h"
+#include "obexd/src/obex.h"
+#include "obexd/src/transport.h"
+#include "obexd/src/service.h"
+#include "obexd/src/log.h"
 
 #define BT_RX_MTU 32767
 #define BT_TX_MTU 32767
diff --git a/obexd/plugins/filesystem.c b/obexd/plugins/filesystem.c
index 98281f2d4..0e6cd49c3 100644
--- a/obexd/plugins/filesystem.c
+++ b/obexd/plugins/filesystem.c
@@ -42,10 +42,10 @@
 
 #include <glib.h>
 
-#include "obexd.h"
-#include "plugin.h"
-#include "log.h"
-#include "mimetype.h"
+#include "obexd/src/obexd.h"
+#include "obexd/src/plugin.h"
+#include "obexd/src/log.h"
+#include "obexd/src/mimetype.h"
 #include "filesystem.h"
 
 #define EOL_CHARS "\n"
diff --git a/obexd/plugins/ftp.c b/obexd/plugins/ftp.c
index e255f4840..a906527c5 100644
--- a/obexd/plugins/ftp.c
+++ b/obexd/plugins/ftp.c
@@ -40,13 +40,13 @@
 
 #include <glib.h>
 
-#include "obexd.h"
-#include "plugin.h"
-#include "log.h"
-#include "obex.h"
-#include "manager.h"
-#include "mimetype.h"
-#include "service.h"
+#include "obexd/src/obexd.h"
+#include "obexd/src/plugin.h"
+#include "obexd/src/log.h"
+#include "obexd/src/obex.h"
+#include "obexd/src/manager.h"
+#include "obexd/src/mimetype.h"
+#include "obexd/src/service.h"
 #include "ftp.h"
 #include "filesystem.h"
 
diff --git a/obexd/plugins/irmc.c b/obexd/plugins/irmc.c
index d343977e9..a3bbd60da 100644
--- a/obexd/plugins/irmc.c
+++ b/obexd/plugins/irmc.c
@@ -36,15 +36,15 @@
 #include <fcntl.h>
 #include <inttypes.h>
 
-#include "obexd.h"
-#include "plugin.h"
-#include "log.h"
-#include "obex.h"
-#include "service.h"
+#include "obexd/src/obexd.h"
+#include "obexd/src/plugin.h"
+#include "obexd/src/log.h"
+#include "obexd/src/obex.h"
+#include "obexd/src/service.h"
+#include "obexd/src/manager.h"
+#include "obexd/src/mimetype.h"
 #include "phonebook.h"
-#include "mimetype.h"
 #include "filesystem.h"
-#include "manager.h"
 
 struct aparam_header {
 	uint8_t tag;
diff --git a/obexd/plugins/mas.c b/obexd/plugins/mas.c
index 0cec1ce9c..ef67ec59c 100644
--- a/obexd/plugins/mas.c
+++ b/obexd/plugins/mas.c
@@ -35,16 +35,15 @@
 #include "gobex/gobex.h"
 #include "gobex/gobex-apparam.h"
 
-#include "obexd.h"
-#include "plugin.h"
-#include "log.h"
-#include "obex.h"
-#include "service.h"
-#include "mimetype.h"
+#include "obexd/src/obexd.h"
+#include "obexd/src/plugin.h"
+#include "obexd/src/log.h"
+#include "obexd/src/obex.h"
+#include "obexd/src/service.h"
+#include "obexd/src/mimetype.h"
+#include "obexd/src/manager.h"
+#include "obexd/src/map_ap.h"
 #include "filesystem.h"
-#include "manager.h"
-#include "map_ap.h"
-
 #include "messages.h"
 
 #define READ_STATUS_REQ 0
diff --git a/obexd/plugins/messages-dummy.c b/obexd/plugins/messages-dummy.c
index bb0627f44..765f08d42 100644
--- a/obexd/plugins/messages-dummy.c
+++ b/obexd/plugins/messages-dummy.c
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "log.h"
+#include "obexd/src/log.h"
 
 #include "messages.h"
 
diff --git a/obexd/plugins/opp.c b/obexd/plugins/opp.c
index ee0204c59..5228ba821 100644
--- a/obexd/plugins/opp.c
+++ b/obexd/plugins/opp.c
@@ -33,12 +33,12 @@
 
 #include <glib.h>
 
-#include "obexd.h"
-#include "plugin.h"
-#include "obex.h"
-#include "service.h"
-#include "log.h"
-#include "manager.h"
+#include "obexd/src/obexd.h"
+#include "obexd/src/plugin.h"
+#include "obexd/src/obex.h"
+#include "obexd/src/service.h"
+#include "obexd/src/log.h"
+#include "obexd/src/manager.h"
 #include "filesystem.h"
 
 #define VCARD_TYPE "text/x-vcard"
diff --git a/obexd/plugins/pbap.c b/obexd/plugins/pbap.c
index ad17d6ae4..cec5acd3f 100644
--- a/obexd/plugins/pbap.c
+++ b/obexd/plugins/pbap.c
@@ -41,15 +41,15 @@
 #include "gobex/gobex.h"
 #include "gobex/gobex-apparam.h"
 
-#include "obexd.h"
-#include "plugin.h"
-#include "log.h"
-#include "obex.h"
-#include "service.h"
+#include "obexd/src/obexd.h"
+#include "obexd/src/plugin.h"
+#include "obexd/src/log.h"
+#include "obexd/src/obex.h"
+#include "obexd/src/service.h"
+#include "obexd/src/manager.h"
+#include "obexd/src/mimetype.h"
 #include "phonebook.h"
-#include "mimetype.h"
 #include "filesystem.h"
-#include "manager.h"
 
 #define PHONEBOOK_TYPE		"x-bt/phonebook"
 #define VCARDLISTING_TYPE	"x-bt/vcard-listing"
diff --git a/obexd/plugins/pcsuite.c b/obexd/plugins/pcsuite.c
index 8ca2dcbfa..43ab409e9 100644
--- a/obexd/plugins/pcsuite.c
+++ b/obexd/plugins/pcsuite.c
@@ -42,12 +42,12 @@
 
 #include "gdbus/gdbus.h"
 
-#include "obexd.h"
-#include "plugin.h"
-#include "log.h"
-#include "obex.h"
-#include "mimetype.h"
-#include "service.h"
+#include "obexd/src/obexd.h"
+#include "obexd/src/plugin.h"
+#include "obexd/src/log.h"
+#include "obexd/src/obex.h"
+#include "obexd/src/mimetype.h"
+#include "obexd/src/service.h"
 #include "ftp.h"
 
 #define PCSUITE_CHANNEL 24
diff --git a/obexd/plugins/phonebook-dummy.c b/obexd/plugins/phonebook-dummy.c
index 6b9d0403f..eeb078f23 100644
--- a/obexd/plugins/phonebook-dummy.c
+++ b/obexd/plugins/phonebook-dummy.c
@@ -41,7 +41,7 @@
 #include <libical/vobject.h>
 #include <libical/vcc.h>
 
-#include "log.h"
+#include "obexd/src/log.h"
 #include "phonebook.h"
 
 typedef void (*vcard_func_t) (const char *file, VObject *vo, void *user_data);
diff --git a/obexd/plugins/phonebook-ebook.c b/obexd/plugins/phonebook-ebook.c
index c339240f1..c422585df 100644
--- a/obexd/plugins/phonebook-ebook.c
+++ b/obexd/plugins/phonebook-ebook.c
@@ -34,9 +34,9 @@
 
 #include "lib/bluetooth.h"
 
-#include "log.h"
-#include "obex.h"
-#include "service.h"
+#include "obexd/src/log.h"
+#include "obexd/src/obex.h"
+#include "obexd/src/service.h"
 #include "phonebook.h"
 
 #define QUERY_FN "(contains \"family_name\" \"%s\")"
diff --git a/obexd/plugins/phonebook-tracker.c b/obexd/plugins/phonebook-tracker.c
index 433f95a7b..0743629cb 100644
--- a/obexd/plugins/phonebook-tracker.c
+++ b/obexd/plugins/phonebook-tracker.c
@@ -33,10 +33,10 @@
 #include <dbus/dbus.h>
 #include <libtracker-sparql/tracker-sparql.h>
 
-#include "log.h"
-#include "obex.h"
-#include "service.h"
-#include "mimetype.h"
+#include "obexd/src/log.h"
+#include "obexd/src/obex.h"
+#include "obexd/src/service.h"
+#include "obexd/src/mimetype.h"
 #include "phonebook.h"
 #include "vcard.h"
 
diff --git a/obexd/plugins/syncevolution.c b/obexd/plugins/syncevolution.c
index f1da94558..854505a58 100644
--- a/obexd/plugins/syncevolution.c
+++ b/obexd/plugins/syncevolution.c
@@ -39,13 +39,13 @@
 #include "gdbus/gdbus.h"
 
 #include "btio/btio.h"
-#include "plugin.h"
-#include "obex.h"
-#include "service.h"
-#include "mimetype.h"
-#include "log.h"
-#include "manager.h"
-#include "obexd.h"
+#include "obexd/src/plugin.h"
+#include "obexd/src/obex.h"
+#include "obexd/src/service.h"
+#include "obexd/src/mimetype.h"
+#include "obexd/src/log.h"
+#include "obexd/src/manager.h"
+#include "obexd/src/obexd.h"
 #include "filesystem.h"
 
 #define SYNCML_TARGET_SIZE 11