diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index 4e0393c0..ab3110a3 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -154,6 +154,7 @@ void appDebugOutput(QtMsgType type, const QMessageLogContext &context, const QSt
     fflush(stderr);
 }
 
+#ifdef LAUNCHER_WITH_UPDATER
 QString getIdealPlatform(QString currentPlatform) {
     auto info = Sys::getKernelInfo();
     switch(info.kernelType) {
@@ -192,6 +193,7 @@ QString getIdealPlatform(QString currentPlatform) {
     }
     return currentPlatform;
 }
+#endif
 
 }
 
@@ -754,6 +756,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         qDebug() << "<> Translations loaded.";
     }
 
+#ifdef LAUNCHER_WITH_UPDATER
     // initialize the updater
     if(BuildConfig.UPDATER_ENABLED)
     {
@@ -763,6 +766,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         m_updateChecker.reset(new UpdateChecker(m_network, channelUrl, BuildConfig.VERSION_CHANNEL, BuildConfig.VERSION_BUILD));
         qDebug() << "<> Updater started.";
     }
+#endif
 
     // Instance icons
     {
@@ -1408,7 +1412,9 @@ MainWindow* Application::showMainWindow(bool minimized)
         }
 
         m_mainWindow->checkInstancePathForProblems();
+#ifdef LAUNCHER_WITH_UPDATER
         connect(this, &Application::updateAllowedChanged, m_mainWindow, &MainWindow::updatesAllowedChanged);
+#endif
         connect(m_mainWindow, &MainWindow::isClosing, this, &Application::on_windowClose);
         m_openWindows++;
     }
diff --git a/launcher/Application.h b/launcher/Application.h
index e08e354a..09007160 100644
--- a/launcher/Application.h
+++ b/launcher/Application.h
@@ -42,7 +42,10 @@
 #include <QIcon>
 #include <QDateTime>
 #include <QUrl>
+
+#ifdef LAUNCHER_WITH_UPDATER
 #include <updater/GoUpdate.h>
+#endif
 
 #include <BaseInstance.h>
 
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index 5397a988..b8db803b 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -156,27 +156,29 @@ set(LAUNCH_SOURCES
     launch/LogModel.h
 )
 
