2012-12-05 11:22:49

by Lucas De Marchi

Subject: [PATCH BlueZ 1/7] build-sys: Define _GNU_SOURCE in config.h

From: Lucas De Marchi <[email protected]>

Instead of defining _GNU_SOURCE in each source file (and potentially
forgetting in some), tell the build system we use extensions and let it
define _GNU_SOURCE in config.h.
---
configure.ac | 1 +
monitor/btsnoop.c | 1 -
monitor/sdp.c | 1 -
profiles/input/hog_device.c | 1 -
src/adapter.c | 1 -
src/mgmt.c | 1 -
src/sdp-xml.c | 1 -
src/textfile.c | 1 -
tools/btsnoop.c | 1 -
tools/ciptool.c | 1 -
tools/hciattach.c | 1 -
tools/rfcomm.c | 1 -
12 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index c97d403..48e2817 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,6 +3,7 @@ AC_INIT(bluez, 5.x)

AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
AM_CONFIG_HEADER(config.h)
+AC_USE_SYSTEM_EXTENSIONS

m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

diff --git a/monitor/btsnoop.c b/monitor/btsnoop.c
index 9f4e5f3..04a6dff 100644
--- a/monitor/btsnoop.c
+++ b/monitor/btsnoop.c
@@ -26,7 +26,6 @@
#include <config.h>
#endif

-#define _GNU_SOURCE
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/monitor/sdp.c b/monitor/sdp.c
index 5812098..45ee59b 100644
--- a/monitor/sdp.c
+++ b/monitor/sdp.c
@@ -26,7 +26,6 @@
#include <config.h>
#endif

-#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/profiles/input/hog_device.c b/profiles/input/hog_device.c
index 8fdc3c6..a873eac 100644
--- a/profiles/input/hog_device.c
+++ b/profiles/input/hog_device.c
@@ -27,7 +27,6 @@
#include <config.h>
#endif

-#define _GNU_SOURCE
#include <stdlib.h>
#include <stdbool.h>
#include <errno.h>
diff --git a/src/adapter.c b/src/adapter.c
index 3c5d277..bf3672f 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -26,7 +26,6 @@
#include <config.h>
#endif

-#define _GNU_SOURCE
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/src/mgmt.c b/src/mgmt.c
index 95b7433..81b0494 100644
--- a/src/mgmt.c
+++ b/src/mgmt.c
@@ -26,7 +26,6 @@
#include <config.h>
#endif

-#define _GNU_SOURCE
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/src/sdp-xml.c b/src/sdp-xml.c
index 32eeaea..7d5f626 100644
--- a/src/sdp-xml.c
+++ b/src/sdp-xml.c
@@ -25,7 +25,6 @@
#include <config.h>
#endif

-#define _GNU_SOURCE
#include <stdio.h>
#include <errno.h>
#include <ctype.h>
diff --git a/src/textfile.c b/src/textfile.c
index 9d88fbc..b6a7e1f 100644
--- a/src/textfile.c
+++ b/src/textfile.c
@@ -25,7 +25,6 @@
#include <config.h>
#endif

-#define _GNU_SOURCE
#include <stdio.h>
#include <errno.h>
#include <ctype.h>
diff --git a/tools/btsnoop.c b/tools/btsnoop.c
index 0a01adf..dcb4a26 100644
--- a/tools/btsnoop.c
+++ b/tools/btsnoop.c
@@ -26,7 +26,6 @@
#include <config.h>
#endif

-#define _GNU_SOURCE
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/tools/ciptool.c b/tools/ciptool.c
index edce9da..e240f38 100644
--- a/tools/ciptool.c
+++ b/tools/ciptool.c
@@ -25,7 +25,6 @@
#include <config.h>
#endif

-#define _GNU_SOURCE
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/tools/hciattach.c b/tools/hciattach.c
index 09aed24..e1e80af 100644
--- a/tools/hciattach.c
+++ b/tools/hciattach.c
@@ -27,7 +27,6 @@
#include <config.h>
#endif

-#define _GNU_SOURCE
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/tools/rfcomm.c b/tools/rfcomm.c
index e8bdd0f..affdbc7 100644
--- a/tools/rfcomm.c
+++ b/tools/rfcomm.c
@@ -25,7 +25,6 @@
#include <config.h>
#endif

-#define _GNU_SOURCE
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
--
1.8.0.1

2012-12-05 15:24:34

by Johan Hedberg

Subject: Re: [PATCH BlueZ 1/7] build-sys: Define _GNU_SOURCE in config.h

Hi Lucas,

On Wed, Dec 05, 2012, Lucas De Marchi wrote:
> Instead of defining _GNU_SOURCE in each source file (and potentially
> forgetting in some), tell the build system we use extensions and let it
> define _GNU_SOURCE in config.h.
> ---
> configure.ac | 1 +
> monitor/btsnoop.c | 1 -
> monitor/sdp.c | 1 -
> profiles/input/hog_device.c | 1 -
> src/adapter.c | 1 -
> src/mgmt.c | 1 -
> src/sdp-xml.c | 1 -
> src/textfile.c | 1 -
> tools/btsnoop.c | 1 -
> tools/ciptool.c | 1 -
> tools/hciattach.c | 1 -
> tools/rfcomm.c | 1 -
> 12 files changed, 1 insertion(+), 11 deletions(-)

All patches in this set have been applied. Thanks!

Johan

2012-12-05 11:22:55

by Lucas De Marchi

Subject: [PATCH BlueZ 7/7] Use entire include path for gobex.h

From: Lucas De Marchi <[email protected]>

---
Makefile.obexd | 7 ++-----
obexd/client/map.c | 3 +--
obexd/client/pbap.c | 2 +-
obexd/client/session.c | 2 +-
obexd/client/transfer.c | 2 +-
obexd/plugins/pbap.c | 2 +-
obexd/src/manager.c | 2 +-
obexd/src/server.c | 2 +-
8 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/Makefile.obexd b/Makefile.obexd
index a895753..e235acc 100644
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -30,9 +30,7 @@ obexd_src_obexd_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ \
-fPIC -D_FILE_OFFSET_BITS=64

obexd_src_obexd_CPPFLAGS = -include $(top_builddir)/config.h -I$(builddir)/lib \
- -I$(builddir)/obexd/src \
- -I$(srcdir)/obexd/src \
- -I$(srcdir)/gobex
+ -I$(builddir)/obexd/src -I$(srcdir)/obexd/src

obexd_src_obexd_SHORTNAME = obexd

@@ -78,7 +76,6 @@ obexd_client_obex_client_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ \
-fPIC -D_FILE_OFFSET_BITS=64

obexd_client_obex_client_CPPFLAGS = -include $(top_builddir)/config.h \
- -I$(builddir)/lib -I$(srcdir)/obexd/src \
- -I$(srcdir)/gobex
+ -I$(builddir)/lib -I$(srcdir)/obexd/src

obexd_client_obex_client_SHORTNAME = obex-client
diff --git a/obexd/client/map.c b/obexd/client/map.c
index 6d7d926..ba33fe2 100644
--- a/obexd/client/map.c
+++ b/obexd/client/map.c
@@ -25,8 +25,7 @@
#include <stdio.h>
#include <glib.h>
#include <gdbus/gdbus.h>
-
-#include <gobex-apparam.h>
+#include <gobex/gobex-apparam.h>

#include "dbus.h"
#include "log.h"
diff --git a/obexd/client/pbap.c b/obexd/client/pbap.c
index 00b631a..c9a5e48 100644
--- a/obexd/client/pbap.c
+++ b/obexd/client/pbap.c
@@ -29,7 +29,7 @@
#include <gdbus/gdbus.h>

#include <bluetooth/bluetooth.h>
-#include <gobex-apparam.h>
+#include <gobex/gobex-apparam.h>

#include "log.h"

diff --git a/obexd/client/session.c b/obexd/client/session.c
index 4ee9d21..2118992 100644
--- a/obexd/client/session.c
+++ b/obexd/client/session.c
@@ -32,7 +32,7 @@

#include <glib.h>
#include <gdbus/gdbus.h>
-#include <gobex.h>
+#include <gobex/gobex.h>

#include "dbus.h"
#include "log.h"
diff --git a/obexd/client/transfer.c b/obexd/client/transfer.c
index 662e087..362419c 100644
--- a/obexd/client/transfer.c
+++ b/obexd/client/transfer.c
@@ -33,7 +33,7 @@

#include <glib.h>
#include <gdbus/gdbus.h>
-#include <gobex.h>
+#include <gobex/gobex.h>

#include "dbus.h"
#include "log.h"
diff --git a/obexd/plugins/pbap.c b/obexd/plugins/pbap.c
index 79237b6..e94edae 100644
--- a/obexd/plugins/pbap.c
+++ b/obexd/plugins/pbap.c
@@ -34,7 +34,7 @@
#include <fcntl.h>
#include <inttypes.h>

-#include <gobex.h>
+#include <gobex/gobex.h>
#include <gobex-apparam.h>

#include "obexd.h"
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index ccf03ca..ce66e19 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -30,7 +30,7 @@
#include <inttypes.h>

#include <btio/btio.h>
-#include <gobex.h>
+#include <gobex/gobex.h>

#include "obexd.h"
#include "obex.h"
diff --git a/obexd/src/server.c b/obexd/src/server.c
index 0b63276..9976bd0 100644
--- a/obexd/src/server.c
+++ b/obexd/src/server.c
@@ -31,7 +31,7 @@
#include <inttypes.h>

#include <glib.h>
-#include <gobex.h>
+#include <gobex/gobex.h>

#include "log.h"
#include "obex.h"
--
1.8.0.1

2012-12-05 11:22:54

by Lucas De Marchi

Subject: [PATCH BlueZ 6/7] Reorder btio.h includes

From: Lucas De Marchi <[email protected]>

Let "#include <btio/btio.h>" together with other includes using '<'
rather than '"'.
---
attrib/client.c | 2 +-
attrib/gattrib.c | 2 +-
attrib/interactive.c | 2 +-
attrib/utils.c | 2 +-
obexd/plugins/bluetooth.c | 2 +-
obexd/plugins/syncevolution.c | 2 +-
obexd/src/manager.c | 2 +-
obexd/src/obex.c | 2 +-
profiles/audio/avctp.c | 2 +-
profiles/audio/avdtp.c | 2 +-
profiles/audio/main.c | 2 +-
profiles/audio/manager.c | 2 +-
profiles/gatt/gas.c | 2 +-
profiles/network/connection.c | 2 +-
profiles/network/server.c | 2 +-
src/device.c | 2 +-
src/plugin.c | 2 +-
17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/attrib/client.c b/attrib/client.c
index 41a96d5..d533732 100644
--- a/attrib/client.c
+++ b/attrib/client.c
@@ -32,12 +32,12 @@
#include <bluetooth/uuid.h>

#include <gdbus/gdbus.h>
+#include <btio/btio.h>
#include "adapter.h"
#include "device.h"
#include "log.h"
#include "error.h"
#include "dbus-common.h"
-#include <btio/btio.h>
#include "storage.h"

#include "att.h"
diff --git a/attrib/gattrib.c b/attrib/gattrib.c
index 9ba850a..0acefc8 100644
--- a/attrib/gattrib.c
+++ b/attrib/gattrib.c
@@ -31,9 +31,9 @@
#include <bluetooth/bluetooth.h>
#include <bluetooth/uuid.h>

+#include <btio/btio.h>
#include "log.h"
#include "att.h"
-#include <btio/btio.h>
#include "gattrib.h"

#define GATT_TIMEOUT 30
diff --git a/attrib/interactive.c b/attrib/interactive.c
index 940cd50..50f7e44 100644
--- a/attrib/interactive.c
+++ b/attrib/interactive.c
@@ -31,8 +31,8 @@
#include <readline/readline.h>
#include <readline/history.h>

-#include "att.h"
#include <btio/btio.h>
+#include "att.h"
#include "gattrib.h"
#include "gatt.h"
#include "gatttool.h"
diff --git a/attrib/utils.c b/attrib/utils.c
index 4ffcd93..08365bd 100644
--- a/attrib/utils.c
+++ b/attrib/utils.c
@@ -30,10 +30,10 @@
#include <bluetooth/uuid.h>
#include <bluetooth/sdp.h>

+#include <btio/btio.h>
#include "att.h"
#include "gattrib.h"
#include "gatt.h"
-#include <btio/btio.h>
#include "gatttool.h"

