diff --git a/src/Indicator.vala b/src/Indicator.vala
index 9c15b68..12e7e4f 100644
--- a/src/Indicator.vala
+++ b/src/Indicator.vala
@@ -4,7 +4,7 @@
 */
 
 public class Keyboard.Indicator : Wingpanel.Indicator {
-    public Wingpanel.IndicatorManager.ServerType server_type { get; construct; }
+    public Wingpanel.ServerType server_type { get; construct; }
 
     private Gdk.Device device;
     private GLib.Settings settings;
@@ -15,7 +15,7 @@ public class Keyboard.Indicator : Wingpanel.Indicator {
     private Gtk.Label layouts_icon;
     private Gtk.Revealer layouts_revealer;
 
-    public Indicator (Wingpanel.IndicatorManager.ServerType server_type) {
+    public Indicator (Wingpanel.ServerType server_type) {
         GLib.Intl.bindtextdomain (Constants.GETTEXT_PACKAGE, Constants.LOCALEDIR);
         GLib.Intl.bind_textdomain_codeset (Constants.GETTEXT_PACKAGE, "UTF-8");
 
@@ -152,7 +152,7 @@ public class Keyboard.Indicator : Wingpanel.Indicator {
     }
 }
 
-public Wingpanel.Indicator? get_indicator (Module module, Wingpanel.IndicatorManager.ServerType server_type) {
+public Wingpanel.Indicator? get_indicator (Module module, Wingpanel.ServerType server_type) {
     debug ("Activating Keyboard Indicator");
     var indicator = new Keyboard.Indicator (server_type);
     return indicator;
diff --git a/src/PopoverWidget.vala b/src/PopoverWidget.vala
index 6fa7a95..2353718 100644
--- a/src/PopoverWidget.vala
+++ b/src/PopoverWidget.vala
@@ -26,7 +26,7 @@ public class Keyboard.Widgets.PopoverWidget : Gtk.Box {
 
     public signal void updated ();
 
-    public Wingpanel.IndicatorManager.ServerType server_type { get; construct; }
+    public Wingpanel.ServerType server_type { get; construct; }
 
     private GLib.Settings settings;
 #if IBUS_1_5_19
@@ -42,7 +42,7 @@ public class Keyboard.Widgets.PopoverWidget : Gtk.Box {
 
     private IBus.Bus bus;
 
-    public PopoverWidget (Wingpanel.IndicatorManager.ServerType server_type) {
+    public PopoverWidget (Wingpanel.ServerType server_type) {
         Object (server_type: server_type);
     }