diff --git a/include/core/wildmoninfo.h b/include/core/wildmoninfo.h
index 6b7dda41..1824bda8 100644
--- a/include/core/wildmoninfo.h
+++ b/include/core/wildmoninfo.h
@@ -2,7 +2,8 @@
 #ifndef GUARD_WILDMONINFO_H
 #define GUARD_WILDMONINFO_H
 
-#include <QtWidgets>
+#include <QString>
+#include <QVector>
 #include "orderedjson.h"
 
 class WildPokemon {
diff --git a/include/editor.h b/include/editor.h
index 83ef2e7c..92b2d911 100644
--- a/include/editor.h
+++ b/include/editor.h
@@ -204,7 +204,6 @@ public:
         ResizeLayoutPopup
     };
 
-public slots:
     void openMapScripts() const;
     bool openScript(const QString &scriptLabel) const;
     bool openScriptInFile(const QString &scriptLabel, const QString &filepath) const;
diff --git a/include/ui/eventframes.h b/include/ui/eventframes.h
index 71cc04a8..631205aa 100644
--- a/include/ui/eventframes.h
+++ b/include/ui/eventframes.h
@@ -2,7 +2,10 @@
 #ifndef EVENTRAMES_H
 #define EVENTRAMES_H
 
-#include <QtWidgets>
+#include <QFrame>
+#include <QLabel>
+#include <QLineEdit>
+#include <QSpinBox>
 
 #include "edithistoryspinbox.h"
 #include "eventcombobox.h"
diff --git a/include/ui/eventpixmapitem.h b/include/ui/eventpixmapitem.h
index ac16c31d..10fc9041 100644
--- a/include/ui/eventpixmapitem.h
+++ b/include/ui/eventpixmapitem.h
@@ -6,7 +6,6 @@
 #include <QGraphicsPixmapItem>
 #include <QGraphicsItemAnimation>
 
-#include <QtWidgets>
 #include <optional>
 
 #include "events.h"
diff --git a/include/ui/imageproviders.h b/include/ui/imageproviders.h
index f1edc04a..eb4f23a4 100644
--- a/include/ui/imageproviders.h
+++ b/include/ui/imageproviders.h
@@ -39,26 +39,8 @@ QImage getTileImage(uint16_t, const Tileset*, const Tileset*);
 QImage getPalettedTileImage(uint16_t, const Tileset*, const Tileset*, int, bool useTruePalettes = false);
 QImage getColoredTileImage(uint16_t tileId, const Tileset *, const Tileset *, const QList<QRgb> &palette);
 QImage getGreyscaleTileImage(uint16_t tileId, const Tileset *, const Tileset *);
+const QList<QRgb>& greyscalePalette();
 
 void flattenTo4bppImage(QImage * image);
 
-static QList<QRgb> greyscalePalette({
-    qRgb(0, 0, 0),
-    qRgb(16, 16, 16),
-    qRgb(32, 32, 32),
-    qRgb(48, 48, 48),
-    qRgb(64, 64, 64),
-    qRgb(80, 80, 80),
-    qRgb(96, 96, 96),
-    qRgb(112, 112, 112),
-    qRgb(128, 128, 128),
-    qRgb(144, 144, 144),
-    qRgb(160, 160, 160),
-    qRgb(176, 176, 176),
-    qRgb(192, 192, 192),
-    qRgb(208, 208, 208),
-    qRgb(224, 224, 224),
-    qRgb(240, 240, 240),
-});
-
 #endif // IMAGEPROVIDERS_H
diff --git a/include/ui/mapimageexporter.h b/include/ui/mapimageexporter.h
index fbb50551..6e8d0595 100644
--- a/include/ui/mapimageexporter.h
+++ b/include/ui/mapimageexporter.h
@@ -4,6 +4,10 @@
 #include "project.h"
 #include "checkeredbgscene.h"
 
