diff --git a/configure.ac.in b/configure.ac.in
index fa4b3dd1a5e8b44bf448f4781198af5270c887bc..8d10f4056f450e438cd5ab621204ca5ef21beb48 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -133,7 +133,7 @@ XDT_CHECK_PACKAGE([GARCON_GTK3], [garcon-gtk3-1], [0.5.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.13.0])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.12.0])
 XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.16.0])
-XDT_CHECK_PACKAGE([EXO], [exo-1], [0.11.0])
+XDT_CHECK_PACKAGE([EXO], [exo-2], [0.11.2])
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0])
 XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.24.0])
 XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.24.0])
diff --git a/plugins/applicationsmenu/Makefile.am b/plugins/applicationsmenu/Makefile.am
index 5396e98fc745550be7b11659269cbae2ca95e455..d66d3eebb3534c42271b1bc39bff2b2c13ddd1ef 100644
--- a/plugins/applicationsmenu/Makefile.am
+++ b/plugins/applicationsmenu/Makefile.am
@@ -19,6 +19,7 @@ libapplicationsmenu_la_SOURCES = \
 
 libapplicationsmenu_la_CFLAGS = \
 	$(GTK_CFLAGS) \
+	$(EXO_CFLAGS) \
 	$(XFCONF_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(LIBXFCE4UI_CFLAGS) \
@@ -37,6 +38,7 @@ libapplicationsmenu_la_LIBADD = \
 	$(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
 	$(top_builddir)/common/libpanel-common.la \
 	$(GTK_LIBS) \
+	$(EXO_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
 	$(LIBXFCE4UI_LIBS) \
 	$(GARCON_LIBS) \
diff --git a/plugins/applicationsmenu/applicationsmenu.c b/plugins/applicationsmenu/applicationsmenu.c
index 90806bd6621bddd6f3d635f801d245bd6badf3c2..29e06881815baf2e4299f648b34393695855d391 100644
--- a/plugins/applicationsmenu/applicationsmenu.c
+++ b/plugins/applicationsmenu/applicationsmenu.c
@@ -20,6 +20,7 @@
 #include <config.h>
 #endif
 
+#include <exo/exo.h>
 #include <garcon/garcon.h>
 #include <garcon-gtk/garcon-gtk.h>
 #include <libxfce4ui/libxfce4ui.h>
diff --git a/plugins/directorymenu/Makefile.am b/plugins/directorymenu/Makefile.am
index c8208f6c3bac85d7825bc31d0662405c2483d53d..b54f7e93f37f550bc07a50af46e0b038a68c8fa6 100644
--- a/plugins/directorymenu/Makefile.am
+++ b/plugins/directorymenu/Makefile.am
@@ -19,6 +19,7 @@ libdirectorymenu_la_SOURCES = \
 
 libdirectorymenu_la_CFLAGS = \
 	$(GTK_CFLAGS) \
+	$(EXO_CFLAGS) \
 	$(XFCONF_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(LIBXFCE4UI_CFLAGS) \
@@ -37,6 +38,7 @@ libdirectorymenu_la_LIBADD = \
 	$(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
 	$(top_builddir)/common/libpanel-common.la \
 	$(GTK_LIBS) \
+	$(EXO_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
 	$(LIBXFCE4UI_LIBS) \
 	$(GIO_LIBS) \
diff --git a/plugins/directorymenu/directorymenu.c b/plugins/directorymenu/directorymenu.c
index 78ed2bd012401ab62e2d20038aa749665c4120af..3564f69db8d54d2dfc90e294cc263d6eeb6f9cd0 100644
--- a/plugins/directorymenu/directorymenu.c
+++ b/plugins/directorymenu/directorymenu.c
@@ -20,6 +20,7 @@
 #include <config.h>
 #endif
 
+#include <exo/exo.h>
 #include <gio/gio.h>
 #include <libxfce4ui/libxfce4ui.h>
 #include <libxfce4util/libxfce4util.h>
@@ -728,7 +729,7 @@ directory_menu_plugin_menu_open (GtkWidget   *mi,
                                                        path_as_arg ? working_dir : NULL,
                                                        working_dir,
                                                        NULL,
-                                                       gtk_widget_get_screen (mi), &error))
+                                                       gtk_widget_get_screen (mi), &error)
 #endif
      )
     {
diff --git a/plugins/tasklist/Makefile.am b/plugins/tasklist/Makefile.am
index 34c38abddd7ed5a4c58bde10c2043fd8329f1def..0139d635aacbb9502a343d9de36db17463d754f8 100644
--- a/plugins/tasklist/Makefile.am
+++ b/plugins/tasklist/Makefile.am
@@ -21,6 +21,7 @@ libtasklist_la_SOURCES = \
 
 libtasklist_la_CFLAGS = \
 	$(GTK_CFLAGS) \
+	$(EXO_CFLAGS) \
 	$(XFCONF_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(LIBXFCE4UI_CFLAGS) \
@@ -39,6 +40,7 @@ libtasklist_la_LIBADD = \
 	$(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
 	$(top_builddir)/common/libpanel-common.la \
 	$(GTK_LIBS) \
+	$(EXO_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
 	$(LIBXFCE4UI_LIBS) \
 	$(LIBWNCK_LIBS) \
diff --git a/plugins/tasklist/tasklist-widget.c b/plugins/tasklist/tasklist-widget.c
index 47bea47fdd7966b7b41052c5efa67bc4aa985a92..fb9251721790ae850c0c7abc511902d32e1162bb 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -28,6 +28,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <exo/exo.h>
 #include <libxfce4ui/libxfce4ui.h>
 #include <libwnck/libwnck.h>
 #include <libxfce4panel/libxfce4panel.h>
diff --git a/plugins/windowmenu/Makefile.am b/plugins/windowmenu/Makefile.am
index 029da7b7446083788fa77e46d9594fd0ad335920..95ece2ab605039f8741f2f38b10a9c094a871b33 100644
--- a/plugins/windowmenu/Makefile.am
+++ b/plugins/windowmenu/Makefile.am
@@ -20,6 +20,7 @@ libwindowmenu_la_SOURCES = \
 
 libwindowmenu_la_CFLAGS = \
 	$(GTK_CFLAGS) \
+	$(EXO_CFLAGS) \
 	$(XFCONF_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(LIBXFCE4UI_CFLAGS) \
@@ -37,6 +38,7 @@ libwindowmenu_la_LIBADD = \
 	$(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
 	$(top_builddir)/common/libpanel-common.la \
 	$(GTK_LIBS) \
+	$(EXO_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
 	$(LIBXFCE4UI_LIBS) \
 	$(LIBWNCK_LIBS) \
diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c
index 3b833b2804dcc39729d48948dc9b7ae4144c5a5d..0c7f327f7215263b00a31730015ad4d0e04837c7 100644
--- a/plugins/windowmenu/windowmenu.c
+++ b/plugins/windowmenu/windowmenu.c
@@ -20,6 +20,7 @@
 #include <config.h>
 #endif
 
+#include <exo/exo.h>
 #include <libxfce4ui/libxfce4ui.h>
 #include <libxfce4panel/libxfce4panel.h>
 #include <libwnck/libwnck.h>