diff --git a/Makefile.am b/Makefile.am
index 8e090db..5f4250d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -356,8 +356,8 @@ EXTRA_DIST += doc/adapter-api.txt doc/device-api.txt doc/profile-api.txt \
 
 AM_CFLAGS += @DBUS_CFLAGS@ @GLIB_CFLAGS@
 
-AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(builddir)/lib \
-		-I$(builddir)/src -I$(srcdir)/src
+AM_CPPFLAGS = -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 e235acc..cbcd65d 100644
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -29,8 +29,9 @@ obexd_src_obexd_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ \
 					-DPLUGINDIR=\""$(obex_plugindir)"\" \
 					-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
+obexd_src_obexd_CPPFLAGS = -I$(builddir)/lib -I$(builddir)/obexd/src  \
+				-I$(srcdir)/obexd/src -I$(srcdir)/btio \
+				-I$(srcdir)/gobex -I$(srcdir)/gdbus
 
 obexd_src_obexd_SHORTNAME = obexd
 
@@ -75,7 +76,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 = -include $(top_builddir)/config.h \
-				-I$(builddir)/lib -I$(srcdir)/obexd/src
+obexd_client_obex_client_CPPFLAGS = -I$(builddir)/lib -I$(srcdir)/obexd/src \
+				-I$(srcdir)/btio -I$(srcdir)/gobex \
+				-I$(srcdir)/gdbus
 
 obexd_client_obex_client_SHORTNAME = obex-client
diff --git a/attrib/client.c b/attrib/client.c
index d533732..138c0ef 100644
--- a/attrib/client.c
+++ b/attrib/client.c
@@ -23,6 +23,10 @@
  */
 
 
+#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 80e76eb..e8788d9 100644
--- a/attrib/gatt-service.c
+++ b/attrib/gatt-service.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 cfa3c53..38c050e 100644
--- a/attrib/gatt.c
+++ b/attrib/gatt.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 5bda975..e66059d 100644
--- a/attrib/gatttool.c
+++ b/attrib/gatttool.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 18b827e..17a60fc 100644
--- a/emulator/b1ee.c
+++ b/emulator/b1ee.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 bd158ee..700c6a8 100644
--- a/emulator/btdev.c
+++ b/emulator/btdev.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 4124702..807c663 100644
--- a/emulator/main.c
+++ b/emulator/main.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 ea8fa21..e4c4570 100644
--- a/emulator/server.c
+++ b/emulator/server.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 0062beb..52876ba 100644
--- a/emulator/vhci.c
+++ b/emulator/vhci.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 483ed66..099b67f 100644
--- a/gdbus/mainloop.c
+++ b/gdbus/mainloop.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 611cded..7cbd612 100644
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 508937d..9e95fa3 100644
--- a/gdbus/polkit.c
+++ b/gdbus/polkit.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 0dcb2a2..9e4f994 100644
--- a/gdbus/watch.c
+++ b/gdbus/watch.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 0c3cc8a..442a3f1 100644
--- a/gobex/gobex-apparam.c
+++ b/gobex/gobex-apparam.c
@@ -19,6 +19,10 @@
  *
  */
 
+#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 f1f3b38..c184c9c 100644
--- a/gobex/gobex-defs.c
+++ b/gobex/gobex-defs.c
@@ -19,6 +19,10 @@
  *
  */
 
+#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 6136f2c..80e8e4e 100644
--- a/gobex/gobex-header.c
+++ b/gobex/gobex-header.c
@@ -19,6 +19,10 @@
  *
  */
 
+#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 d59bbce..c3e3953 100644
--- a/gobex/gobex-packet.c
+++ b/gobex/gobex-packet.c
@@ -19,6 +19,10 @@
  *
  */
 
+#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 f29a7ce..724c788 100644
--- a/gobex/gobex-transfer.c
+++ b/gobex/gobex-transfer.c
@@ -19,6 +19,10 @@
  *
  */
 
