5 files changed, 6 insertions, 7 deletions
diff --git a/input/Makefile.am b/input/Makefile.am
index 52a46a74..a514b629 100644
--- a/input/Makefile.am
+++ b/input/Makefile.am
@@ -10,12 +10,12 @@ libinput_la_SOURCES = main.c \
 	fakehid.c fakehid.h
 
 LDADD = $(top_builddir)/common/libhelper.a \
-		@GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
+		@GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
 endif
 
 AM_LDFLAGS = -module -avoid-version -export-symbols-regex bluetooth_plugin_desc
 
-AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@
+AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
 
 INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/hcid
 
diff --git a/input/device.c b/input/device.c
index ab4e59c7..151ce08c 100644
--- a/input/device.c
+++ b/input/device.c
@@ -40,10 +40,8 @@
 #include <bluetooth/sdp.h>
 
 #include <glib.h>
-
 #include <dbus/dbus.h>
 
-#include "dbus.h"
 #include "dbus-helper.h"
 #include "logging.h"
 #include "textfile.h"
diff --git a/input/main.c b/input/main.c
index c9432c21..b57286b2 100644
--- a/input/main.c
+++ b/input/main.c
@@ -29,7 +29,8 @@
 
 #include <bluetooth/bluetooth.h>
 
-#include "dbus.h"
+#include <glib.h>
+#include <dbus/dbus.h>
 
 #include "plugin.h"
 #include "dbus-service.h"
diff --git a/input/manager.c b/input/manager.c
index 1c024c9c..11e14514 100644
--- a/input/manager.c
+++ b/input/manager.c
@@ -42,7 +42,6 @@
 
 #include <dbus/dbus.h>
 
-#include "dbus.h"
 #include "dbus-helper.h"
 #include "logging.h"
 #include "textfile.h"
diff --git a/input/server.c b/input/server.c
index ff7cdbfd..5e29e99f 100644
--- a/input/server.c
+++ b/input/server.c
@@ -38,13 +38,14 @@
 #include <bluetooth/hci_lib.h>
 
 #include <glib.h>
+#include <dbus/dbus.h>
 
 #include "logging.h"
-#include "dbus.h"
 
 #include "device.h"
 #include "server.h"
 #include "storage.h"
+#include "dbus-helper.h"
 #include "dbus-service.h"
 
 static const char* HID_UUID = "00001124-0000-1000-8000-00805f9b34fb";