GIOChannel *gatt_connect(const gchar *src, const gchar *dst,
diff --git a/obexd/plugins/bluetooth.c b/obexd/plugins/bluetooth.c
index f57a511..4cbeac4 100644
--- a/obexd/plugins/bluetooth.c
+++ b/obexd/plugins/bluetooth.c
@@ -30,6 +30,7 @@

#include <glib.h>
#include <gdbus/gdbus.h>
+#include <btio/btio.h>

#include "obexd.h"
#include "plugin.h"
@@ -38,7 +39,6 @@
#include "transport.h"
#include "service.h"
#include "log.h"
-#include <btio/btio.h>

#define BT_RX_MTU 32767
#define BT_TX_MTU 32767
diff --git a/obexd/plugins/syncevolution.c b/obexd/plugins/syncevolution.c
index 93cf2bf..02c02d4 100644
--- a/obexd/plugins/syncevolution.c
+++ b/obexd/plugins/syncevolution.c
@@ -32,6 +32,7 @@

#include <bluetooth/bluetooth.h>

+#include <btio/btio.h>
#include <gdbus/gdbus.h>
#include "plugin.h"
#include "obex.h"
@@ -39,7 +40,6 @@
#include "mimetype.h"
#include "log.h"
#include "manager.h"
-#include <btio/btio.h>
#include "obexd.h"
#include "filesystem.h"

diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index 3743bbf..ccf03ca 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -29,6 +29,7 @@
#include <sys/socket.h>
#include <inttypes.h>

+#include <btio/btio.h>
#include <gobex.h>

#include "obexd.h"
@@ -37,7 +38,6 @@
#include "server.h"
#include "manager.h"
#include "log.h"
-#include <btio/btio.h>
#include "service.h"

#define OBEX_MANAGER_PATH "/"
diff --git a/obexd/src/obex.c b/obexd/src/obex.c
index e7e6c6f..bdaf923 100644
--- a/obexd/src/obex.c
+++ b/obexd/src/obex.c
@@ -36,6 +36,7 @@
#include <inttypes.h>

#include <glib.h>
+#include <btio/btio.h>
#include <gobex/gobex.h>

#include "obexd.h"
@@ -47,7 +48,6 @@
#include "mimetype.h"
#include "service.h"
#include "transport.h"
-#include <btio/btio.h>

/* Challenge request */
#define NONCE_TAG 0x00
diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c
index 1bf06f2..061ebd0 100644
--- a/profiles/audio/avctp.c
+++ b/profiles/audio/avctp.c
@@ -41,6 +41,7 @@
#include <bluetooth/l2cap.h>

#include <glib.h>
+#include <btio/btio.h>

#include "adapter.h"
#include "../src/device.h"
@@ -48,7 +49,6 @@
#include "log.h"
#include "error.h"
#include "uinput.h"
-#include <btio/btio.h>
#include "manager.h"
#include "device.h"
#include "avctp.h"
diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c
index b9f7d85..8fd7118 100644
--- a/profiles/audio/avdtp.c
+++ b/profiles/audio/avdtp.c
@@ -39,6 +39,7 @@

#include <glib.h>
#include <dbus/dbus.h>
+#include <btio/btio.h>

#include "log.h"

@@ -50,7 +51,6 @@
#include "manager.h"
#include "control.h"
#include "avdtp.h"
-#include <btio/btio.h>
#include "sink.h"
#include "source.h"

diff --git a/profiles/audio/main.c b/profiles/audio/main.c
index 21961cb..0c3a703 100644
--- a/profiles/audio/main.c
+++ b/profiles/audio/main.c
@@ -32,9 +32,9 @@

#include <glib.h>
#include <dbus/dbus.h>
+#include <btio/btio.h>

#include "glib-helper.h"
-#include <btio/btio.h>
#include "plugin.h"
#include "log.h"
#include "device.h"
diff --git a/profiles/audio/manager.c b/profiles/audio/manager.c
index 67a0153..5efe166 100644
--- a/profiles/audio/manager.c
+++ b/profiles/audio/manager.c
@@ -42,10 +42,10 @@

#include <glib.h>
#include <dbus/dbus.h>
+#include <btio/btio.h>
#include <gdbus/gdbus.h>

#include "glib-helper.h"
-#include <btio/btio.h>
#include "../src/adapter.h"
#include "../src/manager.h"
#include "../src/device.h"
diff --git a/profiles/gatt/gas.c b/profiles/gatt/gas.c
index 42db6a2..5ec0a8f 100644
--- a/profiles/gatt/gas.c
+++ b/profiles/gatt/gas.c
@@ -29,13 +29,13 @@

#include <glib.h>
#include <bluetooth/uuid.h>
+#include <btio/btio.h>

#include "adapter.h"
#include "device.h"
#include "attrib/att.h"
#include "attrib/gattrib.h"
#include "attio.h"
-#include <btio/btio.h>
#include "attrib/gatt.h"
#include "log.h"
#include "textfile.h"
diff --git a/profiles/network/connection.c b/profiles/network/connection.c
index c91e59d..8df4a6b 100644
--- a/profiles/network/connection.c
+++ b/profiles/network/connection.c
@@ -33,9 +33,9 @@

#include <glib.h>
#include <gdbus/gdbus.h>
+#include <btio/btio.h>

#include "log.h"
-#include <btio/btio.h>
#include "dbus-common.h"
#include "adapter.h"
#include "device.h"
diff --git a/profiles/network/server.c b/profiles/network/server.c
index 09ea0e7..6d0274a 100644
--- a/profiles/network/server.c
+++ b/profiles/network/server.c
@@ -35,6 +35,7 @@

#include <glib.h>
#include <gdbus/gdbus.h>
+#include <btio/btio.h>

#include "../src/dbus-common.h"
#include "../src/adapter.h"
@@ -42,7 +43,6 @@
#include "log.h"
#include "error.h"
#include "sdpd.h"
-#include <btio/btio.h>

#include "common.h"
#include "server.h"
diff --git a/src/device.c b/src/device.c
index e12f63a..2032b80 100644
--- a/src/device.c
+++ b/src/device.c
@@ -40,6 +40,7 @@
#include <glib.h>
#include <dbus/dbus.h>
#include <gdbus/gdbus.h>
+#include <btio/btio.h>

#include "log.h"

@@ -58,7 +59,6 @@
#include "agent.h"
#include "sdp-xml.h"
#include "storage.h"
-#include <btio/btio.h>
#include "attrib-server.h"
#include "attrib/client.h"

diff --git a/src/plugin.c b/src/plugin.c
index a16deb8..c931e68 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -29,11 +29,11 @@
#include <bluetooth/bluetooth.h>

#include <glib.h>
+#include <btio/btio.h>

#include "plugin.h"
#include "log.h"
#include "hcid.h"
-#include <btio/btio.h>

static GSList *plugins = NULL;

--
1.8.0.1

2012-12-05 11:22:50

by Lucas De Marchi

Subject: [PATCH BlueZ 2/7] Ensure config.h is included by using CPPFLAGS

From: Lucas De Marchi <[email protected]>

Instead of trying to include config.h in each file over the tree and
possibly forgetting to include it, give a "-include config.h" argument
to the compiler so it's guaranteed that a) it will be included for all
source files and b) it will be the first header included.

gdbus/ directory is left out, since it would break other projects using
it.
---
Makefile.am | 5 +++--
Makefile.obexd | 6 ++++--
attrib/client.c | 4 ----
attrib/gatt-service.c | 4 ----
attrib/gatt.c | 4 ----
attrib/gatttool.c | 4 ----
emulator/b1ee.c | 4 ----
emulator/btdev.c | 4 ----
emulator/main.c | 4 ----
emulator/server.c | 4 ----
emulator/vhci.c | 4 ----
gdbus/mainloop.c | 4 ----
gdbus/object.c | 4 ----
gdbus/polkit.c | 4 ----
gdbus/watch.c | 4 ----
gobex/gobex-apparam.c | 4 ----
gobex/gobex-defs.c | 4 ----
gobex/gobex-header.c | 4 ----
gobex/gobex-packet.c | 4 ----
gobex/gobex-transfer.c | 4 ----
gobex/gobex.c | 4 ----
lib/bluetooth.c | 4 ----
lib/hci.c | 4 ----
lib/sdp.c | 4 ----
lib/uuid.c | 4 ----
monitor/btsnoop.c | 4 ----
monitor/control.c | 4 ----
monitor/display.c | 4 ----
monitor/hcidump.c | 4 ----
monitor/l2cap.c | 4 ----
monitor/main.c | 4 ----
monitor/mainloop.c | 4 ----
monitor/packet.c | 4 ----
monitor/sdp.c | 4 ----
monitor/uuid.c | 4 ----
obexd/client/bluetooth.c | 4 ----
obexd/client/dbus.c | 4 ----
obexd/client/driver.c | 4 ----
obexd/client/ftp.c | 4 ----
obexd/client/main.c | 4 ----
obexd/client/manager.c | 4 ----
obexd/client/map.c | 4 ----
obexd/client/opp.c | 4 ----
obexd/client/pbap.c | 4 ----
obexd/client/session.c | 4 ----
obexd/client/sync.c | 4 ----
obexd/client/transfer.c | 4 ----
obexd/client/transport.c | 4 ----
obexd/plugins/bluetooth.c | 4 ----
obexd/plugins/filesystem.c | 4 ----
obexd/plugins/ftp.c | 4 ----
obexd/plugins/irmc.c | 4 ----
obexd/plugins/mas.c | 4 ----
obexd/plugins/messages-dummy.c | 4 ----
obexd/plugins/messages-tracker.c | 4 ----
obexd/plugins/opp.c | 4 ----
obexd/plugins/pbap.c | 4 ----
obexd/plugins/pcsuite.c | 4 ----
obexd/plugins/phonebook-dummy.c | 4 ----
obexd/plugins/phonebook-ebook.c | 4 ----
obexd/plugins/syncevolution.c | 4 ----
obexd/plugins/usb.c | 4 ----
obexd/plugins/vcard.c | 4 ----
obexd/src/log.c | 4 ----
obexd/src/main.c | 4 ----
obexd/src/manager.c | 4 ----
obexd/src/mimetype.c | 4 ----
obexd/src/obex.c | 4 ----
obexd/src/plugin.c | 4 ----
obexd/src/server.c | 4 ----
obexd/src/service.c | 4 ----
obexd/src/transport.c | 4 ----
plugins/adaptername.c | 4 ----
plugins/dbusoob.c | 4 ----
plugins/external-dummy.c | 4 ----
plugins/formfactor.c | 4 ----
plugins/gatt-example.c | 4 ----
plugins/neard.c | 4 ----
plugins/service.c | 4 ----
plugins/storage.c | 4 ----
plugins/wiimote.c | 4 ----
profiles/alert/main.c | 4 ----
profiles/alert/manager.c | 4 ----
profiles/alert/server.c | 4 ----
profiles/audio/a2dp.c | 4 ----
profiles/audio/avctp.c | 4 ----
profiles/audio/avdtp.c | 4 ----
profiles/audio/avrcp.c | 4 ----
profiles/audio/control.c | 4 ----
profiles/audio/device.c | 4 ----
profiles/audio/main.c | 4 ----
profiles/audio/manager.c | 4 ----
profiles/audio/media.c | 4 ----
profiles/audio/player.c | 4 ----
profiles/audio/sink.c | 4 ----
profiles/audio/source.c | 4 ----
profiles/audio/transport.c | 4 ----
profiles/cups/hcrp.c | 4 ----
profiles/cups/main.c | 4 ----
profiles/cups/sdp.c | 4 ----
profiles/cups/spp.c | 4 ----
profiles/cyclingspeed/cyclingspeed.c | 4 ----
profiles/deviceinfo/deviceinfo.c | 4 ----
profiles/deviceinfo/main.c | 4 ----
profiles/gatt/gas.c | 4 ----
profiles/gatt/main.c | 4 ----
profiles/health/hdp_main.c | 4 ----
profiles/health/hdp_manager.c | 4 ----
profiles/health/hdp_util.c | 4 ----
profiles/health/mcap_sync.c | 4 ----
profiles/heartrate/heartrate.c | 4 ----
profiles/heartrate/main.c | 4 ----
profiles/input/device.c | 4 ----
profiles/input/hog_device.c | 4 ----
profiles/input/hog_manager.c | 4 ----
profiles/input/main.c | 4 ----
profiles/input/manager.c | 4 ----
profiles/input/server.c | 4 ----
profiles/input/suspend-dummy.c | 4 ----
profiles/network/common.c | 4 ----
profiles/network/connection.c | 4 ----
profiles/network/main.c | 4 ----
profiles/network/manager.c | 4 ----
profiles/network/server.c | 4 ----
profiles/proximity/immalert.c | 4 ----
profiles/proximity/linkloss.c | 4 ----
profiles/proximity/main.c | 4 ----
profiles/proximity/manager.c | 4 ----
profiles/proximity/monitor.c | 4 ----
profiles/proximity/reporter.c | 4 ----
profiles/sap/main.c | 4 ----
profiles/sap/manager.c | 4 ----
profiles/sap/sap-dummy.c | 4 ----
profiles/sap/server.c | 4 ----
profiles/scanparam/main.c | 4 ----
profiles/scanparam/manager.c | 4 ----
profiles/scanparam/scan.c | 4 ----
profiles/thermometer/main.c | 4 ----
profiles/thermometer/thermometer.c | 4 ----
profiles/time/main.c | 4 ----
profiles/time/manager.c | 4 ----
profiles/time/server.c | 4 ----
src/adapter.c | 4 ----
src/agent.c | 4 ----
src/attrib-server.c | 4 ----
src/dbus-common.c | 4 ----
src/device.c | 4 ----
src/eir.c | 4 ----
src/error.c | 4 ----
src/glib-helper.c | 4 ----
src/log.c | 4 ----
src/main.c | 4 ----
src/manager.c | 4 ----
src/mgmt.c | 4 ----
src/oui.c | 4 ----
src/plugin.c | 4 ----
src/profile.c | 4 ----
src/rfkill.c | 4 ----
src/sdp-client.c | 4 ----
src/sdp-xml.c | 4 ----
src/sdpd-database.c | 4 ----
src/sdpd-request.c | 4 ----
src/sdpd-server.c | 4 ----
src/sdpd-service.c | 4 ----
src/storage.c | 4 ----
src/textfile.c | 4 ----
test/agent.c | 4 ----
test/attest.c | 4 ----
test/avtest.c | 4 ----
test/bdaddr.c | 4 ----
test/gaptest.c | 4 ----
test/hciemu.c | 4 ----
test/hstest.c | 4 ----
test/l2test.c | 4 ----
test/lmptest.c | 4 ----
test/mpris-player.c | 4 ----
test/rctest.c | 4 ----
test/scotest.c | 4 ----
test/sdptest.c | 4 ----
test/test-textfile.c | 4 ----
tools/avinfo.c | 4 ----
tools/bccmd.c | 4 ----
tools/btattach.c | 4 ----
tools/btmgmt.c | 4 ----
tools/btsnoop.c | 4 ----
tools/ciptool.c | 4 ----
tools/csr.c | 4 ----
tools/csr_3wire.c | 4 ----
tools/csr_bcsp.c | 4 ----
tools/csr_h4.c | 4 ----
tools/csr_hci.c | 4 ----
tools/csr_usb.c | 4 ----
tools/dfu.c | 4 ----
tools/dfutool.c | 4 ----
tools/hciattach.c | 4 ----
tools/hciattach_ath3k.c | 4 ----
tools/hciattach_intel.c | 4 ----
tools/hciattach_qualcomm.c | 4 ----
tools/hciattach_st.c | 4 ----
tools/hciattach_ti.c | 4 ----
tools/hciattach_tialt.c | 4 ----
tools/hciconfig.c | 4 ----
tools/hcieventmask.c | 4 ----
tools/hcisecfilter.c | 4 ----
tools/hcitool.c | 4 ----
tools/hid2hci.c | 4 ----
tools/l2ping.c | 4 ----
tools/obex-server-tool.c | 4 ----
tools/rfcomm.c | 4 ----
tools/sdptool.c | 4 ----
tools/ubcsp.c | 4 ----
unit/test-eir.c | 4 ----
212 files changed, 7 insertions(+), 844 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 438fca6..6def418 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -357,8 +357,9 @@ EXTRA_DIST += doc/manager-api.txt \

AM_CFLAGS += @DBUS_CFLAGS@ @GLIB_CFLAGS@

-AM_CPPFLAGS = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \
- -I$(srcdir)/gdbus -I$(srcdir)/btio
+AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(builddir)/lib \
+ -I$(builddir)/src -I$(srcdir)/src -I$(srcdir)/gdbus \
+ -I$(srcdir)/btio

if MCAP
AM_CPPFLAGS += -I$(builddir)/health
diff --git a/Makefile.obexd b/Makefile.obexd
index cbcd65d..f8798f6 100644
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -29,7 +29,8 @@ obexd_src_obexd_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ \
-DPLUGINDIR=\""$(obex_plugindir)"\" \
-fPIC -D_FILE_OFFSET_BITS=64

-obexd_src_obexd_CPPFLAGS = -I$(builddir)/lib -I$(builddir)/obexd/src \
+obexd_src_obexd_CPPFLAGS = -include $(top_builddir)/config.h -I$(builddir)/lib \
+ -I$(builddir)/obexd/src \
-I$(srcdir)/obexd/src -I$(srcdir)/btio \
-I$(srcdir)/gobex -I$(srcdir)/gdbus

