diff --git a/health/hdp.c b/health/hdp.c
index 6d53439..5453eb7 100644
--- a/health/hdp.c
+++ b/health/hdp.c
@@ -20,24 +20,27 @@
  *
  */
 
-#include <gdbus.h>
-
-#include "log.h"
-#include "error.h"
 #include <stdlib.h>
 #include <stdint.h>
-#include <hdp_types.h>
-#include <hdp_util.h>
+#include <sdpd.h>
+#include <unistd.h>
+
+#include <glib.h>
+
+#include <bluetooth/l2cap.h>
+#include <gdbus.h>
+#include <dbus-common.h>
+#include <log.h>
+#include <error.h>
 #include <adapter.h>
 #include <device.h>
-#include <hdp.h>
-#include <mcap.h>
 #include <btio.h>
-#include <mcap_lib.h>
-#include <bluetooth/l2cap.h>
-#include <sdpd.h>
-#include "../src/dbus-common.h"
-#include <unistd.h>
+
+#include "mcap_lib.h"
+#include "hdp_types.h"
+#include "hdp_util.h"
+#include "hdp.h"
+#include "mcap.h"
 
 #ifndef DBUS_TYPE_UNIX_FD
 	#define DBUS_TYPE_UNIX_FD -1
diff --git a/health/hdp_manager.c b/health/hdp_manager.c
index b3c10a9..cccb1a6 100644
--- a/health/hdp_manager.c
+++ b/health/hdp_manager.c
@@ -30,15 +30,14 @@
 #include <btio.h>
 #include <adapter.h>
 #include <device.h>
+#include <glib-helper.h>
+#include <log.h>
 
 #include "hdp_types.h"
 
-#include "log.h"
 #include "hdp_manager.h"
 #include "hdp.h"
 
-#include "glib-helper.h"
-
 static DBusConnection *connection = NULL;
 
 static int hdp_adapter_probe(struct btd_adapter *adapter)
diff --git a/health/hdp_util.c b/health/hdp_util.c
index 4d546ad..f49cb6e 100644
--- a/health/hdp_util.c
+++ b/health/hdp_util.c
@@ -20,15 +20,18 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdint.h>
+
+#include <glib.h>
+
 #include <gdbus.h>
 
 #include <adapter.h>
 #include <device.h>
-#include <stdint.h>
-#include <hdp_types.h>
-#include <hdp_util.h>
-#include <mcap.h>
-#include <hdp.h>
 
 #include <sdpd.h>
 #include <bluetooth/sdp_lib.h>
@@ -36,10 +39,15 @@
 #include <glib-helper.h>
 
 #include <btio.h>
-#include <mcap_lib.h>
 
 #include <log.h>
 
+#include "mcap.h"
+#include "mcap_lib.h"
+#include "hdp_types.h"
+#include "hdp.h"
+#include "hdp_util.h"
+
 typedef gboolean (*parse_item_f)(DBusMessageIter *iter, gpointer user_data,
 								GError **err);
 
diff --git a/health/mcap.c b/health/mcap.c
index bc8c606..4c726b6 100644
--- a/health/mcap.c
+++ b/health/mcap.c
@@ -20,17 +20,20 @@
  *
  */
 
-#include "log.h"
-#include "error.h"
-
 #include <netinet/in.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <unistd.h>
 
-#include "btio.h"
+#include <glib.h>
+
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/l2cap.h>
+
+#include <btio.h>
+#include <log.h>
+#include <error.h>
+
 #include "mcap.h"
 #include "mcap_lib.h"
 #include "mcap_internal.h"
diff --git a/health/mcap_sync.c b/health/mcap_sync.c
index 0e21877..6d8d66b 100644
--- a/health/mcap_sync.c
+++ b/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>