From 85180c23f79808c5fe157bd289aa45b9eea64141 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Sun, 1 Mar 2015 00:14:21 -0800
Subject: [PATCH] profiles: Fix includes for gdbus.h header

---
 profiles/alert/server.c              | 6 ++++--
 profiles/audio/player.c              | 3 ++-
 profiles/cyclingspeed/cyclingspeed.c | 2 +-
 profiles/health/hdp_main.c           | 4 ++--
 profiles/iap/main.c                  | 3 ++-
 profiles/proximity/main.c            | 3 ++-
 profiles/sap/main.c                  | 4 +++-
 profiles/sap/sap-dummy.c             | 4 +++-
 profiles/sap/server.c                | 3 +++
 profiles/sap/server.h                | 2 --
 10 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/profiles/alert/server.c b/profiles/alert/server.c
index b99aa3fab..2f6e3cde1 100644
--- a/profiles/alert/server.c
+++ b/profiles/alert/server.c
@@ -28,19 +28,21 @@
 
 #include <stdbool.h>
 #include <errno.h>
-#include <gdbus/gdbus.h>
-#include <glib.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#include <glib.h>
+
 #include "lib/bluetooth.h"
 #include "lib/hci.h"
 #include "lib/hci_lib.h"
 #include "lib/sdp.h"
 #include "lib/uuid.h"
 
+#include "gdbus/gdbus.h"
+
 #include "src/plugin.h"
 #include "src/dbus-common.h"
 #include "attrib/att.h"
diff --git a/profiles/audio/player.c b/profiles/audio/player.c
index 168e67705..94eb2ebab 100644
--- a/profiles/audio/player.c
+++ b/profiles/audio/player.c
@@ -36,7 +36,8 @@
 
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <gdbus/gdbus.h>
+
+#include "gdbus/gdbus.h"
 
 #include "src/log.h"
 #include "src/dbus-common.h"
diff --git a/profiles/cyclingspeed/cyclingspeed.c b/profiles/cyclingspeed/cyclingspeed.c
index bd7e1e53e..e44772560 100644
--- a/profiles/cyclingspeed/cyclingspeed.c
+++ b/profiles/cyclingspeed/cyclingspeed.c
@@ -26,8 +26,8 @@
 
 #include <errno.h>
 #include <stdbool.h>
+
 #include <glib.h>
-#include <gdbus/gdbus.h>
 
 #include "lib/bluetooth.h"
 #include "lib/sdp.h"
diff --git a/profiles/health/hdp_main.c b/profiles/health/hdp_main.c
index 6dc9acf52..2c4bbe298 100644
--- a/profiles/health/hdp_main.c
+++ b/profiles/health/hdp_main.c
@@ -25,10 +25,10 @@
 #endif
 
 #include <errno.h>
-#include <gdbus/gdbus.h>
 
-#include "src/plugin.h"
+#include "gdbus/gdbus.h"
 
+#include "src/plugin.h"
 #include "hdp_manager.h"
 
 static int hdp_init(void)
diff --git a/profiles/iap/main.c b/profiles/iap/main.c
index 0e8f43f54..53dd9fb9b 100644
--- a/profiles/iap/main.c
+++ b/profiles/iap/main.c
@@ -35,7 +35,8 @@
 #include <sys/signalfd.h>
 
 #include <glib.h>
-#include <gdbus.h>
+
+#include "gdbus/gdbus.h"
 
 #define IAP_PATH "/org/bluez/iap"
 
diff --git a/profiles/proximity/main.c b/profiles/proximity/main.c
index 8a350d4a5..38a51f12e 100644
--- a/profiles/proximity/main.c
+++ b/profiles/proximity/main.c
@@ -29,7 +29,8 @@
 #include <errno.h>
 #include <stdint.h>
 #include <glib.h>
-#include <gdbus/gdbus.h>
+
+#include "gdbus/gdbus.h"
 
 #include "src/log.h"
 #include "src/plugin.h"
diff --git a/profiles/sap/main.c b/profiles/sap/main.c
index ad55cd2e9..cd707ff3e 100644
--- a/profiles/sap/main.c
+++ b/profiles/sap/main.c
@@ -23,7 +23,9 @@
 #endif
 
 #include <errno.h>
-#include <gdbus/gdbus.h>
+
+#include "gdbus/gdbus.h"
+
 #include "src/plugin.h"
 #include "manager.h"
 
diff --git a/profiles/sap/sap-dummy.c b/profiles/sap/sap-dummy.c
index 854105e29..53463ca7c 100644
--- a/profiles/sap/sap-dummy.c
+++ b/profiles/sap/sap-dummy.c
@@ -27,12 +27,14 @@
 #endif
 
 #include <glib.h>
-#include <gdbus/gdbus.h>
 #include <stdint.h>
 
+#include "gdbus/gdbus.h"
+
 #include "src/dbus-common.h"
 #include "src/error.h"
 #include "src/log.h"
+
 #include "sap.h"
 
 #define SAP_DUMMY_IFACE "org.bluez.SimAccessTest1"
diff --git a/profiles/sap/server.c b/profiles/sap/server.c
index a95876189..ce423a178 100644
--- a/profiles/sap/server.c
+++ b/profiles/sap/server.c
@@ -35,6 +35,8 @@
 #include "lib/sdp_lib.h"
 #include "lib/uuid.h"
 
+#include "gdbus/gdbus.h"
+
 #include "btio/btio.h"
 #include "src/adapter.h"
 #include "src/sdpd.h"
@@ -42,6 +44,7 @@
 #include "src/error.h"
 #include "src/dbus-common.h"
 #include "src/shared/util.h"
+
 #include "sap.h"
 #include "server.h"
 
diff --git a/profiles/sap/server.h b/profiles/sap/server.h
index d7e674a9f..4bf9296ad 100644
--- a/profiles/sap/server.h
+++ b/profiles/sap/server.h
@@ -18,7 +18,5 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <gdbus/gdbus.h>
-
 int sap_server_register(struct btd_adapter *adapter);
 void sap_server_unregister(const char *path);
-- 
2.47.3