+#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 59a0159..7c136af 100644
--- a/gobex/gobex.c
+++ b/gobex/gobex.c
@@ -19,6 +19,10 @@
  *
  */
 
+#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 42075a4..d9360dc 100644
--- a/lib/bluetooth.c
+++ b/lib/bluetooth.c
@@ -23,6 +23,10 @@
  *
  */
 
+#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 ba5f582..66b2d5f 100644
--- a/lib/hci.c
+++ b/lib/hci.c
@@ -23,6 +23,10 @@
  *
  */
 
+#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 1cee8dc..dbffec0 100644
--- a/lib/sdp.c
+++ b/lib/sdp.c
@@ -24,6 +24,10 @@
  *
  */
 
+#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 0035c6c..4363aee 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 e8de179..04a6dff 100644
--- a/monitor/btsnoop.c
+++ b/monitor/btsnoop.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 160ce4c..3447b7a 100644
--- a/monitor/control.c
+++ b/monitor/control.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 48c3bac..7b6fc98 100644
--- a/monitor/display.c
+++ b/monitor/display.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 f57ba81..e69bcb1 100644
--- a/monitor/hcidump.c
+++ b/monitor/hcidump.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 db62b05..e982bdd 100644
--- a/monitor/l2cap.c
+++ b/monitor/l2cap.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 5a0229e..27a5722 100644
--- a/monitor/main.c
+++ b/monitor/main.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 99f156c..1cc787e 100644
--- a/monitor/mainloop.c
+++ b/monitor/mainloop.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 7df6545..ee37615 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 5cdf47d..45ee59b 100644
--- a/monitor/sdp.c
+++ b/monitor/sdp.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 ca79b68..c348e17 100644
--- a/monitor/uuid.c
+++ b/monitor/uuid.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 6406b8b..293eb8f 100644
--- a/obexd/client/bluetooth.c
+++ b/obexd/client/bluetooth.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 ad76700..2fa263e 100644
--- a/obexd/client/dbus.c
+++ b/obexd/client/dbus.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib.h>
 #include <gdbus/gdbus.h>
 
diff --git a/obexd/client/driver.c b/obexd/client/driver.c
index 8cd3690..a98dcf4 100644
--- a/obexd/client/driver.c
+++ b/obexd/client/driver.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 ea8be60..839b662 100644
--- a/obexd/client/ftp.c
+++ b/obexd/client/ftp.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 a0b1c97..e0e2eb5 100644
--- a/obexd/client/main.c
+++ b/obexd/client/main.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 36ca942..7a7c33f 100644
--- a/obexd/client/manager.c
+++ b/obexd/client/manager.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 ba33fe2..dcbcc8b 100644
--- a/obexd/client/map.c
+++ b/obexd/client/map.c
@@ -20,6 +20,10 @@
  *
  */
 
+#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 aa08db6..773092a 100644
--- a/obexd/client/opp.c
+++ b/obexd/client/opp.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <errno.h>
 #include <gdbus/gdbus.h>
 
diff --git a/obexd/client/pbap.c b/obexd/client/pbap.c
index c9a5e48..cd199c5 100644
--- a/obexd/client/pbap.c
+++ b/obexd/client/pbap.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 2118992..2bac229 100644
--- a/obexd/client/session.c
+++ b/obexd/client/session.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 a555430..d70706a 100644
--- a/obexd/client/sync.c
+++ b/obexd/client/sync.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 362419c..38c99cd 100644
--- a/obexd/client/transfer.c
+++ b/obexd/client/transfer.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 21dfef4..77e52f7 100644
--- a/obexd/client/transport.c
+++ b/obexd/client/transport.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 4cbeac4..1448d0e 100644
--- a/obexd/plugins/bluetooth.c
+++ b/obexd/plugins/bluetooth.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 1e6c6d7..1132a34 100644
--- a/obexd/plugins/filesystem.c
+++ b/obexd/plugins/filesystem.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 b89f9b2..ff4b761 100644
--- a/obexd/plugins/ftp.c
+++ b/obexd/plugins/ftp.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 1c172b8..c9c3521 100644
--- a/obexd/plugins/irmc.c
+++ b/obexd/plugins/irmc.c
@@ -20,6 +20,10 @@
  *
  */
 