@@ -76,7 +77,8 @@ obexd_client_obex_client_LDADD = lib/libbluetooth-private.la \
obexd_client_obex_client_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ \
-fPIC -D_FILE_OFFSET_BITS=64

-obexd_client_obex_client_CPPFLAGS = -I$(builddir)/lib -I$(srcdir)/obexd/src \
+obexd_client_obex_client_CPPFLAGS = -include $(top_builddir)/config.h \
+ -I$(builddir)/lib -I$(srcdir)/obexd/src \
-I$(srcdir)/btio -I$(srcdir)/gobex \
-I$(srcdir)/gdbus

diff --git a/attrib/client.c b/attrib/client.c
index 51c2b83..44a6730 100644
--- a/attrib/client.c
+++ b/attrib/client.c
@@ -23,10 +23,6 @@
*/


-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <stdlib.h>
#include <stdbool.h>
diff --git a/attrib/gatt-service.c b/attrib/gatt-service.c
index e8788d9..80e76eb 100644
--- a/attrib/gatt-service.c
+++ b/attrib/gatt-service.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <glib.h>
#include <bluetooth/uuid.h>
#include <bluetooth/sdp.h>
diff --git a/attrib/gatt.c b/attrib/gatt.c
index 38c050e..cfa3c53 100644
--- a/attrib/gatt.c
+++ b/attrib/gatt.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdint.h>
#include <stdlib.h>
#include <glib.h>
diff --git a/attrib/gatttool.c b/attrib/gatttool.c
index 2fe95c0..dcfc856 100644
--- a/attrib/gatttool.c
+++ b/attrib/gatttool.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <glib.h>
#include <stdlib.h>
diff --git a/emulator/b1ee.c b/emulator/b1ee.c
index 17a60fc..18b827e 100644
--- a/emulator/b1ee.c
+++ b/emulator/b1ee.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/emulator/btdev.c b/emulator/btdev.c
index 700c6a8..bd158ee 100644
--- a/emulator/btdev.c
+++ b/emulator/btdev.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
diff --git a/emulator/main.c b/emulator/main.c
index 807c663..4124702 100644
--- a/emulator/main.c
+++ b/emulator/main.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <getopt.h>
diff --git a/emulator/server.c b/emulator/server.c
index e4c4570..ea8fa21 100644
--- a/emulator/server.c
+++ b/emulator/server.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <ctype.h>
diff --git a/emulator/vhci.c b/emulator/vhci.c
index 52876ba..0062beb 100644
--- a/emulator/vhci.c
+++ b/emulator/vhci.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/gdbus/mainloop.c b/gdbus/mainloop.c
index 099b67f..483ed66 100644
--- a/gdbus/mainloop.c
+++ b/gdbus/mainloop.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <glib.h>
#include <dbus/dbus.h>

diff --git a/gdbus/object.c b/gdbus/object.c
index 7cbd612..611cded 100644
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <string.h>

diff --git a/gdbus/polkit.c b/gdbus/polkit.c
index 9e95fa3..508937d 100644
--- a/gdbus/polkit.c
+++ b/gdbus/polkit.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>

#include <dbus/dbus.h>
diff --git a/gdbus/watch.c b/gdbus/watch.c
index 9e4f994..0dcb2a2 100644
--- a/gdbus/watch.c
+++ b/gdbus/watch.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <string.h>

diff --git a/gobex/gobex-apparam.c b/gobex/gobex-apparam.c
index 442a3f1..0c3cc8a 100644
--- a/gobex/gobex-apparam.c
+++ b/gobex/gobex-apparam.c
@@ -19,10 +19,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <string.h>
#include <unistd.h>
#include <errno.h>
diff --git a/gobex/gobex-defs.c b/gobex/gobex-defs.c
index c184c9c..f1f3b38 100644
--- a/gobex/gobex-defs.c
+++ b/gobex/gobex-defs.c
@@ -19,10 +19,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <glib.h>

#include "gobex-defs.h"
diff --git a/gobex/gobex-header.c b/gobex/gobex-header.c
index 80e8e4e..6136f2c 100644
--- a/gobex/gobex-header.c
+++ b/gobex/gobex-header.c
@@ -19,10 +19,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <string.h>

#include "gobex-header.h"
diff --git a/gobex/gobex-packet.c b/gobex/gobex-packet.c
index c3e3953..d59bbce 100644
--- a/gobex/gobex-packet.c
+++ b/gobex/gobex-packet.c
@@ -19,10 +19,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <string.h>
#include <errno.h>

diff --git a/gobex/gobex-transfer.c b/gobex/gobex-transfer.c
index 724c788..f29a7ce 100644
--- a/gobex/gobex-transfer.c
+++ b/gobex/gobex-transfer.c
@@ -19,10 +19,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <string.h>
#include <errno.h>

diff --git a/gobex/gobex.c b/gobex/gobex.c
index 7c136af..59a0159 100644
--- a/gobex/gobex.c
+++ b/gobex/gobex.c
@@ -19,10 +19,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include <unistd.h>
#include <string.h>
#include <errno.h>
diff --git a/lib/bluetooth.c b/lib/bluetooth.c
index d9360dc..42075a4 100644
--- a/lib/bluetooth.c
+++ b/lib/bluetooth.c
@@ -23,10 +23,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <ctype.h>
diff --git a/lib/hci.c b/lib/hci.c
index 66b2d5f..ba5f582 100644
--- a/lib/hci.c
+++ b/lib/hci.c
@@ -23,10 +23,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/lib/sdp.c b/lib/sdp.c
index dbffec0..1cee8dc 100644
--- a/lib/sdp.c
+++ b/lib/sdp.c
@@ -24,10 +24,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/lib/uuid.c b/lib/uuid.c
index 4363aee..0035c6c 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <string.h>
#include <stdlib.h>
#include <errno.h>
diff --git a/monitor/btsnoop.c b/monitor/btsnoop.c
index 04a6dff..e8de179 100644
--- a/monitor/btsnoop.c
+++ b/monitor/btsnoop.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/monitor/control.c b/monitor/control.c
index 3447b7a..160ce4c 100644
--- a/monitor/control.c
+++ b/monitor/control.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/monitor/display.c b/monitor/display.c
index 7b6fc98..48c3bac 100644
--- a/monitor/display.c
+++ b/monitor/display.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/monitor/hcidump.c b/monitor/hcidump.c
index e69bcb1..f57ba81 100644
--- a/monitor/hcidump.c
+++ b/monitor/hcidump.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/monitor/l2cap.c b/monitor/l2cap.c
index e982bdd..db62b05 100644
--- a/monitor/l2cap.c
+++ b/monitor/l2cap.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <inttypes.h>
diff --git a/monitor/main.c b/monitor/main.c
index 27a5722..5a0229e 100644
--- a/monitor/main.c
+++ b/monitor/main.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
diff --git a/monitor/mainloop.c b/monitor/mainloop.c
index 1cc787e..99f156c 100644
--- a/monitor/mainloop.c
+++ b/monitor/mainloop.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/monitor/packet.c b/monitor/packet.c
index ee37615..7df6545 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <ctype.h>
diff --git a/monitor/sdp.c b/monitor/sdp.c
index 45ee59b..5cdf47d 100644
--- a/monitor/sdp.c
+++ b/monitor/sdp.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/monitor/uuid.c b/monitor/uuid.c
index c348e17..ca79b68 100644
--- a/monitor/uuid.c
+++ b/monitor/uuid.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "uuid.h"

