diff --git a/accountmanager.cpp b/accountmanager.cpp
index 534e4013..58f08cca 100644
--- a/accountmanager.cpp
+++ b/accountmanager.cpp
@@ -2,8 +2,6 @@
 
 namespace chatterino {
 
-AccountManager AccountManager::instance;
-
 AccountManager::AccountManager()
     : _twitchAnon("justinfan64537", "", "")
     , _twitchUsers()
diff --git a/accountmanager.h b/accountmanager.h
index 66cf8c2a..b2019bf5 100644
--- a/accountmanager.h
+++ b/accountmanager.h
@@ -13,6 +13,7 @@ class AccountManager
 public:
     static AccountManager &getInstance()
     {
+        static AccountManager instance;
         return instance;
     }
 
@@ -23,7 +24,6 @@ public:
     void addTwitchUser(const twitch::TwitchUser &user);
 
 private:
-    static AccountManager instance;
 
     AccountManager();
 
diff --git a/settingsmanager.cpp b/settingsmanager.cpp
index 6fdf8d03..e84d1338 100644
--- a/settingsmanager.cpp
+++ b/settingsmanager.cpp
@@ -9,8 +9,6 @@ using namespace chatterino::messages;
 
 namespace chatterino {
 
-SettingsManager SettingsManager::instance;
-
 SettingsManager::SettingsManager()
     : _settings(Path::getAppdataPath() + "settings.ini", QSettings::IniFormat)
     , _wordTypeMask(Word::Default)
diff --git a/settingsmanager.h b/settingsmanager.h
index 1b8e09c3..6edf7467 100644
--- a/settingsmanager.h
+++ b/settingsmanager.h
@@ -72,11 +72,11 @@ private:
 public:
     static SettingsManager &getInstance()
     {
+        static SettingsManager instance;
         return instance;
     }
 
 private:
-    static SettingsManager instance;
 };
 
 }  // namespace chatterino
diff --git a/widgets/accountpopup.cpp b/widgets/accountpopup.cpp
index 036d375d..9a71d513 100644
--- a/widgets/accountpopup.cpp
+++ b/widgets/accountpopup.cpp
@@ -1,6 +1,6 @@
 #include "widgets/accountpopup.h"
 #include "channel.h"
-#include "ui_userpopup.h"
+#include "ui_accountpopupform.h"
 
 #include <QDebug>
 
diff --git a/widgets/chatwidgetview.cpp b/widgets/chatwidgetview.cpp
index 1ac5f0d6..f74b781e 100644
--- a/widgets/chatwidgetview.cpp
+++ b/widgets/chatwidgetview.cpp
@@ -4,7 +4,7 @@
 #include "messages/message.h"
 #include "messages/wordpart.h"
 #include "settingsmanager.h"
-#include "ui_userpopup.h"
+#include "ui_accountpopupform.h"
 #include "widgets/chatwidget.h"
 
 #include <math.h>