+#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 b279bf0..1b18059 100644
--- a/obexd/plugins/mas.c
+++ b/obexd/plugins/mas.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 869f9df..4c66f51 100644
--- a/obexd/plugins/messages-dummy.c
+++ b/obexd/plugins/messages-dummy.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 96da001..60f3a80 100644
--- a/obexd/plugins/messages-tracker.c
+++ b/obexd/plugins/messages-tracker.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 747ab85..c7ddc63 100644
--- a/obexd/plugins/opp.c
+++ b/obexd/plugins/opp.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 e94edae..4d4f0b8 100644
--- a/obexd/plugins/pbap.c
+++ b/obexd/plugins/pbap.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 6d5bea4..6ad8f49 100644
--- a/obexd/plugins/pcsuite.c
+++ b/obexd/plugins/pcsuite.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 458136e..6b9d040 100644
--- a/obexd/plugins/phonebook-dummy.c
+++ b/obexd/plugins/phonebook-dummy.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 b1935b7..59a4eac 100644
--- a/obexd/plugins/phonebook-ebook.c
+++ b/obexd/plugins/phonebook-ebook.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 02c02d4..2d25d28 100644
--- a/obexd/plugins/syncevolution.c
+++ b/obexd/plugins/syncevolution.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 350b37b..1c3da3e 100644
--- a/obexd/plugins/usb.c
+++ b/obexd/plugins/usb.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 c9f178a..b36e4bf 100644
--- a/obexd/plugins/vcard.c
+++ b/obexd/plugins/vcard.c
@@ -19,6 +19,10 @@
  *
  */
 
+#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 1d3a8f2..59b6151 100644
--- a/obexd/src/log.c
+++ b/obexd/src/log.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 d9329ce..e39f00c 100644
--- a/obexd/src/main.c
+++ b/obexd/src/main.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 ce66e19..02dc999 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 548a31a..833ddc7 100644
--- a/obexd/src/mimetype.c
+++ b/obexd/src/mimetype.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 bdaf923..a3e7b0e 100644
--- a/obexd/src/obex.c
+++ b/obexd/src/obex.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 b8a9daa..c8ec642 100644
--- a/obexd/src/plugin.c
+++ b/obexd/src/plugin.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 9976bd0..091f2ed 100644
--- a/obexd/src/server.c
+++ b/obexd/src/server.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 46fcb1d..4d9ebfd 100644
--- a/obexd/src/service.c
+++ b/obexd/src/service.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 c0fc2c9..4984643 100644
--- a/obexd/src/transport.c
+++ b/obexd/src/transport.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 fbb9470..179152f 100644
--- a/plugins/adaptername.c
+++ b/plugins/adaptername.c
@@ -25,6 +25,10 @@
  *
  */
 
+#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 5c4f650..ae492f1 100644
--- a/plugins/dbusoob.c
+++ b/plugins/dbusoob.c
@@ -23,6 +23,10 @@
  *
  */
 
+#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 86e0ae9..ff31290 100644
--- a/plugins/external-dummy.c
+++ b/plugins/external-dummy.c
@@ -18,6 +18,10 @@
  *
  */
 
+#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 c72fb8a..1978f03 100644
--- a/plugins/formfactor.c
+++ b/plugins/formfactor.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 0d3ce6f..de090e9 100644
--- a/plugins/gatt-example.c
+++ b/plugins/gatt-example.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 8db8520..6d73e48 100644
--- a/plugins/neard.c
+++ b/plugins/neard.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <errno.h>
 #include <gdbus/gdbus.h>
 
