diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4094a5a8..ea52aade 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -140,6 +140,8 @@ jobs:
         if: startsWith(matrix.os, 'windows')
         with:
           variant: sccache
+          # only save on on the default (master) branch
+          save: ${{ github.event_name == 'push' }}
           key: sccache-build-${{ matrix.os }}-${{ matrix.qt-version }}-${{ matrix.skip-crashpad }}
           restore-keys: |
             sccache-build-${{ matrix.os }}-${{ matrix.qt-version }}
@@ -181,13 +183,16 @@ jobs:
       - name: Build (Windows)
         if: startsWith(matrix.os, 'windows')
         shell: pwsh
+        env:
+          # Enable PCH on Windows when crashpad is enabled
+          C2_WINDOWS_USE_PCH: ${{ matrix.skip-crashpad && 'OFF' || 'ON' }}
         run: |
           cd build
           cmake `
               -G"NMake Makefiles" `
               -DCMAKE_BUILD_TYPE=RelWithDebInfo `
               -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" `
-              -DUSE_PRECOMPILED_HEADERS=OFF `
+              -DUSE_PRECOMPILED_HEADERS=${{ env.C2_WINDOWS_USE_PCH }} `
               -DBUILD_WITH_CRASHPAD="$Env:C2_ENABLE_CRASHPAD" `
               -DCHATTERINO_LTO="$Env:C2_ENABLE_LTO" `
               -DCHATTERINO_PLUGINS="$Env:C2_PLUGINS" `
diff --git a/src/PrecompiledHeader.hpp b/src/PrecompiledHeader.hpp
index a4a45395..a774d57d 100644
--- a/src/PrecompiledHeader.hpp
+++ b/src/PrecompiledHeader.hpp
@@ -1,8 +1,10 @@
 #ifdef __cplusplus
+#    include <boost/circular_buffer.hpp>
 #    include <boost/current_function.hpp>
 #    include <boost/foreach.hpp>
 #    include <boost/noncopyable.hpp>
 #    include <boost/optional.hpp>
+#    include <boost/signals2.hpp>
 #    include <IrcCommand>
 #    include <IrcConnection>
 #    include <IrcMessage>
@@ -12,40 +14,29 @@
 #    include <pajlada/signals/connection.hpp>
 #    include <pajlada/signals/signal.hpp>
 #    include <QAbstractListModel>
-#    include <QAbstractNativeEventFilter>
 #    include <QAction>
 #    include <QApplication>
 #    include <QBrush>
 #    include <QBuffer>
-#    include <QButtonGroup>
 #    include <QByteArray>
 #    include <QCheckBox>
 #    include <QClipboard>
 #    include <QColor>
 #    include <QComboBox>
-#    include <QCompleter>
-#    include <QCoreApplication>
 #    include <QDateTime>
 #    include <QDebug>
 #    include <QDesktopServices>
 #    include <QDialog>
 #    include <QDialogButtonBox>
 #    include <QDir>
-#    include <QDockWidget>
-#    include <QDrag>
-#    include <QDragEnterEvent>
 #    include <QElapsedTimer>
-#    include <QEventLoop>
 #    include <QFile>
 #    include <QFileDialog>
 #    include <QFileInfo>
 #    include <QFlags>
 #    include <QFont>
-#    include <QFontDatabase>
-#    include <QFontDialog>
 #    include <QFontMetrics>
 #    include <QFormLayout>
-#    include <QGraphicsBlurEffect>
 #    include <QGroupBox>
 #    include <QHBoxLayout>
 #    include <QHeaderView>
@@ -58,7 +49,6 @@
 #    include <QKeyEvent>
 #    include <QLabel>
 #    include <QLayout>
-#    include <QLibrary>
 #    include <QLineEdit>
 #    include <QList>
 #    include <QListView>
@@ -92,31 +82,17 @@
 #    include <QSizePolicy>
 #    include <QSlider>
 #    include <QSpinBox>
-#    include <QStackedLayout>
 #    include <QStandardPaths>
 #    include <QString>
 #    include <QStyle>
 #    include <QStyleOption>
 #    include <QTabWidget>
-#    include <QtCore/QVariant>
 #    include <QTextEdit>
 #    include <QtGlobal>
 #    include <QThread>
 #    include <QThreadPool>
 #    include <QTime>
 #    include <QTimer>
-#    include <QtWidgets/QApplication>
-#    include <QtWidgets/QButtonGroup>
-#    include <QtWidgets/QDialog>
-#    include <QtWidgets/QDialogButtonBox>
-#    include <QtWidgets/QFormLayout>
-#    include <QtWidgets/QHBoxLayout>
-#    include <QtWidgets/QHeaderView>
-#    include <QtWidgets/QLabel>
-#    include <QtWidgets/QLineEdit>
-#    include <QtWidgets/QPushButton>
-#    include <QtWidgets/QTabWidget>
-#    include <QtWidgets/QVBoxLayout>
 #    include <QUrl>
 #    include <QUuid>
 #    include <QVariant>