static struct {
diff --git a/obexd/client/bluetooth.c b/obexd/client/bluetooth.c
index d233e5c..528845e 100644
--- a/obexd/client/bluetooth.c
+++ b/obexd/client/bluetooth.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <inttypes.h>

diff --git a/obexd/client/dbus.c b/obexd/client/dbus.c
index c8f86f8..78e0b96 100644
--- a/obexd/client/dbus.c
+++ b/obexd/client/dbus.c
@@ -19,10 +19,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <glib.h>
#include <gdbus.h>

diff --git a/obexd/client/driver.c b/obexd/client/driver.c
index fe61219..66501fa 100644
--- a/obexd/client/driver.c
+++ b/obexd/client/driver.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <string.h>
#include <errno.h>
#include <glib.h>
diff --git a/obexd/client/ftp.c b/obexd/client/ftp.c
index 45c1057..e2b650f 100644
--- a/obexd/client/ftp.c
+++ b/obexd/client/ftp.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <string.h>

diff --git a/obexd/client/main.c b/obexd/client/main.c
index 3eabfda..80867be 100644
--- a/obexd/client/main.c
+++ b/obexd/client/main.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/obexd/client/manager.c b/obexd/client/manager.c
index 7f2fede9..93d16ae 100644
--- a/obexd/client/manager.c
+++ b/obexd/client/manager.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/obexd/client/map.c b/obexd/client/map.c
index dc72e4b..0f141c1 100644
--- a/obexd/client/map.c
+++ b/obexd/client/map.c
@@ -20,10 +20,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <string.h>
#include <stdio.h>
diff --git a/obexd/client/opp.c b/obexd/client/opp.c
index 5137de8..5f317a2 100644
--- a/obexd/client/opp.c
+++ b/obexd/client/opp.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <gdbus.h>

diff --git a/obexd/client/pbap.c b/obexd/client/pbap.c
index 6444605..fa8b126 100644
--- a/obexd/client/pbap.c
+++ b/obexd/client/pbap.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <string.h>
#include <stdio.h>
diff --git a/obexd/client/session.c b/obexd/client/session.c
index 1b6b927..4339327 100644
--- a/obexd/client/session.c
+++ b/obexd/client/session.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
diff --git a/obexd/client/sync.c b/obexd/client/sync.c
index 65c9210..45e49b0 100644
--- a/obexd/client/sync.c
+++ b/obexd/client/sync.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <string.h>

diff --git a/obexd/client/transfer.c b/obexd/client/transfer.c
index cac3884..67b8eaf 100644
--- a/obexd/client/transfer.c
+++ b/obexd/client/transfer.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
diff --git a/obexd/client/transport.c b/obexd/client/transport.c
index 77e52f7..21dfef4 100644
--- a/obexd/client/transport.c
+++ b/obexd/client/transport.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <string.h>
#include <errno.h>
#include <glib.h>
diff --git a/obexd/plugins/bluetooth.c b/obexd/plugins/bluetooth.c
index 2506aec..24fd1cb 100644
--- a/obexd/plugins/bluetooth.c
+++ b/obexd/plugins/bluetooth.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <string.h>
#include <unistd.h>
diff --git a/obexd/plugins/filesystem.c b/obexd/plugins/filesystem.c
index 1132a34..1e6c6d7 100644
--- a/obexd/plugins/filesystem.c
+++ b/obexd/plugins/filesystem.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/obexd/plugins/ftp.c b/obexd/plugins/ftp.c
index ff4b761..b89f9b2 100644
--- a/obexd/plugins/ftp.c
+++ b/obexd/plugins/ftp.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <fcntl.h>
#include <stdio.h>
#include <errno.h>
diff --git a/obexd/plugins/irmc.c b/obexd/plugins/irmc.c
index c9c3521..1c172b8 100644
--- a/obexd/plugins/irmc.c
+++ b/obexd/plugins/irmc.c
@@ -20,10 +20,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <string.h>
#include <errno.h>
diff --git a/obexd/plugins/mas.c b/obexd/plugins/mas.c
index 1b18059..b279bf0 100644
--- a/obexd/plugins/mas.c
+++ b/obexd/plugins/mas.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <string.h>
#include <errno.h>
#include <glib.h>
diff --git a/obexd/plugins/messages-dummy.c b/obexd/plugins/messages-dummy.c
index 4c66f51..869f9df 100644
--- a/obexd/plugins/messages-dummy.c
+++ b/obexd/plugins/messages-dummy.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <sys/types.h>
#include <dirent.h>
#include <errno.h>
diff --git a/obexd/plugins/messages-tracker.c b/obexd/plugins/messages-tracker.c
index 60f3a80..96da001 100644
--- a/obexd/plugins/messages-tracker.c
+++ b/obexd/plugins/messages-tracker.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <glib.h>
#include <string.h>
diff --git a/obexd/plugins/opp.c b/obexd/plugins/opp.c
index c7ddc63..747ab85 100644
--- a/obexd/plugins/opp.c
+++ b/obexd/plugins/opp.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <string.h>
#include <unistd.h>
diff --git a/obexd/plugins/pbap.c b/obexd/plugins/pbap.c
index c36fab2..79237b6 100644
--- a/obexd/plugins/pbap.c
+++ b/obexd/plugins/pbap.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <string.h>
#include <errno.h>
diff --git a/obexd/plugins/pcsuite.c b/obexd/plugins/pcsuite.c
index f3d0b1a..b479980 100644
--- a/obexd/plugins/pcsuite.c
+++ b/obexd/plugins/pcsuite.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <fcntl.h>
#include <stdio.h>
#include <errno.h>
diff --git a/obexd/plugins/phonebook-dummy.c b/obexd/plugins/phonebook-dummy.c
index 6b9d040..458136e 100644
--- a/obexd/plugins/phonebook-dummy.c
+++ b/obexd/plugins/phonebook-dummy.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <dirent.h>
#include <errno.h>
#include <stdio.h>
diff --git a/obexd/plugins/phonebook-ebook.c b/obexd/plugins/phonebook-ebook.c
index 59a4eac..b1935b7 100644
--- a/obexd/plugins/phonebook-ebook.c
+++ b/obexd/plugins/phonebook-ebook.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <string.h>
#include <errno.h>
#include <glib.h>
diff --git a/obexd/plugins/syncevolution.c b/obexd/plugins/syncevolution.c
index 0778608..1e8f78a 100644
--- a/obexd/plugins/syncevolution.c
+++ b/obexd/plugins/syncevolution.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <string.h>
#include <stdio.h>
#include <errno.h>
diff --git a/obexd/plugins/usb.c b/obexd/plugins/usb.c
index 7b21623..32e7159 100644
--- a/obexd/plugins/usb.c
+++ b/obexd/plugins/usb.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/obexd/plugins/vcard.c b/obexd/plugins/vcard.c
index 31d6d0d..baf0696 100644
--- a/obexd/plugins/vcard.c
+++ b/obexd/plugins/vcard.c
@@ -19,10 +19,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/obexd/src/log.c b/obexd/src/log.c
index 59b6151..1d3a8f2 100644
--- a/obexd/src/log.c
+++ b/obexd/src/log.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <stdarg.h>
#include <syslog.h>
diff --git a/obexd/src/main.c b/obexd/src/main.c
index a2a94f7..fb38265 100644
--- a/obexd/src/main.c
+++ b/obexd/src/main.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index 1d48224..e038b9e 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <unistd.h>
#include <string.h>
diff --git a/obexd/src/mimetype.c b/obexd/src/mimetype.c
index 833ddc7..548a31a 100644
--- a/obexd/src/mimetype.c
+++ b/obexd/src/mimetype.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <string.h>
diff --git a/obexd/src/obex.c b/obexd/src/obex.c
index 9044961..4656493 100644
--- a/obexd/src/obex.c
+++ b/obexd/src/obex.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/obexd/src/plugin.c b/obexd/src/plugin.c
index c8ec642..b8a9daa 100644
--- a/obexd/src/plugin.c
+++ b/obexd/src/plugin.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <dlfcn.h>
#include <string.h>
diff --git a/obexd/src/server.c b/obexd/src/server.c
index 16be849..0b63276 100644
--- a/obexd/src/server.c
+++ b/obexd/src/server.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/obexd/src/service.c b/obexd/src/service.c
index 4d9ebfd..46fcb1d 100644
--- a/obexd/src/service.c
+++ b/obexd/src/service.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <string.h>
diff --git a/obexd/src/transport.c b/obexd/src/transport.c
index 4984643..c0fc2c9 100644
--- a/obexd/src/transport.c
+++ b/obexd/src/transport.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <string.h>
diff --git a/plugins/adaptername.c b/plugins/adaptername.c
index 179152f..fbb9470 100644
--- a/plugins/adaptername.c
+++ b/plugins/adaptername.c
@@ -25,10 +25,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdlib.h>
#include <stdbool.h>
#include <unistd.h>
diff --git a/plugins/dbusoob.c b/plugins/dbusoob.c
index 9dfca46..95e52f9 100644
--- a/plugins/dbusoob.c
+++ b/plugins/dbusoob.c
@@ -23,10 +23,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdbool.h>

#include <errno.h>
diff --git a/plugins/external-dummy.c b/plugins/external-dummy.c
index ff31290..86e0ae9 100644
--- a/plugins/external-dummy.c
+++ b/plugins/external-dummy.c
@@ -18,10 +18,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "plugin.h"
#include "log.h"

diff --git a/plugins/formfactor.c b/plugins/formfactor.c
index 1978f03..c72fb8a 100644
--- a/plugins/formfactor.c
+++ b/plugins/formfactor.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdlib.h>
#include <errno.h>

diff --git a/plugins/gatt-example.c b/plugins/gatt-example.c
index de090e9..0d3ce6f 100644
--- a/plugins/gatt-example.c
+++ b/plugins/gatt-example.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <glib.h>
#include <bluetooth/uuid.h>
#include <errno.h>
diff --git a/plugins/neard.c b/plugins/neard.c
index 124b97a..842eabf 100644
--- a/plugins/neard.c
+++ b/plugins/neard.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <gdbus.h>

diff --git a/plugins/service.c b/plugins/service.c
index ba7a693..d7c9b29 100644
--- a/plugins/service.c
+++ b/plugins/service.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <stdlib.h>
#include <string.h>
diff --git a/plugins/storage.c b/plugins/storage.c
index 04a02c7..e5a0a7c 100644
--- a/plugins/storage.c
+++ b/plugins/storage.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <bluetooth/bluetooth.h>

#include "plugin.h"
diff --git a/plugins/wiimote.c b/plugins/wiimote.c
index 90d6d7b..319d08c 100644
--- a/plugins/wiimote.c
+++ b/plugins/wiimote.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdbool.h>

#include <bluetooth/bluetooth.h>
diff --git a/profiles/alert/main.c b/profiles/alert/main.c
index b9df0d4..70595f5 100644
--- a/profiles/alert/main.c
+++ b/profiles/alert/main.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdint.h>
#include <glib.h>
#include <errno.h>
diff --git a/profiles/alert/manager.c b/profiles/alert/manager.c
index eb2d627..1a655f0 100644
--- a/profiles/alert/manager.c
+++ b/profiles/alert/manager.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "manager.h"
#include "server.h"

diff --git a/profiles/alert/server.c b/profiles/alert/server.c
index 1c92906..60d0108 100644
--- a/profiles/alert/server.c
+++ b/profiles/alert/server.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdbool.h>
#include <errno.h>
#include <gdbus.h>
diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
index 177f653..ffdcec6 100644
--- a/profiles/audio/a2dp.c
+++ b/profiles/audio/a2dp.c
@@ -23,10 +23,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdlib.h>
#include <errno.h>

diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c
index dcffb05..ee19ae5 100644
--- a/profiles/audio/avctp.c
+++ b/profiles/audio/avctp.c
@@ -23,10 +23,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdlib.h>
#include <stdint.h>
#include <stdbool.h>
diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c
index 4b74b65..3fe21da 100644
--- a/profiles/audio/avdtp.c
+++ b/profiles/audio/avdtp.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>
diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
index 2517df8..c69652f 100644
--- a/profiles/audio/avrcp.c
+++ b/profiles/audio/avrcp.c
@@ -23,10 +23,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdlib.h>
#include <stdint.h>
#include <stdbool.h>
diff --git a/profiles/audio/control.c b/profiles/audio/control.c
index 7299b7e..489ad07 100644
--- a/profiles/audio/control.c
+++ b/profiles/audio/control.c
@@ -23,10 +23,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdlib.h>
#include <stdint.h>
#include <errno.h>
diff --git a/profiles/audio/device.c b/profiles/audio/device.c
index fef2bea..c111262 100644
--- a/profiles/audio/device.c
+++ b/profiles/audio/device.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/profiles/audio/main.c b/profiles/audio/main.c
index c5d1426..fa48e23 100644
--- a/profiles/audio/main.c
+++ b/profiles/audio/main.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <sys/socket.h>
#include <unistd.h>
diff --git a/profiles/audio/manager.c b/profiles/audio/manager.c
index 355d7fb..7544197 100644
--- a/profiles/audio/manager.c
+++ b/profiles/audio/manager.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index 2041d23..2ac7d7d 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -23,10 +23,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>

#include <bluetooth/uuid.h>
diff --git a/profiles/audio/player.c b/profiles/audio/player.c
index 34b1f20..460fb5a 100644
--- a/profiles/audio/player.c
+++ b/profiles/audio/player.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdlib.h>
#include <stdint.h>
#include <stdbool.h>
diff --git a/profiles/audio/sink.c b/profiles/audio/sink.c
index bc9a194..e7901e0 100644
--- a/profiles/audio/sink.c
+++ b/profiles/audio/sink.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdint.h>
#include <stdbool.h>
#include <errno.h>
diff --git a/profiles/audio/source.c b/profiles/audio/source.c
index 1105d3e..8913ab1 100644
--- a/profiles/audio/source.c
+++ b/profiles/audio/source.c
@@ -23,10 +23,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdint.h>
#include <stdbool.h>
#include <errno.h>
diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
index 610aca3..79355ce 100644
--- a/profiles/audio/transport.c
+++ b/profiles/audio/transport.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>

#include <bluetooth/uuid.h>
diff --git a/profiles/cups/hcrp.c b/profiles/cups/hcrp.c
index a93dda0..4af47a9 100644
--- a/profiles/cups/hcrp.c
+++ b/profiles/cups/hcrp.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/profiles/cups/main.c b/profiles/cups/main.c
index 5aa927f..7c06efe 100644
--- a/profiles/cups/main.c
+++ b/profiles/cups/main.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/profiles/cups/sdp.c b/profiles/cups/sdp.c
index c7f17a4..203577b 100644
--- a/profiles/cups/sdp.c
+++ b/profiles/cups/sdp.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/profiles/cups/spp.c b/profiles/cups/spp.c
index d906ed2..fba9632 100644
--- a/profiles/cups/spp.c
+++ b/profiles/cups/spp.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/profiles/cyclingspeed/cyclingspeed.c b/profiles/cyclingspeed/cyclingspeed.c
index 7c40ca1..f678ed9 100644
--- a/profiles/cyclingspeed/cyclingspeed.c
+++ b/profiles/cyclingspeed/cyclingspeed.c
@@ -20,10 +20,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <gdbus.h>
#include <errno.h>
#include <stdbool.h>
diff --git a/profiles/deviceinfo/deviceinfo.c b/profiles/deviceinfo/deviceinfo.c
index da27df8..e2daab5 100644
--- a/profiles/deviceinfo/deviceinfo.c
+++ b/profiles/deviceinfo/deviceinfo.c
@@ -20,10 +20,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdbool.h>

#include <glib.h>
diff --git a/profiles/deviceinfo/main.c b/profiles/deviceinfo/main.c
index 3884579..d67e58b 100644
--- a/profiles/deviceinfo/main.c
+++ b/profiles/deviceinfo/main.c
@@ -20,10 +20,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <glib.h>
#include <errno.h>
#include <stdint.h>
diff --git a/profiles/gatt/gas.c b/profiles/gatt/gas.c
index e6cddad..78b6ff1 100644
--- a/profiles/gatt/gas.c
+++ b/profiles/gatt/gas.c
@@ -20,10 +20,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdbool.h>
#include <stdlib.h>
#include <sys/types.h>
diff --git a/profiles/gatt/main.c b/profiles/gatt/main.c
index ecd4455..6b90dc2 100644
--- a/profiles/gatt/main.c
+++ b/profiles/gatt/main.c
@@ -20,10 +20,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdint.h>
#include <glib.h>
#include <errno.h>
diff --git a/profiles/health/hdp_main.c b/profiles/health/hdp_main.c
index 1d38bea..96dc678 100644
--- a/profiles/health/hdp_main.c
+++ b/profiles/health/hdp_main.c
@@ -20,10 +20,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>

#include <gdbus.h>
diff --git a/profiles/health/hdp_manager.c b/profiles/health/hdp_manager.c
index 7b799f4..c182852 100644
--- a/profiles/health/hdp_manager.c
+++ b/profiles/health/hdp_manager.c
@@ -20,10 +20,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdbool.h>

#include <bluetooth/sdp.h>
diff --git a/profiles/health/hdp_util.c b/profiles/health/hdp_util.c
index 1fd33e5..714117c 100644
--- a/profiles/health/hdp_util.c
+++ b/profiles/health/hdp_util.c
@@ -20,10 +20,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdint.h>
#include <stdbool.h>

diff --git a/profiles/health/mcap_sync.c b/profiles/health/mcap_sync.c
index 6d8d66b..0e21877 100644
--- a/profiles/health/mcap_sync.c
+++ b/profiles/health/mcap_sync.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdint.h>
#include <netinet/in.h>
#include <time.h>
diff --git a/profiles/heartrate/heartrate.c b/profiles/heartrate/heartrate.c
index 535d55b..ab61b87 100644
--- a/profiles/heartrate/heartrate.c
+++ b/profiles/heartrate/heartrate.c
@@ -20,10 +20,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <gdbus.h>
#include <errno.h>
#include <stdbool.h>
diff --git a/profiles/heartrate/main.c b/profiles/heartrate/main.c
index 80a6ba4..23337c4 100644
--- a/profiles/heartrate/main.c
+++ b/profiles/heartrate/main.c
@@ -20,10 +20,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdint.h>
#include <glib.h>
#include <errno.h>
diff --git a/profiles/input/device.c b/profiles/input/device.c
index d713ebe..d512f48 100644
--- a/profiles/input/device.c
+++ b/profiles/input/device.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdlib.h>
#include <stdbool.h>
#include <errno.h>
diff --git a/profiles/input/hog_device.c b/profiles/input/hog_device.c
index a873eac..1e06c79 100644
--- a/profiles/input/hog_device.c
+++ b/profiles/input/hog_device.c
@@ -23,10 +23,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdlib.h>
#include <stdbool.h>
#include <errno.h>
diff --git a/profiles/input/hog_manager.c b/profiles/input/hog_manager.c
index 595b160..d16bf5f 100644
--- a/profiles/input/hog_manager.c
+++ b/profiles/input/hog_manager.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <stdbool.h>

diff --git a/profiles/input/main.c b/profiles/input/main.c
index 4ddc511..3595b0b 100644
--- a/profiles/input/main.c
+++ b/profiles/input/main.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>

#include <bluetooth/bluetooth.h>
diff --git a/profiles/input/manager.c b/profiles/input/manager.c
index b8e89c3..2b1b38c 100644
--- a/profiles/input/manager.c
+++ b/profiles/input/manager.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <stdbool.h>

diff --git a/profiles/input/server.c b/profiles/input/server.c
index eaf3b6a..4f8cc90 100644
--- a/profiles/input/server.c
+++ b/profiles/input/server.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <unistd.h>
#include <stdbool.h>
#include <errno.h>
diff --git a/profiles/input/suspend-dummy.c b/profiles/input/suspend-dummy.c
index b43946d..d76fac5 100644
--- a/profiles/input/suspend-dummy.c
+++ b/profiles/input/suspend-dummy.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/profiles/network/common.c b/profiles/network/common.c
index 34ab788..107d58d 100644
--- a/profiles/network/common.c
+++ b/profiles/network/common.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/profiles/network/connection.c b/profiles/network/connection.c
index 3203848..b97c151 100644
--- a/profiles/network/connection.c
+++ b/profiles/network/connection.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <stdbool.h>
#include <errno.h>
diff --git a/profiles/network/main.c b/profiles/network/main.c
index 8ec1f3f..c8f9ea0 100644
--- a/profiles/network/main.c
+++ b/profiles/network/main.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>

#include <gdbus.h>
diff --git a/profiles/network/manager.c b/profiles/network/manager.c
index 06ef9fc..d3da540 100644
--- a/profiles/network/manager.c
+++ b/profiles/network/manager.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdbool.h>

#include <bluetooth/bluetooth.h>
diff --git a/profiles/network/server.c b/profiles/network/server.c
index 7e5e653..153ec08 100644
--- a/profiles/network/server.c
+++ b/profiles/network/server.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
diff --git a/profiles/proximity/immalert.c b/profiles/proximity/immalert.c
index 8deecb3..8ea37b6 100644
--- a/profiles/proximity/immalert.c
+++ b/profiles/proximity/immalert.c
@@ -20,10 +20,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdbool.h>

#include <glib.h>
diff --git a/profiles/proximity/linkloss.c b/profiles/proximity/linkloss.c
index 30e4ca8..a325ef1 100644
--- a/profiles/proximity/linkloss.c
+++ b/profiles/proximity/linkloss.c
@@ -20,10 +20,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdbool.h>

#include <glib.h>
diff --git a/profiles/proximity/main.c b/profiles/proximity/main.c
index 1e627a3..93f4a1c 100644
--- a/profiles/proximity/main.c
+++ b/profiles/proximity/main.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <stdint.h>
#include <glib.h>
diff --git a/profiles/proximity/manager.c b/profiles/proximity/manager.c
index fb34e8f..9190b63 100644
--- a/profiles/proximity/manager.c
+++ b/profiles/proximity/manager.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdbool.h>

#include <glib.h>
diff --git a/profiles/proximity/monitor.c b/profiles/proximity/monitor.c
index 58c0ed6..9868fce 100644
--- a/profiles/proximity/monitor.c
+++ b/profiles/proximity/monitor.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <fcntl.h>
#include <gdbus.h>
diff --git a/profiles/proximity/reporter.c b/profiles/proximity/reporter.c
index 17a084a..c279062 100644
--- a/profiles/proximity/reporter.c
+++ b/profiles/proximity/reporter.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdbool.h>
#include <errno.h>

diff --git a/profiles/sap/main.c b/profiles/sap/main.c
index 4894f2e..c5df5a1 100644
--- a/profiles/sap/main.c
+++ b/profiles/sap/main.c
@@ -18,10 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <gdbus.h>
#include "plugin.h"
diff --git a/profiles/sap/manager.c b/profiles/sap/manager.c
index fddd7aa..36fdb6c 100644
--- a/profiles/sap/manager.c
+++ b/profiles/sap/manager.c
@@ -18,10 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdbool.h>

#include "log.h"
diff --git a/profiles/sap/sap-dummy.c b/profiles/sap/sap-dummy.c
index 36354b8..a3e08bb 100644
--- a/profiles/sap/sap-dummy.c
+++ b/profiles/sap/sap-dummy.c
@@ -22,10 +22,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <glib.h>
#include <gdbus.h>
#include <stdint.h>
diff --git a/profiles/sap/server.c b/profiles/sap/server.c
index bb37c18..24441d1 100644
--- a/profiles/sap/server.c
+++ b/profiles/sap/server.c
@@ -24,10 +24,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <glib.h>
#include <bluetooth/sdp.h>
diff --git a/profiles/scanparam/main.c b/profiles/scanparam/main.c
index 74e8a55..5099666 100644
--- a/profiles/scanparam/main.c
+++ b/profiles/scanparam/main.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <stdint.h>
#include <glib.h>
diff --git a/profiles/scanparam/manager.c b/profiles/scanparam/manager.c
index cea2b29..8acade1 100644
--- a/profiles/scanparam/manager.c
+++ b/profiles/scanparam/manager.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdbool.h>
#include <errno.h>
#include <glib.h>
diff --git a/profiles/scanparam/scan.c b/profiles/scanparam/scan.c
index 849336e..49f1eda 100644
--- a/profiles/scanparam/scan.c
+++ b/profiles/scanparam/scan.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdbool.h>

#include <bluetooth/bluetooth.h>
diff --git a/profiles/thermometer/main.c b/profiles/thermometer/main.c
index 6c1c40c..bf2b54c 100644
--- a/profiles/thermometer/main.c
+++ b/profiles/thermometer/main.c
@@ -20,10 +20,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdint.h>
#include <glib.h>
#include <errno.h>
diff --git a/profiles/thermometer/thermometer.c b/profiles/thermometer/thermometer.c
index 9c497c9..6fb0d03 100644
--- a/profiles/thermometer/thermometer.c
+++ b/profiles/thermometer/thermometer.c
@@ -20,10 +20,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdbool.h>
#include <errno.h>

diff --git a/profiles/time/main.c b/profiles/time/main.c
index 08abed2..3cbecd1 100644
--- a/profiles/time/main.c
+++ b/profiles/time/main.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdint.h>
#include <glib.h>
#include <errno.h>
diff --git a/profiles/time/manager.c b/profiles/time/manager.c
index 608a807..fec9084 100644
--- a/profiles/time/manager.c
+++ b/profiles/time/manager.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdbool.h>

#include "manager.h"
diff --git a/profiles/time/server.c b/profiles/time/server.c
index 0a17b83..c6405b1 100644
--- a/profiles/time/server.c
+++ b/profiles/time/server.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <glib.h>
#include <time.h>
#include <errno.h>
diff --git a/src/adapter.c b/src/adapter.c
index bf3672f..7994d89 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/src/agent.c b/src/agent.c
index 3d234c2..97d34ce 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/src/attrib-server.c b/src/attrib-server.c
index 1a9bd69..5cd5460 100644
--- a/src/attrib-server.c
+++ b/src/attrib-server.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <stdint.h>
#include <stdbool.h>
diff --git a/src/dbus-common.c b/src/dbus-common.c
index afd07de..3c73e32 100644
--- a/src/dbus-common.c
+++ b/src/dbus-common.c
@@ -23,10 +23,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <stdint.h>

diff --git a/src/device.c b/src/device.c
index 8c00a59..32fb788 100644
--- a/src/device.c
+++ b/src/device.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/src/eir.c b/src/eir.c
index 5162b85..c9bcd1c 100644
--- a/src/eir.c
+++ b/src/eir.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <ctype.h>
#include <stdlib.h>
diff --git a/src/error.c b/src/error.c
index c2d9baa..c5747c0 100644
--- a/src/error.c
+++ b/src/error.c
@@ -23,10 +23,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <gdbus.h>

#include "error.h"
diff --git a/src/glib-helper.c b/src/glib-helper.c
index fe5713a..9647ef2 100644
--- a/src/glib-helper.c
+++ b/src/glib-helper.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdlib.h>
#include <errno.h>

diff --git a/src/log.c b/src/log.c
index 75a98a9..14090ad 100644
--- a/src/log.c
+++ b/src/log.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <stdarg.h>
#include <syslog.h>
diff --git a/src/main.c b/src/main.c
index bc53a8e..90cd326 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,10 +23,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/src/manager.c b/src/manager.c
index 3088dd9..8711d39 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdlib.h>
#include <stdio.h>
#include <stdbool.h>
diff --git a/src/mgmt.c b/src/mgmt.c
index 81b0494..aba8643 100644
--- a/src/mgmt.c
+++ b/src/mgmt.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/src/oui.c b/src/oui.c
index 80bb3d3..b239231 100644
--- a/src/oui.c
+++ b/src/oui.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/src/plugin.c b/src/plugin.c
index 2a86e68..d576207 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <dlfcn.h>
#include <string.h>
diff --git a/src/profile.c b/src/profile.c
index a085ab2..755c387 100644
--- a/src/profile.c
+++ b/src/profile.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/src/rfkill.c b/src/rfkill.c
index f82596b..4c4c62c 100644
--- a/src/rfkill.c
+++ b/src/rfkill.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>
#include <stdio.h>
#include <fcntl.h>
diff --git a/src/sdp-client.c b/src/sdp-client.c
index 55e59c2..d378446 100644
--- a/src/sdp-client.c
+++ b/src/sdp-client.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <errno.h>

#include <bluetooth/bluetooth.h>
diff --git a/src/sdp-xml.c b/src/sdp-xml.c
index 7d5f626..a3615e3 100644
--- a/src/sdp-xml.c
+++ b/src/sdp-xml.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <ctype.h>
diff --git a/src/sdpd-database.c b/src/sdpd-database.c
index dd492bf..0abdb90 100644
--- a/src/sdpd-database.c
+++ b/src/sdpd-database.c
@@ -24,10 +24,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/src/sdpd-request.c b/src/sdpd-request.c
index 2af743e..8f9f1cc 100644
--- a/src/sdpd-request.c
+++ b/src/sdpd-request.c
@@ -24,10 +24,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/src/sdpd-server.c b/src/sdpd-server.c
index 1d9509e..979c193 100644
--- a/src/sdpd-server.c
+++ b/src/sdpd-server.c
@@ -24,10 +24,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/src/sdpd-service.c b/src/sdpd-service.c
index b43ddc2..570ab56 100644
--- a/src/sdpd-service.c
+++ b/src/sdpd-service.c
@@ -24,10 +24,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/src/storage.c b/src/storage.c
index ac66021..090df92 100644
--- a/src/storage.c
+++ b/src/storage.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <ctype.h>
diff --git a/src/textfile.c b/src/textfile.c
index b6a7e1f..167bc97 100644
--- a/src/textfile.c
+++ b/src/textfile.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <ctype.h>
diff --git a/test/agent.c b/test/agent.c
index 1713ec3..ea39d6e 100644
--- a/test/agent.c
+++ b/test/agent.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/test/attest.c b/test/attest.c
index 12ba682..c74df9a 100644
--- a/test/attest.c
+++ b/test/attest.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/test/avtest.c b/test/avtest.c
index 541b3cd..85e5aae 100644
--- a/test/avtest.c
+++ b/test/avtest.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/test/bdaddr.c b/test/bdaddr.c
index f87fa38..062ebc6 100644
--- a/test/bdaddr.c
+++ b/test/bdaddr.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/test/gaptest.c b/test/gaptest.c
index a0541b1..175c9d8 100644
--- a/test/gaptest.c
+++ b/test/gaptest.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/test/hciemu.c b/test/hciemu.c
index a125cf4..61ad0bd 100644
--- a/test/hciemu.c
+++ b/test/hciemu.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/test/hstest.c b/test/hstest.c
index ac68059..edf6f89 100644
--- a/test/hstest.c
+++ b/test/hstest.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/test/l2test.c b/test/l2test.c
index 7645681..c5b6efe 100644
--- a/test/l2test.c
+++ b/test/l2test.c
@@ -23,10 +23,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <ctype.h>
diff --git a/test/lmptest.c b/test/lmptest.c
index 549ae12..81d0bee 100644
--- a/test/lmptest.c
+++ b/test/lmptest.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/test/mpris-player.c b/test/mpris-player.c
index 7985cdd..86ddca5 100644
--- a/test/mpris-player.c
+++ b/test/mpris-player.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/test/rctest.c b/test/rctest.c
index de38bd0..417cb3f 100644
--- a/test/rctest.c
+++ b/test/rctest.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <ctype.h>
diff --git a/test/scotest.c b/test/scotest.c
index a40e395..89dd771 100644
--- a/test/scotest.c
+++ b/test/scotest.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <ctype.h>
diff --git a/test/sdptest.c b/test/sdptest.c
index 480a468..f05cd65 100644
--- a/test/sdptest.c
+++ b/test/sdptest.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/test/test-textfile.c b/test/test-textfile.c
index e0a0c5b..b30e355 100644
--- a/test/test-textfile.c
+++ b/test/test-textfile.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/tools/avinfo.c b/tools/avinfo.c
index d237742..55dd9b4 100644
--- a/tools/avinfo.c
+++ b/tools/avinfo.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <ctype.h>
diff --git a/tools/bccmd.c b/tools/bccmd.c
index 952bf13..3aa6112 100644
--- a/tools/bccmd.c
+++ b/tools/bccmd.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/tools/btattach.c b/tools/btattach.c
index a69c49e..5de97b6 100644
--- a/tools/btattach.c
+++ b/tools/btattach.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/tools/btmgmt.c b/tools/btmgmt.c
index ff6a46a..cd1ff4b 100644
--- a/tools/btmgmt.c
+++ b/tools/btmgmt.c
@@ -19,10 +19,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/tools/btsnoop.c b/tools/btsnoop.c
index dcb4a26..ad7d785 100644
--- a/tools/btsnoop.c
+++ b/tools/btsnoop.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/tools/ciptool.c b/tools/ciptool.c
index e240f38..5e38407 100644
--- a/tools/ciptool.c
+++ b/tools/ciptool.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/tools/csr.c b/tools/csr.c
index b4ea1fb..5851ace 100644
--- a/tools/csr.c
+++ b/tools/csr.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/tools/csr_3wire.c b/tools/csr_3wire.c
index 33fcf38..7537e6b 100644
--- a/tools/csr_3wire.c
+++ b/tools/csr_3wire.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <stdint.h>
diff --git a/tools/csr_bcsp.c b/tools/csr_bcsp.c
index f7afe53..d69808f 100644
--- a/tools/csr_bcsp.c
+++ b/tools/csr_bcsp.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/tools/csr_h4.c b/tools/csr_h4.c
index 3371770..796dac4 100644
--- a/tools/csr_h4.c
+++ b/tools/csr_h4.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/tools/csr_hci.c b/tools/csr_hci.c
index 6bd37c3..78ef758 100644
--- a/tools/csr_hci.c
+++ b/tools/csr_hci.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <string.h>
diff --git a/tools/csr_usb.c b/tools/csr_usb.c
index 19903b0..c4f6614 100644
--- a/tools/csr_usb.c
+++ b/tools/csr_usb.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <string.h>
diff --git a/tools/dfu.c b/tools/dfu.c
index 39ec088..47d8251 100644
--- a/tools/dfu.c
+++ b/tools/dfu.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <string.h>
diff --git a/tools/dfutool.c b/tools/dfutool.c
index 16dd62e..260684d 100644
--- a/tools/dfutool.c
+++ b/tools/dfutool.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <ctype.h>
diff --git a/tools/hciattach.c b/tools/hciattach.c
index e1e80af..34aaf80 100644
--- a/tools/hciattach.c
+++ b/tools/hciattach.c
@@ -23,10 +23,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/tools/hciattach_ath3k.c b/tools/hciattach_ath3k.c
index 23208c6..4dd6036 100644
--- a/tools/hciattach_ath3k.c
+++ b/tools/hciattach_ath3k.c
@@ -17,10 +17,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/tools/hciattach_intel.c b/tools/hciattach_intel.c
index 749098e..9bca0d4 100644
--- a/tools/hciattach_intel.c
+++ b/tools/hciattach_intel.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/tools/hciattach_qualcomm.c b/tools/hciattach_qualcomm.c
index 0e02e1e..b5a2d89 100644
--- a/tools/hciattach_qualcomm.c
+++ b/tools/hciattach_qualcomm.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/tools/hciattach_st.c b/tools/hciattach_st.c
index dbb7c47..7b25760 100644
--- a/tools/hciattach_st.c
+++ b/tools/hciattach_st.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/tools/hciattach_ti.c b/tools/hciattach_ti.c
index b57c6b7..9db26c8 100644
--- a/tools/hciattach_ti.c
+++ b/tools/hciattach_ti.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/tools/hciattach_tialt.c b/tools/hciattach_tialt.c
index c3caa49..18a304c 100644
--- a/tools/hciattach_tialt.c
+++ b/tools/hciattach_tialt.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/tools/hciconfig.c b/tools/hciconfig.c
index 045e9a8..b0a4f3b 100644
--- a/tools/hciconfig.c
+++ b/tools/hciconfig.c
@@ -23,10 +23,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <ctype.h>
diff --git a/tools/hcieventmask.c b/tools/hcieventmask.c
index 87beac9..e556c1b 100644
--- a/tools/hcieventmask.c
+++ b/tools/hcieventmask.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/tools/hcisecfilter.c b/tools/hcisecfilter.c
index 9ad4ce0..97f0691 100644
--- a/tools/hcisecfilter.c
+++ b/tools/hcisecfilter.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <sys/socket.h>

diff --git a/tools/hcitool.c b/tools/hcitool.c
index a05e31f..9b541a3 100644
--- a/tools/hcitool.c
+++ b/tools/hcitool.c
@@ -23,10 +23,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <ctype.h>
diff --git a/tools/hid2hci.c b/tools/hid2hci.c
index e3a5b2e..fe27d29 100644
--- a/tools/hid2hci.c
+++ b/tools/hid2hci.c
@@ -22,10 +22,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/tools/l2ping.c b/tools/l2ping.c
index 29fb3d0..8d35fd9 100644
--- a/tools/l2ping.c
+++ b/tools/l2ping.c
@@ -23,10 +23,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/tools/obex-server-tool.c b/tools/obex-server-tool.c
index e37c56f..84ffe8d 100644
--- a/tools/obex-server-tool.c
+++ b/tools/obex-server-tool.c
@@ -19,10 +19,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include <sys/types.h>
#include <sys/socket.h>
#include <fcntl.h>
diff --git a/tools/rfcomm.c b/tools/rfcomm.c
index affdbc7..984ea3e 100644
--- a/tools/rfcomm.c
+++ b/tools/rfcomm.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/tools/sdptool.c b/tools/sdptool.c
index a55df50..18c062c 100644
--- a/tools/sdptool.c
+++ b/tools/sdptool.c
@@ -25,10 +25,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <ctype.h>
diff --git a/tools/ubcsp.c b/tools/ubcsp.c
index b3f883a..6bba7e2 100644
--- a/tools/ubcsp.c
+++ b/tools/ubcsp.c
@@ -26,10 +26,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/*****************************************************************************/
/*****************************************************************************/
/*****************************************************************************/
diff --git a/unit/test-eir.c b/unit/test-eir.c
index cefcacd..90aebbf 100644
--- a/unit/test-eir.c
+++ b/unit/test-eir.c
@@ -21,10 +21,6 @@
*
*/

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <check.h>

#include <stdint.h>
--
1.8.0.1

2012-12-05 11:22:53

by Lucas De Marchi

Subject: [PATCH BlueZ 5/7] Use the entire include path for btio.h

From: Lucas De Marchi <[email protected]>

---
Makefile.am | 2 +-
Makefile.obexd | 4 ++--
attrib/client.c | 2 +-
attrib/gattrib.c | 2 +-
attrib/gatttool.c | 2 +-
attrib/interactive.c | 2 +-
attrib/utils.c | 2 +-
obexd/client/bluetooth.c | 2 +-
obexd/plugins/bluetooth.c | 2 +-
obexd/plugins/syncevolution.c | 2 +-
obexd/src/manager.c | 2 +-
obexd/src/obex.c | 2 +-
profiles/audio/avctp.c | 2 +-
profiles/audio/avdtp.c | 2 +-
profiles/audio/main.c | 2 +-
profiles/audio/manager.c | 2 +-
profiles/gatt/gas.c | 2 +-
profiles/health/hdp.c | 2 +-
profiles/health/hdp_manager.c | 2 +-
profiles/health/hdp_util.c | 2 +-
profiles/health/mcap.c | 2 +-
profiles/health/mcap_sync.c | 2 +-
profiles/input/device.c | 2 +-
profiles/input/server.c | 2 +-
profiles/network/connection.c | 2 +-
profiles/network/server.c | 2 +-
profiles/sap/server.c | 2 +-
src/attrib-server.c | 2 +-
src/device.c | 2 +-
src/plugin.c | 2 +-
src/profile.c | 2 +-
src/sdp-client.c | 2 +-
test/btiotest.c | 2 +-
33 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8e717da..1c3e955 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -358,7 +358,7 @@ EXTRA_DIST += doc/manager-api.txt \
AM_CFLAGS += @DBUS_CFLAGS@ @GLIB_CFLAGS@

AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(builddir)/lib \
- -I$(builddir)/src -I$(srcdir)/src -I$(srcdir)/btio
+ -I$(builddir)/src -I$(srcdir)/src

if MCAP
AM_CPPFLAGS += -I$(builddir)/health
diff --git a/Makefile.obexd b/Makefile.obexd
index 738e73d..a895753 100644
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -31,7 +31,7 @@ obexd_src_obexd_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ \

obexd_src_obexd_CPPFLAGS = -include $(top_builddir)/config.h -I$(builddir)/lib \
-I$(builddir)/obexd/src \
- -I$(srcdir)/obexd/src -I$(srcdir)/btio \
+ -I$(srcdir)/obexd/src \
-I$(srcdir)/gobex

obexd_src_obexd_SHORTNAME = obexd
@@ -79,6 +79,6 @@ obexd_client_obex_client_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ \

obexd_client_obex_client_CPPFLAGS = -include $(top_builddir)/config.h \
-I$(builddir)/lib -I$(srcdir)/obexd/src \
- -I$(srcdir)/btio -I$(srcdir)/gobex
+ -I$(srcdir)/gobex

obexd_client_obex_client_SHORTNAME = obex-client
diff --git a/attrib/client.c b/attrib/client.c
index 2220ce1..41a96d5 100644
--- a/attrib/client.c
+++ b/attrib/client.c
@@ -37,7 +37,7 @@
#include "log.h"
#include "error.h"
#include "dbus-common.h"
-#include "btio.h"
+#include <btio/btio.h>
#include "storage.h"

#include "att.h"
diff --git a/attrib/gattrib.c b/attrib/gattrib.c
index 309e58f..9ba850a 100644
--- a/attrib/gattrib.c
+++ b/attrib/gattrib.c
@@ -33,7 +33,7 @@

#include "log.h"
#include "att.h"
-#include "btio.h"
+#include <btio/btio.h>
#include "gattrib.h"

#define GATT_TIMEOUT 30
diff --git a/attrib/gatttool.c b/attrib/gatttool.c
index dcfc856..5bda975 100644
--- a/attrib/gatttool.c
+++ b/attrib/gatttool.c
@@ -33,7 +33,7 @@
#include <bluetooth/uuid.h>

#include "att.h"
-#include "btio.h"
+#include <btio/btio.h>
#include "gattrib.h"
#include "gatt.h"
#include "gatttool.h"
diff --git a/attrib/interactive.c b/attrib/interactive.c
index 6030fb7..940cd50 100644
--- a/attrib/interactive.c
+++ b/attrib/interactive.c
@@ -32,7 +32,7 @@
#include <readline/history.h>

#include "att.h"
-#include "btio.h"
+#include <btio/btio.h>
#include "gattrib.h"
#include "gatt.h"
#include "gatttool.h"
diff --git a/attrib/utils.c b/attrib/utils.c
index b5ade9a..4ffcd93 100644
--- a/attrib/utils.c
+++ b/attrib/utils.c
@@ -33,7 +33,7 @@
#include "att.h"
#include "gattrib.h"
#include "gatt.h"
-#include "btio.h"
+#include <btio/btio.h>
#include "gatttool.h"

GIOChannel *gatt_connect(const gchar *src, const gchar *dst,
diff --git a/obexd/client/bluetooth.c b/obexd/client/bluetooth.c
index 336f112..6406b8b 100644
--- a/obexd/client/bluetooth.c
+++ b/obexd/client/bluetooth.c
@@ -26,7 +26,7 @@

#include <glib.h>
#include <gdbus/gdbus.h>
-#include <btio.h>
+#include <btio/btio.h>

#include <bluetooth/bluetooth.h>
#include <bluetooth/rfcomm.h>
diff --git a/obexd/plugins/bluetooth.c b/obexd/plugins/bluetooth.c
index b2d6f28..f57a511 100644
--- a/obexd/plugins/bluetooth.c
+++ b/obexd/plugins/bluetooth.c
@@ -38,7 +38,7 @@
#include "transport.h"
#include "service.h"
#include "log.h"
-#include "btio.h"
+#include <btio/btio.h>

#define BT_RX_MTU 32767
#define BT_TX_MTU 32767
diff --git a/obexd/plugins/syncevolution.c b/obexd/plugins/syncevolution.c
index 24b2d5e..93cf2bf 100644
--- a/obexd/plugins/syncevolution.c
+++ b/obexd/plugins/syncevolution.c
@@ -39,7 +39,7 @@
#include "mimetype.h"
#include "log.h"
#include "manager.h"
-#include "btio.h"
+#include <btio/btio.h>
#include "obexd.h"
#include "filesystem.h"

diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index aaf911a..3743bbf 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -37,7 +37,7 @@
#include "server.h"
#include "manager.h"
#include "log.h"
-#include "btio.h"
+#include <btio/btio.h>
#include "service.h"

#define OBEX_MANAGER_PATH "/"
diff --git a/obexd/src/obex.c b/obexd/src/obex.c
index 4656493..e7e6c6f 100644
--- a/obexd/src/obex.c
+++ b/obexd/src/obex.c
@@ -47,7 +47,7 @@
#include "mimetype.h"
#include "service.h"
#include "transport.h"
-#include "btio.h"
+#include <btio/btio.h>

/* Challenge request */
#define NONCE_TAG 0x00
diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c
index ee19ae5..1bf06f2 100644
--- a/profiles/audio/avctp.c
+++ b/profiles/audio/avctp.c
@@ -48,7 +48,7 @@
#include "log.h"
#include "error.h"
#include "uinput.h"
-#include "btio.h"
+#include <btio/btio.h>
#include "manager.h"
#include "device.h"
#include "avctp.h"
diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c
index 3fe21da..b9f7d85 100644
--- a/profiles/audio/avdtp.c
+++ b/profiles/audio/avdtp.c
@@ -50,7 +50,7 @@
#include "manager.h"
#include "control.h"
#include "avdtp.h"
-#include "btio.h"
+#include <btio/btio.h>
#include "sink.h"
#include "source.h"

diff --git a/profiles/audio/main.c b/profiles/audio/main.c
index fa48e23..21961cb 100644
--- a/profiles/audio/main.c
+++ b/profiles/audio/main.c
@@ -34,7 +34,7 @@
#include <dbus/dbus.h>

#include "glib-helper.h"
-#include "btio.h"
+#include <btio/btio.h>
#include "plugin.h"
#include "log.h"
#include "device.h"
diff --git a/profiles/audio/manager.c b/profiles/audio/manager.c
index 0361ae4..67a0153 100644
--- a/profiles/audio/manager.c
+++ b/profiles/audio/manager.c
@@ -45,7 +45,7 @@
#include <gdbus/gdbus.h>

#include "glib-helper.h"
-#include "btio.h"
+#include <btio/btio.h>
#include "../src/adapter.h"
#include "../src/manager.h"
#include "../src/device.h"
diff --git a/profiles/gatt/gas.c b/profiles/gatt/gas.c
index 78b6ff1..42db6a2 100644
--- a/profiles/gatt/gas.c
+++ b/profiles/gatt/gas.c
@@ -35,7 +35,7 @@
#include "attrib/att.h"
#include "attrib/gattrib.h"
#include "attio.h"
-#include "btio.h"
+#include <btio/btio.h>
#include "attrib/gatt.h"
#include "log.h"
#include "textfile.h"
diff --git a/profiles/health/hdp.c b/profiles/health/hdp.c
index d062abb..23cdc5f 100644
--- a/profiles/health/hdp.c
+++ b/profiles/health/hdp.c
@@ -35,7 +35,7 @@
#include <error.h>
#include <adapter.h>
#include <device.h>
-#include <btio.h>
+#include <btio/btio.h>

#include "mcap_lib.h"
#include "hdp_types.h"
diff --git a/profiles/health/hdp_manager.c b/profiles/health/hdp_manager.c
index c182852..3945bf8 100644
--- a/profiles/health/hdp_manager.c
+++ b/profiles/health/hdp_manager.c
@@ -26,7 +26,7 @@
#include <bluetooth/sdp_lib.h>
#include <bluetooth/uuid.h>

-#include <btio.h>
+#include <btio/btio.h>
#include <adapter.h>
#include <device.h>
#include <profile.h>
diff --git a/profiles/health/hdp_util.c b/profiles/health/hdp_util.c
index 8aa5723..339f8cf 100644
--- a/profiles/health/hdp_util.c
+++ b/profiles/health/hdp_util.c
@@ -36,7 +36,7 @@
#include <sdp-client.h>
#include <glib-helper.h>

-#include <btio.h>
+#include <btio/btio.h>

#include <log.h>

diff --git a/profiles/health/mcap.c b/profiles/health/mcap.c
index 57ea1c3..466d266 100644
--- a/profiles/health/mcap.c
+++ b/profiles/health/mcap.c
@@ -30,7 +30,7 @@
#include <bluetooth/bluetooth.h>
#include <bluetooth/l2cap.h>

-#include <btio.h>
+#include <btio/btio.h>
#include <log.h>
#include <error.h>

diff --git a/profiles/health/mcap_sync.c b/profiles/health/mcap_sync.c
index 0e21877..06ea7da 100644
--- a/profiles/health/mcap_sync.c
+++ b/profiles/health/mcap_sync.c
@@ -31,7 +31,7 @@
#include <bluetooth/l2cap.h>
#include <adapter.h>
#include <manager.h>
-#include <btio.h>
+#include <btio/btio.h>
#include <log.h>

#include "mcap.h"
diff --git a/profiles/input/device.c b/profiles/input/device.c
index b876765..986e924 100644
--- a/profiles/input/device.c
+++ b/profiles/input/device.c
@@ -45,7 +45,7 @@

#include "device.h"
#include "error.h"
-#include "btio.h"
+#include <btio/btio.h>

#include "sdp-client.h"

diff --git a/profiles/input/server.c b/profiles/input/server.c
index 4f8cc90..db5592b 100644
--- a/profiles/input/server.c
+++ b/profiles/input/server.c
@@ -35,7 +35,7 @@
#include "log.h"

#include "glib-helper.h"
-#include "btio.h"
+#include <btio/btio.h>
#include "../src/adapter.h"
#include "../src/device.h"
#include "../src/profile.h"
diff --git a/profiles/network/connection.c b/profiles/network/connection.c
index e1e0376..c91e59d 100644
--- a/profiles/network/connection.c
+++ b/profiles/network/connection.c
@@ -35,7 +35,7 @@
#include <gdbus/gdbus.h>

#include "log.h"
-#include "btio.h"
+#include <btio/btio.h>
#include "dbus-common.h"
#include "adapter.h"
#include "device.h"
diff --git a/profiles/network/server.c b/profiles/network/server.c
index c093d34..09ea0e7 100644
--- a/profiles/network/server.c
+++ b/profiles/network/server.c
@@ -42,7 +42,7 @@
#include "log.h"
#include "error.h"
#include "sdpd.h"
-#include "btio.h"
+#include <btio/btio.h>

#include "common.h"
#include "server.h"
diff --git a/profiles/sap/server.c b/profiles/sap/server.c
index 24441d1..033b9a3 100644
--- a/profiles/sap/server.c
+++ b/profiles/sap/server.c
@@ -31,7 +31,7 @@
#include <bluetooth/uuid.h>

#include "adapter.h"
-#include "btio.h"
+#include <btio/btio.h>
#include "sdpd.h"
#include "log.h"
#include "error.h"
diff --git a/src/attrib-server.c b/src/attrib-server.c
index 0718c4b..bdf5b38 100644
--- a/src/attrib-server.c
+++ b/src/attrib-server.c
@@ -36,7 +36,7 @@

#include <gdbus/gdbus.h>
#include "log.h"
-#include "btio.h"
+#include <btio/btio.h>
#include "sdpd.h"
#include "hcid.h"
#include "adapter.h"
diff --git a/src/device.c b/src/device.c
index 5b570bc..e12f63a 100644
--- a/src/device.c
+++ b/src/device.c
@@ -58,7 +58,7 @@
#include "agent.h"
#include "sdp-xml.h"
#include "storage.h"
-#include "btio.h"
+#include <btio/btio.h>
#include "attrib-server.h"
#include "attrib/client.h"

diff --git a/src/plugin.c b/src/plugin.c
index d576207..a16deb8 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -33,7 +33,7 @@
#include "plugin.h"
#include "log.h"
#include "hcid.h"
-#include "btio.h"
+#include <btio/btio.h>

static GSList *plugins = NULL;

diff --git a/src/profile.c b/src/profile.c
index 88d7cdb..6613b1c 100644
--- a/src/profile.c
+++ b/src/profile.c
@@ -35,7 +35,7 @@
#include <bluetooth/sdp.h>
#include <bluetooth/sdp_lib.h>

-#include "btio.h"
+#include <btio/btio.h>
#include "sdpd.h"
#include "log.h"
#include "error.h"
diff --git a/src/sdp-client.c b/src/sdp-client.c
index d378446..b2a253e 100644
--- a/src/sdp-client.c
+++ b/src/sdp-client.c
@@ -29,7 +29,7 @@

#include <glib.h>

-#include "btio.h"
+#include <btio/btio.h>
#include "sdp-client.h"

/* Number of seconds to keep a sdp_session_t in the cache */
diff --git a/test/btiotest.c b/test/btiotest.c
index 593bafc..4b170ac 100644
--- a/test/btiotest.c
+++ b/test/btiotest.c
@@ -30,7 +30,7 @@

#include <glib.h>

-#include "btio.h"
+#include <btio/btio.h>

#define DEFAULT_ACCEPT_TIMEOUT 2
static gint opt_update_sec = 0;
--
1.8.0.1

2012-12-05 11:22:52

by Lucas De Marchi

Subject: [PATCH BlueZ 4/7] Use the entire include path for gdbus.h

From: Lucas De Marchi <[email protected]>

---
Makefile.am | 3 +--
Makefile.obexd | 5 ++---
attrib/client.c | 2 +-
obexd/client/bluetooth.c | 2 +-
obexd/client/dbus.c | 2 +-
obexd/client/driver.c | 2 +-
obexd/client/ftp.c | 2 +-
obexd/client/main.c | 2 +-
obexd/client/manager.c | 2 +-
obexd/client/map.c | 2 +-
obexd/client/opp.c | 2 +-
obexd/client/pbap.c | 2 +-
obexd/client/session.c | 2 +-
obexd/client/session.h | 2 +-
obexd/client/sync.c | 2 +-
obexd/client/transfer.c | 2 +-
obexd/plugins/bluetooth.c | 2 +-
obexd/plugins/pcsuite.c | 2 +-
obexd/plugins/syncevolution.c | 2 +-
obexd/plugins/usb.c | 2 +-
obexd/plugins/vcard.c | 2 +-
obexd/src/main.c | 2 +-
obexd/src/manager.c | 2 +-
plugins/dbusoob.c | 2 +-
plugins/neard.c | 2 +-
plugins/service.c | 2 +-
profiles/alert/server.c | 2 +-
profiles/audio/avrcp.c | 2 +-
profiles/audio/control.c | 2 +-
profiles/audio/device.c | 2 +-
profiles/audio/manager.c | 2 +-
profiles/audio/media.c | 2 +-
profiles/audio/player.c | 2 +-
profiles/audio/sink.c | 2 +-
profiles/audio/source.c | 2 +-
profiles/audio/transport.c | 2 +-
profiles/cups/main.c | 2 +-
profiles/cyclingspeed/cyclingspeed.c | 2 +-
profiles/health/hdp.c | 2 +-
profiles/health/hdp_main.c | 2 +-
profiles/health/hdp_util.c | 2 +-
profiles/heartrate/heartrate.c | 2 +-
profiles/heartrate/manager.c | 2 +-
profiles/input/device.c | 2 +-
profiles/input/main.c | 2 +-
profiles/network/connection.c | 2 +-
profiles/network/main.c | 2 +-
profiles/network/manager.c | 2 +-
profiles/network/server.c | 2 +-
profiles/proximity/immalert.c | 2 +-
profiles/proximity/linkloss.c | 2 +-
profiles/proximity/main.c | 2 +-
profiles/proximity/manager.c | 2 +-
profiles/proximity/monitor.c | 2 +-
profiles/proximity/reporter.c | 2 +-
profiles/sap/main.c | 2 +-
profiles/sap/sap-dummy.c | 2 +-
profiles/sap/server.h | 2 +-
profiles/thermometer/thermometer.c | 2 +-
src/adapter.c | 2 +-
src/agent.c | 2 +-
src/attrib-server.c | 2 +-
src/dbus-common.c | 2 +-
src/device.c | 2 +-
src/error.c | 2 +-
src/main.c | 2 +-
src/manager.c | 2 +-
src/profile.c | 2 +-
68 files changed, 69 insertions(+), 71 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a2cdb62..8e717da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -358,8 +358,7 @@ EXTRA_DIST += doc/manager-api.txt \
AM_CFLAGS += @DBUS_CFLAGS@ @GLIB_CFLAGS@

AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(builddir)/lib \
- -I$(builddir)/src -I$(srcdir)/src -I$(srcdir)/gdbus \
- -I$(srcdir)/btio
+ -I$(builddir)/src -I$(srcdir)/src -I$(srcdir)/btio

if MCAP
AM_CPPFLAGS += -I$(builddir)/health
diff --git a/Makefile.obexd b/Makefile.obexd
index f8798f6..738e73d 100644
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -32,7 +32,7 @@ obexd_src_obexd_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ \
obexd_src_obexd_CPPFLAGS = -include $(top_builddir)/config.h -I$(builddir)/lib \
-I$(builddir)/obexd/src \
-I$(srcdir)/obexd/src -I$(srcdir)/btio \
- -I$(srcdir)/gobex -I$(srcdir)/gdbus
+ -I$(srcdir)/gobex

obexd_src_obexd_SHORTNAME = obexd

@@ -79,7 +79,6 @@ obexd_client_obex_client_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ \

obexd_client_obex_client_CPPFLAGS = -include $(top_builddir)/config.h \
-I$(builddir)/lib -I$(srcdir)/obexd/src \
- -I$(srcdir)/btio -I$(srcdir)/gobex \
- -I$(srcdir)/gdbus
+ -I$(srcdir)/btio -I$(srcdir)/gobex

obexd_client_obex_client_SHORTNAME = obex-client
diff --git a/attrib/client.c b/attrib/client.c
index 44a6730..2220ce1 100644
--- a/attrib/client.c
+++ b/attrib/client.c
@@ -31,10 +31,10 @@
#include <bluetooth/bluetooth.h>
#include <bluetooth/uuid.h>

+#include <gdbus/gdbus.h>
#include "adapter.h"
#include "device.h"
#include "log.h"
-#include "gdbus.h"
#include "error.h"
#include "dbus-common.h"
#include "btio.h"
diff --git a/obexd/client/bluetooth.c b/obexd/client/bluetooth.c
index 528845e..336f112 100644
--- a/obexd/client/bluetooth.c
+++ b/obexd/client/bluetooth.c
@@ -25,7 +25,7 @@
#include <inttypes.h>

#include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
#include <btio.h>

#include <bluetooth/bluetooth.h>
diff --git a/obexd/client/dbus.c b/obexd/client/dbus.c
index 78e0b96..ad76700 100644
--- a/obexd/client/dbus.c
+++ b/obexd/client/dbus.c
@@ -20,7 +20,7 @@
*/

#include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "log.h"
#include "dbus.h"
diff --git a/obexd/client/driver.c b/obexd/client/driver.c
index 66501fa..8cd3690 100644
--- a/obexd/client/driver.c
+++ b/obexd/client/driver.c
@@ -24,7 +24,7 @@
#include <string.h>
#include <errno.h>
#include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "transfer.h"
#include "session.h"
diff --git a/obexd/client/ftp.c b/obexd/client/ftp.c
index e2b650f..ea8be60 100644
--- a/obexd/client/ftp.c
+++ b/obexd/client/ftp.c
@@ -24,7 +24,7 @@
#include <errno.h>
#include <string.h>

-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "dbus.h"
#include "log.h"
diff --git a/obexd/client/main.c b/obexd/client/main.c
index 80867be..a0b1c97 100644
--- a/obexd/client/main.c
+++ b/obexd/client/main.c
@@ -30,7 +30,7 @@
#include <sys/signalfd.h>

#include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "log.h"
#include "manager.h"
diff --git a/obexd/client/manager.c b/obexd/client/manager.c
index 93d16ae..36ca942 100644
--- a/obexd/client/manager.c
+++ b/obexd/client/manager.c
@@ -28,7 +28,7 @@
#include <syslog.h>

#include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "log.h"
#include "transfer.h"
diff --git a/obexd/client/map.c b/obexd/client/map.c
index 0f141c1..6d7d926 100644
--- a/obexd/client/map.c
+++ b/obexd/client/map.c
@@ -24,7 +24,7 @@
#include <string.h>
#include <stdio.h>
#include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include <gobex-apparam.h>

diff --git a/obexd/client/opp.c b/obexd/client/opp.c
index 5f317a2..aa08db6 100644
--- a/obexd/client/opp.c
+++ b/obexd/client/opp.c
@@ -22,7 +22,7 @@
*/

#include <errno.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "log.h"

diff --git a/obexd/client/pbap.c b/obexd/client/pbap.c
index fa8b126..00b631a 100644
--- a/obexd/client/pbap.c
+++ b/obexd/client/pbap.c
@@ -26,7 +26,7 @@
#include <string.h>
#include <stdio.h>
#include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include <bluetooth/bluetooth.h>
#include <gobex-apparam.h>
diff --git a/obexd/client/session.c b/obexd/client/session.c
index 4339327..4ee9d21 100644
--- a/obexd/client/session.c
+++ b/obexd/client/session.c
@@ -31,7 +31,7 @@
#include <sys/stat.h>

#include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
#include <gobex.h>

#include "dbus.h"
diff --git a/obexd/client/session.h b/obexd/client/session.h
index af71568..402c042 100644
--- a/obexd/client/session.h
+++ b/obexd/client/session.h
@@ -24,7 +24,7 @@

#include <stdint.h>
#include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

struct obc_session;

diff --git a/obexd/client/sync.c b/obexd/client/sync.c
index 45e49b0..a555430 100644
--- a/obexd/client/sync.c
+++ b/obexd/client/sync.c
@@ -26,7 +26,7 @@
#include <string.h>

#include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "log.h"

diff --git a/obexd/client/transfer.c b/obexd/client/transfer.c
index 67b8eaf..662e087 100644
--- a/obexd/client/transfer.c
+++ b/obexd/client/transfer.c
@@ -32,7 +32,7 @@
#include <inttypes.h>

#include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
#include <gobex.h>

#include "dbus.h"
diff --git a/obexd/plugins/bluetooth.c b/obexd/plugins/bluetooth.c
index 24fd1cb..b2d6f28 100644
--- a/obexd/plugins/bluetooth.c
+++ b/obexd/plugins/bluetooth.c
@@ -29,7 +29,7 @@
#include <sys/socket.h>

#include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "obexd.h"
#include "plugin.h"
diff --git a/obexd/plugins/pcsuite.c b/obexd/plugins/pcsuite.c
index b479980..6d5bea4 100644
--- a/obexd/plugins/pcsuite.c
+++ b/obexd/plugins/pcsuite.c
@@ -35,7 +35,7 @@
#include <inttypes.h>

#include <glib.h>
-#include "gdbus.h"
+#include <gdbus/gdbus.h>

#include "obexd.h"
#include "plugin.h"
diff --git a/obexd/plugins/syncevolution.c b/obexd/plugins/syncevolution.c
index 1e8f78a..24b2d5e 100644
--- a/obexd/plugins/syncevolution.c
+++ b/obexd/plugins/syncevolution.c
@@ -32,6 +32,7 @@

#include <bluetooth/bluetooth.h>

+#include <gdbus/gdbus.h>
#include "plugin.h"
#include "obex.h"
#include "service.h"
@@ -40,7 +41,6 @@
#include "manager.h"
#include "btio.h"
#include "obexd.h"
-#include "gdbus.h"
#include "filesystem.h"

#define SYNCML_TARGET_SIZE 11
diff --git a/obexd/plugins/usb.c b/obexd/plugins/usb.c
index 32e7159..350b37b 100644
--- a/obexd/plugins/usb.c
+++ b/obexd/plugins/usb.c
@@ -33,7 +33,7 @@
#include <inttypes.h>

#include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "obexd.h"
#include "plugin.h"
diff --git a/obexd/plugins/vcard.c b/obexd/plugins/vcard.c
index baf0696..c9f178a 100644
--- a/obexd/plugins/vcard.c
+++ b/obexd/plugins/vcard.c
@@ -27,7 +27,7 @@
#include <errno.h>

#include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "vcard.h"

diff --git a/obexd/src/main.c b/obexd/src/main.c
index fb38265..d9329ce 100644
--- a/obexd/src/main.c
+++ b/obexd/src/main.c
@@ -38,7 +38,7 @@
#include <syslog.h>
#include <glib.h>

-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "log.h"
#include "obexd.h"
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index e038b9e..aaf911a 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -25,7 +25,7 @@
#include <unistd.h>
#include <string.h>
#include <errno.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
#include <sys/socket.h>
#include <inttypes.h>

diff --git a/plugins/dbusoob.c b/plugins/dbusoob.c
index 95e52f9..5c4f650 100644
--- a/plugins/dbusoob.c
+++ b/plugins/dbusoob.c
@@ -26,7 +26,7 @@
#include <stdbool.h>

#include <errno.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include <bluetooth/bluetooth.h>
#include <bluetooth/hci.h>
diff --git a/plugins/neard.c b/plugins/neard.c
index 842eabf..8db8520 100644
--- a/plugins/neard.c
+++ b/plugins/neard.c
@@ -22,7 +22,7 @@
*/

#include <errno.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include <bluetooth/bluetooth.h>
#include <bluetooth/hci.h>
diff --git a/plugins/service.c b/plugins/service.c
index d7c9b29..81318d7 100644
--- a/plugins/service.c
+++ b/plugins/service.c
@@ -30,7 +30,7 @@
#include <bluetooth/sdp.h>
#include <bluetooth/sdp_lib.h>

-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "dbus-common.h"
#include "sdpd.h"
diff --git a/profiles/alert/server.c b/profiles/alert/server.c
index 60d0108..4bc0265 100644
--- a/profiles/alert/server.c
+++ b/profiles/alert/server.c
@@ -24,7 +24,7 @@

#include <stdbool.h>
#include <errno.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
#include <glib.h>
#include <bluetooth/uuid.h>
#include <stdlib.h>
diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
index c69652f..6da001a 100644
--- a/profiles/audio/avrcp.c
+++ b/profiles/audio/avrcp.c
@@ -41,7 +41,7 @@

#include <glib.h>
#include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "../src/adapter.h"
#include "../src/device.h"
diff --git a/profiles/audio/control.c b/profiles/audio/control.c
index 489ad07..b8a66f0 100644
--- a/profiles/audio/control.c
+++ b/profiles/audio/control.c
@@ -40,7 +40,7 @@

#include <glib.h>
#include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "../src/adapter.h"
#include "../src/device.h"
diff --git a/profiles/audio/device.c b/profiles/audio/device.c
index c111262..2ee0d3d 100644
--- a/profiles/audio/device.c
+++ b/profiles/audio/device.c
@@ -36,7 +36,7 @@

#include <glib.h>
#include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "log.h"
#include "../src/adapter.h"
diff --git a/profiles/audio/manager.c b/profiles/audio/manager.c
index 7544197..0361ae4 100644
--- a/profiles/audio/manager.c
+++ b/profiles/audio/manager.c
@@ -42,7 +42,7 @@

#include <glib.h>
#include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "glib-helper.h"
#include "btio.h"
diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index 2ac7d7d..db60d7d 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -28,7 +28,7 @@
#include <bluetooth/uuid.h>

#include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "../src/adapter.h"
#include "../src/device.h"
diff --git a/profiles/audio/player.c b/profiles/audio/player.c
index 460fb5a..66af11e 100644
--- a/profiles/audio/player.c
+++ b/profiles/audio/player.c
@@ -31,7 +31,7 @@

#include <glib.h>
#include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "log.h"
#include "player.h"
diff --git a/profiles/audio/sink.c b/profiles/audio/sink.c
index e7901e0..c8f7207 100644
--- a/profiles/audio/sink.c
+++ b/profiles/audio/sink.c
@@ -31,7 +31,7 @@

#include <glib.h>
#include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "log.h"

diff --git a/profiles/audio/source.c b/profiles/audio/source.c
index 8913ab1..964f273 100644
--- a/profiles/audio/source.c
+++ b/profiles/audio/source.c
@@ -32,7 +32,7 @@

#include <glib.h>
#include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "log.h"

diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
index 79355ce..112e9a5 100644
--- a/profiles/audio/transport.c
+++ b/profiles/audio/transport.c
@@ -27,7 +27,7 @@
#include <bluetooth/uuid.h>

#include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "../src/adapter.h"
#include "../src/device.h"
diff --git a/profiles/cups/main.c b/profiles/cups/main.c
index 7c06efe..73a568d 100644
--- a/profiles/cups/main.c
+++ b/profiles/cups/main.c
@@ -35,7 +35,7 @@
#include <bluetooth/sdp.h>
#include <bluetooth/sdp_lib.h>

-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "cups.h"

diff --git a/profiles/cyclingspeed/cyclingspeed.c b/profiles/cyclingspeed/cyclingspeed.c
index f678ed9..468f180 100644
--- a/profiles/cyclingspeed/cyclingspeed.c
+++ b/profiles/cyclingspeed/cyclingspeed.c
@@ -20,7 +20,7 @@
*
*/

-#include <gdbus.h>
+#include <gdbus/gdbus.h>
#include <errno.h>
#include <stdbool.h>
#include <glib.h>
diff --git a/profiles/health/hdp.c b/profiles/health/hdp.c
index 0692d43..d062abb 100644
--- a/profiles/health/hdp.c
+++ b/profiles/health/hdp.c
@@ -29,7 +29,7 @@
#include <glib.h>

#include <bluetooth/l2cap.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
#include <dbus-common.h>
#include <log.h>
#include <error.h>
diff --git a/profiles/health/hdp_main.c b/profiles/health/hdp_main.c
index 96dc678..7f4e8d5 100644
--- a/profiles/health/hdp_main.c
+++ b/profiles/health/hdp_main.c
@@ -22,7 +22,7 @@

#include <errno.h>

-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "plugin.h"
#include "hdp_manager.h"
diff --git a/profiles/health/hdp_util.c b/profiles/health/hdp_util.c
index 714117c..8aa5723 100644
--- a/profiles/health/hdp_util.c
+++ b/profiles/health/hdp_util.c
@@ -25,7 +25,7 @@

#include <glib.h>

-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include <adapter.h>
#include <device.h>
diff --git a/profiles/heartrate/heartrate.c b/profiles/heartrate/heartrate.c
index ab61b87..7abb6ed 100644
--- a/profiles/heartrate/heartrate.c
+++ b/profiles/heartrate/heartrate.c
@@ -20,7 +20,7 @@
*
*/

-#include <gdbus.h>
+#include <gdbus/gdbus.h>
#include <errno.h>
#include <stdbool.h>
#include <glib.h>
diff --git a/profiles/heartrate/manager.c b/profiles/heartrate/manager.c
index aeb69f4..b939a2a 100644
--- a/profiles/heartrate/manager.c
+++ b/profiles/heartrate/manager.c
@@ -20,7 +20,7 @@
*
*/

-#include <gdbus.h>
+#include <gdbus/gdbus.h>
#include <errno.h>
#include <stdbool.h>
#include <bluetooth/uuid.h>
diff --git a/profiles/input/device.c b/profiles/input/device.c
index d512f48..b876765 100644
--- a/profiles/input/device.c
+++ b/profiles/input/device.c
@@ -33,7 +33,7 @@
#include <bluetooth/sdp.h>
#include <bluetooth/sdp_lib.h>

-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "log.h"

diff --git a/profiles/input/main.c b/profiles/input/main.c
index 3595b0b..6b66f8b 100644
--- a/profiles/input/main.c
+++ b/profiles/input/main.c
@@ -25,7 +25,7 @@

#include <bluetooth/bluetooth.h>

-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "plugin.h"
#include "hcid.h"
diff --git a/profiles/network/connection.c b/profiles/network/connection.c
index b97c151..e1e0376 100644
--- a/profiles/network/connection.c
+++ b/profiles/network/connection.c
@@ -32,7 +32,7 @@
#include <bluetooth/sdp.h>

#include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "log.h"
#include "btio.h"
diff --git a/profiles/network/main.c b/profiles/network/main.c
index c8f9ea0..98eb7b5 100644
--- a/profiles/network/main.c
+++ b/profiles/network/main.c
@@ -23,7 +23,7 @@

#include <errno.h>

-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "plugin.h"
#include "manager.h"
diff --git a/profiles/network/manager.c b/profiles/network/manager.c
index d3da540..70ad888 100644
--- a/profiles/network/manager.c
+++ b/profiles/network/manager.c
@@ -29,7 +29,7 @@
#include <bluetooth/uuid.h>

#include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "log.h"

diff --git a/profiles/network/server.c b/profiles/network/server.c
index 153ec08..c093d34 100644
--- a/profiles/network/server.c
+++ b/profiles/network/server.c
@@ -34,7 +34,7 @@
#include <netinet/in.h>

#include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "../src/dbus-common.h"
#include "../src/adapter.h"
diff --git a/profiles/proximity/immalert.c b/profiles/proximity/immalert.c
index 8ea37b6..92166d4 100644
--- a/profiles/proximity/immalert.c
+++ b/profiles/proximity/immalert.c
@@ -27,7 +27,7 @@
#include <adapter.h>

#include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "log.h"
#include "attrib/gattrib.h"
diff --git a/profiles/proximity/linkloss.c b/profiles/proximity/linkloss.c
index a325ef1..648202f 100644
--- a/profiles/proximity/linkloss.c
+++ b/profiles/proximity/linkloss.c
@@ -27,7 +27,7 @@
#include <adapter.h>

#include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "log.h"
#include "attrib/att-database.h"
diff --git a/profiles/proximity/main.c b/profiles/proximity/main.c
index 93f4a1c..b795fd7 100644
--- a/profiles/proximity/main.c
+++ b/profiles/proximity/main.c
@@ -25,7 +25,7 @@
#include <errno.h>
#include <stdint.h>
#include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "log.h"
#include "plugin.h"
diff --git a/profiles/proximity/manager.c b/profiles/proximity/manager.c
index 9190b63..6da08ed 100644
--- a/profiles/proximity/manager.c
+++ b/profiles/proximity/manager.c
@@ -25,7 +25,7 @@
#include <stdbool.h>

#include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
#include <bluetooth/uuid.h>

#include "adapter.h"
diff --git a/profiles/proximity/monitor.c b/profiles/proximity/monitor.c
index 9868fce..517e50d 100644
--- a/profiles/proximity/monitor.c
+++ b/profiles/proximity/monitor.c
@@ -24,7 +24,7 @@

#include <errno.h>
#include <fcntl.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
#include <stdint.h>
#include <stdbool.h>
#include <stdio.h>
diff --git a/profiles/proximity/reporter.c b/profiles/proximity/reporter.c
index c279062..d504f9d 100644
--- a/profiles/proximity/reporter.c
+++ b/profiles/proximity/reporter.c
@@ -30,7 +30,7 @@
#include <adapter.h>

#include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "log.h"

diff --git a/profiles/sap/main.c b/profiles/sap/main.c
index c5df5a1..d2218d4 100644
--- a/profiles/sap/main.c
+++ b/profiles/sap/main.c
@@ -19,7 +19,7 @@
*/

#include <errno.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
#include "plugin.h"
#include "manager.h"

diff --git a/profiles/sap/sap-dummy.c b/profiles/sap/sap-dummy.c
index a3e08bb..0f9265c 100644
--- a/profiles/sap/sap-dummy.c
+++ b/profiles/sap/sap-dummy.c
@@ -23,7 +23,7 @@
*/

#include <glib.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>
#include <stdint.h>

#include "dbus-common.h"
diff --git a/profiles/sap/server.h b/profiles/sap/server.h
index e636d91..73b38ab 100644
--- a/profiles/sap/server.h
+++ b/profiles/sap/server.h
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/

-#include <gdbus.h>
+#include <gdbus/gdbus.h>

int sap_server_register(const char *path, const bdaddr_t *src);
void sap_server_unregister(const char *path);
diff --git a/profiles/thermometer/thermometer.c b/profiles/thermometer/thermometer.c
index 6fb0d03..31bf718 100644
--- a/profiles/thermometer/thermometer.c
+++ b/profiles/thermometer/thermometer.c
@@ -25,7 +25,7 @@

#include <bluetooth/uuid.h>

-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "dbus-common.h"
#include "adapter.h"
diff --git a/src/adapter.c b/src/adapter.c
index 7994d89..4a69923 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -39,7 +39,7 @@

#include <glib.h>
#include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "log.h"
#include "textfile.h"
diff --git a/src/agent.c b/src/agent.c
index 97d34ce..82a0e9c 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -34,7 +34,7 @@

#include <glib.h>
#include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "log.h"

diff --git a/src/attrib-server.c b/src/attrib-server.c
index 5cd5460..0718c4b 100644
--- a/src/attrib-server.c
+++ b/src/attrib-server.c
@@ -34,8 +34,8 @@
#include <bluetooth/sdp.h>
#include <bluetooth/sdp_lib.h>

+#include <gdbus/gdbus.h>
#include "log.h"
-#include "gdbus.h"
#include "btio.h"
#include "sdpd.h"
#include "hcid.h"
diff --git a/src/dbus-common.c b/src/dbus-common.c
index 3c73e32..579e704 100644
--- a/src/dbus-common.c
+++ b/src/dbus-common.c
@@ -28,7 +28,7 @@

#include <glib.h>
#include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "log.h"

diff --git a/src/device.c b/src/device.c
index 32fb788..5b570bc 100644
--- a/src/device.c
+++ b/src/device.c
@@ -39,7 +39,7 @@

#include <glib.h>
#include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "log.h"

diff --git a/src/error.c b/src/error.c
index c5747c0..a019dae 100644
--- a/src/error.c
+++ b/src/error.c
@@ -23,7 +23,7 @@
*
*/

-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "error.h"

diff --git a/src/main.c b/src/main.c
index 90cd326..0534e26 100644
--- a/src/main.c
+++ b/src/main.c
@@ -40,7 +40,7 @@

#include <dbus/dbus.h>

-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "log.h"

diff --git a/src/manager.c b/src/manager.c
index 8711d39..6f17f7c 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -38,7 +38,7 @@

#include <dbus/dbus.h>

-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include "glib-helper.h"
#include "hcid.h"
diff --git a/src/profile.c b/src/profile.c
index 755c387..88d7cdb 100644
--- a/src/profile.c
+++ b/src/profile.c
@@ -28,7 +28,7 @@

#include <glib.h>
#include <dbus/dbus.h>
-#include <gdbus.h>
+#include <gdbus/gdbus.h>

#include <bluetooth/bluetooth.h>
#include <bluetooth/uuid.h>
--
1.8.0.1

2012-12-05 11:22:51

by Lucas De Marchi

Subject: [PATCH BlueZ 3/7] build-sys: Add missing force arg to symlink creation

From: Lucas De Marchi <[email protected]>

If we don't force the symlink creation the build fails when the link
already exists. This happens if the rule to create the link is triggered
again because the file it points to changed. This is the case when doing
incremental builds and we modified the file.

$ make
$ touch lib/cmtp.h
$ make
GEN lib/bluetooth/cmtp.h
ln: failed to create symbolic link ‘lib/bluetooth/cmtp.h’: File exists
make: *** [lib/bluetooth/cmtp.h] Error 1
make: *** Waiting for unfinished jobs....
---
Makefile.am | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6def418..a2cdb62 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -427,10 +427,10 @@ src/builtin.h: src/genbuiltin $(builtin_sources)
$(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@

profiles/sap/sap.c: profiles/sap/@SAP_DRIVER@
- $(AM_V_GEN)$(LN_S) $(abs_top_srcdir)/$< $@
+ $(AM_V_GEN)$(LN_S) -f $(abs_top_srcdir)/$< $@

profiles/input/suspend.c: profiles/input/@HOG_SUSPEND_DRIVER@
- $(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@
+ $(AM_V_GEN)$(LN_S) -f $(abs_top_builddir)/$< $@

scripts/%.rules:
$(AM_V_GEN)cp $(subst 97-,,$@) $@
@@ -439,7 +439,7 @@ $(lib_libbluetooth_la_OBJECTS): $(local_headers)

lib/bluetooth/%.h: lib/%.h
$(AM_V_at)$(MKDIR_P) lib/bluetooth
- $(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@
+ $(AM_V_GEN)$(LN_S) -f $(abs_top_builddir)/$< $@

clean-local:
$(RM) -r lib/bluetooth
--
1.8.0.1