diff --git a/plugins/service.c b/plugins/service.c
index 81318d7..b59b342 100644
--- a/plugins/service.c
+++ b/plugins/service.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 e5a0a7c..04a02c7 100644
--- a/plugins/storage.c
+++ b/plugins/storage.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 319d08c..90d6d7b 100644
--- a/plugins/wiimote.c
+++ b/plugins/wiimote.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 70595f5..b9df0d4 100644
--- a/profiles/alert/main.c
+++ b/profiles/alert/main.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 1a655f0..eb2d627 100644
--- a/profiles/alert/manager.c
+++ b/profiles/alert/manager.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 4bc0265..20eb5fc 100644
--- a/profiles/alert/server.c
+++ b/profiles/alert/server.c
@@ -22,6 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdbool.h>
 #include <errno.h>
 #include <gdbus/gdbus.h>
diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
index ffdcec6..177f653 100644
--- a/profiles/audio/a2dp.c
+++ b/profiles/audio/a2dp.c
@@ -23,6 +23,10 @@
  *
  */
 
+#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 061ebd0..382e77d 100644
--- a/profiles/audio/avctp.c
+++ b/profiles/audio/avctp.c
@@ -23,6 +23,10 @@
  *
  */
 
+#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 8fd7118..3007053 100644
--- a/profiles/audio/avdtp.c
+++ b/profiles/audio/avdtp.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 6da001a..8af681b 100644
--- a/profiles/audio/avrcp.c
+++ b/profiles/audio/avrcp.c
@@ -23,6 +23,10 @@
  *
  */
 
+#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 b8a66f0..ef6df72 100644
--- a/profiles/audio/control.c
+++ b/profiles/audio/control.c
@@ -23,6 +23,10 @@
  *
  */
 
+#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 2ee0d3d..9979b36 100644
--- a/profiles/audio/device.c
+++ b/profiles/audio/device.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 0c3a703..6bf406f 100644
--- a/profiles/audio/main.c
+++ b/profiles/audio/main.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 5efe166..8d7dc22 100644
--- a/profiles/audio/manager.c
+++ b/profiles/audio/manager.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 4c5d38b..0839f69 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -23,6 +23,10 @@
  *
  */
 
+#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 9a820b7..b04d99e 100644
--- a/profiles/audio/player.c
+++ b/profiles/audio/player.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 c8f7207..4be3bac 100644
--- a/profiles/audio/sink.c
+++ b/profiles/audio/sink.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 964f273..6713cc4 100644
--- a/profiles/audio/source.c
+++ b/profiles/audio/source.c
@@ -23,6 +23,10 @@
  *
  */
 
+#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 ad4ae0d..abb22b4 100644
--- a/profiles/audio/transport.c
+++ b/profiles/audio/transport.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 4af47a9..a93dda0 100644
--- a/profiles/cups/hcrp.c
+++ b/profiles/cups/hcrp.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 11f2a24..f990b93 100644
--- a/profiles/cups/main.c
+++ b/profiles/cups/main.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 203577b..c7f17a4 100644
--- a/profiles/cups/sdp.c
+++ b/profiles/cups/sdp.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 fba9632..d906ed2 100644
--- a/profiles/cups/spp.c
+++ b/profiles/cups/spp.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 468f180..e236ff7 100644
--- a/profiles/cyclingspeed/cyclingspeed.c
+++ b/profiles/cyclingspeed/cyclingspeed.c
@@ -20,11 +20,15 @@
  *
  */
 
-#include <gdbus/gdbus.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <errno.h>
 #include <stdbool.h>
 #include <glib.h>
 #include <bluetooth/uuid.h>
+#include <gdbus/gdbus.h>
 
 #include "plugin.h"
 #include "adapter.h"
diff --git a/profiles/deviceinfo/deviceinfo.c b/profiles/deviceinfo/deviceinfo.c
index e2daab5..da27df8 100644
--- a/profiles/deviceinfo/deviceinfo.c
+++ b/profiles/deviceinfo/deviceinfo.c
@@ -20,6 +20,10 @@
  *
  */
 
