diff --git a/common/xfpm-power-common.c b/common/xfpm-power-common.c
index f757f344fcb3c182db26f1e73f2ffe499178e230..43fc73143d370005600d1198af2132c47969da6f 100644
--- a/common/xfpm-power-common.c
+++ b/common/xfpm-power-common.c
@@ -23,7 +23,6 @@
 #endif
 
 #include <libxfce4util/libxfce4util.h>
-#include <dbus/dbus-glib-lowlevel.h>
 #include <upower.h>
 
 #include "xfpm-power-common.h"
diff --git a/common/xfpm-power-common.h b/common/xfpm-power-common.h
index 0fc84bff8fbf2f9b7c2da696653515d9a386d18b..6272c5a4287a3c326a111b3503f6f0f99c258990 100644
--- a/common/xfpm-power-common.h
+++ b/common/xfpm-power-common.h
@@ -21,8 +21,6 @@
 #ifndef XFPM_UPOWER_COMMON
 #define XFPM_UPOWER_COMMON
 
-#include <dbus/dbus-glib.h>
-
 #define UPOWER_NAME 	      "org.freedesktop.UPower"
 #define UPOWER_PATH 	      "/org/freedesktop/UPower"
 
diff --git a/configure.ac.in b/configure.ac.in
index bac8e09b388a87e0844b897f45f79718086aa373..351844f09bc7211128b28a1d587365eab2f4b94f 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -61,8 +61,6 @@ XDT_I18N([@LINGUAS@])
 #=====================================================#
 m4_define([gtk_minimum_version], [3.10.0])
 m4_define([glib_minimum_version], [2.30.0])
-m4_define([dbus_minimum_version], [1.1])
-m4_define([dbus_glib_minimum_version], [0.84])
 
 m4_define([xfconf_minimum_version], [4.10.0])
 m4_define([libxfce4ui_minimum_version],[4.11.0])
@@ -79,8 +77,7 @@ XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [glib_minimum_version])
 XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [glib_minimum_version])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [glib_minimum_version])
 XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [glib_minimum_version])
-XDT_CHECK_PACKAGE([DBUS], [dbus-1], [dbus_minimum_version])
-XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [dbus_glib_minimum_version])
+XDT_CHECK_PACKAGE([GIO], [gio-2.0], [glib_minimum_version])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0],[xfconf_minimum_version])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2],[libxfce4ui_minimum_version])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0],[libxfce4util_minimum_version])
diff --git a/libdbus/xfpm-dbus-monitor.c b/libdbus/xfpm-dbus-monitor.c
index a5888c4ec5990a2a61ceb30c511ee42c34ba31a2..a2b58993af5af800a568cdfec1851d4585e6c236 100644
--- a/libdbus/xfpm-dbus-monitor.c
+++ b/libdbus/xfpm-dbus-monitor.c
@@ -27,10 +27,6 @@
 
 #include <glib.h>
 
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <dbus/dbus-glib.h>
-
 #include <libxfce4util/libxfce4util.h>
 
 #include "xfpm-dbus.h"
diff --git a/libdbus/xfpm-dbus-monitor.h b/libdbus/xfpm-dbus-monitor.h
index b946502f6496ca790bfcdf15df70eeb13c84f434..168c47bae8c2c226ac5e8b6a14b4669abeb4273d 100644
--- a/libdbus/xfpm-dbus-monitor.h
+++ b/libdbus/xfpm-dbus-monitor.h
@@ -22,7 +22,6 @@
 #define __XFPM_DBUS_MONITOR_H
 
 #include <glib-object.h>
-#include <dbus/dbus.h>
 
 G_BEGIN_DECLS
 
diff --git a/libdbus/xfpm-dbus.h b/libdbus/xfpm-dbus.h
index 728b180486f957ca4ffefee97c9960821b640f46..fb1fd230fffb805d25cefabb43ef6f580eecb5e1 100644
--- a/libdbus/xfpm-dbus.h
+++ b/libdbus/xfpm-dbus.h
@@ -22,8 +22,7 @@
 #define __XFPM_DBUS_H
 
 #include <glib.h>
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
+#include <gio/gio.h>
 
 gboolean	xfpm_dbus_name_has_owner 	   (DBusConnection *bus,
 						    const gchar *name);
diff --git a/libdbus/xfpm-unique.c b/libdbus/xfpm-unique.c
index adb1d722995a038d309389dbe98a45f71a821493..971bae02f588558357b90da69ae4f8c280cf3678 100644
--- a/libdbus/xfpm-unique.c
+++ b/libdbus/xfpm-unique.c
@@ -29,8 +29,6 @@
 #include "xfpm-unique.h"
 #include "xfpm-dbus.h"
 
-#include <dbus/dbus-glib-lowlevel.h>
-
 static void xfpm_unique_dbus_class_init 	(XfpmUniqueClass *klass);
 static void xfpm_unique_dbus_init		(XfpmUnique *unique);
 
diff --git a/panel-plugins/power-manager-plugin/power-manager-button.c b/panel-plugins/power-manager-plugin/power-manager-button.c
index 48f6c36245cc9f6261bd45b9fd8f535cca8171d2..26c2f4d107584fda16eeb1e8473fdd429098ee2e 100644
--- a/panel-plugins/power-manager-plugin/power-manager-button.c
+++ b/panel-plugins/power-manager-plugin/power-manager-button.c
@@ -29,7 +29,6 @@
 #include <glib.h>
 #include <libxfce4util/libxfce4util.h>
 #include <libxfce4ui/libxfce4ui.h>
-#include <dbus/dbus-glib.h>
 #include <upower.h>
 #include <xfconf/xfconf.h>
 