+#include <QBuffer>
+#include <QMessageBox>
+#include <QProgressDialog>
+
 class QGifImage;
 
 namespace Ui {
diff --git a/include/ui/montabwidget.h b/include/ui/montabwidget.h
index 5a2c3a5d..9daa8cd1 100644
--- a/include/ui/montabwidget.h
+++ b/include/ui/montabwidget.h
@@ -3,7 +3,8 @@
 
 #include "wildmoninfo.h"
 
-#include <QtWidgets>
+#include <QPushButton>
+#include <QTableView>
 #include <QVector>
 
 class Editor;
diff --git a/include/ui/projectsettingseditor.h b/include/ui/projectsettingseditor.h
index 34eb4207..62495610 100644
--- a/include/ui/projectsettingseditor.h
+++ b/include/ui/projectsettingseditor.h
@@ -1,10 +1,12 @@
 #ifndef PROJECTSETTINGSEDITOR_H
 #define PROJECTSETTINGSEDITOR_H
 
-#include <QMainWindow>
 #include "project.h"
 #include "ui_projectsettingseditor.h"
 
+#include <QMainWindow>
+#include <QMessageBox>
+
 class QAbstractButton;
 
 
diff --git a/include/ui/regionmapeditor.h b/include/ui/regionmapeditor.h
index 86a38198..46b2a885 100644
--- a/include/ui/regionmapeditor.h
+++ b/include/ui/regionmapeditor.h
@@ -12,6 +12,7 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QCloseEvent>
 #include <QResizeEvent>
+#include <QUndoGroup>
 
 namespace Ui {
 class RegionMapEditor;
diff --git a/include/ui/shortcutseditor.h b/include/ui/shortcutseditor.h
index 6f136773..0ac96346 100644
--- a/include/ui/shortcutseditor.h
+++ b/include/ui/shortcutseditor.h
@@ -5,7 +5,6 @@
 
 #include <QMainWindow>
 #include <QDialog>
-#include <QMap>
 #include <QHash>
 #include <QAction>
 
@@ -40,7 +39,7 @@ private:
     QHash<MultiKeyEdit *, QPointer<const QObject>> multiKeyEdits_objects;
 
     void parseObjectList(const QObjectList &objectList);
-    void parseObject(const QObject *object, QMap<const QObject*, QString> *objects_labels, QMap<const QObject*, QString> *objects_prefixes);
+    void parseObject(const QObject *object, QHash<const QObject*, QString> *objects_labels, QHash<const QObject*, QString> *objects_prefixes);
     QString getLabel(const QObject *object) const;
     bool stringPropertyIsNotEmpty(const QObject *object, const char *name) const;
     void populateMainContainer();
diff --git a/src/config/porymapconfig.cpp b/src/config/porymapconfig.cpp
index b93d32f0..70eeb0d7 100644
--- a/src/config/porymapconfig.cpp
+++ b/src/config/porymapconfig.cpp
@@ -73,7 +73,7 @@ void PorymapConfig::saveGeometry(const QWidget* widget, const QString& keyPrefix
         if (splitter) this->savedGeometryMap.insert(stateKey, splitter->saveState());
     }
     if (recursive) {
-        for (const auto splitter : widget->findChildren<QSplitter*>()) {
+        for (const auto& splitter : widget->findChildren<QSplitter*>()) {
             saveGeometry(splitter, key + "_", false);
         }
     }
@@ -98,7 +98,7 @@ bool PorymapConfig::restoreGeometry(QWidget* widget, const QString& keyPrefix, b
         }
     }
     if (recursive) {
-        for (const auto splitter : widget->findChildren<QSplitter*>()) {
+        for (const auto& splitter : widget->findChildren<QSplitter*>()) {
             restoreGeometry(splitter, key + "_", false);
         }
     }
diff --git a/src/core/map.cpp b/src/core/map.cpp
index 47b27991..4000ee7b 100644
--- a/src/core/map.cpp
+++ b/src/core/map.cpp
@@ -6,6 +6,7 @@
 #include "editcommands.h"
 #include "project.h"
 
+#include <QDir>
 #include <QTime>
 #include <QPainter>
 #include <QImage>
diff --git a/src/core/maplayout.cpp b/src/core/maplayout.cpp
index 44616ab6..6cef6252 100644
--- a/src/core/maplayout.cpp
+++ b/src/core/maplayout.cpp
@@ -1,13 +1,14 @@
 #include "maplayout.h"
 
-#include <QRegularExpression>
-
 #include "scripting.h"
 #include "imageproviders.h"
 #include "utility.h"
 #include "project.h"
 #include "layoutpixmapitem.h"
 
+#include <QDir>
+#include <QRegularExpression>
+
 QList<int> Layout::s_globalMetatileLayerOrder;
 QList<float> Layout::s_globalMetatileLayerOpacity;
 
diff --git a/src/core/parseutil.cpp b/src/core/parseutil.cpp
index 5eeb8333..a969f5aa 100644
--- a/src/core/parseutil.cpp
+++ b/src/core/parseutil.cpp
@@ -606,7 +606,8 @@ QMap<QString, QString> ParseUtil::readNamedIndexCArray(const QString &filename,
     QMap<QString, QString> map;
 
     QRegularExpression re_text(QString(R"(\b%1\b\s*(\[?[^\]]*\])?\s*=\s*\{([^\}]*)\})").arg(label));
-    QString arrayText = re_text.match(this->text).captured(2).replace(QRegularExpression("\\s*"), "");
+    static const QRegularExpression re_spaces("\\s*");
+    QString arrayText = re_text.match(this->text).captured(2).replace(re_spaces, "");
 
     static const QRegularExpression re_findRow("\\[(?<index>[A-Za-z0-9_]*)\\][\\s=]+(?<value>&?[A-Za-z0-9_]*)");
     QRegularExpressionMatchIterator rowIter = re_findRow.globalMatch(arrayText);
diff --git a/src/editor.cpp b/src/editor.cpp
index f85f427b..8c77b0a3 100644
--- a/src/editor.cpp
+++ b/src/editor.cpp
@@ -2081,7 +2081,7 @@ void Editor::onEventDragged(Event *event, const QPoint &oldPosition, const QPoin
     if (!this->map || !this->map_item)
         return;
 
-    this->map_item->hoverChanged(newPosition);
+    emit this->map_item->hoverChanged(newPosition);
 
     // Drag all the other selected events (if any) with it
     QList<Event*> draggedEvents;
diff --git a/src/project.cpp b/src/project.cpp
index d1aa6579..e32311a0 100644
--- a/src/project.cpp
+++ b/src/project.cpp
@@ -14,15 +14,19 @@
 #include "scripting.h"
 
 #include <QDir>
+#include <QDirIterator>
+#include <QFile>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonValue>
-#include <QFile>
-#include <QTextStream>
-#include <QStandardItem>
 #include <QMessageBox>
+#include <QPixmapCache>
+#include <QProcess>
 #include <QRegularExpression>
+#include <QStandardItem>
+#include <QTextStream>
+
 #include <algorithm>
 
 int Project::num_tiles_primary = 512;
diff --git a/src/ui/colorpicker.cpp b/src/ui/colorpicker.cpp
index a3cfe524..0b9ee596 100644
--- a/src/ui/colorpicker.cpp
+++ b/src/ui/colorpicker.cpp
@@ -1,7 +1,12 @@
 #include "colorpicker.h"
 #include "ui_colorpicker.h"
 
-#include <QtWidgets>
+#include <QDialog>
+#include <QPainter>
+#include <QScreen>
+#include <QShortcut>
+#include <QTimer>
+#include <QWindow>
 
 const int zoom_box_dimensions = 15;
 
diff --git a/src/ui/customscriptseditor.cpp b/src/ui/customscriptseditor.cpp
index 22c13258..f2cf8f59 100644
--- a/src/ui/customscriptseditor.cpp
+++ b/src/ui/customscriptseditor.cpp
@@ -7,7 +7,9 @@
 #include "filedialog.h"
 #include "eventfilters.h"
 
+#include <QDesktopServices>
 #include <QDir>
+#include <QToolTip>
 
 CustomScriptsEditor::CustomScriptsEditor(QWidget *parent) :
     QMainWindow(parent),
diff --git a/src/ui/imageproviders.cpp b/src/ui/imageproviders.cpp
index 5efa1e91..7f2fe5c3 100644
--- a/src/ui/imageproviders.cpp
+++ b/src/ui/imageproviders.cpp
@@ -168,7 +168,7 @@ QImage getPalettedTileImage(uint16_t tileId, const Tileset *primaryTileset, cons
 }
 
 QImage getGreyscaleTileImage(uint16_t tileId, const Tileset *primaryTileset, const Tileset *secondaryTileset) {
-    return getColoredTileImage(tileId, primaryTileset, secondaryTileset, greyscalePalette);
+    return getColoredTileImage(tileId, primaryTileset, secondaryTileset, greyscalePalette());
 }
 
 // gbagfx allows 4bpp image data to be represented with 8bpp .png files by considering only the lower 4 bits of each pixel.
@@ -270,3 +270,25 @@ QImage getMetatileSheetImage(const Layout *layout, int numMetatilesWide, bool us
                                  Metatile::pixelSize(),
                                  useTruePalettes);
 }
+
+const QList<QRgb>& greyscalePalette() {
+    static const QList<QRgb> palette = {
+        qRgb(0, 0, 0),
+        qRgb(16, 16, 16),
+        qRgb(32, 32, 32),
+        qRgb(48, 48, 48),
+        qRgb(64, 64, 64),
+        qRgb(80, 80, 80),
+        qRgb(96, 96, 96),
+        qRgb(112, 112, 112),
+        qRgb(128, 128, 128),
+        qRgb(144, 144, 144),
+        qRgb(160, 160, 160),
+        qRgb(176, 176, 176),
+        qRgb(192, 192, 192),
+        qRgb(208, 208, 208),
+        qRgb(224, 224, 224),
+        qRgb(240, 240, 240),
+    };
+    return palette;
+}
diff --git a/src/ui/mapimageexporter.cpp b/src/ui/mapimageexporter.cpp
index 46782c65..2652b06a 100644
--- a/src/ui/mapimageexporter.cpp
+++ b/src/ui/mapimageexporter.cpp
@@ -5,8 +5,11 @@
 #include "filedialog.h"
 
 #include <QImage>
+#include <QMovie>
 #include <QPainter>
 #include <QPoint>
+#include <QShowEvent>
+#include <QTimer>
 
 QString MapImageExporter::getTitle(ImageExporterMode mode) {
     switch (mode)
diff --git a/src/ui/maplistmodels.cpp b/src/ui/maplistmodels.cpp
index ba4e9a79..e3a1d7fe 100644
--- a/src/ui/maplistmodels.cpp
+++ b/src/ui/maplistmodels.cpp
@@ -3,8 +3,11 @@
 #include "project.h"
 #include "filterchildrenproxymodel.h"
 
-#include <QMouseEvent>
+#include <QCloseEvent>
+#include <QDesktopServices>
 #include <QLineEdit>
+#include <QMimeData>
+#include <QMouseEvent>
 
 
 
diff --git a/src/ui/prefab.cpp b/src/ui/prefab.cpp
index 43da720a..66153539 100644
--- a/src/ui/prefab.cpp
+++ b/src/ui/prefab.cpp
@@ -15,6 +15,7 @@
 #include <QDir>
 #include <QSpacerItem>
 #include <QMessageBox>
+#include <QToolTip>
 
 const QString defaultFilepath = "prefabs.json";
 
diff --git a/src/ui/projectsettingseditor.cpp b/src/ui/projectsettingseditor.cpp
index 714ad326..434c6c8f 100644
--- a/src/ui/projectsettingseditor.cpp
+++ b/src/ui/projectsettingseditor.cpp
@@ -7,6 +7,8 @@
 #include "eventfilters.h"
 
 #include <QAbstractButton>
+#include <QCloseEvent>
+#include <QDesktopServices>
 #include <QFormLayout>
 
 /*
diff --git a/src/ui/regionmapeditor.cpp b/src/ui/regionmapeditor.cpp
index 5f4cded0..e36d8fb0 100644
--- a/src/ui/regionmapeditor.cpp
+++ b/src/ui/regionmapeditor.cpp
@@ -9,15 +9,17 @@
 #include "utility.h"
 #include "eventfilters.h"
 
+#include <QColor>
 #include <QDir>
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QFormLayout>
 #include <QLineEdit>
-#include <QSpinBox>
-#include <QColor>
+#include <QListWidget>
 #include <QMessageBox>
+#include <QSpinBox>
 #include <QTransform>
+
 #include <math.h>
 
 RegionMapEditor::RegionMapEditor(QWidget *parent, Project *project) :
diff --git a/src/ui/shortcutseditor.cpp b/src/ui/shortcutseditor.cpp
index 8b33d0c9..77cb9c47 100644
--- a/src/ui/shortcutseditor.cpp
+++ b/src/ui/shortcutseditor.cpp
@@ -81,7 +81,7 @@ void ShortcutsEditor::resetShortcuts() {
     }
 }
 
-void ShortcutsEditor::parseObject(const QObject *object, QMap<const QObject*, QString> *objects_labels, QMap<const QObject*, QString> *objects_prefixes) {
+void ShortcutsEditor::parseObject(const QObject *object, QHash<const QObject*, QString> *objects_labels, QHash<const QObject*, QString> *objects_prefixes) {
     auto menu = dynamic_cast<const QMenu*>(object);
     if (menu) {
         // If a menu is provided we'll use it to create prefixes for any of the menu's actions,
@@ -107,8 +107,8 @@ void ShortcutsEditor::parseObject(const QObject *object, QMap<const QObject*, QS
 }
 
 void ShortcutsEditor::parseObjectList(const QObjectList &objectList) {
-    QMap<const QObject*, QString> objects_labels;
-    QMap<const QObject*, QString> objects_prefixes;
+    QHash<const QObject*, QString> objects_labels;
+    QHash<const QObject*, QString> objects_prefixes;
     for (const auto &object : objectList) {
         parseObject(object, &objects_labels, &objects_prefixes);
     }
diff --git a/src/ui/tileseteditor.cpp b/src/ui/tileseteditor.cpp
index dc709759..01bf2760 100644
--- a/src/ui/tileseteditor.cpp
+++ b/src/ui/tileseteditor.cpp
@@ -12,9 +12,13 @@
 #include "eventfilters.h"
 #include "utility.h"
 #include "message.h"
-#include <QDialogButtonBox>
+
+#include <QClipboard>
 #include <QCloseEvent>
+#include <QDialogButtonBox>
 #include <QImageReader>
+#include <QProgressDialog>
+#include <QToolTip>
 
 TilesetEditor::TilesetEditor(Project *project, Layout *layout, QWidget *parent) :
     QMainWindow(parent),
diff --git a/src/ui/tileseteditortileselector.cpp b/src/ui/tileseteditortileselector.cpp
index 026b3d58..204d99c8 100644
--- a/src/ui/tileseteditortileselector.cpp
+++ b/src/ui/tileseteditortileselector.cpp
@@ -273,7 +273,7 @@ QImage TilesetEditorTileSelector::buildImage(int tileIdStart, int numTiles) {
 
     // Image is first converted using greyscale so that palettes with duplicate colors
     // are properly represented in the final image.
-    QImage indexedImage = image.convertToFormat(QImage::Format::Format_Indexed8, greyscalePalette.toVector());
+    QImage indexedImage = image.convertToFormat(QImage::Format::Format_Indexed8, greyscalePalette().toVector());
     QList<QRgb> palette = Tileset::getPalette(this->paletteId, this->primaryTileset, this->secondaryTileset, true);
     indexedImage.setColorTable(palette.toVector());
     return indexedImage;
diff --git a/src/ui/unlockableicon.cpp b/src/ui/unlockableicon.cpp
index c13dbd6e..2c9a68c1 100644
--- a/src/ui/unlockableicon.cpp
+++ b/src/ui/unlockableicon.cpp
@@ -19,10 +19,10 @@ bool UnlockableIcon::createDataFile(const QString& inputFilepath, const QString&
     if (inputFilepath.isEmpty() || outputFilepath.isEmpty() || key.isEmpty()) return false;
     if (key.length() >= std::numeric_limits<quint8>::max()) return false;
 
-    QByteArray key64 = key.toUtf8().toBase64();
+    const QByteArray key64 = key.toUtf8().toBase64();
     if (key64.length() >= std::numeric_limits<quint8>::max()) return false;
 
-    QImage iconImage(inputFilepath);
+    const QImage iconImage(inputFilepath);
     if (iconImage.isNull()) return false;
 
     QByteArray iconData;
@@ -32,7 +32,7 @@ bool UnlockableIcon::createDataFile(const QString& inputFilepath, const QString&
     buffer.close();
     if (iconData.length() >= std::numeric_limits<quint16>::max()) return false;
 
-    QByteArray iconData64 = iconData.toBase64();
+    const QByteArray iconData64 = iconData.toBase64();
     if (iconData64.length() >= std::numeric_limits<quint16>::max()) return false;
 
     QFile file(outputFilepath);