-# Old update system
-set(UPDATE_SOURCES
-    updater/GoUpdate.h
-    updater/GoUpdate.cpp
-    updater/UpdateChecker.h
-    updater/UpdateChecker.cpp
-    updater/DownloadTask.h
-    updater/DownloadTask.cpp
-)
-
-add_unit_test(UpdateChecker
-    SOURCES updater/UpdateChecker_test.cpp
-    LIBS Launcher_logic
-    DATA updater/testdata
+if (Launcher_UPDATER_BASE)
+    set(Launcher_APP_BINARY_DEFS "-DLAUNCHER_WITH_UPDATER ${Launcher_APP_BINARY_DEFS}")
+    # Old update system
+    set(UPDATE_SOURCES
+        updater/GoUpdate.h
+        updater/GoUpdate.cpp
+        updater/UpdateChecker.h
+        updater/UpdateChecker.cpp
+        updater/DownloadTask.h
+        updater/DownloadTask.cpp
     )
 
-add_unit_test(DownloadTask
-    SOURCES updater/DownloadTask_test.cpp
-    LIBS Launcher_logic
-    DATA updater/testdata
+    add_unit_test(UpdateChecker
+        SOURCES updater/UpdateChecker_test.cpp
+        LIBS Launcher_logic
+        DATA updater/testdata
     )
+    add_unit_test(DownloadTask
+        SOURCES updater/DownloadTask_test.cpp
+        LIBS Launcher_logic
+        DATA updater/testdata
+    )
+endif()
 
 # Backend for the news bar... there's usually no news.
 set(NEWS_SOURCES
diff --git a/launcher/minecraft/launch/LauncherPartLaunch.cpp b/launcher/minecraft/launch/LauncherPartLaunch.cpp
index d7010355..d6fc11e7 100644
--- a/launcher/minecraft/launch/LauncherPartLaunch.cpp
+++ b/launcher/minecraft/launch/LauncherPartLaunch.cpp
@@ -16,6 +16,7 @@
 #include "LauncherPartLaunch.h"
 
 #include <QStandardPaths>
+#include <QRegularExpression>
 
 #include "launch/LaunchTask.h"
 #include "minecraft/MinecraftInstance.h"
diff --git a/launcher/net/PasteUpload.cpp b/launcher/net/PasteUpload.cpp
index ead5e170..2f200a99 100644
--- a/launcher/net/PasteUpload.cpp
+++ b/launcher/net/PasteUpload.cpp
@@ -43,6 +43,8 @@
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QFile>
+#include <QHttpPart>
+#include <QUrlQuery>
 
 std::array<PasteUpload::PasteTypeInfo, 4> PasteUpload::PasteTypes = {
     {{"0x0.st", "https://0x0.st", ""},
diff --git a/launcher/ui/GuiUtil.cpp b/launcher/ui/GuiUtil.cpp
index 320f1502..62f36951 100644
--- a/launcher/ui/GuiUtil.cpp
+++ b/launcher/ui/GuiUtil.cpp
@@ -38,6 +38,7 @@
 #include <QClipboard>
 #include <QApplication>
 #include <QFileDialog>
+#include <QStandardPaths>
 
 #include "ui/dialogs/ProgressDialog.h"
 #include "ui/dialogs/CustomMessageBox.h"
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 0a5f2000..a6168e7a 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -1010,6 +1010,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
     }
 
 
+#ifdef LAUNCHER_WITH_UPDATER
     if(BuildConfig.UPDATER_ENABLED)
     {
         bool updatesAllowed = APPLICATION->updatesAreAllowed();
@@ -1028,6 +1029,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
             updater->checkForUpdate(APPLICATION->settings()->get("UpdateChannel").toString(), false);
         }
     }
+#endif
 
     setSelectedInstanceById(APPLICATION->settings()->get("SelectedInstance").toString());
 
@@ -1337,6 +1339,7 @@ void MainWindow::repopulateAccountsMenu()
     ui->profileMenu->addAction(ui->actionManageAccounts);
 }
 
+#ifdef LAUNCHER_WITH_UPDATER
 void MainWindow::updatesAllowedChanged(bool allowed)
 {
     if(!BuildConfig.UPDATER_ENABLED)
@@ -1345,6 +1348,7 @@ void MainWindow::updatesAllowedChanged(bool allowed)
     }
     ui->actionCheckUpdate->setEnabled(allowed);
 }
+#endif
 
 /*
  * Assumes the sender is a QAction
@@ -1450,6 +1454,7 @@ void MainWindow::updateNewsLabel()
     }
 }
 
+#ifdef LAUNCHER_WITH_UPDATER
 void MainWindow::updateAvailable(GoUpdate::Status status)
 {
     if(!APPLICATION->updatesAreAllowed())
@@ -1475,6 +1480,7 @@ void MainWindow::updateNotAvailable()
     UpdateDialog dlg(false, this);
     dlg.exec();
 }
+#endif
 
 QList<int> stringToIntList(const QString &string)
 {
@@ -1496,6 +1502,7 @@ QString intListToString(const QList<int> &list)
     return slist.join(',');
 }
 
+#ifdef LAUNCHER_WITH_UPDATER
 void MainWindow::downloadUpdates(GoUpdate::Status status)
 {
     if(!APPLICATION->updatesAreAllowed())
@@ -1529,6 +1536,7 @@ void MainWindow::downloadUpdates(GoUpdate::Status status)
         CustomMessageBox::selectable(this, tr("Error"), updateTask.failReason(), QMessageBox::Warning)->show();
     }
 }
+#endif
 
 void MainWindow::onCatToggled(bool state)
 {
@@ -1841,6 +1849,7 @@ void MainWindow::on_actionConfig_Folder_triggered()
     }
 }
 
+#ifdef LAUNCHER_WITH_UPDATER
 void MainWindow::checkForUpdates()
 {
     if(BuildConfig.UPDATER_ENABLED)
@@ -1853,6 +1862,7 @@ void MainWindow::checkForUpdates()
         qWarning() << "Updater not set up. Cannot check for updates.";
     }
 }
+#endif
 
 void MainWindow::on_actionSettings_triggered()
 {
diff --git a/launcher/ui/MainWindow.h b/launcher/ui/MainWindow.h
index 61a75c45..abd4db92 100644
--- a/launcher/ui/MainWindow.h
+++ b/launcher/ui/MainWindow.h
@@ -54,7 +54,9 @@ public:
 
     void checkInstancePathForProblems();
 
+#ifdef LAUNCHER_WITH_UPDATER
     void updatesAllowedChanged(bool allowed);
+#endif
 
     void droppedURLs(QList<QUrl> urls);
 signals:
@@ -100,7 +102,9 @@ private slots:
 
     void on_actionViewCentralModsFolder_triggered();
 
+#ifdef LAUNCHER_WITH_UPDATER
     void checkForUpdates();
+#endif
 
     void on_actionSettings_triggered();
 
@@ -167,9 +171,11 @@ private slots:
 
     void startTask(Task *task);
 
+#ifdef LAUNCHER_WITH_UPDATER
     void updateAvailable(GoUpdate::Status status);
 
     void updateNotAvailable();
+#endif
 
     void defaultAccountChanged();
 
@@ -179,10 +185,12 @@ private slots:
 
     void updateNewsLabel();
 
+#ifdef LAUNCHER_WITH_UPDATER
     /*!
      * Runs the DownloadTask and installs updates.
      */
     void downloadUpdates(GoUpdate::Status status);
+#endif
 
     void konamiTriggered();
 
diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp
index 4be24979..edbf609f 100644
--- a/launcher/ui/pages/global/LauncherPage.cpp
+++ b/launcher/ui/pages/global/LauncherPage.cpp
@@ -78,6 +78,7 @@ LauncherPage::LauncherPage(QWidget *parent) : QWidget(parent), ui(new Ui::Launch
     m_languageModel = APPLICATION->translations();
     loadSettings();
 
+#ifdef LAUNCHER_WITH_UPDATER
     if(BuildConfig.UPDATER_ENABLED)
     {
         QObject::connect(APPLICATION->updateChecker().get(), &UpdateChecker::channelListLoaded, this, &LauncherPage::refreshUpdateChannelList);
@@ -90,11 +91,9 @@ LauncherPage::LauncherPage(QWidget *parent) : QWidget(parent), ui(new Ui::Launch
         {
             APPLICATION->updateChecker()->updateChanList(false);
         }
+        ui->updateSettingsBox->setHidden(false);
     }
-    else
-    {
-        ui->updateSettingsBox->setHidden(true);
-    }
+#endif
     connect(ui->fontSizeBox, SIGNAL(valueChanged(int)), SLOT(refreshFontPreview()));
     connect(ui->consoleFont, SIGNAL(currentFontChanged(QFont)), SLOT(refreshFontPreview()));
 }
@@ -189,6 +188,7 @@ void LauncherPage::on_metadataDisableBtn_clicked()
     ui->metadataWarningLabel->setHidden(!ui->metadataDisableBtn->isChecked());
 }
 
+#ifdef LAUNCHER_WITH_UPDATER
 void LauncherPage::refreshUpdateChannelList()
 {
     // Stop listening for selection changes. It's going to change a lot while we update it and
@@ -260,6 +260,7 @@ void LauncherPage::refreshUpdateChannelDesc()
         m_currentUpdateChannel = selected.id;
     }
 }
