diff --git a/launcher/Application.h b/launcher/Application.h
index 1ffc6e153..8ca473a8b 100644
--- a/launcher/Application.h
+++ b/launcher/Application.h
@@ -49,9 +49,7 @@
 
 #include "QObjectPtr.h"
 
-#include "launch/LogModel.h"
 #include "minecraft/auth/MinecraftAccount.h"
-#include "settings/SettingsObject.h"
 
 class LaunchController;
 class LocalPeer;
@@ -78,11 +76,10 @@ class ThemeManager;
 class IconTheme;
 class BaseInstance;
 
-struct MinecraftTarget;
+class LogModel;
 
-// pointers for lazy people
-using InstancePtr = std::shared_ptr<BaseInstance>;
-using MinecraftTargetPtr = std::shared_ptr<MinecraftTarget>;
+struct MinecraftTarget;
+class MinecraftAccount;
 
 namespace Meta {
 class Index;
@@ -221,8 +218,8 @@ class Application : public QApplication {
     bool launch(BaseInstance* instance,
                 bool online = true,
                 bool demo = false,
-                MinecraftTargetPtr targetToJoin = nullptr,
-                MinecraftAccountPtr accountToUse = nullptr,
+                std::shared_ptr<MinecraftTarget> targetToJoin = nullptr,
+                shared_qobject_ptr<MinecraftAccount> accountToUse = nullptr,
                 const QString& offlineName = QString());
     bool kill(BaseInstance* instance);
     void closeCurrentWindow();
diff --git a/launcher/java/JavaInstallList.cpp b/launcher/java/JavaInstallList.cpp
index aa7fab8a0..5dd12cb05 100644
--- a/launcher/java/JavaInstallList.cpp
+++ b/launcher/java/JavaInstallList.cpp
@@ -41,6 +41,7 @@
 #include <algorithm>
 
 #include "Application.h"
+#include "settings/SettingsObject.h"
 #include "java/JavaChecker.h"
 #include "java/JavaInstallList.h"
 #include "java/JavaUtils.h"
diff --git a/launcher/meta/BaseEntity.cpp b/launcher/meta/BaseEntity.cpp
index b0e754ada..c809f851a 100644
--- a/launcher/meta/BaseEntity.cpp
+++ b/launcher/meta/BaseEntity.cpp
@@ -26,6 +26,7 @@
 #include "net/NetJob.h"
 
 #include "Application.h"
+#include "settings/SettingsObject.h"
 #include "BuildConfig.h"
 #include "tasks/Task.h"
 
diff --git a/launcher/minecraft/auth/steps/MSAStep.cpp b/launcher/minecraft/auth/steps/MSAStep.cpp
index 9c6cab276..51a5e5ce0 100644
--- a/launcher/minecraft/auth/steps/MSAStep.cpp
+++ b/launcher/minecraft/auth/steps/MSAStep.cpp
@@ -37,6 +37,7 @@
 
 #include <QAbstractOAuth2>
 #include <QNetworkRequest>
+#include <QNetworkReply>
 #include <QOAuthHttpServerReplyHandler>
 #include <QOAuthOobReplyHandler>
 
diff --git a/launcher/net/NetJob.cpp b/launcher/net/NetJob.cpp
index 444985431..a40219962 100644
--- a/launcher/net/NetJob.cpp
+++ b/launcher/net/NetJob.cpp
@@ -41,6 +41,7 @@
 #include "tasks/ConcurrentTask.h"
 #if defined(LAUNCHER_APPLICATION)
 #include "Application.h"
+#include "settings/SettingsObject.h"
 #include "ui/dialogs/CustomMessageBox.h"
 #endif
 
diff --git a/launcher/net/NetRequest.cpp b/launcher/net/NetRequest.cpp
index da909e65b..7faeffbe0 100644
--- a/launcher/net/NetRequest.cpp
+++ b/launcher/net/NetRequest.cpp
@@ -49,6 +49,7 @@
 
 #if defined(LAUNCHER_APPLICATION)
 #include "Application.h"
+#include "settings/SettingsObject.h"
 #endif
 #include "BuildConfig.h"
 
diff --git a/launcher/translations/TranslationsModel.cpp b/launcher/translations/TranslationsModel.cpp
index ee2e240ab..dea7241b2 100644
--- a/launcher/translations/TranslationsModel.cpp
+++ b/launcher/translations/TranslationsModel.cpp
@@ -53,6 +53,7 @@
 #include "POTranslator.h"
 
 #include "Application.h"
+#include "settings/SettingsObject.h"
 
 const static QLatin1String defaultLangCode("en_US");
 
diff --git a/launcher/ui/dialogs/BlockedModsDialog.cpp b/launcher/ui/dialogs/BlockedModsDialog.cpp
index 2a96b7f94..4abaf6eb5 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.cpp
+++ b/launcher/ui/dialogs/BlockedModsDialog.cpp
@@ -27,6 +27,7 @@
 #include "ui_BlockedModsDialog.h"
 
 #include "Application.h"
+#include "settings/SettingsObject.h"
 #include "modplatform/helpers/HashUtils.h"
 
 #include <QDebug>
diff --git a/launcher/ui/dialogs/MSALoginDialog.cpp b/launcher/ui/dialogs/MSALoginDialog.cpp
index e6b53d292..e238a54eb 100644
--- a/launcher/ui/dialogs/MSALoginDialog.cpp
+++ b/launcher/ui/dialogs/MSALoginDialog.cpp
@@ -35,6 +35,7 @@
 
 #include "MSALoginDialog.h"
 #include "Application.h"
+#include "settings/SettingsObject.h"
 
 #include "ui_MSALoginDialog.h"
 
diff --git a/launcher/ui/dialogs/skins/SkinManageDialog.cpp b/launcher/ui/dialogs/skins/SkinManageDialog.cpp
index 8a275eb1a..51bfc897a 100644
--- a/launcher/ui/dialogs/skins/SkinManageDialog.cpp
+++ b/launcher/ui/dialogs/skins/SkinManageDialog.cpp
@@ -33,6 +33,7 @@
 #include <QUrl>
 
 #include "Application.h"
+#include "settings/SettingsObject.h"
 #include "DesktopServices.h"
 #include "Json.h"
 #include "QObjectPtr.h"
diff --git a/launcher/ui/pagedialog/PageDialog.cpp b/launcher/ui/pagedialog/PageDialog.cpp
index 7e52b5f65..0cd80521f 100644
--- a/launcher/ui/pagedialog/PageDialog.cpp
+++ b/launcher/ui/pagedialog/PageDialog.cpp
@@ -21,6 +21,7 @@
 #include <QVBoxLayout>
 
 #include "Application.h"
+#include "settings/SettingsObject.h"
 
 #include "ui/widgets/PageContainer.h"
 
diff --git a/launcher/ui/pages/global/LanguagePage.cpp b/launcher/ui/pages/global/LanguagePage.cpp
index f4be75782..94c582775 100644
--- a/launcher/ui/pages/global/LanguagePage.cpp
+++ b/launcher/ui/pages/global/LanguagePage.cpp
@@ -38,6 +38,7 @@
 
 #include <QVBoxLayout>
 #include "Application.h"
+#include "settings/SettingsObject.h"
 #include "ui/widgets/LanguageSelectionWidget.h"
 
 LanguagePage::LanguagePage(QWidget* parent) : QWidget(parent)
diff --git a/launcher/ui/pages/instance/ScreenshotsPage.cpp b/launcher/ui/pages/instance/ScreenshotsPage.cpp
index dc0290e1b..e926974ea 100644
--- a/launcher/ui/pages/instance/ScreenshotsPage.cpp
+++ b/launcher/ui/pages/instance/ScreenshotsPage.cpp
@@ -55,6 +55,7 @@
 #include <QStyledItemDelegate>
 
 #include <Application.h>
+#include "settings/SettingsObject.h"
 
 #include "ui/dialogs/CustomMessageBox.h"
 #include "ui/dialogs/ProgressDialog.h"
diff --git a/launcher/ui/pages/modplatform/ResourceModel.cpp b/launcher/ui/pages/modplatform/ResourceModel.cpp
index 036a50467..e90eafbf2 100644
--- a/launcher/ui/pages/modplatform/ResourceModel.cpp
+++ b/launcher/ui/pages/modplatform/ResourceModel.cpp
@@ -14,6 +14,7 @@
 #include <memory>
 
 #include "Application.h"
+#include "settings/SettingsObject.h"
 #include "BuildConfig.h"
 
 #include "modplatform/ResourceAPI.h"
diff --git a/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp b/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp
index 0e352f419..5c9c2fd72 100644
--- a/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp
+++ b/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp
@@ -23,6 +23,7 @@
 #include <QIcon>
 #include <QProcessEnvironment>
 #include "Application.h"
+#include "settings/SettingsObject.h"
 #include "Exception.h"
 #include "FileSystem.h"
 #include "Json.h"
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
index eb95b291c..a11d87507 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
+++ b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
@@ -35,6 +35,7 @@
 
 #include "ListModel.h"
 #include "Application.h"
+#include "settings/SettingsObject.h"
 #include "net/ApiDownload.h"
 #include "net/HttpMetaCache.h"
 #include "net/NetJob.h"
diff --git a/launcher/ui/pages/modplatform/technic/TechnicModel.cpp b/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
index ddda2831c..c0d7a90a7 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
+++ b/launcher/ui/pages/modplatform/technic/TechnicModel.cpp
@@ -35,6 +35,7 @@
 
 #include "TechnicModel.h"
 #include "Application.h"
+#include "settings/SettingsObject.h"
 #include "BuildConfig.h"
 #include "Json.h"
 
diff --git a/launcher/ui/setupwizard/AutoJavaWizardPage.cpp b/launcher/ui/setupwizard/AutoJavaWizardPage.cpp
index fd173e71d..06fc9075b 100644
--- a/launcher/ui/setupwizard/AutoJavaWizardPage.cpp
+++ b/launcher/ui/setupwizard/AutoJavaWizardPage.cpp
@@ -2,6 +2,7 @@
 #include "ui_AutoJavaWizardPage.h"
 
 #include "Application.h"
+#include "settings/SettingsObject.h"
 
 AutoJavaWizardPage::AutoJavaWizardPage(QWidget* parent) : BaseWizardPage(parent), ui(new Ui::AutoJavaWizardPage)
 {
diff --git a/launcher/ui/setupwizard/JavaWizardPage.cpp b/launcher/ui/setupwizard/JavaWizardPage.cpp
index 06b8a89a9..baeab2da8 100644
--- a/launcher/ui/setupwizard/JavaWizardPage.cpp
+++ b/launcher/ui/setupwizard/JavaWizardPage.cpp
@@ -1,5 +1,6 @@
 #include "JavaWizardPage.h"
 #include "Application.h"
+#include "settings/SettingsObject.h"
 
 #include <QFileDialog>
 #include <QGroupBox>
diff --git a/launcher/ui/setupwizard/LanguageWizardPage.cpp b/launcher/ui/setupwizard/LanguageWizardPage.cpp
index 09cdb807e..e9ba36299 100644
--- a/launcher/ui/setupwizard/LanguageWizardPage.cpp
+++ b/launcher/ui/setupwizard/LanguageWizardPage.cpp
@@ -1,5 +1,6 @@
 #include "LanguageWizardPage.h"
 #include <Application.h>
+#include "settings/SettingsObject.h"
 #include <translations/TranslationsModel.h>
 
 #include <BuildConfig.h>
diff --git a/launcher/ui/setupwizard/PasteWizardPage.cpp b/launcher/ui/setupwizard/PasteWizardPage.cpp
index 777fd3a44..979ec50fd 100644
--- a/launcher/ui/setupwizard/PasteWizardPage.cpp
+++ b/launcher/ui/setupwizard/PasteWizardPage.cpp
@@ -2,6 +2,7 @@
 #include "ui_PasteWizardPage.h"
 
 #include "Application.h"
+#include "settings/SettingsObject.h"
 #include "net/PasteUpload.h"
 
 PasteWizardPage::PasteWizardPage(QWidget* parent) : BaseWizardPage(parent), ui(new Ui::PasteWizardPage)
diff --git a/launcher/ui/themes/CatPainter.cpp b/launcher/ui/themes/CatPainter.cpp
index 7c152fdc9..a4bda0297 100644
--- a/launcher/ui/themes/CatPainter.cpp
+++ b/launcher/ui/themes/CatPainter.cpp
@@ -19,6 +19,7 @@
 #include "ui/themes/CatPainter.h"
 #include <QPixmap>
 #include "Application.h"
+#include "settings/SettingsObject.h"
 
 CatPainter::CatPainter(const QString& path, QObject* parent) : QObject(parent)
 {
diff --git a/launcher/ui/themes/ThemeManager.cpp b/launcher/ui/themes/ThemeManager.cpp
index b69a416d9..89478960d 100644
--- a/launcher/ui/themes/ThemeManager.cpp
+++ b/launcher/ui/themes/ThemeManager.cpp
@@ -33,6 +33,7 @@
 #include "ui/themes/SystemTheme.h"
 
 #include "Application.h"
+#include "settings/SettingsObject.h"
 
 ThemeManager::ThemeManager()
 {
diff --git a/launcher/ui/widgets/AppearanceWidget.cpp b/launcher/ui/widgets/AppearanceWidget.cpp
index 0eedd1fc3..41a80dc2a 100644
--- a/launcher/ui/widgets/AppearanceWidget.cpp
+++ b/launcher/ui/widgets/AppearanceWidget.cpp
@@ -43,6 +43,9 @@
 #include "ui/themes/ITheme.h"
 #include "ui/themes/ThemeManager.h"
 
+#include <Application.h>
+#include "settings/SettingsObject.h"
+
 AppearanceWidget::AppearanceWidget(bool themesOnly, QWidget* parent)
     : QWidget(parent), m_ui(new Ui::AppearanceWidget), m_themesOnly(themesOnly)
 {
diff --git a/launcher/ui/widgets/AppearanceWidget.h b/launcher/ui/widgets/AppearanceWidget.h
index 1fc89af3a..a63c53112 100644
--- a/launcher/ui/widgets/AppearanceWidget.h
+++ b/launcher/ui/widgets/AppearanceWidget.h
@@ -20,13 +20,9 @@
 #pragma once
 
 #include <QDialog>
-#include <memory>
 
-#include <Application.h>
 #include <translations/TranslationsModel.h>
 #include <QTextCursor>
-#include "java/JavaChecker.h"
-#include "ui/pages/BasePage.h"
 
 class QTextCharFormat;
 class SettingsObject;
diff --git a/launcher/ui/widgets/LanguageSelectionWidget.cpp b/launcher/ui/widgets/LanguageSelectionWidget.cpp
index 4ca416aad..a32f7034d 100644
--- a/launcher/ui/widgets/LanguageSelectionWidget.cpp
+++ b/launcher/ui/widgets/LanguageSelectionWidget.cpp
@@ -6,6 +6,7 @@
 #include <QTreeView>
 #include <QVBoxLayout>
 #include "Application.h"
+#include "settings/SettingsObject.h"
 #include "BuildConfig.h"
 #include "settings/Setting.h"
 #include "translations/TranslationsModel.h"