+#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 d67e58b..3884579 100644
--- a/profiles/deviceinfo/main.c
+++ b/profiles/deviceinfo/main.c
@@ -20,6 +20,10 @@
  *
  */
 
+#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 5ec0a8f..2c1dc83 100644
--- a/profiles/gatt/gas.c
+++ b/profiles/gatt/gas.c
@@ -20,6 +20,10 @@
  *
  */
 
+#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 6b90dc2..ecd4455 100644
--- a/profiles/gatt/main.c
+++ b/profiles/gatt/main.c
@@ -20,6 +20,10 @@
  *
  */
 
+#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 7f4e8d5..e705ee9 100644
--- a/profiles/health/hdp_main.c
+++ b/profiles/health/hdp_main.c
@@ -20,6 +20,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <errno.h>
 
 #include <gdbus/gdbus.h>
diff --git a/profiles/health/hdp_manager.c b/profiles/health/hdp_manager.c
index 3945bf8..b801706 100644
--- a/profiles/health/hdp_manager.c
+++ b/profiles/health/hdp_manager.c
@@ -20,6 +20,10 @@
  *
  */
 
+#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 339f8cf..b2fb2ac 100644
--- a/profiles/health/hdp_util.c
+++ b/profiles/health/hdp_util.c
@@ -20,6 +20,10 @@
  *
  */
 
+#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 06ea7da..b9c679d 100644
--- a/profiles/health/mcap_sync.c
+++ b/profiles/health/mcap_sync.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 7abb6ed..155100e 100644
--- a/profiles/heartrate/heartrate.c
+++ b/profiles/heartrate/heartrate.c
@@ -20,11 +20,15 @@
  *
  */
 
-#include <gdbus/gdbus.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <errno.h>
 #include <stdbool.h>
 #include <glib.h>
 #include <bluetooth/uuid.h>
+#include <gdbus/gdbus.h>
 
 #include "adapter.h"
 #include "dbus-common.h"
diff --git a/profiles/heartrate/main.c b/profiles/heartrate/main.c
index 23337c4..80a6ba4 100644
--- a/profiles/heartrate/main.c
+++ b/profiles/heartrate/main.c
@@ -20,6 +20,10 @@
  *
  */
 
+#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 986e924..b22e0a7 100644
--- a/profiles/input/device.c
+++ b/profiles/input/device.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 1e06c79..a873eac 100644
--- a/profiles/input/hog_device.c
+++ b/profiles/input/hog_device.c
@@ -23,6 +23,10 @@
  *
  */
 
+#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 d16bf5f..595b160 100644
--- a/profiles/input/hog_manager.c
+++ b/profiles/input/hog_manager.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 6b66f8b..29337d9 100644
--- a/profiles/input/main.c
+++ b/profiles/input/main.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 2b1b38c..b8e89c3 100644
--- a/profiles/input/manager.c
+++ b/profiles/input/manager.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 db5592b..8476b7c 100644
--- a/profiles/input/server.c
+++ b/profiles/input/server.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 d76fac5..b43946d 100644
--- a/profiles/input/suspend-dummy.c
+++ b/profiles/input/suspend-dummy.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 107d58d..34ab788 100644
--- a/profiles/network/common.c
+++ b/profiles/network/common.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 8df4a6b..1856eb8 100644
--- a/profiles/network/connection.c
+++ b/profiles/network/connection.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 98eb7b5..99a1954 100644
--- a/profiles/network/main.c
+++ b/profiles/network/main.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <errno.h>
 
 #include <gdbus/gdbus.h>
diff --git a/profiles/network/manager.c b/profiles/network/manager.c
index 70ad888..e737f6d 100644
--- a/profiles/network/manager.c
+++ b/profiles/network/manager.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 6d0274a..e32e51d 100644
--- a/profiles/network/server.c
+++ b/profiles/network/server.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 92166d4..04557b4 100644
--- a/profiles/proximity/immalert.c
+++ b/profiles/proximity/immalert.c
@@ -20,6 +20,10 @@
  *
  */
 