diff --git a/settings/xfpm-settings-main.c b/settings/xfpm-settings-main.c
index 0bbb6ec7536ed3890a7063cedba601758b49b030..70f379f1f1ea85400d78d45be2f59f48be77a6a0 100644
--- a/settings/xfpm-settings-main.c
+++ b/settings/xfpm-settings-main.c
@@ -33,9 +33,6 @@
 #include <libxfce4util/libxfce4util.h>
 #include <libxfce4ui/libxfce4ui.h>
 
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-
 #include <xfconf/xfconf.h>
 
 #include "common/xfpm-common.h"
diff --git a/src/xfpm-battery.h b/src/xfpm-battery.h
index 3039f6e849dcf4428101dc46aed4ac19cf7d2279..4d3e9129f109fa95c6bc7f5b8515d5ac756a02eb 100644
--- a/src/xfpm-battery.h
+++ b/src/xfpm-battery.h
@@ -23,7 +23,6 @@
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
-#include <dbus/dbus-glib.h>
 #include <upower.h>
 
 #include "xfpm-enum-glib.h"
diff --git a/src/xfpm-console-kit.c b/src/xfpm-console-kit.c
index c0653061ed0edd48b3f7e151ec88950be6e52996..dbb58f6ad59846c945f4ee5ef9e7fc6e34eca3e6 100644
--- a/src/xfpm-console-kit.c
+++ b/src/xfpm-console-kit.c
@@ -30,8 +30,6 @@
 #include <string.h>
 #endif
 
-#include <dbus/dbus-glib.h>
-
 #include "xfpm-console-kit.h"
 #include "xfpm-dbus-monitor.h"
 
diff --git a/src/xfpm-inhibit.c b/src/xfpm-inhibit.c
index a3c2cd89753e97c23383c6d643d941eda1e0b229..a8619eed84e15b8539bbca6d5115889e920a9237 100644
--- a/src/xfpm-inhibit.c
+++ b/src/xfpm-inhibit.c
@@ -32,9 +32,6 @@
 
 #include <glib.h>
 
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-
 #include <libxfce4util/libxfce4util.h>
 
 #include "xfpm-inhibit.h"
diff --git a/src/xfpm-kbd-backlight.c b/src/xfpm-kbd-backlight.c
index 83ebbc0297c3f9711022620cf4a352717ca17abd..a70f043c402f5b8554277dd9054c71c1bd85c47f 100644
--- a/src/xfpm-kbd-backlight.c
+++ b/src/xfpm-kbd-backlight.c
@@ -26,7 +26,6 @@
 #include <string.h>
 #endif
 
-#include <dbus/dbus-glib.h>
 #include <libxfce4util/libxfce4util.h>
 
 #include "xfpm-kbd-backlight.h"
diff --git a/src/xfpm-main.c b/src/xfpm-main.c
index 2731e01389650b70a1f64ae57c91988cde45fbfb..746790323d15c3c46cbc5becd28bf61bf1690e25 100644
--- a/src/xfpm-main.c
+++ b/src/xfpm-main.c
@@ -41,9 +41,6 @@
 #include <libxfce4util/libxfce4util.h>
 #include <libxfce4ui/libxfce4ui.h>
 
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-
 #include "xfpm-dbus.h"
 #include "xfpm-debug.h"
 #include "xfpm-common.h"
diff --git a/src/xfpm-manager.c b/src/xfpm-manager.c
index 5b0f4dc290c8e10a799518b6f41c0eaf464bb1e8..724ae87431019b74efae25b18af537115ba6fb7a 100644
--- a/src/xfpm-manager.c
+++ b/src/xfpm-manager.c
@@ -37,8 +37,7 @@
 #include <libxfce4ui/libxfce4ui.h>
 #include <xfconf/xfconf.h>
 
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
+#include <gio/gunixfdlist.h>
 
 #include <libnotify/notify.h>
 
diff --git a/src/xfpm-manager.h b/src/xfpm-manager.h
index fcbceb35082986cc9f7f8e7bd8d260c6e7c383fd..7a1d1318cad40cf92ad5eb3cd946e85644bf971f 100644
--- a/src/xfpm-manager.h
+++ b/src/xfpm-manager.h
@@ -22,7 +22,6 @@
 #define __XFPM_MANAGER_H
 
 #include <glib-object.h>
-#include <dbus/dbus-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/xfpm-network-manager.c b/src/xfpm-network-manager.c
index 908b8132e60772019dbc2a48a4711dcf599c6968..da240a1b161a1fb25cedbbc1cb7f4a8e5ebf891f 100644
--- a/src/xfpm-network-manager.c
+++ b/src/xfpm-network-manager.c
@@ -23,7 +23,6 @@
 #endif
 
 #include <glib.h>
-#include <dbus/dbus-glib.h>
 
 #include "xfpm-network-manager.h"
 
diff --git a/src/xfpm-polkit.c b/src/xfpm-polkit.c
index c6510ab7f200f72fd74f894130d61bb403f93636..a92f2f61f5b6cad3b591a484370263a1fa7bbfb6 100644
--- a/src/xfpm-polkit.c
+++ b/src/xfpm-polkit.c
@@ -57,8 +57,6 @@
 #include <errno.h>
 #endif
 
-#include <dbus/dbus-glib.h>
-
 #include "xfpm-polkit.h"
 #include "xfpm-debug.h"
 
diff --git a/src/xfpm-power.c b/src/xfpm-power.c
index b374dc9b801edd95b524d3bb069b3b6c5f9a7dae..318c5fb8a6312a38126bc26664fcdfb0f28af94d 100644
--- a/src/xfpm-power.c
+++ b/src/xfpm-power.c
@@ -33,8 +33,6 @@
 #include <errno.h>
 #endif
 
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
 #include <upower.h>
 #include <gdk/gdkx.h>