diff --git a/launcher/include/account.h b/launcher/include/account.h
index ac06745..e0709c4 100644
--- a/launcher/include/account.h
+++ b/launcher/include/account.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <QObject>
 #include <QtQml>
 #include <qcorotask.h>
 
diff --git a/launcher/include/assetupdater.h b/launcher/include/assetupdater.h
index 3cd6b98..6ea6d71 100644
--- a/launcher/include/assetupdater.h
+++ b/launcher/include/assetupdater.h
@@ -28,8 +28,8 @@ private:
     QCoro::Task<bool> checkRemoteDalamudAssetVersion();
     QCoro::Task<bool> checkRemoteDalamudVersion();
 
-    QCoro::Task<bool> installCompatibilityTool();
-    QCoro::Task<bool> installDxvkTool();
+    QCoro::Task<bool> installCompatibilityTool() const;
+    QCoro::Task<bool> installDxvkTool() const;
     QCoro::Task<bool> installDalamudAssets();
     QCoro::Task<bool> installDalamud();
     QCoro::Task<bool> installRuntime();
@@ -39,7 +39,7 @@ private:
     [[nodiscard]] QUrl dotnetRuntimePackageUrl(const QString &version) const;
     [[nodiscard]] QUrl dotnetDesktopPackageUrl(const QString &version) const;
 
-    bool extractZip(const QString &filePath, const QString &directory);
+    static bool extractZip(const QString &filePath, const QString &directory);
 
     LauncherCore &launcher;
 
diff --git a/launcher/include/benchmarkinstaller.h b/launcher/include/benchmarkinstaller.h
index 197976a..1456010 100644
--- a/launcher/include/benchmarkinstaller.h
+++ b/launcher/include/benchmarkinstaller.h
@@ -5,7 +5,7 @@
 
 #include <QObject>
 #include <QString>
-#include <QtQml/qqmlregistration.h>
+#include <QtQml>
 
 class LauncherCore;
 class Profile;
diff --git a/launcher/include/squareenixlogin.h b/launcher/include/squareenixlogin.h
index 8260b2b..fce7deb 100644
--- a/launcher/include/squareenixlogin.h
+++ b/launcher/include/squareenixlogin.h
@@ -23,11 +23,11 @@ public:
 private:
     /// Checks the gate status to see if the servers are closed for maintenance
     /// \return False if the gate is closed, true if open.
-    QCoro::Task<bool> checkGateStatus();
+    QCoro::Task<bool> checkGateStatus() const;
 
     /// Checks the login status to see if the servers are closed for maintenance
     /// \return False if logging in is disabled, true if open.
-    QCoro::Task<bool> checkLoginStatus();
+    QCoro::Task<bool> checkLoginStatus() const;
 
     /// Check for updates to the boot components. Even though we don't use these, it's checked by later login steps.
     QCoro::Task<bool> checkBootUpdates();
@@ -46,7 +46,7 @@ private:
     QCoro::Task<bool> registerSession();
 
     /// Returns the hashes of the boot components
-    QCoro::Task<QString> getBootHash();
+    QCoro::Task<QString> getBootHash() const;
 
     /// Gets the SHA1 hash of a file
     static QString getFileHash(const QString &file);
diff --git a/launcher/src/assetupdater.cpp b/launcher/src/assetupdater.cpp
index 3c6e239..80a69c9 100644
--- a/launcher/src/assetupdater.cpp
+++ b/launcher/src/assetupdater.cpp
@@ -203,7 +203,7 @@ QCoro::Task<bool> AssetUpdater::checkRemoteDalamudVersion()
     co_return true;
 }
 
-QCoro::Task<bool> AssetUpdater::installCompatibilityTool()
+QCoro::Task<bool> AssetUpdater::installCompatibilityTool() const
 {
     Q_EMIT launcher.stageChanged(i18n("Updating compatibility tool..."));
 
@@ -245,7 +245,7 @@ QCoro::Task<bool> AssetUpdater::installCompatibilityTool()
     co_return true;
 }
 
-QCoro::Task<bool> AssetUpdater::installDxvkTool()
+QCoro::Task<bool> AssetUpdater::installDxvkTool() const
 {
     Q_EMIT launcher.stageChanged(i18n("Updating DXVK..."));
 
diff --git a/launcher/src/squareenixlogin.cpp b/launcher/src/squareenixlogin.cpp
index 83dde2b..a2a2418 100644
--- a/launcher/src/squareenixlogin.cpp
+++ b/launcher/src/squareenixlogin.cpp
@@ -67,7 +67,7 @@ QCoro::Task<std::optional<LoginAuth>> SquareEnixLogin::login(LoginInformation *i
     co_return m_auth;
 }
 
-QCoro::Task<bool> SquareEnixLogin::checkGateStatus()
+QCoro::Task<bool> SquareEnixLogin::checkGateStatus() const
 {
     Q_EMIT m_launcher.stageChanged(i18n("Checking gate..."));
     qInfo(ASTRA_LOG) << "Checking if the gate is open...";
@@ -108,7 +108,7 @@ QCoro::Task<bool> SquareEnixLogin::checkGateStatus()
     co_return false;
 }
 
-QCoro::Task<bool> SquareEnixLogin::checkLoginStatus()
+QCoro::Task<bool> SquareEnixLogin::checkLoginStatus() const
 {
     Q_EMIT m_launcher.stageChanged(i18n("Checking login..."));
     qInfo(ASTRA_LOG) << "Checking if login is open...";
@@ -416,7 +416,7 @@ QCoro::Task<bool> SquareEnixLogin::registerSession()
     co_return false;
 }
 
-QCoro::Task<QString> SquareEnixLogin::getBootHash()
+QCoro::Task<QString> SquareEnixLogin::getBootHash() const
 {
     const QList<QString> fileList = {QStringLiteral("ffxivboot.exe"),
                                      QStringLiteral("ffxivboot64.exe"),
diff --git a/launcher/src/steamapi.cpp b/launcher/src/steamapi.cpp
index 7ba84b5..2084db9 100644
--- a/launcher/src/steamapi.cpp
+++ b/launcher/src/steamapi.cpp
@@ -3,7 +3,6 @@
 
 #include "steamapi.h"
 
-#include "astra_log.h"
 #include "launchercore.h"
 
 SteamAPI::SteamAPI(QObject *parent)