diff --git a/gpt4all-chat/chat.cpp b/gpt4all-chat/chat.cpp
index e8bbfa8b..926142bc 100644
--- a/gpt4all-chat/chat.cpp
+++ b/gpt4all-chat/chat.cpp
@@ -1,9 +1,23 @@
 #include "chat.h"
+
 #include "chatlistmodel.h"
 #include "mysettings.h"
-#include "modellist.h"
 #include "network.h"
 #include "server.h"
+#include "database.h"
+
+#include <QDataStream>
+#include <QDateTime>
+#include <QDebug>
+#include <QLatin1String>
+#include <QMap>
+#include <QString>
+#include <QStringList>
+#include <QTextStream>
+#include <Qt>
+#include <QtGlobal>
+
+#include <utility>
 
 Chat::Chat(QObject *parent)
     : QObject(parent)
diff --git a/gpt4all-chat/chat.h b/gpt4all-chat/chat.h
index 0859cb8b..a4116e1c 100644
--- a/gpt4all-chat/chat.h
+++ b/gpt4all-chat/chat.h
@@ -1,14 +1,19 @@
 #ifndef CHAT_H
 #define CHAT_H
 
-#include <QObject>
-#include <QtQml>
-#include <QDataStream>
-
 #include "chatllm.h"
 #include "chatmodel.h"
