--- src/xpad-tray.c	
+++ src/xpad-tray.c	
@@ -28,7 +28,8 @@ 
 #include "xpad-settings.h"
 
 #ifdef HAVE_APP_INDICATOR
-#include <libayatana-appindicator/app-indicator.h>
+#include <libappindicator/app-indicator.h>
+#endif
 
 #include "xpad-tray.h"
 #include "xpad-app.h"
@@ -46,11 +47,11 @@ 
 	NEW_PAD
 };
 
+static AppIndicator *app_indicator = NULL;
+
 #define ICON_NAME "xpad"
 #define TRAY_ICON "xpad-panel"
 
-static AppIndicator *app_indicator = NULL;
-
 static void menu_spawn (XpadSettings *settings)
 {
 	GtkWidget *pad = xpad_pad_new (xpad_app_get_pad_group (), settings);
@@ -205,18 +206,3 @@ 
 	else
 		return FALSE;
 }
-
-#else
-
-void xpad_tray_init (XpadSettings *settings) {
-}
-
-void xpad_tray_dispose (XpadSettings *settings) {
-}
-
-gboolean xpad_tray_has_indicator ()
-{
-	return FALSE;
-}
-
-#endif