diff -rNaud xfce4-mailwatch-plugin/panel-plugin/Makefile.am xfce4-mailwatch-plugin-new/panel-plugin/Makefile.am
--- xfce4-mailwatch-plugin/panel-plugin/Makefile.am	2010-06-08 18:25:06.000000000 +0200
+++ xfce4-mailwatch-plugin-new/panel-plugin/Makefile.am	2010-12-08 22:59:58.496000001 +0100
@@ -50,20 +50,22 @@
 	-I$(top_srcdir)/libmailwatch-core \
 	@GTHREAD_CFLAGS@ \
 	@LIBXFCE4PANEL_CFLAGS@ \
+	@LIBXFCEGUI4_CFLAGS@ \
 	-DDATADIR=\"$(datadir)\" \
 	-DLOCALEDIR=\"$(localedir)\"
 
 xfce4_mailwatch_plugin_DEPENDENCIES = \
 	$(top_builddir)/libmailwatch-core/libmailwatch-core.la
 
-xfce4_mailwatch_plugin_LDFLAGS = \
+xfce4_mailwatch_plugin_LDADD = \
 	$(top_builddir)/libmailwatch-core/libmailwatch-core.la \
 	@GTHREAD_LIBS@ \
 	@LIBXFCE4PANEL_LIBS@ \
+	@LIBXFCEGUI4_LIBS@ \
 	@GNUTLS_LIBS@
 
 if HAVE_CYGWIN
-  xfce4_mailwatch_plugin_LDFLAGS += \
+  xfce4_mailwatch_plugin_LDFLAGS = \
 	-no-undefined
 endif
 
diff -rNaud xfce4-mailwatch-plugin/panel-plugin/mailwatch-plugin.c xfce4-mailwatch-plugin-new/panel-plugin/mailwatch-plugin.c
--- xfce4-mailwatch-plugin/panel-plugin/mailwatch-plugin.c	2010-06-08 18:25:06.000000000 +0200
+++ xfce4-mailwatch-plugin-new/panel-plugin/mailwatch-plugin.c	2010-12-08 22:59:49.213000001 +0100
@@ -31,8 +31,7 @@
 
 #include <libxfce4util/libxfce4util.h>
 #include <libxfcegui4/libxfcegui4.h>
-#include <libxfce4panel/xfce-panel-plugin.h>
-#include <libxfce4panel/xfce-panel-convenience.h>
+#include <libxfce4panel/libxfce4panel.h>
 
 #include "mailwatch.h"
 #include "mailwatch-mailbox.h"