diff --git a/launcher/archive/ArchiveReader.cpp b/launcher/archive/ArchiveReader.cpp
index c5a06c8a6..e47a4a720 100644
--- a/launcher/archive/ArchiveReader.cpp
+++ b/launcher/archive/ArchiveReader.cpp
@@ -33,6 +33,7 @@
  *      limitations under the License.
  */
 #include "ArchiveReader.h"
+#include <archive.h>
 #include <archive_entry.h>
 #include <QDir>
 #include <QFileInfo>
@@ -239,4 +240,5 @@ bool ArchiveReader::exists(const QString& filePath) const
     return false;
 }
 
+ArchiveReader::File::File() : m_archive(ArchivePtr(archive_read_new(), archive_read_free)) {}
 }  // namespace MMCZip
diff --git a/launcher/archive/ArchiveReader.h b/launcher/archive/ArchiveReader.h
index e05b16025..36da1fea0 100644
--- a/launcher/archive/ArchiveReader.h
+++ b/launcher/archive/ArchiveReader.h
@@ -34,14 +34,13 @@
  */
 #pragma once
 
-#include <archive.h>
-#include <archive_entry.h>
-
 #include <QByteArray>
 #include <QDateTime>
 #include <QStringList>
 #include <memory>
 
+struct archive;
+struct archive_entry;
 namespace MMCZip {
 class ArchiveReader {
    public:
@@ -56,8 +55,8 @@ class ArchiveReader {
 
     class File {
        public:
-        File() : m_archive(ArchivePtr(archive_read_new(), archive_read_free)) {}
-        virtual ~File() {}
+        File();
+        virtual ~File() = default;
 
         QString filename();
         bool isFile();
diff --git a/launcher/archive/ArchiveWriter.cpp b/launcher/archive/ArchiveWriter.cpp
index bbd16aba8..ccd18bad6 100644
--- a/launcher/archive/ArchiveWriter.cpp
+++ b/launcher/archive/ArchiveWriter.cpp
@@ -34,6 +34,7 @@
  */
 #include "ArchiveWriter.h"
 #include <archive.h>
+#include <archive_entry.h>
 
 #include <QFile>
 #include <QFileInfo>
diff --git a/launcher/archive/ArchiveWriter.h b/launcher/archive/ArchiveWriter.h
index 14e1764ea..2e2b31153 100644
--- a/launcher/archive/ArchiveWriter.h
+++ b/launcher/archive/ArchiveWriter.h
@@ -34,13 +34,11 @@
  */
 #pragma once
 
-#include <archive.h>
-#include <archive_entry.h>
-
 #include <QByteArray>
 #include <QFileDevice>
 #include "archive/ArchiveReader.h"
 
+struct archive;
 namespace MMCZip {
 
 class ArchiveWriter {
diff --git a/launcher/archive/ExportToZipTask.h b/launcher/archive/ExportToZipTask.h
index add6c2b15..315c78f93 100644
--- a/launcher/archive/ExportToZipTask.h
+++ b/launcher/archive/ExportToZipTask.h
@@ -39,7 +39,7 @@
 #include <QFuture>
 #include <QFutureWatcher>
 
-#include "ArchiveWriter.h"
+#include "archive/ArchiveWriter.h"
 #include "tasks/Task.h"
 
 namespace MMCZip {
diff --git a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
index 52d8206c1..27ad42dc8 100644
--- a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
@@ -1,7 +1,6 @@
 #include "LocalModParseTask.h"
 
 #include <qdcss.h>
-#include <qstringview.h>
 #include <toml++/toml.h>
 #include <QJsonArray>
 #include <QJsonDocument>
@@ -14,7 +13,6 @@
 #include "Json.h"
 #include "archive/ArchiveReader.h"
 #include "minecraft/mod/ModDetails.h"
-#include "modplatform/ModIndex.h"
 #include "settings/INIFile.h"
 
 static const QRegularExpression s_newlineRegex("\r\n|\n|\r");
diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index fa1bf2c0b..cd4c275af 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -30,7 +30,6 @@
 #include <memory>
 #include "Application.h"
 #include "Json.h"
-#include "archive/ExportToZipTask.h"
 #include "minecraft/PackProfile.h"
 #include "minecraft/mod/ModFolderModel.h"
 #include "modplatform/ModIndex.h"
@@ -38,6 +37,8 @@
 #include "modplatform/helpers/HashUtils.h"
 #include "tasks/Task.h"
 
+#include "archive/ExportToZipTask.h"
+
 const QString FlamePackExportTask::TEMPLATE = "<li><a href=\"{url}\">{name}{authors}</a></li>\n";
 const QStringList FlamePackExportTask::FILE_EXTENSIONS({ "jar", "zip" });
 
diff --git a/nix/unwrapped.nix b/nix/unwrapped.nix
index d7cba0bed..312e12bcf 100644
--- a/nix/unwrapped.nix
+++ b/nix/unwrapped.nix
@@ -82,6 +82,7 @@ stdenv.mkDerivation {
       cmark
       kdePackages.qtbase
       kdePackages.qtnetworkauth
+      kdePackages.qt5compat
       libarchive
       tomlplusplus
       zlib