+#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 648202f..c1c4177 100644
--- a/profiles/proximity/linkloss.c
+++ b/profiles/proximity/linkloss.c
@@ -20,6 +20,10 @@
  *
  */
 
+#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 b795fd7..c7c50dc 100644
--- a/profiles/proximity/main.c
+++ b/profiles/proximity/main.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 6da08ed..b93a609 100644
--- a/profiles/proximity/manager.c
+++ b/profiles/proximity/manager.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 517e50d..023de72 100644
--- a/profiles/proximity/monitor.c
+++ b/profiles/proximity/monitor.c
@@ -22,6 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <errno.h>
 #include <fcntl.h>
 #include <gdbus/gdbus.h>
diff --git a/profiles/proximity/reporter.c b/profiles/proximity/reporter.c
index d504f9d..ef3ab6a 100644
--- a/profiles/proximity/reporter.c
+++ b/profiles/proximity/reporter.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 d2218d4..8cc9533 100644
--- a/profiles/sap/main.c
+++ b/profiles/sap/main.c
@@ -18,6 +18,10 @@
  *  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/gdbus.h>
 #include "plugin.h"
diff --git a/profiles/sap/manager.c b/profiles/sap/manager.c
index 36fdb6c..fddd7aa 100644
--- a/profiles/sap/manager.c
+++ b/profiles/sap/manager.c
@@ -18,6 +18,10 @@
  *  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 0f9265c..6c717dc 100644
--- a/profiles/sap/sap-dummy.c
+++ b/profiles/sap/sap-dummy.c
@@ -22,6 +22,10 @@
  *  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/gdbus.h>
 #include <stdint.h>
diff --git a/profiles/sap/server.c b/profiles/sap/server.c
index 033b9a3..d075e40 100644
--- a/profiles/sap/server.c
+++ b/profiles/sap/server.c
@@ -24,6 +24,10 @@
  *  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 5099666..74e8a55 100644
--- a/profiles/scanparam/main.c
+++ b/profiles/scanparam/main.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 8acade1..cea2b29 100644
--- a/profiles/scanparam/manager.c
+++ b/profiles/scanparam/manager.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 49f1eda..849336e 100644
--- a/profiles/scanparam/scan.c
+++ b/profiles/scanparam/scan.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 bf2b54c..6c1c40c 100644
--- a/profiles/thermometer/main.c
+++ b/profiles/thermometer/main.c
@@ -20,6 +20,10 @@
  *
  */
 
+#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 31bf718..537db99 100644
--- a/profiles/thermometer/thermometer.c
+++ b/profiles/thermometer/thermometer.c
@@ -20,6 +20,10 @@
  *
  */
 
+#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 3cbecd1..08abed2 100644
--- a/profiles/time/main.c
+++ b/profiles/time/main.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 fec9084..608a807 100644
--- a/profiles/time/manager.c
+++ b/profiles/time/manager.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 c6405b1..0a17b83 100644
--- a/profiles/time/server.c
+++ b/profiles/time/server.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 fff3d3f..aa109fb 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 82a0e9c..7ecf19a 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 bdf5b38..8dc0d6a 100644
--- a/src/attrib-server.c
+++ b/src/attrib-server.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 579e704..73003e9 100644
--- a/src/dbus-common.c
+++ b/src/dbus-common.c
@@ -23,6 +23,10 @@
  *
  */
 
+#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 2032b80..f6357a0 100644
--- a/src/device.c
+++ b/src/device.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 c9bcd1c..5162b85 100644
--- a/src/eir.c
+++ b/src/eir.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 a019dae..7692790 100644
--- a/src/error.c
+++ b/src/error.c
@@ -23,6 +23,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gdbus/gdbus.h>
 
 #include "error.h"
diff --git a/src/glib-helper.c b/src/glib-helper.c
index 9647ef2..fe5713a 100644
--- a/src/glib-helper.c
+++ b/src/glib-helper.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 14090ad..75a98a9 100644
--- a/src/log.c
+++ b/src/log.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 0534e26..78e60c3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,6 +23,10 @@
  *
  */
 