+#endif
 
 void LauncherPage::applySettings()
 {
diff --git a/launcher/ui/pages/global/LauncherPage.h b/launcher/ui/pages/global/LauncherPage.h
index f38c922e..ccfd7e9e 100644
--- a/launcher/ui/pages/global/LauncherPage.h
+++ b/launcher/ui/pages/global/LauncherPage.h
@@ -90,6 +90,7 @@ slots:
     void on_iconsDirBrowseBtn_clicked();
     void on_metadataDisableBtn_clicked();
 
+#ifdef LAUNCHER_WITH_UPDATER
     /*!
      * Updates the list of update channels in the combo box.
      */
@@ -100,13 +101,13 @@ slots:
      */
     void refreshUpdateChannelDesc();
 
+    void updateChannelSelectionChanged(int index);
+#endif
     /*!
      * Updates the font preview
      */
     void refreshFontPreview();
 
-    void updateChannelSelectionChanged(int index);
-
 private:
     Ui::LauncherPage *ui;
 
diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index 417bbe05..ceb68c5b 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -50,6 +50,9 @@
          <property name="title">
           <string>Update Settings</string>
          </property>
+         <property name="visible">
+          <bool>false</bool>
+         </property>
          <layout class="QVBoxLayout" name="verticalLayout_7">
           <item>
            <widget class="QCheckBox" name="autoUpdateCheckBox">
diff --git a/launcher/ui/pages/instance/LogPage.cpp b/launcher/ui/pages/instance/LogPage.cpp
index 30a8735f..51303501 100644
--- a/launcher/ui/pages/instance/LogPage.cpp
+++ b/launcher/ui/pages/instance/LogPage.cpp
@@ -39,6 +39,7 @@
 #include "Application.h"
 
 #include <QIcon>
+#include <QIdentityProxyModel>
 #include <QScrollBar>
 #include <QShortcut>
 
diff --git a/launcher/ui/pages/instance/ModFolderPage.h b/launcher/ui/pages/instance/ModFolderPage.h
index 72e2d404..2dd44e85 100644
--- a/launcher/ui/pages/instance/ModFolderPage.h
+++ b/launcher/ui/pages/instance/ModFolderPage.h
@@ -41,6 +41,7 @@
 #include "ui/pages/BasePage.h"
 
 #include <Application.h>
+#include <QSortFilterProxyModel>
 
 class ModFolderModel;
 namespace Ui
diff --git a/launcher/ui/pages/instance/ScreenshotsPage.h b/launcher/ui/pages/instance/ScreenshotsPage.h
index c22706af..c34c9755 100644
--- a/launcher/ui/pages/instance/ScreenshotsPage.h
+++ b/launcher/ui/pages/instance/ScreenshotsPage.h
@@ -35,6 +35,7 @@
 
 #pragma once
 
+#include <QItemSelection>
 #include <QMainWindow>
 
 #include "ui/pages/BasePage.h"
diff --git a/launcher/ui/pages/instance/ServersPage.cpp b/launcher/ui/pages/instance/ServersPage.cpp
index 2af6164c..d6303cdd 100644
--- a/launcher/ui/pages/instance/ServersPage.cpp
+++ b/launcher/ui/pages/instance/ServersPage.cpp
@@ -47,6 +47,7 @@
 
 #include <QFileSystemWatcher>
 #include <QMenu>
+#include <QTimer>
 
 static const int COLUMN_COUNT = 2; // 3 , TBD: latency and other nice things.
 
diff --git a/launcher/ui/pages/instance/WorldListPage.cpp b/launcher/ui/pages/instance/WorldListPage.cpp
index 76725539..731dd85f 100644
--- a/launcher/ui/pages/instance/WorldListPage.cpp
+++ b/launcher/ui/pages/instance/WorldListPage.cpp
@@ -46,6 +46,7 @@
 #include <QInputDialog>
 #include <QProcess>
 #include <Qt>
+#include <QSortFilterProxyModel>
 
 #include "tools/MCEditTool.h"
 #include "FileSystem.h"
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
index 63b944c4..0d8e1dcf 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
+++ b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp
@@ -11,6 +11,8 @@
 
 #include <BuildConfig.h>
 
+#include <net/NetJob.h>
+
 namespace LegacyFTB {
 
 FilterModel::FilterModel(QObject *parent) : QSortFilterProxyModel(parent)
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h
index 14aa6747..1b4d8da4 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h
@@ -39,6 +39,7 @@
 
 #include "modplatform/modrinth/ModrinthPackManifest.h"
 #include "ui/pages/modplatform/modrinth/ModrinthPage.h"
+#include "net/NetJob.h"
 
 class ModPage;
 class Version;