-#include "database.h"
-#include "localdocsmodel.h"
+#include "localdocsmodel.h" // IWYU pragma: keep
+#include "modellist.h"
+
+#include <QList>
+#include <QObject>
+#include <QQmlEngine>
+#include <QString>
+#include <QtGlobal>
+
+class QDataStream;
+struct ResultInfo;
 
 class Chat : public QObject
 {
diff --git a/gpt4all-chat/chatapi.cpp b/gpt4all-chat/chatapi.cpp
index 4d92101e..560eb55f 100644
--- a/gpt4all-chat/chatapi.cpp
+++ b/gpt4all-chat/chatapi.cpp
@@ -1,15 +1,23 @@
 #include "chatapi.h"
 
-#include <string>
-#include <vector>
-#include <iostream>
+#include "../gpt4all-backend/llmodel.h"
 
 #include <QCoreApplication>
-#include <QThread>
-#include <QEventLoop>
+#include <QGuiApplication>
+#include <QDebug>
+#include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonArray>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QThread>
+#include <QUrl>
+#include <QVariant>
+#include <Qt>
+#include <QtGlobal>
+#include <QtLogging>
+
+#include <iostream>
 
 //#define DEBUG
 
@@ -192,7 +200,7 @@ void ChatAPIWorker::request(const QString &apiKey,
     request.setRawHeader("Authorization", authorization.toUtf8());
     m_networkManager = new QNetworkAccessManager(this);
     QNetworkReply *reply = m_networkManager->post(request, array);
-    connect(qApp, &QCoreApplication::aboutToQuit, reply, &QNetworkReply::abort);
+    connect(qGuiApp, &QCoreApplication::aboutToQuit, reply, &QNetworkReply::abort);
     connect(reply, &QNetworkReply::finished, this, &ChatAPIWorker::handleFinished);
     connect(reply, &QNetworkReply::readyRead, this, &ChatAPIWorker::handleReadyRead);
     connect(reply, &QNetworkReply::errorOccurred, this, &ChatAPIWorker::handleErrorOccurred);
diff --git a/gpt4all-chat/chatapi.h b/gpt4all-chat/chatapi.h
index d2f8dc0a..0c47dfe1 100644
--- a/gpt4all-chat/chatapi.h
+++ b/gpt4all-chat/chatapi.h
@@ -1,17 +1,23 @@
 #ifndef CHATAPI_H
 #define CHATAPI_H
 
-#include <stdexcept>
+#include "../gpt4all-backend/llmodel.h"
 
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <QNetworkRequest>
 #include <QObject>
 #include <QString>
 #include <QStringList>
-#include <QThread>
+#include <QList>
 
-#include "../gpt4all-backend/llmodel.h"
+#include <cstddef>
+#include <cstdint>
+#include <stdexcept>
+#include <functional>
+#include <string>
+#include <vector>
+
+class QByteArray;
+class QNetworkAccessManager;
 
 class ChatAPI;
 class ChatAPIWorker : public QObject {
diff --git a/gpt4all-chat/chatlistmodel.cpp b/gpt4all-chat/chatlistmodel.cpp
index c7bee3e5..03d592cf 100644
--- a/gpt4all-chat/chatlistmodel.cpp
+++ b/gpt4all-chat/chatlistmodel.cpp
@@ -1,8 +1,21 @@
 #include "chatlistmodel.h"
+
+#include "database.h" // IWYU pragma: keep
 #include "mysettings.h"
 
-#include <QFile>
 #include <QDataStream>
+#include <QDir>
+#include <QElapsedTimer>
+#include <QFile>
+#include <QFileInfo>
+#include <QGlobalStatic>
+#include <QGuiApplication>
+#include <QIODevice>
+#include <QSettings>
+#include <QString>
+#include <Qt>
+
+#include <algorithm>
 
 #define CHAT_FORMAT_MAGIC 0xF5D553CC
 #define CHAT_FORMAT_VERSION 7
@@ -223,7 +236,7 @@ void ChatsRestoreThread::run()
         qDebug() << "deserializing chat" << f.file;
 
         Chat *chat = new Chat;
-        chat->moveToThread(qApp->thread());
+        chat->moveToThread(qGuiApp->thread());
         if (!chat->deserialize(in, version)) {
             qWarning() << "ERROR: Couldn't deserialize chat from file:" << file.fileName();
         } else {
diff --git a/gpt4all-chat/chatlistmodel.h b/gpt4all-chat/chatlistmodel.h
index 89a10e7e..691b5780 100644
--- a/gpt4all-chat/chatlistmodel.h
+++ b/gpt4all-chat/chatlistmodel.h
@@ -1,8 +1,22 @@
 #ifndef CHATLISTMODEL_H
 #define CHATLISTMODEL_H
 
-#include <QAbstractListModel>
 #include "chat.h"
+#include "chatllm.h"
+#include "chatmodel.h"
+
+#include <QAbstractListModel>
+#include <QByteArray>
+#include <QDebug>
+#include <QHash>
+#include <QList>
+#include <QObject>
+#include <QThread>
+#include <QVariant>
+#include <QVector>
+#include <Qt>
+#include <QtGlobal>
+#include <QtLogging>
 
 class ChatsRestoreThread : public QThread
 {
diff --git a/gpt4all-chat/chatllm.cpp b/gpt4all-chat/chatllm.cpp
index 999c233d..87bdcb4e 100644
--- a/gpt4all-chat/chatllm.cpp
+++ b/gpt4all-chat/chatllm.cpp
@@ -1,11 +1,27 @@
 #include "chatllm.h"
+
 #include "chat.h"
 #include "chatapi.h"
+#include "database.h"
 #include "localdocs.h"
-#include "modellist.h"
-#include "network.h"
 #include "mysettings.h"
-#include "../gpt4all-backend/llmodel.h"
+#include "network.h"
+
+#include <QDataStream>
+#include <QDebug>
+#include <QFile>
+#include <QGlobalStatic>
+#include <QIODevice>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QList>
+#include <QMutex>
+#include <QMutexLocker>
+#include <QSet>
+#include <QVariantMap>
+#include <QWaitCondition>
+#include <Qt>
+#include <QtLogging>
 
 #include <algorithm>
 #include <cctype>
@@ -13,12 +29,10 @@
 #include <cstddef>
 #include <functional>
 #include <limits>
-#include <string>
+#include <optional>
 #include <utility>
 #include <vector>
 
-#include <QElapsedTimer>
-
 //#define DEBUG
 //#define DEBUG_MODEL_LOADING
 
diff --git a/gpt4all-chat/chatllm.h b/gpt4all-chat/chatllm.h
index fabb0164..c65f8888 100644
--- a/gpt4all-chat/chatllm.h
+++ b/gpt4all-chat/chatllm.h
@@ -1,16 +1,29 @@
 #ifndef CHATLLM_H
 #define CHATLLM_H
 
-#include <QObject>
-#include <QThread>
-#include <QFileInfo>
-
-#include <memory>
-
-#include "database.h"
 #include "modellist.h"
+
 #include "../gpt4all-backend/llmodel.h"
 
+#include <QByteArray>
+#include <QElapsedTimer>
+#include <QFileInfo>
+#include <QObject>
+#include <QPair>
+#include <QString>
+#include <QThread>
+#include <QVector>
+#include <QtGlobal>
+
+#include <atomic>
+#include <cstdint>
+#include <memory>
+#include <string>
+
+class QDataStream;
+struct ResultInfo;
+template <typename T> class QList;
+
 enum LLModelType {
     GPTJ_,
     LLAMA_,
diff --git a/gpt4all-chat/chatmodel.h b/gpt4all-chat/chatmodel.h
index 0502ca72..2de88744 100644
--- a/gpt4all-chat/chatmodel.h
+++ b/gpt4all-chat/chatmodel.h
@@ -2,8 +2,17 @@
 #define CHATMODEL_H
 
 #include <QAbstractListModel>
-#include <QtQml>
+#include <QByteArray>
 #include <QDataStream>
+#include <QHash>
+#include <QList>
+#include <QObject>
+#include <QPair>
+#include <QString>
+#include <QVariant>
+#include <QVector>
+#include <Qt>
+#include <QtGlobal>
 
 struct ChatItem
 {
diff --git a/gpt4all-chat/database.cpp b/gpt4all-chat/database.cpp
index fbb87968..f098d811 100644
--- a/gpt4all-chat/database.cpp
+++ b/gpt4all-chat/database.cpp
@@ -2,11 +2,32 @@
 
 #include "embeddings.h"
 #include "embllm.h"
+#include "modellist.h"
 #include "mysettings.h"
 #include "network.h"
 
-#include <QTimer>
+#include <QDateTime>
+#include <QDebug>
+#include <QDir>
+#include <QDirIterator>
+#include <QFile>
+#include <QFileSystemWatcher>
+#include <QIODevice>
 #include <QPdfDocument>
+#include <QPdfSelection>
+#include <QRegularExpression>
+#include <QSqlDatabase>
+#include <QSqlError>
+#include <QSqlQuery>
+#include <QTextStream>
+#include <QTimer>
+#include <QVariant>
+#include <Qt>
+#include <QtLogging>
+
+#include <cmath>
+#include <utility>
+#include <vector>
 
 //#define DEBUG
 //#define DEBUG_EXAMPLE
diff --git a/gpt4all-chat/database.h b/gpt4all-chat/database.h
index 1bd15bde..c8160f3c 100644
--- a/gpt4all-chat/database.h
+++ b/gpt4all-chat/database.h
@@ -3,16 +3,26 @@
 
 #include <QElapsedTimer>
 #include <QFileInfo>
-#include <QFileSystemWatcher>
+#include <QLatin1String>
+#include <QList>
+#include <QMap>
 #include <QObject>
 #include <QQueue>
+#include <QString>
 #include <QThread>
+#include <QVector>
+#include <QtGlobal>
 #include <QtSql>
 
-#include "embllm.h"
+#include <cstddef>
 
+class EmbeddingLLM;
 class Embeddings;
+class QFileSystemWatcher;
+class QSqlError;
+class QTextStream;
 class QTimer;
+struct EmbeddingResult;
 
 struct DocumentInfo
 {
diff --git a/gpt4all-chat/download.cpp b/gpt4all-chat/download.cpp
index d1a239e0..41e946c4 100644
--- a/gpt4all-chat/download.cpp
+++ b/gpt4all-chat/download.cpp
@@ -1,18 +1,37 @@
 #include "download.h"
-#include "network.h"
+
 #include "modellist.h"
 #include "mysettings.h"
+#include "network.h"
 
+#include <QByteArray>
 #include <QCoreApplication>
-#include <QNetworkRequest>
-#include <QNetworkAccessManager>
+#include <QDebug>
+#include <QGlobalStatic>
+#include <QGuiApplication>
+#include <QIODevice>
+#include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonArray>
-#include <QUrl>
-#include <QDir>
-#include <QStandardPaths>
+#include <QJsonValue>
+#include <QList>
+#include <QNetworkRequest>
+#include <QPair>
 #include <QSettings>
+#include <QSslConfiguration>
+#include <QSslError>
+#include <QSslSocket>
+#include <QStringList>
+#include <QTextStream>
+#include <QUrl>
+#include <QVariant>
+#include <QVector>
+#include <Qt>
+#include <QtLogging>
+
+#include <algorithm>
+#include <cstddef>
+#include <utility>
 
 class MyDownload: public Download { };
 Q_GLOBAL_STATIC(MyDownload, downloadInstance)
@@ -104,7 +123,7 @@ void Download::updateReleaseNotes()
     conf.setPeerVerifyMode(QSslSocket::VerifyNone);
     request.setSslConfiguration(conf);
     QNetworkReply *jsonReply = m_networkManager.get(request);
-    connect(qApp, &QCoreApplication::aboutToQuit, jsonReply, &QNetworkReply::abort);
+    connect(qGuiApp, &QCoreApplication::aboutToQuit, jsonReply, &QNetworkReply::abort);
     connect(jsonReply, &QNetworkReply::finished, this, &Download::handleReleaseJsonDownloadFinished);
 }
 
@@ -149,7 +168,7 @@ void Download::downloadModel(const QString &modelFile)
     conf.setPeerVerifyMode(QSslSocket::VerifyNone);
     request.setSslConfiguration(conf);
     QNetworkReply *modelReply = m_networkManager.get(request);
-    connect(qApp, &QCoreApplication::aboutToQuit, modelReply, &QNetworkReply::abort);
+    connect(qGuiApp, &QCoreApplication::aboutToQuit, modelReply, &QNetworkReply::abort);
     connect(modelReply, &QNetworkReply::downloadProgress, this, &Download::handleDownloadProgress);
     connect(modelReply, &QNetworkReply::errorOccurred, this, &Download::handleErrorOccurred);
     connect(modelReply, &QNetworkReply::finished, this, &Download::handleModelDownloadFinished);
diff --git a/gpt4all-chat/download.h b/gpt4all-chat/download.h
index 3002b73d..0dfcea29 100644
--- a/gpt4all-chat/download.h
+++ b/gpt4all-chat/download.h
@@ -1,13 +1,22 @@
 #ifndef DOWNLOAD_H
 #define DOWNLOAD_H
 
-#include <QObject>
+#include <QCryptographicHash>
+#include <QDateTime>
+#include <QFile>
+#include <QHash>
+#include <QMap>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <QFile>
-#include <QVariant>
-#include <QTemporaryFile>
+#include <QObject>
+#include <QString>
 #include <QThread>
+#include <QtGlobal>
+
+class QByteArray;
+class QFile;
+class QSslError;
+template <typename T> class QList;
 
 struct ReleaseInfo {
     Q_GADGET
diff --git a/gpt4all-chat/embeddings.cpp b/gpt4all-chat/embeddings.cpp
index cd157033..97890d97 100644
--- a/gpt4all-chat/embeddings.cpp
+++ b/gpt4all-chat/embeddings.cpp
@@ -1,12 +1,21 @@
 #include "embeddings.h"
 
-#include <QFile>
-#include <QFileInfo>
-#include <QDebug>
-
 #include "mysettings.h"
+
 #include "hnswlib/hnswlib.h"
 
+#include <QDebug>
+#include <QFileInfo>
+#include <QtGlobal>
+#include <QtLogging>
+
+#include <algorithm>
+#include <atomic>
+#include <exception>
+#include <queue>
+#include <string>
+#include <utility>
+
 #define EMBEDDINGS_VERSION 0
 
 const int s_dim = 384;              // Dimension of the elements
diff --git a/gpt4all-chat/embeddings.h b/gpt4all-chat/embeddings.h
index 88f87579..165e61c0 100644
--- a/gpt4all-chat/embeddings.h
+++ b/gpt4all-chat/embeddings.h
@@ -2,11 +2,14 @@
 #define EMBEDDINGS_H
 
 #include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+#include <vector>
 
 namespace hnswlib {
-    template <typename T>
-    class HierarchicalNSW;
     class InnerProductSpace;
+    template <typename T> class HierarchicalNSW;
 }
 
 class Embeddings : public QObject
diff --git a/gpt4all-chat/embllm.cpp b/gpt4all-chat/embllm.cpp
index d40ad651..fe6fb4cb 100644
--- a/gpt4all-chat/embllm.cpp
+++ b/gpt4all-chat/embllm.cpp
@@ -1,6 +1,32 @@
 #include "embllm.h"
+
 #include "modellist.h"
 
+#include "../gpt4all-backend/llmodel.h"
+
+#include <QCoreApplication>
+#include <QDebug>
+#include <QFile>
+#include <QFileInfo>
+#include <QGuiApplication>
+#include <QIODevice>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonValue>
+#include <QList>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QUrl>
+#include <Qt>
+#include <QtGlobal>
+#include <QtLogging>
+
+#include <exception>
+#include <string>
+#include <utility>
+
 EmbeddingLLMWorker::EmbeddingLLMWorker()
     : QObject(nullptr)
     , m_networkManager(new QNetworkAccessManager(this))
@@ -128,7 +154,7 @@ void EmbeddingLLMWorker::sendAtlasRequest(const QStringList &texts, const QStrin
     request.setRawHeader("Authorization", authorization.toUtf8());
     request.setAttribute(QNetworkRequest::User, userData);
     QNetworkReply *reply = m_networkManager->post(request, doc.toJson(QJsonDocument::Compact));
-    connect(qApp, &QCoreApplication::aboutToQuit, reply, &QNetworkReply::abort);
+    connect(qGuiApp, &QCoreApplication::aboutToQuit, reply, &QNetworkReply::abort);
     connect(reply, &QNetworkReply::finished, this, &EmbeddingLLMWorker::handleFinished);
 }
 
diff --git a/gpt4all-chat/embllm.h b/gpt4all-chat/embllm.h
index 2535a0f5..b9109f23 100644
--- a/gpt4all-chat/embllm.h
+++ b/gpt4all-chat/embllm.h
@@ -1,13 +1,20 @@
 #ifndef EMBLLM_H
 #define EMBLLM_H
 
+#include <QByteArray>
 #include <QNetworkAccessManager>
-#include <QNetworkReply>
 #include <QObject>
+#include <QString>
 #include <QStringList>
 #include <QThread>
+#include <QVariant>
+#include <QVector>
 
-#include "../gpt4all-backend/llmodel.h"
+#include <atomic>
+#include <vector>
+
+class LLModel;
+class QNetworkAccessManager;
 
 struct EmbeddingChunk {
     int folder_id;
diff --git a/gpt4all-chat/llm.cpp b/gpt4all-chat/llm.cpp
index 9efb3482..7eb9c4d0 100644
--- a/gpt4all-chat/llm.cpp
+++ b/gpt4all-chat/llm.cpp
@@ -1,20 +1,22 @@
 #include "llm.h"
+
 #include "../gpt4all-backend/llmodel.h"
 #include "../gpt4all-backend/sysinfo.h"
 
 #include <QCoreApplication>
-#include <QDesktopServices>
-#include <QDir>
-#include <QFile>
+#include <QDebug>
+#include <QFileInfo>
+#include <QGlobalStatic>
+#include <QNetworkInformation>
 #include <QProcess>
-#include <QResource>
 #include <QSettings>
 #include <QUrl>
-#include <QNetworkInformation>
-#include <fstream>
+#include <QtLogging>
+
+#include <string>
 
 #ifndef GPT4ALL_OFFLINE_INSTALLER
-#include "network.h"
+#   include "network.h"
 #endif
 
 class MyLLM: public LLM { };
diff --git a/gpt4all-chat/llm.h b/gpt4all-chat/llm.h
index 55367742..f570c49a 100644
--- a/gpt4all-chat/llm.h
+++ b/gpt4all-chat/llm.h
@@ -2,6 +2,8 @@
 #define LLM_H
 
 #include <QObject>
+#include <QString>
+#include <QtGlobal>
 
 class LLM : public QObject
 {
diff --git a/gpt4all-chat/localdocs.cpp b/gpt4all-chat/localdocs.cpp
index 697c9585..d0670618 100644
--- a/gpt4all-chat/localdocs.cpp
+++ b/gpt4all-chat/localdocs.cpp
@@ -1,6 +1,14 @@
 #include "localdocs.h"
+
+#include "database.h"
 #include "mysettings.h"
 
+#include <QCoreApplication>
+#include <QGlobalStatic>
+#include <QGuiApplication>
+#include <QUrl>
+#include <Qt>
+
 class MyLocalDocs: public LocalDocs { };
 Q_GLOBAL_STATIC(MyLocalDocs, localDocsInstance)
 LocalDocs *LocalDocs::globalInstance()
@@ -55,7 +63,7 @@ LocalDocs::LocalDocs()
     connect(m_database, &Database::collectionListUpdated,
         m_localDocsModel, &LocalDocsModel::collectionListUpdated, Qt::QueuedConnection);
 
-    connect(qApp, &QCoreApplication::aboutToQuit, this, &LocalDocs::aboutToQuit);
+    connect(qGuiApp, &QCoreApplication::aboutToQuit, this, &LocalDocs::aboutToQuit);
 }
 
 void LocalDocs::aboutToQuit()
diff --git a/gpt4all-chat/localdocs.h b/gpt4all-chat/localdocs.h
index 9a42b63c..ad694524 100644
--- a/gpt4all-chat/localdocs.h
+++ b/gpt4all-chat/localdocs.h
@@ -1,10 +1,12 @@
 #ifndef LOCALDOCS_H
 #define LOCALDOCS_H
 
-#include "localdocsmodel.h"
-#include "database.h"
+#include "localdocsmodel.h" // IWYU pragma: keep
 
 #include <QObject>
+#include <QString>
+
+class Database;
 
 class LocalDocs : public QObject
 {
diff --git a/gpt4all-chat/localdocsmodel.cpp b/gpt4all-chat/localdocsmodel.cpp
index 5be05286..9ce92e60 100644
--- a/gpt4all-chat/localdocsmodel.cpp
+++ b/gpt4all-chat/localdocsmodel.cpp
@@ -3,6 +3,11 @@
 #include "localdocs.h"
 #include "network.h"
 
+#include <QMap>
+#include <QtGlobal>
+
+#include <utility>
+
 LocalDocsCollectionsModel::LocalDocsCollectionsModel(QObject *parent)
     : QSortFilterProxyModel(parent)
 {
diff --git a/gpt4all-chat/localdocsmodel.h b/gpt4all-chat/localdocsmodel.h
index a3bdc5fc..ed9fcff1 100644
--- a/gpt4all-chat/localdocsmodel.h
+++ b/gpt4all-chat/localdocsmodel.h
@@ -1,9 +1,23 @@
 #ifndef LOCALDOCSMODEL_H
 #define LOCALDOCSMODEL_H
 
-#include <QAbstractListModel>
 #include "database.h"
 
+#include <QAbstractListModel>
+#include <QByteArray>
+#include <QHash>
+#include <QList>
+#include <QModelIndex>
+#include <QObject>
+#include <QSortFilterProxyModel>
+#include <QString>
+#include <QVariant>
+#include <QVector>
+#include <Qt>
+
+#include <cstddef>
+#include <functional>
+
 class LocalDocsCollectionsModel : public QSortFilterProxyModel
 {
     Q_OBJECT
diff --git a/gpt4all-chat/logger.cpp b/gpt4all-chat/logger.cpp
index 659c2b77..fc9fea89 100644
--- a/gpt4all-chat/logger.cpp
+++ b/gpt4all-chat/logger.cpp
@@ -1,10 +1,14 @@
 #include "logger.h"
 
-#include <QFile>
-#include <QDebug>
-#include <QStandardPaths>
 #include <QDateTime>
+#include <QDebug>
+#include <QGlobalStatic>
+#include <QIODevice>
+#include <QStandardPaths>
+
+#include <cstdio>
 #include <iostream>
+#include <string>
 
 class MyLogger: public Logger { };
 Q_GLOBAL_STATIC(MyLogger, loggerInstance)
diff --git a/gpt4all-chat/logger.h b/gpt4all-chat/logger.h
index d02143e4..5ca865c0 100644
--- a/gpt4all-chat/logger.h
+++ b/gpt4all-chat/logger.h
@@ -1,6 +1,9 @@
 #ifndef LOGGER_H
 #define LOGGER_H
+
 #include <QFile>
+#include <QString>
+#include <QtLogging>
 
 class Logger
 {
diff --git a/gpt4all-chat/main.cpp b/gpt4all-chat/main.cpp
index 705278df..1068162f 100644
--- a/gpt4all-chat/main.cpp
+++ b/gpt4all-chat/main.cpp
@@ -1,19 +1,24 @@
-#include <QDirIterator>
-#include <QGuiApplication>
-#include <QQmlApplicationEngine>
-#include <QQmlContext>
-
-#include "llm.h"
-#include "modellist.h"
 #include "chatlistmodel.h"
-#include "localdocs.h"
-#include "download.h"
-#include "network.h"
-#include "mysettings.h"
 #include "config.h"
+#include "download.h"
+#include "llm.h"
+#include "localdocs.h"
 #include "logger.h"
+#include "modellist.h"
+#include "mysettings.h"
+#include "network.h"
+
 #include "../gpt4all-backend/llmodel.h"
 
+#include <QCoreApplication>
+#include <QGuiApplication>
+#include <QObject>
+#include <QQmlApplicationEngine>
+#include <QQmlEngine>
+#include <QString>
+#include <Qt>
+#include <QUrl>
+
 int main(int argc, char *argv[])
 {
     QCoreApplication::setOrganizationName("nomic.ai");
diff --git a/gpt4all-chat/modellist.cpp b/gpt4all-chat/modellist.cpp
index 6d0f7c73..5a7d4591 100644
--- a/gpt4all-chat/modellist.cpp
+++ b/gpt4all-chat/modellist.cpp
@@ -1,12 +1,43 @@
 #include "modellist.h"
+
 #include "mysettings.h"
 #include "network.h"
+
 #include "../gpt4all-backend/llmodel.h"
 
+#include <QChar>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QDir>
+#include <QDirIterator>
+#include <QEventLoop>
 #include <QFile>
-#include <QStandardPaths>
+#include <QFileInfo>
+#include <QGlobalStatic>
+#include <QGuiApplication>
+#include <QIODevice>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonValue>
+#include <QNetworkRequest>
+#include <QObject>
+#include <QRegularExpression>
+#include <QSettings>
+#include <QSslConfiguration>
+#include <QSslError>
+#include <QSslSocket>
+#include <QTextStream>
+#include <QTimer>
+#include <QtLogging>
+#include <QUrl>
+
 #include <algorithm>
 #include <compare>
+#include <cstddef>
+#include <iterator>
+#include <string>
+#include <utility>
 
 //#define USE_LOCAL_MODELSJSON
 
@@ -1278,7 +1309,7 @@ void ModelList::updateModelsFromJson()
     conf.setPeerVerifyMode(QSslSocket::VerifyNone);
     request.setSslConfiguration(conf);
     QNetworkReply *jsonReply = m_networkManager.get(request);
-    connect(qApp, &QCoreApplication::aboutToQuit, jsonReply, &QNetworkReply::abort);
+    connect(qGuiApp, &QCoreApplication::aboutToQuit, jsonReply, &QNetworkReply::abort);
     QEventLoop loop;
     connect(jsonReply, &QNetworkReply::finished, &loop, &QEventLoop::quit);
     QTimer::singleShot(1500, &loop, &QEventLoop::quit);
@@ -1322,7 +1353,7 @@ void ModelList::updateModelsFromJsonAsync()
     conf.setPeerVerifyMode(QSslSocket::VerifyNone);
     request.setSslConfiguration(conf);
     QNetworkReply *jsonReply = m_networkManager.get(request);
-    connect(qApp, &QCoreApplication::aboutToQuit, jsonReply, &QNetworkReply::abort);
+    connect(qGuiApp, &QCoreApplication::aboutToQuit, jsonReply, &QNetworkReply::abort);
     connect(jsonReply, &QNetworkReply::finished, this, &ModelList::handleModelsJsonDownloadFinished);
     connect(jsonReply, &QNetworkReply::errorOccurred, this, &ModelList::handleModelsJsonDownloadErrorOccurred);
 }
@@ -1914,7 +1945,7 @@ void ModelList::discoverSearch(const QString &search)
     QNetworkRequest request(hfUrl);
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
     QNetworkReply *reply = m_networkManager.get(request);
-    connect(qApp, &QCoreApplication::aboutToQuit, reply, &QNetworkReply::abort);
+    connect(qGuiApp, &QCoreApplication::aboutToQuit, reply, &QNetworkReply::abort);
     connect(reply, &QNetworkReply::finished, this, &ModelList::handleDiscoveryFinished);
     connect(reply, &QNetworkReply::errorOccurred, this, &ModelList::handleDiscoveryErrorOccurred);
 }
@@ -2022,7 +2053,7 @@ void ModelList::parseDiscoveryJsonFile(const QByteArray &jsonData)
         request.setAttribute(QNetworkRequest::User, jsonData);
         request.setAttribute(QNetworkRequest::UserMax, filename);
         QNetworkReply *reply = m_networkManager.head(request);
-        connect(qApp, &QCoreApplication::aboutToQuit, reply, &QNetworkReply::abort);
+        connect(qGuiApp, &QCoreApplication::aboutToQuit, reply, &QNetworkReply::abort);
         connect(reply, &QNetworkReply::finished, this, &ModelList::handleDiscoveryItemFinished);
         connect(reply, &QNetworkReply::errorOccurred, this, &ModelList::handleDiscoveryItemErrorOccurred);
     }
diff --git a/gpt4all-chat/modellist.h b/gpt4all-chat/modellist.h
index 6d2034dd..6c547650 100644
--- a/gpt4all-chat/modellist.h
+++ b/gpt4all-chat/modellist.h
@@ -2,7 +2,24 @@
 #define MODELLIST_H
 
 #include <QAbstractListModel>
+#include <QByteArray>
+#include <QDateTime>
+#include <QHash>
+#include <QList>
+#include <QMutex>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QObject>
+#include <QPair>
+#include <QSortFilterProxyModel>
+#include <QString>
+#include <Qt>
+#include <QtGlobal>
 #include <QtQml>
+#include <QVariant>
+#include <QVector>
+
+class QSslError;
 
 struct ModelInfo {
     Q_GADGET
diff --git a/gpt4all-chat/mysettings.cpp b/gpt4all-chat/mysettings.cpp
index d5e72633..bbe833e8 100644
--- a/gpt4all-chat/mysettings.cpp
+++ b/gpt4all-chat/mysettings.cpp
@@ -1,13 +1,26 @@
 #include "mysettings.h"
+
 #include "modellist.h"
+
 #include "../gpt4all-backend/llmodel.h"
 
+#include <QDebug>
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
+#include <QGlobalStatic>
+#include <QIODevice>
 #include <QSettings>
 #include <QStandardPaths>
+#include <QThread>
+#include <QtLogging>
 #include <QUrl>
+#include <QVariant>
+
+#include <algorithm>
+#include <string>
+#include <thread>
+#include <vector>
 
 static int      default_threadCount         = std::min(4, (int32_t) std::thread::hardware_concurrency());
 static bool     default_saveChatsContext    = false;
diff --git a/gpt4all-chat/mysettings.h b/gpt4all-chat/mysettings.h
index 0ddef469..b6393c49 100644
--- a/gpt4all-chat/mysettings.h
+++ b/gpt4all-chat/mysettings.h
@@ -1,12 +1,16 @@
 #ifndef MYSETTINGS_H
 #define MYSETTINGS_H
 
+#include "modellist.h"
+
+#include <QDateTime>
+#include <QObject>
+#include <QString>
+#include <QVector>
+
 #include <cstdint>
 
-#include <QObject>
-#include <QMutex>
-
-#include "modellist.h"
+struct ModelInfo;
 
 class MySettings : public QObject
 {
diff --git a/gpt4all-chat/network.cpp b/gpt4all-chat/network.cpp
index ec85d8f2..13ef29b2 100644
--- a/gpt4all-chat/network.cpp
+++ b/gpt4all-chat/network.cpp
@@ -1,21 +1,44 @@
 #include "network.h"
 
+#include "chat.h"
 #include "chatlistmodel.h"
 #include "download.h"
 #include "llm.h"
 #include "localdocs.h"
+#include "localdocsmodel.h"
+#include "modellist.h"
 #include "mysettings.h"
 
-#include <cmath>
+#include "../gpt4all-backend/llmodel.h"
 
+#include <QByteArray>
 #include <QCoreApplication>
+#include <QDateTime>
+#include <QDebug>
+#include <QGlobalStatic>
 #include <QGuiApplication>
-#include <QUuid>
-#include <QJsonDocument>
 #include <QJsonArray>
+#include <QJsonDocument>
 #include <QJsonObject>
+#include <QList>
+#include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QScreen>
+#include <QSettings>
+#include <QSize>
+#include <QSslConfiguration>
+#include <QSslError>
+#include <QSslSocket>
+#include <QSysInfo>
+#include <Qt>
+#include <QtGlobal>
+#include <QtLogging>
+#include <QUrl>
+#include <QUuid>
+
+#include <cmath>
+#include <cstring>
+#include <utility>
 
 //#define DEBUG
 
@@ -162,7 +185,7 @@ bool Network::packageAndSendJson(const QString &ingestId, const QString &json)
     QByteArray body(newDoc.toJson(QJsonDocument::Compact));
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
     QNetworkReply *jsonReply = m_networkManager.post(request, body);
-    connect(qApp, &QCoreApplication::aboutToQuit, jsonReply, &QNetworkReply::abort);
+    connect(qGuiApp, &QCoreApplication::aboutToQuit, jsonReply, &QNetworkReply::abort);
     connect(jsonReply, &QNetworkReply::finished, this, &Network::handleJsonUploadFinished);
     m_activeUploads.append(jsonReply);
     return true;
@@ -336,7 +359,7 @@ void Network::sendIpify()
     conf.setPeerVerifyMode(QSslSocket::VerifyNone);
     request.setSslConfiguration(conf);
     QNetworkReply *reply = m_networkManager.get(request);
-    connect(qApp, &QCoreApplication::aboutToQuit, reply, &QNetworkReply::abort);
+    connect(qGuiApp, &QCoreApplication::aboutToQuit, reply, &QNetworkReply::abort);
     connect(reply, &QNetworkReply::finished, this, &Network::handleIpifyFinished);
 }
 
@@ -349,7 +372,7 @@ void Network::sendMixpanel(const QByteArray &json)
     request.setSslConfiguration(conf);
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
     QNetworkReply *trackReply = m_networkManager.post(request, json);
-    connect(qApp, &QCoreApplication::aboutToQuit, trackReply, &QNetworkReply::abort);
+    connect(qGuiApp, &QCoreApplication::aboutToQuit, trackReply, &QNetworkReply::abort);
     connect(trackReply, &QNetworkReply::finished, this, &Network::handleMixpanelFinished);
 }
 
@@ -411,7 +434,7 @@ void Network::sendHealth()
     conf.setPeerVerifyMode(QSslSocket::VerifyNone);
     request.setSslConfiguration(conf);
     QNetworkReply *healthReply = m_networkManager.get(request);
-    connect(qApp, &QCoreApplication::aboutToQuit, healthReply, &QNetworkReply::abort);
+    connect(qGuiApp, &QCoreApplication::aboutToQuit, healthReply, &QNetworkReply::abort);
     connect(healthReply, &QNetworkReply::finished, this, &Network::handleHealthFinished);
 }
 
diff --git a/gpt4all-chat/network.h b/gpt4all-chat/network.h
index 5e9f6e6e..92fa7290 100644
--- a/gpt4all-chat/network.h
+++ b/gpt4all-chat/network.h
@@ -1,10 +1,18 @@
 #ifndef NETWORK_H
 #define NETWORK_H
 
-#include <QObject>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
 #include <QJsonValue>
+#include <QMap>
+#include <QNetworkAccessManager>
+#include <QObject>
+#include <QString>
+#include <QVariant>
+#include <QVector>
+
+class QByteArray;
+class QNetworkReply;
+class QSslError;
+template <typename T> class QList;
 
 struct KeyValue {
     QString key;
diff --git a/gpt4all-chat/responsetext.cpp b/gpt4all-chat/responsetext.cpp
index 534a6f9a..45f86d43 100644
--- a/gpt4all-chat/responsetext.cpp
+++ b/gpt4all-chat/responsetext.cpp
@@ -1,13 +1,24 @@
 #include "responsetext.h"
 
-#include <QTextCharFormat>
-#include <QTextDocument>
-#include <QTextDocumentFragment>
-#include <QFontMetricsF>
-#include <QTextTableCell>
-#include <QGuiApplication>
+#include <QBrush>
+#include <QChar>
 #include <QClipboard>
+#include <QFont>
+#include <QFontMetricsF>
+#include <QGuiApplication>
+#include <QList>
 #include <QPainter>
+#include <QQuickTextDocument>
+#include <QRegularExpression>
+#include <Qt>
+#include <QTextBlock>
+#include <QTextCharFormat>
+#include <QTextCursor>
+#include <QTextDocument>
+#include <QTextFrame>
+#include <QTextTableCell>
+#include <QtGlobal>
+#include <QVariant>
 
 enum Language {
     None,
diff --git a/gpt4all-chat/responsetext.h b/gpt4all-chat/responsetext.h
index 216fe3fd..a1f1d8ff 100644
--- a/gpt4all-chat/responsetext.h
+++ b/gpt4all-chat/responsetext.h
@@ -1,12 +1,20 @@
 #ifndef RESPONSETEXT_H
 #define RESPONSETEXT_H
 
+#include <QColor>
 #include <QObject>
 #include <QQmlEngine>
-#include <QQuickTextDocument>
+#include <QQuickTextDocument> // IWYU pragma: keep
+#include <QRectF>
+#include <QSizeF>
+#include <QString>
 #include <QSyntaxHighlighter>
-#include <QRegularExpression>
 #include <QTextObjectInterface>
+#include <QVector>
+
+class QPainter;
+class QTextDocument;
+class QTextFormat;
 
 class SyntaxHighlighter : public QSyntaxHighlighter {
     Q_OBJECT
diff --git a/gpt4all-chat/server.cpp b/gpt4all-chat/server.cpp
index c8aa2364..57699860 100644
--- a/gpt4all-chat/server.cpp
+++ b/gpt4all-chat/server.cpp
@@ -1,13 +1,28 @@
 #include "server.h"
-#include "chat.h"
-#include "mysettings.h"
-#include "modellist.h"
 
-#include <QJsonDocument>
+#include "chat.h"
+#include "modellist.h"
+#include "mysettings.h"
+
+#include <QByteArray>
+#include <QDateTime>
+#include <QDebug>
+#include <QHostAddress>
+#include <QHttpServer>
+#include <QHttpServerRequest>
+#include <QHttpServerResponder>
 #include <QJsonArray>
+#include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonValue>
+#include <QPair>
+#include <Qt>
+#include <QtLogging>
+
 #include <iostream>
+#include <string>
+#include <type_traits>
+#include <utility>
 
 //#define DEBUG
 
diff --git a/gpt4all-chat/server.h b/gpt4all-chat/server.h
index 0250d9bd..3f8a12eb 100644
--- a/gpt4all-chat/server.h
+++ b/gpt4all-chat/server.h
@@ -2,9 +2,16 @@
 #define SERVER_H
 
 #include "chatllm.h"
+#include "database.h"
 
+#include <QHttpServerResponse>
 #include <QObject>
-#include <QtHttpServer/QHttpServer>
+#include <QList>
+#include <QString>
+
+class Chat;
+class QHttpServer;
+class QHttpServerRequest;
 
 class Server : public ChatLLM
 {