+#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 47204a4..bc10f32 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 aba8643..81b0494 100644
--- a/src/mgmt.c
+++ b/src/mgmt.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 b239231..80bb3d3 100644
--- a/src/oui.c
+++ b/src/oui.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 c931e68..5622d7b 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 6613b1c..afa487b 100644
--- a/src/profile.c
+++ b/src/profile.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 4c4c62c..f82596b 100644
--- a/src/rfkill.c
+++ b/src/rfkill.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 b2a253e..106344a 100644
--- a/src/sdp-client.c
+++ b/src/sdp-client.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 a3615e3..7d5f626 100644
--- a/src/sdp-xml.c
+++ b/src/sdp-xml.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 0abdb90..dd492bf 100644
--- a/src/sdpd-database.c
+++ b/src/sdpd-database.c
@@ -24,6 +24,10 @@
  *
  */
 
+#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 8f9f1cc..2af743e 100644
--- a/src/sdpd-request.c
+++ b/src/sdpd-request.c
@@ -24,6 +24,10 @@
  *
  */
 
+#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 979c193..1d9509e 100644
--- a/src/sdpd-server.c
+++ b/src/sdpd-server.c
@@ -24,6 +24,10 @@
  *
  */
 
+#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 570ab56..b43ddc2 100644
--- a/src/sdpd-service.c
+++ b/src/sdpd-service.c
@@ -24,6 +24,10 @@
  *
  */
 
+#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 090df92..ac66021 100644
--- a/src/storage.c
+++ b/src/storage.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 167bc97..b6a7e1f 100644
--- a/src/textfile.c
+++ b/src/textfile.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 f234066..85dfb22 100644
--- a/test/agent.c
+++ b/test/agent.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 c74df9a..12ba682 100644
--- a/test/attest.c
+++ b/test/attest.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 85e5aae..541b3cd 100644
--- a/test/avtest.c
+++ b/test/avtest.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 062ebc6..f87fa38 100644
--- a/test/bdaddr.c
+++ b/test/bdaddr.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 175c9d8..a0541b1 100644
--- a/test/gaptest.c
+++ b/test/gaptest.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 61ad0bd..a125cf4 100644
--- a/test/hciemu.c
+++ b/test/hciemu.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 edf6f89..ac68059 100644
--- a/test/hstest.c
+++ b/test/hstest.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 c88116d..3147504 100644
--- a/test/l2test.c
+++ b/test/l2test.c
@@ -23,6 +23,10 @@
  *
  */
 
+#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 81d0bee..549ae12 100644
--- a/test/lmptest.c
+++ b/test/lmptest.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 d351123..90c87aa 100644
--- a/test/mpris-player.c
+++ b/test/mpris-player.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 58aa533..77fa03c 100644
--- a/test/rctest.c
+++ b/test/rctest.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 89dd771..a40e395 100644
--- a/test/scotest.c
+++ b/test/scotest.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 f05cd65..480a468 100644
--- a/test/sdptest.c
+++ b/test/sdptest.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 b30e355..e0a0c5b 100644
--- a/test/test-textfile.c
+++ b/test/test-textfile.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 55dd9b4..d237742 100644
--- a/tools/avinfo.c
+++ b/tools/avinfo.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 3aa6112..952bf13 100644
--- a/tools/bccmd.c
+++ b/tools/bccmd.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 5de97b6..a69c49e 100644
--- a/tools/btattach.c
+++ b/tools/btattach.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 cd1ff4b..ff6a46a 100644
--- a/tools/btmgmt.c
+++ b/tools/btmgmt.c
@@ -19,6 +19,10 @@
  *
  */
 
