diff --git a/libdevkit-power/Makefile.am b/libdevkit-power/Makefile.am
index 30bb5dd..ea8c61b 100644
--- a/libdevkit-power/Makefile.am
+++ b/libdevkit-power/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = \
 	$(GLIB_CFLAGS)						\
-	$(DBUS_CFLAGS)						\
+	$(DBUS_GLIB_CFLAGS)					\
 	-I$(top_srcdir)/libdevkit-power				\
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\"			\
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
@@ -11,6 +11,10 @@ noinst_LTLIBRARIES =						\
 libdevkit_power_la_SOURCES =					\
 	dkp-debug.c						\
 	dkp-debug.h						\
+	dkp-client.c						\
+	dkp-client.h						\
+	dkp-client-device.c					\
+	dkp-client-device.h					\
 	dkp-history-obj.h					\
 	dkp-history-obj.c					\
 	dkp-enum.c						\
@@ -18,7 +22,8 @@ libdevkit_power_la_SOURCES =					\
 	dkp-object.c						\
 	dkp-object.h
 
-libdevkit_power_la_LIBADD = $(INTLLIBS) $(GLIB_LIBS)
+libdevkit_power_la_LIBADD = $(INTLLIBS) $(GLIB_LIBS) $(DBUS_GLIB_LIBS)
+
 
 clean-local:
 	rm -f *~
diff --git a/tools/dkp-client-device.c b/libdevkit-power/dkp-client-device.c
similarity index 100%
rename from tools/dkp-client-device.c
rename to libdevkit-power/dkp-client-device.c
diff --git a/tools/dkp-client-device.h b/libdevkit-power/dkp-client-device.h
similarity index 100%
rename from tools/dkp-client-device.h
rename to libdevkit-power/dkp-client-device.h
diff --git a/tools/dkp-client.c b/libdevkit-power/dkp-client.c
similarity index 100%
rename from tools/dkp-client.c
rename to libdevkit-power/dkp-client.c
diff --git a/tools/dkp-client.h b/libdevkit-power/dkp-client.h
similarity index 100%
rename from tools/dkp-client.h
rename to libdevkit-power/dkp-client.h
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4c88843..cab1a2d 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -34,10 +34,6 @@ bin_PROGRAMS = devkit-power devkit-power-on-battery
 
 devkit_power_SOURCES = 					\
 	dkp-tool.c					\
-	dkp-client.c					\
-	dkp-client.h					\
-	dkp-client-device.c				\
-	dkp-client-device.h				\
 	$(BUILT_SOURCES)
 
 devkit_power_CPPFLAGS = 				\