diff --git a/panel-plugins/power-manager-plugin/power-manager-button.c b/panel-plugins/power-manager-plugin/power-manager-button.c
index 1f3b9e2ef2362b03643f99e18dbd932114a6a6fa..949f61cdb4d12b5cefa4e9bcd1ba7f30eed58297 100644
--- a/panel-plugins/power-manager-plugin/power-manager-button.c
+++ b/panel-plugins/power-manager-plugin/power-manager-button.c
@@ -939,8 +939,8 @@ power_manager_button_size_changed_cb (XfcePanelPlugin *plugin, gint size, PowerM
     gint xthickness;
     gint ythickness;
 
-    g_return_val_if_fail (POWER_MANAGER_IS_BUTTON (button), FALSE);
-    g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), FALSE);
+    g_return_if_fail (POWER_MANAGER_IS_BUTTON (button), FALSE);
+    g_return_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), FALSE);
     g_return_if_fail (size > 0);
 
     size /= xfce_panel_plugin_get_nrows (plugin);
diff --git a/src/Makefile.am b/src/Makefile.am
index 59fd59d2733ee355ed2bf7757ab3c51226ec6208..f4c4a974410b766ed6ff0e983eb2ff896669a1b4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,6 +52,7 @@ xfce4_power_manager_CFLAGS =                    \
 	-DSBINDIR=\"$(sbindir)\"                \
 	-DUPOWER_ENABLE_DEPRECATED              \
 	-DXFPM_SUSPEND_HELPER_CMD=\"$(prefix)/bin/xfce4-pm-helper\" \
+	-UXFCE_PLUGIN                           \
 	-DXFPM_SYSTRAY							\
 	$(GOBJECT_CFLAGS)                       \
 	$(GTHREAD_CFLAGS)                       \