diff --git a/src/Indicator.vala b/src/Indicator.vala
index 3f87c38..676c8c9 100644
--- a/src/Indicator.vala
+++ b/src/Indicator.vala
@@ -4,12 +4,12 @@
  */
 
 public class QuickSettings.Indicator : Wingpanel.Indicator {
-    public Wingpanel.IndicatorManager.ServerType server_type { get; construct; }
+    public Wingpanel.ServerType server_type { get; construct; }
 
     private EndSessionDialog? current_dialog;
     private PopoverWidget? popover_widget;
 
-    public Indicator (Wingpanel.IndicatorManager.ServerType server_type) {
+    public Indicator (Wingpanel.ServerType server_type) {
         Object (
             code_name: "quick-settings",
             server_type: server_type,
@@ -119,6 +119,6 @@ public class QuickSettings.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) {
     return new QuickSettings.Indicator (server_type);
 }
diff --git a/src/PopoverWidget.vala b/src/PopoverWidget.vala
index f85d2ab..ec1af9b 100644
--- a/src/PopoverWidget.vala
+++ b/src/PopoverWidget.vala
@@ -4,7 +4,7 @@
  */
 
 public class QuickSettings.PopoverWidget : Gtk.Box {
-    public Wingpanel.IndicatorManager.ServerType server_type { get; construct; }
+    public Wingpanel.ServerType server_type { get; construct; }
 
     private const string FDO_ACCOUNTS_NAME = "org.freedesktop.Accounts";
     private const string FDO_ACCOUNTS_PATH = "/org/freedesktop/Accounts";
@@ -15,7 +15,7 @@ public class QuickSettings.PopoverWidget : Gtk.Box {
     private UserList accounts_view;
     private Gtk.Button current_user_button;
 
-    public PopoverWidget (Wingpanel.IndicatorManager.ServerType server_type) {
+    public PopoverWidget (Wingpanel.ServerType server_type) {
         Object (server_type: server_type);
     }
 
diff --git a/src/Widgets/SessionBox.vala b/src/Widgets/SessionBox.vala
index 0f79c0d..5f5e6bf 100644
--- a/src/Widgets/SessionBox.vala
+++ b/src/Widgets/SessionBox.vala
@@ -4,11 +4,11 @@
  */
 
 public class QuickSettings.SessionBox : Gtk.Box {
-    public Wingpanel.IndicatorManager.ServerType server_type { get; construct; }
+    public Wingpanel.ServerType server_type { get; construct; }
 
     private Gtk.Popover? popover;
 
-    public SessionBox (Wingpanel.IndicatorManager.ServerType server_type) {
+    public SessionBox (Wingpanel.ServerType server_type) {
         Object (server_type: server_type);
     }