+#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 ad7d785..dcb4a26 100644
--- a/tools/btsnoop.c
+++ b/tools/btsnoop.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 5e38407..e240f38 100644
--- a/tools/ciptool.c
+++ b/tools/ciptool.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 5851ace..b4ea1fb 100644
--- a/tools/csr.c
+++ b/tools/csr.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 7537e6b..33fcf38 100644
--- a/tools/csr_3wire.c
+++ b/tools/csr_3wire.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 d69808f..f7afe53 100644
--- a/tools/csr_bcsp.c
+++ b/tools/csr_bcsp.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 796dac4..3371770 100644
--- a/tools/csr_h4.c
+++ b/tools/csr_h4.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 78ef758..6bd37c3 100644
--- a/tools/csr_hci.c
+++ b/tools/csr_hci.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 c4f6614..19903b0 100644
--- a/tools/csr_usb.c
+++ b/tools/csr_usb.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 47d8251..39ec088 100644
--- a/tools/dfu.c
+++ b/tools/dfu.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 260684d..16dd62e 100644
--- a/tools/dfutool.c
+++ b/tools/dfutool.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 34aaf80..e1e80af 100644
--- a/tools/hciattach.c
+++ b/tools/hciattach.c
@@ -23,6 +23,10 @@
  *
  */
 
+#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 4dd6036..23208c6 100644
--- a/tools/hciattach_ath3k.c
+++ b/tools/hciattach_ath3k.c
@@ -17,6 +17,10 @@
  *
  */
 
+#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 9bca0d4..749098e 100644
--- a/tools/hciattach_intel.c
+++ b/tools/hciattach_intel.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 b5a2d89..0e02e1e 100644
--- a/tools/hciattach_qualcomm.c
+++ b/tools/hciattach_qualcomm.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 7b25760..dbb7c47 100644
--- a/tools/hciattach_st.c
+++ b/tools/hciattach_st.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 9db26c8..b57c6b7 100644
--- a/tools/hciattach_ti.c
+++ b/tools/hciattach_ti.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 18a304c..c3caa49 100644
--- a/tools/hciattach_tialt.c
+++ b/tools/hciattach_tialt.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 fe88ec8..6b18c4f 100644
--- a/tools/hciconfig.c
+++ b/tools/hciconfig.c
@@ -23,6 +23,10 @@
  *
  */
 
+#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 e556c1b..87beac9 100644
--- a/tools/hcieventmask.c
+++ b/tools/hcieventmask.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 97f0691..9ad4ce0 100644
--- a/tools/hcisecfilter.c
+++ b/tools/hcisecfilter.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 9b541a3..a05e31f 100644
--- a/tools/hcitool.c
+++ b/tools/hcitool.c
@@ -23,6 +23,10 @@
  *
  */
 
+#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 fe27d29..e3a5b2e 100644
--- a/tools/hid2hci.c
+++ b/tools/hid2hci.c
@@ -22,6 +22,10 @@
  *
  */
 
+#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 8d35fd9..29fb3d0 100644
--- a/tools/l2ping.c
+++ b/tools/l2ping.c
@@ -23,6 +23,10 @@
  *
  */
 
+#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 84ffe8d..e37c56f 100644
--- a/tools/obex-server-tool.c
+++ b/tools/obex-server-tool.c
@@ -19,6 +19,10 @@
  *
  */
 
+#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 984ea3e..affdbc7 100644
--- a/tools/rfcomm.c
+++ b/tools/rfcomm.c
@@ -21,6 +21,10 @@
  *
  */
 
+#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 18c062c..a55df50 100644
--- a/tools/sdptool.c
+++ b/tools/sdptool.c
@@ -25,6 +25,10 @@
  *
  */
 
+#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 6bba7e2..b3f883a 100644
--- a/tools/ubcsp.c
+++ b/tools/ubcsp.c
@@ -26,6 +26,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 /*****************************************************************************/
 /*****************************************************************************/
 /*****************************************************************************/
diff --git a/unit/test-eir.c b/unit/test-eir.c
index 90aebbf..cefcacd 100644
--- a/unit/test-eir.c
+++ b/unit/test-eir.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <check.h>
 
 #include <stdint.h>