From f9ca52777b8e0274bbb965fae923073c8d1daa74 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Fri, 19 Dec 2025 01:59:03 +0100
Subject: [PATCH] Cleaning includes and forward declarations

---
 .../ext/launcher/include/filesystemaccess.h        |  1 -
 .../ext/launcher/include/profile/assetsdialog.h    |  2 +-
 .../ext/launcher/include/profile/assettreemodel.h  |  2 +-
 apps/OpenSpace/ext/launcher/src/launcherwindow.cpp |  3 +--
 .../ext/launcher/src/notificationwindow.cpp        |  1 -
 .../src/profile/additionalscriptsdialog.cpp        |  2 --
 .../ext/launcher/src/profile/deltatimesdialog.cpp  |  5 +----
 .../ext/launcher/src/profile/marknodesdialog.cpp   |  2 --
 .../ext/launcher/src/profile/metadialog.cpp        |  2 --
 .../ext/launcher/src/profile/timedialog.cpp        |  3 +--
 .../launcher/src/sgctedit/displaywindowunion.cpp   |  2 +-
 apps/OpenSpace/ext/sgct                            |  2 +-
 ext/ghoul                                          |  2 +-
 include/openspace/documentation/verifier.h         |  2 +-
 include/openspace/engine/logfactory.h              |  6 ++++--
 include/openspace/engine/moduleengine.h            |  9 ++++-----
 .../interaction/keyframerecordinghandler.h         |  2 --
 include/openspace/interaction/scriptcamerastates.h |  2 --
 include/openspace/mission/mission.h                |  2 +-
 include/openspace/navigation/navigationhandler.h   |  3 ---
 include/openspace/navigation/pathcurve.h           |  2 +-
 include/openspace/network/parallelpeer.h           |  2 --
 .../openspace/rendering/colormappingcomponent.h    |  2 --
 include/openspace/rendering/dashboard.h            |  2 --
 include/openspace/rendering/framebufferrenderer.h  | 14 ++++++++------
 include/openspace/rendering/labelscomponent.h      |  6 ++++--
 include/openspace/rendering/loadingscreen.h        | 12 +++++++-----
 include/openspace/rendering/luaconsole.h           | 10 ++++------
 include/openspace/rendering/renderable.h           |  1 -
 include/openspace/rendering/renderengine.h         |  5 +----
 .../openspace/rendering/screenspacerenderable.h    |  6 ++++--
 include/openspace/rendering/texturecomponent.h     |  6 ++++--
 include/openspace/rendering/transferfunction.h     |  6 ++++--
 include/openspace/scene/scene.h                    |  8 +++++---
 include/openspace/scene/sceneinitializer.h         |  2 +-
 include/openspace/scripting/scriptengine.h         |  1 +
 include/openspace/util/timemanager.h               |  1 -
 modules/audio/audiomodule.cpp                      |  1 -
 modules/base/basemodule.cpp                        |  1 -
 modules/base/dashboard/dashboarditemangle.cpp      |  1 -
 modules/base/dashboard/dashboarditemdistance.cpp   |  1 -
 modules/base/rendering/grids/renderablegrid.cpp    |  1 -
 .../base/rendering/grids/renderableradialgrid.cpp  |  1 -
 .../rendering/grids/renderablesphericalgrid.cpp    |  1 -
 .../rendering/pointcloud/renderablepointcloud.cpp  |  4 ----
 modules/base/rendering/renderablenodearrow.cpp     |  1 -
 .../base/rendering/renderableplaneimagelocal.cpp   |  1 -
 .../base/rendering/renderableplaneimageonline.cpp  |  1 -
 modules/base/rendering/renderablesphere.cpp        |  2 --
 .../base/rendering/renderablesphereimageonline.cpp |  1 -
 .../base/rendering/renderabletimevaryingsphere.cpp |  1 -
 modules/base/rendering/screenspaceimageonline.cpp  |  2 --
 modules/digitaluniverse/digitaluniversemodule.cpp  |  1 -
 modules/exoplanets/datastructure.cpp               |  1 -
 modules/exoplanets/datastructure.h                 |  3 ++-
 modules/exoplanets/exoplanetshelper.cpp            |  3 +--
 modules/exoplanets/exoplanetsmodule.cpp            |  1 -
 modules/exoplanets/exoplanetsmodule.h              |  3 ++-
 .../fieldlines/rendering/renderablefieldlines.cpp  |  1 -
 .../rendering/renderablefieldlinessequence.cpp     |  1 -
 modules/fitsfilereader/src/fitsfilereader.cpp      |  1 -
 modules/gaia/rendering/octreemanager.cpp           |  1 -
 modules/gaia/rendering/renderablegaiastars.cpp     |  6 ++----
 modules/gaia/rendering/renderablegaiastars.h       |  1 -
 modules/galaxy/galaxymodule.cpp                    |  1 -
 .../globebrowsing/src/asynctiledataprovider.cpp    |  1 -
 .../src/geojson/geojsonproperties.cpp              |  2 +-
 modules/globebrowsing/src/globelabelscomponent.cpp |  1 -
 modules/globebrowsing/src/gpulayergroup.cpp        |  1 -
 modules/globebrowsing/src/memoryawaretilecache.cpp |  1 -
 modules/globebrowsing/src/renderableglobe.cpp      |  5 ++---
 modules/globebrowsing/src/ringscomponent.cpp       |  2 --
 .../src/tileprovider/imagesequencetileprovider.cpp |  1 -
 .../src/tileprovider/singleimagetileprovider.cpp   |  1 -
 .../src/tileprovider/sizereferencetileprovider.cpp |  1 -
 .../src/tileprovider/temporaltileprovider.cpp      |  1 -
 .../src/tileprovider/texttileprovider.cpp          |  1 -
 .../src/tileprovider/tileindextileprovider.cpp     |  1 -
 .../src/tileprovider/tileproviderbydate.cpp        |  1 -
 .../src/tileprovider/tileproviderbyindex.cpp       |  2 --
 modules/imgui/imguimodule.cpp                      |  3 ---
 modules/imgui/imguimodule.h                        |  2 +-
 modules/imgui/include/guiparallelcomponent.h       |  1 +
 modules/iswa/rendering/renderableiswacygnet.cpp    |  1 -
 modules/iswa/rendering/renderabletexturecygnet.cpp |  3 ---
 modules/iswa/rendering/renderabletexturecygnet.h   |  2 --
 modules/iswa/rendering/renderabletextureplane.cpp  |  1 -
 modules/iswa/util/dataprocessor.cpp                |  1 -
 modules/iswa/util/dataprocessorkameleon.cpp        |  2 --
 modules/iswa/util/iswamanager.cpp                  |  1 -
 modules/kameleon/src/kameleonwrapper.cpp           |  2 --
 modules/kameleonvolume/kameleonvolumereader.cpp    |  1 -
 .../rendering/renderablekameleonvolume.cpp         |  1 -
 .../rendering/renderablekameleonvolume.h           |  1 -
 modules/multiresvolume/rendering/brickmanager.cpp  |  1 -
 .../rendering/errorhistogrammanager.cpp            |  1 -
 .../multiresvolume/rendering/histogrammanager.cpp  |  1 -
 .../rendering/localerrorhistogrammanager.cpp       |  2 --
 .../rendering/localtfbrickselector.h               |  2 +-
 .../rendering/multiresvolumeraycaster.cpp          |  2 --
 .../rendering/renderablemultiresvolume.cpp         |  5 +----
 .../rendering/simpletfbrickselector.h              |  2 +-
 modules/multiresvolume/rendering/tsp.cpp           |  1 -
 modules/server/servermodule.cpp                    |  2 --
 modules/server/src/serverinterface.cpp             |  2 --
 modules/server/src/topics/eventtopic.cpp           |  1 -
 .../server/src/topics/flightcontrollertopic.cpp    |  5 ++---
 modules/server/src/topics/skybrowsertopic.cpp      |  1 -
 modules/server/src/topics/timetopic.cpp            |  1 -
 modules/server/src/topics/topic.cpp                |  1 -
 modules/skybrowser/src/renderableskytarget.cpp     |  1 -
 modules/skybrowser/src/targetbrowserpair.cpp       |  1 -
 modules/skybrowser/src/wwtdatahandler.cpp          |  2 +-
 .../rendering/renderableconstellationbounds.cpp    |  1 -
 .../rendering/renderableconstellationlines.cpp     |  1 -
 .../rendering/renderableconstellationsbase.cpp     |  1 -
 modules/space/rendering/renderablefluxnodes.cpp    |  4 ----
 .../space/rendering/renderablehabitablezone.cpp    |  1 -
 .../space/rendering/renderableorbitalkepler.cpp    |  1 -
 modules/space/rendering/renderablerings.cpp        |  1 -
 modules/space/rendering/renderablestars.cpp        |  5 ++---
 modules/space/rendering/renderabletravelspeed.cpp  |  1 -
 modules/space/spacemodule.cpp                      |  1 -
 modules/space/translation/spicetranslation.cpp     |  1 -
 .../rendering/renderablefov.cpp                    |  1 -
 .../rendering/renderablemodelprojection.cpp        |  1 -
 .../rendering/renderableplanetprojection.cpp       |  1 -
 modules/spacecraftinstruments/util/decoder.cpp     |  1 -
 .../spacecraftinstruments/util/hongkangparser.cpp  |  1 -
 .../util/instrumenttimesparser.cpp                 |  2 --
 .../util/projectioncomponent.cpp                   |  1 -
 modules/spout/renderableplanespout.cpp             |  1 -
 modules/spout/renderablespherespout.cpp            |  1 -
 modules/statemachine/statemachinemodule.cpp        |  2 --
 modules/sync/syncs/httpsynchronization.cpp         |  1 -
 modules/sync/syncs/urlsynchronization.cpp          |  1 -
 modules/telemetry/src/general/nodestelemetry.cpp   |  2 +-
 .../telemetry/src/specific/planetssonification.cpp |  2 +-
 modules/telemetry/telemetrymodule.h                |  2 +-
 modules/touch/touchmodule.cpp                      |  1 -
 modules/toyvolume/rendering/toyvolumeraycaster.cpp |  1 -
 modules/video/src/videoplayer.cpp                  |  1 -
 modules/volume/rendering/basicvolumeraycaster.cpp  |  1 -
 .../rendering/renderabletimevaryingvolume.cpp      |  2 --
 .../volume/tasks/generaterawvolumefromfiletask.cpp |  1 -
 modules/volume/transferfunction.cpp                |  2 +-
 modules/volume/transferfunctionhandler.cpp         |  1 -
 modules/webbrowser/src/browserclient.cpp           |  2 +-
 modules/webbrowser/src/screenspacebrowser.cpp      |  1 -
 modules/webbrowser/src/webrenderhandler.cpp        |  1 -
 modules/webgui/webguimodule.h                      |  2 --
 src/data/csvloader.cpp                             |  1 -
 src/data/dataloader.cpp                            |  5 -----
 src/data/speckloader.cpp                           |  2 --
 src/documentation/documentationengine.cpp          |  4 ----
 src/documentation/verifier.cpp                     |  8 --------
 src/engine/configuration.cpp                       |  4 +---
 src/engine/downloadmanager.cpp                     |  2 --
 src/engine/globals.cpp                             |  1 -
 src/engine/openspaceengine.cpp                     | 14 --------------
 src/engine/settings.cpp                            |  1 -
 src/interaction/actionmanager.cpp                  |  2 --
 src/interaction/keyframerecordinghandler.cpp       |  4 ----
 src/interaction/sessionrecording.cpp               |  4 ----
 src/interaction/sessionrecordinghandler.cpp        | 10 ----------
 src/interaction/tasks/convertrecformattask.cpp     |  1 -
 src/mission/mission.cpp                            |  6 ------
 src/mission/missionmanager.cpp                     |  1 -
 src/navigation/keyframenavigator.cpp               |  2 --
 src/navigation/navigationhandler.cpp               |  8 +-------
 src/navigation/orbitalnavigator.cpp                |  4 ----
 src/navigation/path.cpp                            |  2 +-
 src/navigation/pathcurve.cpp                       |  3 ---
 src/navigation/pathcurves/avoidcollisioncurve.cpp  |  5 +----
 src/navigation/pathcurves/zoomoutoverviewcurve.cpp |  2 --
 src/network/parallelconnection.cpp                 |  1 -
 src/network/parallelpeer.cpp                       |  1 -
 src/properties/misc/optionproperty.cpp             |  1 -
 src/properties/misc/selectionproperty.cpp          |  1 -
 src/properties/misc/stringproperty.cpp             |  1 -
 src/properties/property.cpp                        |  2 +-
 src/properties/vector/dvec3property.cpp            |  2 --
 src/rendering/dashboard.cpp                        |  1 -
 src/rendering/dashboarditem.cpp                    |  2 --
 src/rendering/dashboardtextitem.cpp                |  1 -
 src/rendering/framebufferrenderer.cpp              |  4 ----
 src/rendering/labelscomponent.cpp                  |  1 -
 src/rendering/renderable.cpp                       |  3 ---
 src/rendering/screenspacerenderable.cpp            |  4 ++--
 src/rendering/screenspacerenderableframebuffer.cpp |  2 --
 src/rendering/screenspacerenderabletext.cpp        |  4 ----
 src/rendering/texturecomponent.cpp                 |  1 -
 src/rendering/transferfunction.cpp                 |  1 -
 src/scene/asset.cpp                                |  3 +--
 src/scene/lightsource.cpp                          |  1 -
 src/scene/profile.cpp                              |  2 --
 src/scene/rotation.cpp                             |  1 -
 src/scene/scale.cpp                                |  1 -
 src/scene/translation.cpp                          |  2 --
 src/scripting/scriptengine.cpp                     |  1 -
 src/scripting/scriptscheduler.cpp                  |  1 -
 src/util/distanceconversion.cpp                    |  1 -
 src/util/dynamicfilesequencedownloader.cpp         |  1 -
 src/util/ellipsoid.cpp                             |  1 -
 src/util/histogram.cpp                             |  1 -
 src/util/httprequest.cpp                           |  3 +--
 src/util/openspacemodule.cpp                       |  1 -
 src/util/spicemanager.cpp                          |  8 ++------
 src/util/syncbuffer.cpp                            |  1 -
 src/util/task.cpp                                  |  1 -
 src/util/timemanager.cpp                           |  2 --
 211 files changed, 98 insertions(+), 380 deletions(-)

diff --git a/apps/OpenSpace/ext/launcher/include/filesystemaccess.h b/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
index f49927c0de..13442627c3 100644
--- a/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
+++ b/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
@@ -27,7 +27,6 @@
 
 #include <QDir>
 #include <QFileSystemModel>
-
 #include <string>
 #include <vector>
 
diff --git a/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
index 937ac49a4b..b63923b0e7 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
@@ -25,9 +25,9 @@
 #ifndef __OPENSPACE_UI_LAUNCHER___ASSETSDIALOG___H__
 #define __OPENSPACE_UI_LAUNCHER___ASSETSDIALOG___H__
 
-#include <QDialog>
 #include <QSortFilterProxyModel>
 
+#include <QDialog>
 #include "assettreemodel.h"
 #include <filesystem>
 
diff --git a/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h b/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h
index 69327691b1..89c7fd393b 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h
@@ -28,7 +28,7 @@
 #include <QAbstractItemModel>
 
 #include "assettreeitem.h"
-#include "openspace/scene/profile.h"
+#include <openspace/scene/profile.h>
 #include <QString>
 #include <QVariant>
 #include <memory>
diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 7e7cc0a79d..31bf616d40 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -33,7 +33,6 @@
 #include <openspace/engine/configuration.h>
 #include <openspace/engine/settings.h>
 #include <openspace/openspace.h>
-#include <openspace/scene/profile.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/format.h>
 #include <ghoul/misc/assert.h>
@@ -44,8 +43,8 @@
 #include <QMenu>
 #include <QMessageBox>
 #include <QPushButton>
-#include <iostream>
 #include <cassert>
+#include <iostream>
 #include <stdexcept>
 #include <utility>
 
diff --git a/apps/OpenSpace/ext/launcher/src/notificationwindow.cpp b/apps/OpenSpace/ext/launcher/src/notificationwindow.cpp
index 648b27d926..830001dc73 100644
--- a/apps/OpenSpace/ext/launcher/src/notificationwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/notificationwindow.cpp
@@ -26,7 +26,6 @@
 
 #include <openspace/openspace.h>
 #include <openspace/engine/settings.h>
-#include <openspace/util/httprequest.h>
 #include <ghoul/format.h>
 #include <ghoul/logging/loglevel.h>
 #include <ghoul/logging/logmanager.h>
diff --git a/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
index f17cbb483c..89316dcf72 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
@@ -36,9 +36,7 @@
 #include <new>
 #include <numeric>
 #include <sstream>
-#include <string>
 #include <utility>
-#include <vector>
 
 AdditionalScriptsDialog::AdditionalScriptsDialog(QWidget* parent,
                                                  std::vector<std::string>* scripts)
diff --git a/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
index f7b69df523..13e572d00c 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
@@ -25,6 +25,7 @@
 #include "profile/deltatimesdialog.h"
 
 #include "profile/line.h"
+#include <ghoul/format.h>
 #include <QComboBox>
 #include <QDialogButtonBox>
 #include <QKeyEvent>
@@ -36,12 +37,8 @@
 #include <array>
 #include <cstdint>
 #include <cstdlib>
-#include <format>
 #include <new>
-#include <string>
-#include <string_view>
 #include <utility>
-#include <vector>
 
 namespace {
     constexpr int MaxNumberOfKeys = 30;
diff --git a/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp
index b6310dddb7..c058cd2247 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp
@@ -32,9 +32,7 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 #include <new>
-#include <string>
 #include <utility>
-#include <vector>
 
 MarkNodesDialog::MarkNodesDialog(QWidget* parent, std::vector<std::string>* markedNodes)
     : QDialog(parent)
diff --git a/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp
index bdf1bc78ea..a55c1891ed 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp
@@ -25,12 +25,10 @@
 #include "profile/metadialog.h"
 
 #include "profile/line.h"
-#include <openspace/scene/profile.h>
 #include <QDialogButtonBox>
 #include <QLabel>
 #include <QTextEdit>
 #include <QVBoxLayout>
-#include <optional>
 #include <utility>
 
 MetaDialog::MetaDialog(QWidget* parent, std::optional<openspace::Profile::Meta>* meta)
diff --git a/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
index d7bde8ec34..daf3477b46 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
@@ -25,13 +25,12 @@
 #include "profile/timedialog.h"
 
 #include "profile/line.h"
+#include <ghoul/format.h>
 #include <QCheckBox>
 #include <QDateTimeEdit>
 #include <QDialogButtonBox>
 #include <QLabel>
 #include <QVBoxLayout>
-#include <format>
-#include <optional>
 
 using namespace openspace;
 
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp
index 03769d131d..d14175b3e8 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp
@@ -30,9 +30,9 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 #include <algorithm>
-#include <optional>
 #include <cstdint>
 #include <cstdlib>
+#include <optional>
 #include <variant>
 
 namespace {
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 58640fcd78..097b0ebec4 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 58640fcd780a542a515adfae13f0915006e18210
+Subproject commit 097b0ebec4250be76bb6cef055d465409847208a
diff --git a/ext/ghoul b/ext/ghoul
index 80947f9bbd..37e2f01103 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 80947f9bbd76730cc4e35dc7c0035afd84272bc0
+Subproject commit 37e2f01103c97740a1d14a6c8f0dddd428af5a4b
diff --git a/include/openspace/documentation/verifier.h b/include/openspace/documentation/verifier.h
index f6aaa0e214..c569b5c8b9 100644
--- a/include/openspace/documentation/verifier.h
+++ b/include/openspace/documentation/verifier.h
@@ -32,9 +32,9 @@
 #include <optional>
 #include <string>
 #include <type_traits>
+#include <utility>
 #include <variant>
 #include <vector>
-#include <utility>
 
 namespace ghoul { class Dictionary; }
 
diff --git a/include/openspace/engine/logfactory.h b/include/openspace/engine/logfactory.h
index 61e0816ae8..0982efa8ac 100644
--- a/include/openspace/engine/logfactory.h
+++ b/include/openspace/engine/logfactory.h
@@ -27,8 +27,10 @@
 
 #include <memory>
 
-namespace ghoul { class Dictionary; }
-namespace ghoul::logging { class Log; }
+namespace ghoul {
+    namespace logging { class Log; }
+    class Dictionary;
+} // namespace ghoul
 
 namespace openspace {
 
diff --git a/include/openspace/engine/moduleengine.h b/include/openspace/engine/moduleengine.h
index e9413d55de..d51395a769 100644
--- a/include/openspace/engine/moduleengine.h
+++ b/include/openspace/engine/moduleengine.h
@@ -28,13 +28,12 @@
 #include <openspace/properties/propertyowner.h>
 
 #include <openspace/properties/list/stringlistproperty.h>
-#include <map>
 #include <memory>
-#include <string>
-#include <vector>
 
-namespace ghoul { class Dictionary; }
-namespace ghoul::systemcapabilities { struct Version; }
+namespace ghoul {
+    namespace systemcapabilities { struct Version; }
+    class Dictionary;
+} // namespace ghoul
 
 namespace openspace {
 
diff --git a/include/openspace/interaction/keyframerecordinghandler.h b/include/openspace/interaction/keyframerecordinghandler.h
index 807a3b7956..2a6775e052 100644
--- a/include/openspace/interaction/keyframerecordinghandler.h
+++ b/include/openspace/interaction/keyframerecordinghandler.h
@@ -29,8 +29,6 @@
 
 #include <openspace/interaction/sessionrecording.h>
 #include <filesystem>
-#include <string>
-#include <vector>
 
 namespace ghoul { class Dictionary; }
 namespace openspace::scripting { struct LuaLibrary; }
diff --git a/include/openspace/interaction/scriptcamerastates.h b/include/openspace/interaction/scriptcamerastates.h
index 342f736d87..f9617f5cc3 100644
--- a/include/openspace/interaction/scriptcamerastates.h
+++ b/include/openspace/interaction/scriptcamerastates.h
@@ -27,8 +27,6 @@
 
 #include <openspace/interaction/camerainteractionstates.h>
 
-#include <ghoul/glm.h>
-
 namespace openspace::interaction {
 
 class ScriptCameraStates : public CameraInteractionStates {
diff --git a/include/openspace/mission/mission.h b/include/openspace/mission/mission.h
index 7ae028c18a..300d6b11ed 100644
--- a/include/openspace/mission/mission.h
+++ b/include/openspace/mission/mission.h
@@ -25,8 +25,8 @@
 #ifndef __OPENSPACE_CORE___MISSION___H__
 #define __OPENSPACE_CORE___MISSION___H__
 
-#include <openspace/util/timerange.h>
 #include <openspace/util/time.h>
+#include <openspace/util/timerange.h>
 #include <functional>
 #include <optional>
 #include <string>
diff --git a/include/openspace/navigation/navigationhandler.h b/include/openspace/navigation/navigationhandler.h
index 41a8320745..9d92a40c0b 100644
--- a/include/openspace/navigation/navigationhandler.h
+++ b/include/openspace/navigation/navigationhandler.h
@@ -45,9 +45,7 @@
 #include <filesystem>
 #include <functional>
 #include <optional>
-#include <string>
 #include <variant>
-#include <vector>
 
 namespace openspace {
     namespace scripting { struct LuaLibrary; }
@@ -58,7 +56,6 @@ namespace openspace {
 namespace openspace::interaction {
 
 struct JoystickInputStates;
-struct NavigationState;
 struct NodeCameraStateSpec;
 struct WebsocketInputStates;
 
diff --git a/include/openspace/navigation/pathcurve.h b/include/openspace/navigation/pathcurve.h
index 6748e45718..74ad0b1101 100644
--- a/include/openspace/navigation/pathcurve.h
+++ b/include/openspace/navigation/pathcurve.h
@@ -27,8 +27,8 @@
 
 #include <ghoul/glm.h>
 #include <ghoul/misc/exception.h>
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace openspace::interaction {
 
diff --git a/include/openspace/network/parallelpeer.h b/include/openspace/network/parallelpeer.h
index d59920cd1c..be66c6a595 100644
--- a/include/openspace/network/parallelpeer.h
+++ b/include/openspace/network/parallelpeer.h
@@ -36,9 +36,7 @@
 #include <deque>
 #include <memory>
 #include <mutex>
-#include <string>
 #include <thread>
-#include <vector>
 
 namespace openspace {
 
diff --git a/include/openspace/rendering/colormappingcomponent.h b/include/openspace/rendering/colormappingcomponent.h
index 158d2ceaa8..7a4b58e8a0 100644
--- a/include/openspace/rendering/colormappingcomponent.h
+++ b/include/openspace/rendering/colormappingcomponent.h
@@ -38,8 +38,6 @@
 #include <ghoul/opengl/texture.h>
 #include <memory>
 #include <optional>
-#include <string>
-#include <vector>
 
 namespace ghoul { class Dictionary; }
 
diff --git a/include/openspace/rendering/dashboard.h b/include/openspace/rendering/dashboard.h
index ccfcf893ab..4b34ec6364 100644
--- a/include/openspace/rendering/dashboard.h
+++ b/include/openspace/rendering/dashboard.h
@@ -34,8 +34,6 @@
 #include <ghoul/glm.h>
 #include <chrono>
 #include <memory>
-#include <string>
-#include <vector>
 
 namespace openspace {
 
diff --git a/include/openspace/rendering/framebufferrenderer.h b/include/openspace/rendering/framebufferrenderer.h
index c0da38b6e8..2c1a266d00 100644
--- a/include/openspace/rendering/framebufferrenderer.h
+++ b/include/openspace/rendering/framebufferrenderer.h
@@ -34,12 +34,14 @@
 #include <map>
 #include <vector>
 
-namespace ghoul { class Dictionary; }
-namespace ghoul::filesystem { class File; }
-namespace ghoul::opengl {
-    class ProgramObject;
-    class Texture;
-} // namespace ghoul::opengl
+namespace ghoul {
+    namespace filesystem { class File; }
+    namespace opengl {
+        class ProgramObject;
+        class Texture;
+    } // namespace ghoul::opengl
+    class Dictionary;
+} // namespace ghoul
 
 namespace openspace {
 
diff --git a/include/openspace/rendering/labelscomponent.h b/include/openspace/rendering/labelscomponent.h
index f63c22ab7d..5465895256 100644
--- a/include/openspace/rendering/labelscomponent.h
+++ b/include/openspace/rendering/labelscomponent.h
@@ -38,8 +38,10 @@
 #include <filesystem>
 #include <memory>
 
-namespace ghoul { class Dictionary; }
-namespace ghoul::fontrendering { class Font; }
+namespace ghoul {
+    namespace fontrendering { class Font; }
+    class Dictionary;
+} // namespace ghoul
 
 namespace openspace {
 
diff --git a/include/openspace/rendering/loadingscreen.h b/include/openspace/rendering/loadingscreen.h
index 772140785f..f6c86227a9 100644
--- a/include/openspace/rendering/loadingscreen.h
+++ b/include/openspace/rendering/loadingscreen.h
@@ -38,11 +38,13 @@
 
 // #define LOADINGSCREEN_DEBUGGING
 
-namespace ghoul::fontrendering { class Font; }
-namespace ghoul::opengl {
-    class ProgramObject;
-    class Texture;
-} // namespace ghoul::opengl
+namespace ghoul {
+    namespace fontrendering { class Font; }
+    namespace opengl {
+        class ProgramObject;
+        class Texture;
+    } // namespace ghoul::opengl
+} // namespace ghoul
 
 namespace openspace {
 
diff --git a/include/openspace/rendering/luaconsole.h b/include/openspace/rendering/luaconsole.h
index ab03f51bdf..7701aafae6 100644
--- a/include/openspace/rendering/luaconsole.h
+++ b/include/openspace/rendering/luaconsole.h
@@ -34,14 +34,12 @@
 #include <openspace/util/keys.h>
 #include <openspace/util/mouse.h>
 #include <functional>
-#include <map>
 #include <memory>
-#include <string>
-#include <string_view>
-#include <vector>
 
-namespace ghoul::fontrendering { class Font; }
-namespace ghoul::opengl { class ProgramObject; }
+namespace ghoul {
+    namespace fontrendering { class Font; }
+    namespace opengl { class ProgramObject; }
+} // namespace ghoul
 
 namespace openspace {
 
diff --git a/include/openspace/rendering/renderable.h b/include/openspace/rendering/renderable.h
index 486be431a4..59439181f6 100644
--- a/include/openspace/rendering/renderable.h
+++ b/include/openspace/rendering/renderable.h
@@ -34,7 +34,6 @@
 #include <ghoul/misc/managedmemoryuniqueptr.h>
 #include <functional>
 #include <optional>
-#include <string_view>
 #include <tuple>
 
 namespace ghoul {
diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h
index 00f3d80cfc..a519261d9d 100644
--- a/include/openspace/rendering/renderengine.h
+++ b/include/openspace/rendering/renderengine.h
@@ -38,9 +38,6 @@
 #include <chrono>
 #include <filesystem>
 #include <memory>
-#include <string>
-#include <string_view>
-#include <vector>
 
 namespace ghoul {
     namespace fontrendering { class Font; }
@@ -50,7 +47,7 @@ namespace ghoul {
     } // namespace opengl
     class Dictionary;
     class SharedMemory;
-} // ghoul
+} // namespace ghoul
 
 namespace openspace {
 
diff --git a/include/openspace/rendering/screenspacerenderable.h b/include/openspace/rendering/screenspacerenderable.h
index adcaa8adbe..cec4c1dd85 100644
--- a/include/openspace/rendering/screenspacerenderable.h
+++ b/include/openspace/rendering/screenspacerenderable.h
@@ -37,8 +37,10 @@
 #include <ghoul/opengl/uniformcache.h>
 #include <memory>
 
-namespace ghoul { class Dictionary; }
-namespace ghoul::opengl { class ProgramObject; }
+namespace ghoul {
+    namespace opengl { class ProgramObject; }
+    class Dictionary;
+} // namespace ghoul
 
 namespace openspace {
 
diff --git a/include/openspace/rendering/texturecomponent.h b/include/openspace/rendering/texturecomponent.h
index 161e3a5751..e54fad5a90 100644
--- a/include/openspace/rendering/texturecomponent.h
+++ b/include/openspace/rendering/texturecomponent.h
@@ -29,8 +29,10 @@
 #include <filesystem>
 #include <memory>
 
-namespace ghoul::filesystem { class File; }
-namespace ghoul::opengl { class Texture; }
+namespace ghoul {
+    namespace filesystem { class File; }
+    namespace opengl { class Texture; }
+} // namespace ghoul
 
 namespace openspace {
 
diff --git a/include/openspace/rendering/transferfunction.h b/include/openspace/rendering/transferfunction.h
index 045af80965..6cc7579c33 100644
--- a/include/openspace/rendering/transferfunction.h
+++ b/include/openspace/rendering/transferfunction.h
@@ -30,8 +30,10 @@
 #include <functional>
 #include <memory>
 
-namespace ghoul::filesystem { class File; }
-namespace ghoul::opengl { class Texture; }
+namespace ghoul {
+    namespace filesystem { class File; }
+    namespace opengl { class Texture; }
+} // namespace ghoul
 
 namespace openspace {
 
diff --git a/include/openspace/scene/scene.h b/include/openspace/scene/scene.h
index 9663634fe6..d1ab42534d 100644
--- a/include/openspace/scene/scene.h
+++ b/include/openspace/scene/scene.h
@@ -42,9 +42,11 @@
 #include <unordered_map>
 #include <vector>
 
-namespace ghoul { class Dictionary; }
-namespace ghoul::lua { class LuaState; }
-namespace ghoul::opengl { class ProgramObject; }
+namespace ghoul {
+    namespace lua { class LuaState; }
+    namespace opengl { class ProgramObject; }
+    class Dictionary;
+} // namespace ghoul
 
 namespace openspace {
 
diff --git a/include/openspace/scene/sceneinitializer.h b/include/openspace/scene/sceneinitializer.h
index aeb33a8311..ea60a23d22 100644
--- a/include/openspace/scene/sceneinitializer.h
+++ b/include/openspace/scene/sceneinitializer.h
@@ -26,8 +26,8 @@
 #define __OPENSPACE_CORE___SCENEINITIALIZER___H__
 
 #include <openspace/util/threadpool.h>
-#include <unordered_set>
 #include <mutex>
+#include <unordered_set>
 #include <vector>
 
 namespace openspace {
diff --git a/include/openspace/scripting/scriptengine.h b/include/openspace/scripting/scriptengine.h
index e0e09480ae..3526d76a19 100644
--- a/include/openspace/scripting/scriptengine.h
+++ b/include/openspace/scripting/scriptengine.h
@@ -26,6 +26,7 @@
 #define __OPENSPACE_CORE___SCRIPTENGINE___H__
 
 #include <openspace/util/syncable.h>
+
 #include <openspace/scripting/lualibrary.h>
 #include <ghoul/lua/luastate.h>
 #include <ghoul/misc/boolean.h>
diff --git a/include/openspace/util/timemanager.h b/include/openspace/util/timemanager.h
index d6395197d5..f80fd0f50f 100644
--- a/include/openspace/util/timemanager.h
+++ b/include/openspace/util/timemanager.h
@@ -35,7 +35,6 @@
 #include <functional>
 #include <optional>
 #include <utility>
-#include <vector>
 
 namespace openspace {
 
diff --git a/modules/audio/audiomodule.cpp b/modules/audio/audiomodule.cpp
index 1cc6055894..5653272c6d 100644
--- a/modules/audio/audiomodule.cpp
+++ b/modules/audio/audiomodule.cpp
@@ -35,7 +35,6 @@
 #include <ghoul/misc/exception.h>
 #include <soloud.h>
 #include <soloud_wav.h>
-#include <optional>
 #include <string_view>
 #include <utility>
 
diff --git a/modules/base/basemodule.cpp b/modules/base/basemodule.cpp
index f4e7fc5d81..506c20ce6e 100644
--- a/modules/base/basemodule.cpp
+++ b/modules/base/basemodule.cpp
@@ -101,7 +101,6 @@
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/templatefactory.h>
 #include <ghoul/misc/dictionary.h>
-#include <ghoul/opengl/programobjectmanager.h>
 #include <ghoul/opengl/texturemanager.h>
 
 namespace openspace {
diff --git a/modules/base/dashboard/dashboarditemangle.cpp b/modules/base/dashboard/dashboarditemangle.cpp
index 038a6e26a8..5c14a4ddc3 100644
--- a/modules/base/dashboard/dashboarditemangle.cpp
+++ b/modules/base/dashboard/dashboarditemangle.cpp
@@ -39,7 +39,6 @@
 #include <algorithm>
 #include <cmath>
 #include <optional>
-#include <utility>
 
 namespace {
     enum Type {
diff --git a/modules/base/dashboard/dashboarditemdistance.cpp b/modules/base/dashboard/dashboarditemdistance.cpp
index 1f0eeb6aee..66478a1836 100644
--- a/modules/base/dashboard/dashboarditemdistance.cpp
+++ b/modules/base/dashboard/dashboarditemdistance.cpp
@@ -39,7 +39,6 @@
 #include <ghoul/misc/profiling.h>
 #include <algorithm>
 #include <optional>
-#include <utility>
 
 namespace {
     enum Type {
diff --git a/modules/base/rendering/grids/renderablegrid.cpp b/modules/base/rendering/grids/renderablegrid.cpp
index e0c5ee5c93..e2d5194ce1 100644
--- a/modules/base/rendering/grids/renderablegrid.cpp
+++ b/modules/base/rendering/grids/renderablegrid.cpp
@@ -35,7 +35,6 @@
 #include <ghoul/opengl/openglstatecache.h>
 #include <ghoul/opengl/programobject.h>
 #include <cmath>
-#include <memory>
 
 namespace {
     constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
diff --git a/modules/base/rendering/grids/renderableradialgrid.cpp b/modules/base/rendering/grids/renderableradialgrid.cpp
index cdec94acb6..0ea62d5601 100644
--- a/modules/base/rendering/grids/renderableradialgrid.cpp
+++ b/modules/base/rendering/grids/renderableradialgrid.cpp
@@ -35,7 +35,6 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/opengl/openglstatecache.h>
 #include <ghoul/opengl/programobject.h>
-#include <memory>
 #include <optional>
 #include <utility>
 
diff --git a/modules/base/rendering/grids/renderablesphericalgrid.cpp b/modules/base/rendering/grids/renderablesphericalgrid.cpp
index 8c5ee80c90..f70d1ee590 100644
--- a/modules/base/rendering/grids/renderablesphericalgrid.cpp
+++ b/modules/base/rendering/grids/renderablesphericalgrid.cpp
@@ -36,7 +36,6 @@
 #include <ghoul/opengl/programobject.h>
 #include <algorithm>
 #include <cmath>
-#include <memory>
 #include <optional>
 
 namespace {
diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
index 9d3ab6d46e..c63ac7a1d5 100644
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -25,14 +25,12 @@
 #include <modules/base/rendering/pointcloud/renderablepointcloud.h>
 
 #include <modules/base/basemodule.h>
-#include <openspace/data/dataloader.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/engine/globals.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/format.h>
-#include <ghoul/glm.h>
 #include <ghoul/io/texture/texturereader.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
@@ -41,14 +39,12 @@
 #include <ghoul/misc/profiling.h>
 #include <ghoul/opengl/openglstatecache.h>
 #include <ghoul/opengl/programobject.h>
-#include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureconversion.h>
 #include <ghoul/opengl/textureunit.h>
 #include <glm/gtx/quaternion.hpp>
 #include <algorithm>
 #include <cmath>
 #include <cstdint>
-#include <memory>
 #include <utility>
 #include <variant>
 
diff --git a/modules/base/rendering/renderablenodearrow.cpp b/modules/base/rendering/renderablenodearrow.cpp
index 08728998cf..03e1abc703 100644
--- a/modules/base/rendering/renderablenodearrow.cpp
+++ b/modules/base/rendering/renderablenodearrow.cpp
@@ -31,7 +31,6 @@
 #include <openspace/rendering/helper.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/util/updatestructures.h>
-#include <ghoul/glm.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
diff --git a/modules/base/rendering/renderableplaneimagelocal.cpp b/modules/base/rendering/renderableplaneimagelocal.cpp
index 64242bdf1e..4a92c2aa8d 100644
--- a/modules/base/rendering/renderableplaneimagelocal.cpp
+++ b/modules/base/rendering/renderableplaneimagelocal.cpp
@@ -37,7 +37,6 @@
 #include <ghoul/opengl/texture.h>
 #include <cstdlib>
 #include <limits>
-#include <memory>
 
 namespace {
     constexpr openspace::properties::Property::PropertyInfo TextureInfo = {
diff --git a/modules/base/rendering/renderableplaneimageonline.cpp b/modules/base/rendering/renderableplaneimageonline.cpp
index 25b47be4b0..9e264bab9f 100644
--- a/modules/base/rendering/renderableplaneimageonline.cpp
+++ b/modules/base/rendering/renderableplaneimageonline.cpp
@@ -33,7 +33,6 @@
 #include <ghoul/opengl/texture.h>
 #include <cstdlib>
 #include <limits>
-#include <memory>
 #include <utility>
 
 namespace {
diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index 1f09a62cff..0cafe06365 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -28,7 +28,6 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/engine/globals.h>
 #include <openspace/rendering/renderengine.h>
-#include <openspace/util/sphere.h>
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/format.h>
@@ -43,7 +42,6 @@
 #include <cmath>
 #include <filesystem>
 #include <limits>
-#include <memory>
 #include <optional>
 
 namespace {
diff --git a/modules/base/rendering/renderablesphereimageonline.cpp b/modules/base/rendering/renderablesphereimageonline.cpp
index 5620e59883..1bf7ca5cb1 100644
--- a/modules/base/rendering/renderablesphereimageonline.cpp
+++ b/modules/base/rendering/renderablesphereimageonline.cpp
@@ -25,7 +25,6 @@
 #include <modules/base/rendering/renderablesphereimageonline.h>
 
 #include <openspace/documentation/documentation.h>
-#include <openspace/engine/downloadmanager.h>
 #include <openspace/engine/globals.h>
 #include <ghoul/format.h>
 #include <ghoul/io/texture/texturereader.h>
diff --git a/modules/base/rendering/renderabletimevaryingsphere.cpp b/modules/base/rendering/renderabletimevaryingsphere.cpp
index cd4e0060a7..f88db3a386 100644
--- a/modules/base/rendering/renderabletimevaryingsphere.cpp
+++ b/modules/base/rendering/renderabletimevaryingsphere.cpp
@@ -31,7 +31,6 @@
 #include <ghoul/io/texture/texturereader.h>
 #include <ghoul/opengl/texture.h>
 #include <algorithm>
-#include <filesystem>
 #include <iterator>
 #include <utility>
 
diff --git a/modules/base/rendering/screenspaceimageonline.cpp b/modules/base/rendering/screenspaceimageonline.cpp
index 8b3058b03f..4f54ee7eb3 100644
--- a/modules/base/rendering/screenspaceimageonline.cpp
+++ b/modules/base/rendering/screenspaceimageonline.cpp
@@ -26,13 +26,11 @@
 
 #include <openspace/documentation/documentation.h>
 #include <openspace/engine/globals.h>
-#include <openspace/engine/downloadmanager.h>
 #include <ghoul/format.h>
 #include <ghoul/io/texture/texturereader.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/opengl/texture.h>
 #include <optional>
-#include <future>
 #include <utility>
 
 namespace {
diff --git a/modules/digitaluniverse/digitaluniversemodule.cpp b/modules/digitaluniverse/digitaluniversemodule.cpp
index 6803c91e0a..f06273f29b 100644
--- a/modules/digitaluniverse/digitaluniversemodule.cpp
+++ b/modules/digitaluniverse/digitaluniversemodule.cpp
@@ -32,7 +32,6 @@
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/objectmanager.h>
 #include <ghoul/misc/templatefactory.h>
-#include <ghoul/opengl/programobjectmanager.h>
 
 namespace openspace {
 
diff --git a/modules/exoplanets/datastructure.cpp b/modules/exoplanets/datastructure.cpp
index 3404678a7f..b8d71e7582 100644
--- a/modules/exoplanets/datastructure.cpp
+++ b/modules/exoplanets/datastructure.cpp
@@ -32,7 +32,6 @@
 #include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
-#include <ghoul/misc/dictionary.h>
 #include <cmath>
 #include <optional>
 #include <string_view>
diff --git a/modules/exoplanets/datastructure.h b/modules/exoplanets/datastructure.h
index 8edabd6bb3..a5e3798959 100644
--- a/modules/exoplanets/datastructure.h
+++ b/modules/exoplanets/datastructure.h
@@ -25,13 +25,14 @@
 #ifndef __OPENSPACE_MODULE_EXOPLANETS___DATASTRUCTURE___H__
 #define __OPENSPACE_MODULE_EXOPLANETS___DATASTRUCTURE___H__
 
-#include <openspace/documentation/documentation.h>
 #include <ghoul/glm.h>
 #include <ghoul/misc/dictionary.h>
 #include <limits>
 #include <string>
 #include <vector>
 
+namespace openspace::documentation { struct Documentation; }
+
 namespace openspace::exoplanets {
 
 struct ExoplanetDataEntry {
diff --git a/modules/exoplanets/exoplanetshelper.cpp b/modules/exoplanets/exoplanetshelper.cpp
index a29e7d17c7..3e4eebf591 100644
--- a/modules/exoplanets/exoplanetshelper.cpp
+++ b/modules/exoplanets/exoplanetshelper.cpp
@@ -30,6 +30,7 @@
 #include <openspace/engine/moduleengine.h>
 #include <openspace/util/spicemanager.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/stringhelper.h>
 #include <glm/gtx/transform.hpp>
@@ -37,9 +38,7 @@
 #include <fstream>
 #include <sstream>
 #include <filesystem>
-#include <format>
 #include <memory>
-#include <string>
 
 namespace {
     constexpr std::string_view _loggerCat = "ExoplanetsModule";
diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp
index f12e960c9c..9536001308 100644
--- a/modules/exoplanets/exoplanetsmodule.cpp
+++ b/modules/exoplanets/exoplanetsmodule.cpp
@@ -31,7 +31,6 @@
 #include <openspace/util/factorymanager.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/format.h>
-#include <ghoul/glm.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/dictionary.h>
diff --git a/modules/exoplanets/exoplanetsmodule.h b/modules/exoplanets/exoplanetsmodule.h
index 2e28f14ad8..3758c8cf8b 100644
--- a/modules/exoplanets/exoplanetsmodule.h
+++ b/modules/exoplanets/exoplanetsmodule.h
@@ -27,7 +27,6 @@
 
 #include <openspace/util/openspacemodule.h>
 
-#include <openspace/documentation/documentation.h>
 #include <openspace/properties/misc/stringproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
@@ -37,6 +36,8 @@
 
 namespace openspace {
 
+namespace documentation { struct Documentation; }
+
 class ExoplanetsModule : public OpenSpaceModule {
 public:
     constexpr static const char* Name = "Exoplanets";
diff --git a/modules/fieldlines/rendering/renderablefieldlines.cpp b/modules/fieldlines/rendering/renderablefieldlines.cpp
index 928a8c527d..5bc2bf2425 100644
--- a/modules/fieldlines/rendering/renderablefieldlines.cpp
+++ b/modules/fieldlines/rendering/renderablefieldlines.cpp
@@ -33,7 +33,6 @@
 #include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
-#include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/exception.h>
 #include <ghoul/misc/stringhelper.h>
 #include <ghoul/opengl/programobject.h>
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
index ca2fd838fa..36080825bf 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
@@ -30,7 +30,6 @@
 #include <openspace/engine/globals.h>
 #include <openspace/engine/windowdelegate.h>
 #include <openspace/rendering/renderengine.h>
-#include <openspace/rendering/transferfunction.h>
 #include <openspace/util/time.h>
 #include <openspace/util/timemanager.h>
 #include <openspace/util/updatestructures.h>
diff --git a/modules/fitsfilereader/src/fitsfilereader.cpp b/modules/fitsfilereader/src/fitsfilereader.cpp
index c371d1ac39..b154a225c0 100644
--- a/modules/fitsfilereader/src/fitsfilereader.cpp
+++ b/modules/fitsfilereader/src/fitsfilereader.cpp
@@ -33,7 +33,6 @@
 #include <fstream>
 #include <iterator>
 #include <sstream>
-#include <string>
 #include <string_view>
 #include <utility>
 
diff --git a/modules/gaia/rendering/octreemanager.cpp b/modules/gaia/rendering/octreemanager.cpp
index 0a1349d86b..0867204940 100644
--- a/modules/gaia/rendering/octreemanager.cpp
+++ b/modules/gaia/rendering/octreemanager.cpp
@@ -24,7 +24,6 @@
 
 #include <modules/gaia/rendering/octreemanager.h>
 
-#include <modules/gaia/rendering/octreeculler.h>
 #include <modules/globebrowsing/src/basictypes.h>
 #include <openspace/util/distanceconstants.h>
 #include <ghoul/format.h>
diff --git a/modules/gaia/rendering/renderablegaiastars.cpp b/modules/gaia/rendering/renderablegaiastars.cpp
index 798a20fabd..ee7d983654 100644
--- a/modules/gaia/rendering/renderablegaiastars.cpp
+++ b/modules/gaia/rendering/renderablegaiastars.cpp
@@ -39,17 +39,15 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/exception.h>
-#include <ghoul/opengl/bufferbinding.h>
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
 #include <ghoul/systemcapabilities/generalcapabilitiescomponent.h>
+#include <algorithm>
 #include <array>
-#include <fstream>
 #include <cstdint>
 #include <cstdlib>
-#include <algorithm>
-#include <optional>
+#include <fstream>
 #include <set>
 #include <utility>
 
diff --git a/modules/gaia/rendering/renderablegaiastars.h b/modules/gaia/rendering/renderablegaiastars.h
index a8a9b85c19..91df520fe3 100644
--- a/modules/gaia/rendering/renderablegaiastars.h
+++ b/modules/gaia/rendering/renderablegaiastars.h
@@ -42,7 +42,6 @@
 #include <ghoul/opengl/uniformcache.h>
 #include <filesystem>
 #include <memory>
-#include <vector>
 
 namespace ghoul::filesystem { class File; }
 
diff --git a/modules/galaxy/galaxymodule.cpp b/modules/galaxy/galaxymodule.cpp
index 42a738726e..1d1ddef7d0 100644
--- a/modules/galaxy/galaxymodule.cpp
+++ b/modules/galaxy/galaxymodule.cpp
@@ -34,7 +34,6 @@
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/templatefactory.h>
-#include <vector>
 
 namespace openspace {
 
diff --git a/modules/globebrowsing/src/asynctiledataprovider.cpp b/modules/globebrowsing/src/asynctiledataprovider.cpp
index b5fbaedc7a..ba9bf598ba 100644
--- a/modules/globebrowsing/src/asynctiledataprovider.cpp
+++ b/modules/globebrowsing/src/asynctiledataprovider.cpp
@@ -26,7 +26,6 @@
 
 #include <modules/globebrowsing/src/lruthreadpool.h>
 #include <modules/globebrowsing/src/rawtile.h>
-#include <modules/globebrowsing/src/rawtiledatareader.h>
 #include <modules/globebrowsing/src/tileloadjob.h>
 #include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
diff --git a/modules/globebrowsing/src/geojson/geojsonproperties.cpp b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
index af4c87d96a..8ac5c97e9a 100644
--- a/modules/globebrowsing/src/geojson/geojsonproperties.cpp
+++ b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
@@ -27,6 +27,7 @@
 #include <modules/globebrowsing/src/renderableglobe.h>
 #include <openspace/documentation/documentation.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
 #include <geos/io/GeoJSON.h>
@@ -34,7 +35,6 @@
 #include <algorithm>
 #include <array>
 #include <filesystem>
-#include <format>
 
 // Keys used to read properties from GeoJson files
 namespace geojson::propertykeys {
diff --git a/modules/globebrowsing/src/globelabelscomponent.cpp b/modules/globebrowsing/src/globelabelscomponent.cpp
index e2ad9f3473..a3c86d26b5 100644
--- a/modules/globebrowsing/src/globelabelscomponent.cpp
+++ b/modules/globebrowsing/src/globelabelscomponent.cpp
@@ -44,7 +44,6 @@
 #include <cmath>
 #include <cstdint>
 #include <cstring>
-#include <filesystem>
 #include <fstream>
 #include <ios>
 #include <optional>
diff --git a/modules/globebrowsing/src/gpulayergroup.cpp b/modules/globebrowsing/src/gpulayergroup.cpp
index 4528592abf..9f106d5158 100644
--- a/modules/globebrowsing/src/gpulayergroup.cpp
+++ b/modules/globebrowsing/src/gpulayergroup.cpp
@@ -35,7 +35,6 @@
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/texture.h>
 #include <string>
-#include <vector>
 
 namespace openspace::globebrowsing {
 
diff --git a/modules/globebrowsing/src/memoryawaretilecache.cpp b/modules/globebrowsing/src/memoryawaretilecache.cpp
index 509a294ace..7ea360e8fb 100644
--- a/modules/globebrowsing/src/memoryawaretilecache.cpp
+++ b/modules/globebrowsing/src/memoryawaretilecache.cpp
@@ -27,7 +27,6 @@
 #include <modules/globebrowsing/src/basictypes.h>
 #include <modules/globebrowsing/src/layergroupid.h>
 #include <modules/globebrowsing/src/rawtile.h>
-#include <modules/globebrowsing/src/tiletextureinitdata.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/profiling.h>
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index 2dbaa3e656..c74ed422ee 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -26,7 +26,6 @@
 
 #include <modules/debugging/rendering/debugrenderer.h>
 #include <modules/globebrowsing/src/basictypes.h>
-#include <modules/globebrowsing/src/gpulayergroup.h>
 #include <modules/globebrowsing/src/layer.h>
 #include <modules/globebrowsing/src/layergroup.h>
 #include <modules/globebrowsing/src/layergroupid.h>
@@ -51,10 +50,10 @@
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/memorypool.h>
 #include <ghoul/misc/profiling.h>
-#include <ghoul/opengl/texture.h>
-#include <ghoul/opengl/textureunit.h>
 #include <ghoul/opengl/openglstatecache.h>
 #include <ghoul/opengl/programobject.h>
+#include <ghoul/opengl/texture.h>
+#include <ghoul/opengl/textureunit.h>
 #include <ghoul/systemcapabilities/openglcapabilitiescomponent.h>
 #include <algorithm>
 #include <cmath>
diff --git a/modules/globebrowsing/src/ringscomponent.cpp b/modules/globebrowsing/src/ringscomponent.cpp
index 54bbee522f..0ca302c3a8 100644
--- a/modules/globebrowsing/src/ringscomponent.cpp
+++ b/modules/globebrowsing/src/ringscomponent.cpp
@@ -34,12 +34,10 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
-#include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/exception.h>
 #include <ghoul/misc/profiling.h>
 #include <ghoul/opengl/openglstatecache.h>
 #include <ghoul/opengl/programobject.h>
-#include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
 #include <ghoul/io/texture/texturereader.h>
 #include <array>
diff --git a/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp b/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp
index cbee800bcb..6142848368 100644
--- a/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp
@@ -25,7 +25,6 @@
 #include <modules/globebrowsing/src/tileprovider/imagesequencetileprovider.h>
 
 #include <modules/globebrowsing/src/tileindex.h>
-#include <modules/globebrowsing/src/tileprovider/defaulttileprovider.h>
 #include <openspace/documentation/documentation.h>
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/profiling.h>
diff --git a/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp
index e72e6f93cb..c694ecb8cb 100644
--- a/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp
@@ -30,7 +30,6 @@
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/exception.h>
 #include <ghoul/misc/profiling.h>
-#include <ghoul/opengl/texture.h>
 #include <limits>
 #include <optional>
 
diff --git a/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp b/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp
index 67a413705d..14d9bea93a 100644
--- a/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp
@@ -26,7 +26,6 @@
 
 #include <modules/globebrowsing/src/geodeticpatch.h>
 #include <modules/globebrowsing/src/layergroupid.h>
-#include <modules/globebrowsing/src/tiletextureinitdata.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/engine/globals.h>
 #include <ghoul/font/fontmanager.h>
diff --git a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
index 344020049d..f801e99f5d 100644
--- a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp
@@ -27,7 +27,6 @@
 #include <modules/globebrowsing/globebrowsingmodule.h>
 #include <modules/globebrowsing/src/memoryawaretilecache.h>
 #include <modules/globebrowsing/src/tileindex.h>
-#include <modules/globebrowsing/src/tileprovider/defaulttileprovider.h>
 #include <modules/globebrowsing/src/tiletextureinitdata.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/engine/globals.h>
diff --git a/modules/globebrowsing/src/tileprovider/texttileprovider.cpp b/modules/globebrowsing/src/tileprovider/texttileprovider.cpp
index 4277af1d61..381ac3744b 100644
--- a/modules/globebrowsing/src/tileprovider/texttileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/texttileprovider.cpp
@@ -27,7 +27,6 @@
 #include <modules/globebrowsing/globebrowsingmodule.h>
 #include <modules/globebrowsing/src/memoryawaretilecache.h>
 #include <modules/globebrowsing/src/tileindex.h>
-#include <modules/globebrowsing/src/tiletextureinitdata.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/moduleengine.h>
 #include <openspace/rendering/renderengine.h>
diff --git a/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp b/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp
index 527c961ef2..212b5c3205 100644
--- a/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp
@@ -29,7 +29,6 @@
 #include <modules/globebrowsing/src/tileindex.h>
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/profiling.h>
-#include <cstdint>
 #include <limits>
 #include <optional>
 
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbydate.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbydate.cpp
index 05656d3457..7eadf8187b 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbydate.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbydate.cpp
@@ -32,7 +32,6 @@
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/profiling.h>
 #include <algorithm>
-#include <map>
 #include <utility>
 
 namespace {
diff --git a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
index 6be9b39213..e7a4369070 100644
--- a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
+++ b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp
@@ -28,10 +28,8 @@
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/profiling.h>
 #include <algorithm>
-#include <cstdint>
 #include <limits>
 #include <utility>
-#include <vector>
 
 namespace {
     // This TileProvider provides the ability to override the contents for tiles at
diff --git a/modules/imgui/imguimodule.cpp b/modules/imgui/imguimodule.cpp
index 01cf5bea36..57ff280b90 100644
--- a/modules/imgui/imguimodule.cpp
+++ b/modules/imgui/imguimodule.cpp
@@ -45,13 +45,10 @@
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/profiling.h>
 #include <ghoul/opengl/programobject.h>
-#include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
-#include <ghoul/opengl/uniformcache.h>
 #include <algorithm>
 #include <cstdarg>
 #include <cstddef>
-#include <cstdint>
 #include <cstring>
 #include <filesystem>
 #include <utility>
diff --git a/modules/imgui/imguimodule.h b/modules/imgui/imguimodule.h
index 033095a233..bae66b0187 100644
--- a/modules/imgui/imguimodule.h
+++ b/modules/imgui/imguimodule.h
@@ -47,8 +47,8 @@
 #include <openspace/util/touch.h>
 #include <ghoul/glm.h>
 #include <ghoul/opengl/ghoul_gl.h>
-#include <ghoul/opengl/uniformcache.h>
 #include <ghoul/opengl/texture.h>
+#include <ghoul/opengl/uniformcache.h>
 #include <array>
 #include <cstdint>
 #include <memory>
diff --git a/modules/imgui/include/guiparallelcomponent.h b/modules/imgui/include/guiparallelcomponent.h
index d8ecf9f07e..5a11523100 100644
--- a/modules/imgui/include/guiparallelcomponent.h
+++ b/modules/imgui/include/guiparallelcomponent.h
@@ -32,6 +32,7 @@ namespace openspace::gui {
 class GuiParallelComponent : public GuiPropertyComponent {
 public:
     GuiParallelComponent();
+
     void render() override;
 
 private:
diff --git a/modules/iswa/rendering/renderableiswacygnet.cpp b/modules/iswa/rendering/renderableiswacygnet.cpp
index 9f7a08050e..9dc9e7ad12 100644
--- a/modules/iswa/rendering/renderableiswacygnet.cpp
+++ b/modules/iswa/rendering/renderableiswacygnet.cpp
@@ -42,7 +42,6 @@
 #include <ghoul/misc/dictionary.h>
 #include <cmath>
 #include <cstdlib>
-#include <optional>
 
 namespace {
     constexpr std::string_view _loggerCat = "IswaCygnet";
diff --git a/modules/iswa/rendering/renderabletexturecygnet.cpp b/modules/iswa/rendering/renderabletexturecygnet.cpp
index 97d9b40af4..a2d00dae47 100644
--- a/modules/iswa/rendering/renderabletexturecygnet.cpp
+++ b/modules/iswa/rendering/renderabletexturecygnet.cpp
@@ -29,10 +29,7 @@
 #include <ghoul/format.h>
 #include <ghoul/io/texture/texturereader.h>
 #include <ghoul/logging/logmanager.h>
-#include <ghoul/opengl/texture.h>
 #include <ghoul/misc/dictionary.h>
-#include <future>
-#include <memory>
 #include <utility>
 
 namespace {
diff --git a/modules/iswa/rendering/renderabletexturecygnet.h b/modules/iswa/rendering/renderabletexturecygnet.h
index 3d5df7245c..57b86c9c8c 100644
--- a/modules/iswa/rendering/renderabletexturecygnet.h
+++ b/modules/iswa/rendering/renderabletexturecygnet.h
@@ -27,8 +27,6 @@
 
 #include <modules/iswa/rendering/renderableiswacygnet.h>
 
-#include <openspace/engine/downloadmanager.h>
-
 namespace openspace {
 
 /**
diff --git a/modules/iswa/rendering/renderabletextureplane.cpp b/modules/iswa/rendering/renderabletextureplane.cpp
index 672589f314..05bb71858a 100644
--- a/modules/iswa/rendering/renderabletextureplane.cpp
+++ b/modules/iswa/rendering/renderabletextureplane.cpp
@@ -29,7 +29,6 @@
 #include <openspace/rendering/renderengine.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/misc/dictionary.h>
-#include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
 #include <ghoul/opengl/programobject.h>
 
diff --git a/modules/iswa/util/dataprocessor.cpp b/modules/iswa/util/dataprocessor.cpp
index 501d836047..6fde4f674c 100644
--- a/modules/iswa/util/dataprocessor.cpp
+++ b/modules/iswa/util/dataprocessor.cpp
@@ -24,7 +24,6 @@
 
 #include <modules/iswa/util/dataprocessor.h>
 
-#include <openspace/util/histogram.h>
 #include <algorithm>
 #include <numeric>
 #include <cmath>
diff --git a/modules/iswa/util/dataprocessorkameleon.cpp b/modules/iswa/util/dataprocessorkameleon.cpp
index 093d17d297..6a21c08ec1 100644
--- a/modules/iswa/util/dataprocessorkameleon.cpp
+++ b/modules/iswa/util/dataprocessorkameleon.cpp
@@ -27,12 +27,10 @@
 #include <modules/kameleon/include/kameleonwrapper.h>
 #include <openspace/properties/misc/selectionproperty.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/glm.h>
 #include <ghoul/misc/assert.h>
 #include <algorithm>
 #include <filesystem>
 #include <iterator>
-#include <set>
 #include <utility>
 
 namespace openspace {
diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp
index 88dbb1e1a6..f477f1a8c6 100644
--- a/modules/iswa/util/iswamanager.cpp
+++ b/modules/iswa/util/iswamanager.cpp
@@ -39,7 +39,6 @@
 #include <openspace/scripting/lualibrary.h>
 #include <openspace/scripting/scriptengine.h>
 #include <openspace/util/spicemanager.h>
-#include <ghoul/designpattern/event.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
diff --git a/modules/kameleon/src/kameleonwrapper.cpp b/modules/kameleon/src/kameleonwrapper.cpp
index c0334cfada..e614b7d3c1 100644
--- a/modules/kameleon/src/kameleonwrapper.cpp
+++ b/modules/kameleon/src/kameleonwrapper.cpp
@@ -25,11 +25,9 @@
 #include <modules/kameleon/include/kameleonwrapper.h>
 
 #include <ghoul/format.h>
-#include <ghoul/glm.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/stringhelper.h>
-#include <glm/gtx/std_based_type.hpp>
 #include <ghoul/format.h>
 #include <ghoul/misc/exception.h>
 #include <algorithm>
diff --git a/modules/kameleonvolume/kameleonvolumereader.cpp b/modules/kameleonvolume/kameleonvolumereader.cpp
index 035b3ea244..ae8a29f64f 100644
--- a/modules/kameleonvolume/kameleonvolumereader.cpp
+++ b/modules/kameleonvolume/kameleonvolumereader.cpp
@@ -30,7 +30,6 @@
 #include <ghoul/format.h>
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/exception.h>
-#include <filesystem>
 #include <limits>
 #include <utility>
 
diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
index 3fe19a1621..b1c71af857 100644
--- a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
+++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
@@ -43,7 +43,6 @@
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/opengl/texture.h>
 #include <array>
-#include <filesystem>
 #include <optional>
 
 namespace {
diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.h b/modules/kameleonvolume/rendering/renderablekameleonvolume.h
index f22c82e771..ff0b805bb1 100644
--- a/modules/kameleonvolume/rendering/renderablekameleonvolume.h
+++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.h
@@ -38,7 +38,6 @@
 #include <memory>
 
 namespace openspace { class TransferFunction; }
-
 namespace openspace::volume {
     class BasicVolumeRaycaster;
     template <typename T> class RawVolume;
diff --git a/modules/multiresvolume/rendering/brickmanager.cpp b/modules/multiresvolume/rendering/brickmanager.cpp
index a94cea8cd6..fc3508c331 100644
--- a/modules/multiresvolume/rendering/brickmanager.cpp
+++ b/modules/multiresvolume/rendering/brickmanager.cpp
@@ -31,7 +31,6 @@
 #include <glm/gtx/std_based_type.hpp>
 #include <algorithm>
 #include <cmath>
-#include <format>
 #include <string_view>
 
 namespace {
diff --git a/modules/multiresvolume/rendering/errorhistogrammanager.cpp b/modules/multiresvolume/rendering/errorhistogrammanager.cpp
index aeb8ded73b..0f0f5f7129 100644
--- a/modules/multiresvolume/rendering/errorhistogrammanager.cpp
+++ b/modules/multiresvolume/rendering/errorhistogrammanager.cpp
@@ -25,7 +25,6 @@
 #include <modules/multiresvolume/rendering/errorhistogrammanager.h>
 
 #include <modules/multiresvolume/rendering/tsp.h>
-#include <openspace/util/histogram.h>
 #include <openspace/util/progressbar.h>
 #include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
diff --git a/modules/multiresvolume/rendering/histogrammanager.cpp b/modules/multiresvolume/rendering/histogrammanager.cpp
index e406b59be3..4c85427541 100644
--- a/modules/multiresvolume/rendering/histogrammanager.cpp
+++ b/modules/multiresvolume/rendering/histogrammanager.cpp
@@ -25,7 +25,6 @@
 #include <modules/multiresvolume/rendering/histogrammanager.h>
 
 #include <modules/multiresvolume/rendering/tsp.h>
-#include <openspace/util/histogram.h>
 #include <cstring>
 #include <fstream>
 #include <utility>
diff --git a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
index aed3fc0532..c3bc5a64a7 100644
--- a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
+++ b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
@@ -25,7 +25,6 @@
 #include <modules/multiresvolume/rendering/localerrorhistogrammanager.h>
 
 #include <modules/multiresvolume/rendering/tsp.h>
-#include <openspace/util/histogram.h>
 #include <openspace/util/progressbar.h>
 #include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
@@ -34,7 +33,6 @@
 #include <cstring>
 #include <fstream>
 #include <string_view>
-#include <vector>
 
 namespace {
     constexpr std::string_view _loggerCat = "LocalErrorHistogramManager";
diff --git a/modules/multiresvolume/rendering/localtfbrickselector.h b/modules/multiresvolume/rendering/localtfbrickselector.h
index 797d22b0b9..99bc661a55 100644
--- a/modules/multiresvolume/rendering/localtfbrickselector.h
+++ b/modules/multiresvolume/rendering/localtfbrickselector.h
@@ -32,9 +32,9 @@
 
 namespace openspace {
 
-class TSP;
 class LocalErrorHistogramManager;
 class TransferFunction;
+class TSP;
 
 class LocalTfBrickSelector : public BrickSelector {
 public:
diff --git a/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp b/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
index 37e882346c..92ab6f1eef 100644
--- a/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
+++ b/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
@@ -29,10 +29,8 @@
 #include <openspace/rendering/transferfunction.h>
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/opengl/bufferbinding.h>
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/texture.h>
-#include <ghoul/opengl/textureunit.h>
 #include <glm/gtx/std_based_type.hpp>
 #include <cstdlib>
 
diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
index fb3217f2d3..b4aec584df 100644
--- a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
+++ b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
@@ -49,11 +49,8 @@
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/exception.h>
 #include <algorithm>
-#include <chrono>
-#include <filesystem>
-#include <fstream>
 #include <cmath>
-#include <optional>
+#include <fstream>
 
 namespace {
     constexpr std::string_view _loggerCat = "RenderableMultiresVolume";
diff --git a/modules/multiresvolume/rendering/simpletfbrickselector.h b/modules/multiresvolume/rendering/simpletfbrickselector.h
index 441544d341..7267812fd3 100644
--- a/modules/multiresvolume/rendering/simpletfbrickselector.h
+++ b/modules/multiresvolume/rendering/simpletfbrickselector.h
@@ -31,9 +31,9 @@
 
 namespace openspace {
 
-class TSP;
 class HistogramManager;
 class TransferFunction;
+class TSP;
 
 class SimpleTfBrickSelector : public BrickSelector {
 public:
diff --git a/modules/multiresvolume/rendering/tsp.cpp b/modules/multiresvolume/rendering/tsp.cpp
index 7bf2546d0c..05f50bdb51 100644
--- a/modules/multiresvolume/rendering/tsp.cpp
+++ b/modules/multiresvolume/rendering/tsp.cpp
@@ -31,7 +31,6 @@
 #include <ghoul/logging/logmanager.h>
 #include <algorithm>
 #include <cmath>
-#include <filesystem>
 #include <list>
 #include <numeric>
 #include <queue>
diff --git a/modules/server/servermodule.cpp b/modules/server/servermodule.cpp
index ab14054f27..362495a63c 100644
--- a/modules/server/servermodule.cpp
+++ b/modules/server/servermodule.cpp
@@ -24,7 +24,6 @@
 
 #include <modules/server/servermodule.h>
 
-#include <modules/server/include/serverinterface.h>
 #include <modules/server/include/connection.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/engine/globalscallbacks.h>
@@ -38,7 +37,6 @@
 #include <algorithm>
 #include <optional>
 #include <thread>
-#include <utility>
 
 namespace {
     struct [[codegen::Dictionary(ServerModule)]] Parameters {
diff --git a/modules/server/src/serverinterface.cpp b/modules/server/src/serverinterface.cpp
index dff25afd82..418313079f 100644
--- a/modules/server/src/serverinterface.cpp
+++ b/modules/server/src/serverinterface.cpp
@@ -26,10 +26,8 @@
 
 #include <openspace/documentation/documentation.h>
 #include <ghoul/misc/dictionary.h>
-#include <ghoul/io/socket/socketserver.h>
 #include <ghoul/io/socket/tcpsocketserver.h>
 #include <ghoul/io/socket/websocketserver.h>
-#include <optional>
 
 namespace {
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
diff --git a/modules/server/src/topics/eventtopic.cpp b/modules/server/src/topics/eventtopic.cpp
index 9af3580809..f961241505 100644
--- a/modules/server/src/topics/eventtopic.cpp
+++ b/modules/server/src/topics/eventtopic.cpp
@@ -27,7 +27,6 @@
 #include <modules/server/include/connection.h>
 #include <modules/server/include/jsonconverters.h>
 #include <openspace/engine/globals.h>
-#include <openspace/events/event.h>
 #include <openspace/events/eventengine.h>
 #include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
diff --git a/modules/server/src/topics/flightcontrollertopic.cpp b/modules/server/src/topics/flightcontrollertopic.cpp
index 683409178b..e080a55de7 100644
--- a/modules/server/src/topics/flightcontrollertopic.cpp
+++ b/modules/server/src/topics/flightcontrollertopic.cpp
@@ -27,7 +27,6 @@
 #include <modules/server/include/connection.h>
 #include <openspace/engine/globals.h>
 #include <openspace/interaction/websocketcamerastates.h>
-#include <openspace/interaction/websocketinputstate.h>
 #include <openspace/navigation/navigationhandler.h>
 #include <openspace/navigation/orbitalnavigator.h>
 #include <openspace/rendering/renderable.h>
@@ -38,11 +37,11 @@
 #include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
-#include <iterator>
-#include <unordered_map>
 #include <ghoul/misc/assert.h>
 #include <algorithm>
+#include <iterator>
 #include <string_view>
+#include <unordered_map>
 #include <vector>
 
 namespace {
diff --git a/modules/server/src/topics/skybrowsertopic.cpp b/modules/server/src/topics/skybrowsertopic.cpp
index 4ae66ea919..575dd545d8 100644
--- a/modules/server/src/topics/skybrowsertopic.cpp
+++ b/modules/server/src/topics/skybrowsertopic.cpp
@@ -32,7 +32,6 @@
 #include <openspace/engine/globals.h>
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/dictionaryjsonformatter.h>
-#include <memory>
 #include <string_view>
 #include <vector>
 
diff --git a/modules/server/src/topics/timetopic.cpp b/modules/server/src/topics/timetopic.cpp
index ae5d546c45..e9cbfa94ee 100644
--- a/modules/server/src/topics/timetopic.cpp
+++ b/modules/server/src/topics/timetopic.cpp
@@ -30,7 +30,6 @@
 #include <ghoul/misc/profiling.h>
 #include <optional>
 #include <string_view>
-#include <vector>
 
 namespace {
     constexpr std::string_view SubscribeEvent = "start_subscription";
diff --git a/modules/server/src/topics/topic.cpp b/modules/server/src/topics/topic.cpp
index 0a3b36d785..1df5f878ae 100644
--- a/modules/server/src/topics/topic.cpp
+++ b/modules/server/src/topics/topic.cpp
@@ -25,7 +25,6 @@
 #include <modules/server/include/topics/topic.h>
 
 #include <modules/server/include/connection.h>
-#include <openspace/json.h>
 #include <ghoul/misc/profiling.h>
 #include <utility>
 
diff --git a/modules/skybrowser/src/renderableskytarget.cpp b/modules/skybrowser/src/renderableskytarget.cpp
index b23451a152..4a68d5e41b 100644
--- a/modules/skybrowser/src/renderableskytarget.cpp
+++ b/modules/skybrowser/src/renderableskytarget.cpp
@@ -36,7 +36,6 @@
 #include <ghoul/misc/profiling.h>
 #include <ghoul/opengl/programobject.h>
 #include <memory>
-#include <optional>
 #include <utility>
 
 namespace {
diff --git a/modules/skybrowser/src/targetbrowserpair.cpp b/modules/skybrowser/src/targetbrowserpair.cpp
index 53c933023a..26da0025c0 100644
--- a/modules/skybrowser/src/targetbrowserpair.cpp
+++ b/modules/skybrowser/src/targetbrowserpair.cpp
@@ -26,7 +26,6 @@
 
 #include <modules/skybrowser/include/renderableskytarget.h>
 #include <modules/skybrowser/include/screenspaceskybrowser.h>
-#include <modules/skybrowser/include/utility.h>
 #include <modules/skybrowser/include/wwtdatahandler.h>
 #include <modules/skybrowser/skybrowsermodule.h>
 #include <openspace/camera/camera.h>
diff --git a/modules/skybrowser/src/wwtdatahandler.cpp b/modules/skybrowser/src/wwtdatahandler.cpp
index f8b57715e6..8613c44350 100644
--- a/modules/skybrowser/src/wwtdatahandler.cpp
+++ b/modules/skybrowser/src/wwtdatahandler.cpp
@@ -26,13 +26,13 @@
 
 #include <modules/skybrowser/include/utility.h>
 #include <openspace/util/httprequest.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/profiling.h>
 #include <tinyxml2.h>
 #include <algorithm>
 #include <cctype>
 #include <chrono>
-#include <format>
 #include <fstream>
 #include <memory>
 #include <string_view>
diff --git a/modules/space/rendering/renderableconstellationbounds.cpp b/modules/space/rendering/renderableconstellationbounds.cpp
index f69e7bb363..8ddf7d0ad3 100644
--- a/modules/space/rendering/renderableconstellationbounds.cpp
+++ b/modules/space/rendering/renderableconstellationbounds.cpp
@@ -40,7 +40,6 @@
 #include <array>
 #include <filesystem>
 #include <fstream>
-#include <optional>
 #include <set>
 #include <sstream>
 #include <utility>
diff --git a/modules/space/rendering/renderableconstellationlines.cpp b/modules/space/rendering/renderableconstellationlines.cpp
index 50c7a448c8..64f109cc1c 100644
--- a/modules/space/rendering/renderableconstellationlines.cpp
+++ b/modules/space/rendering/renderableconstellationlines.cpp
@@ -42,7 +42,6 @@
 #include <algorithm>
 #include <filesystem>
 #include <fstream>
-#include <optional>
 #include <set>
 #include <sstream>
 #include <tuple>
diff --git a/modules/space/rendering/renderableconstellationsbase.cpp b/modules/space/rendering/renderableconstellationsbase.cpp
index 0523742caf..81320f56d7 100644
--- a/modules/space/rendering/renderableconstellationsbase.cpp
+++ b/modules/space/rendering/renderableconstellationsbase.cpp
@@ -35,7 +35,6 @@
 #include <ghoul/misc/exception.h>
 #include <filesystem>
 #include <fstream>
-#include <optional>
 #include <sstream>
 #include <utility>
 
diff --git a/modules/space/rendering/renderablefluxnodes.cpp b/modules/space/rendering/renderablefluxnodes.cpp
index a199258340..ceb675c916 100644
--- a/modules/space/rendering/renderablefluxnodes.cpp
+++ b/modules/space/rendering/renderablefluxnodes.cpp
@@ -28,7 +28,6 @@
 #include <openspace/engine/globals.h>
 #include <openspace/engine/windowdelegate.h>
 #include <openspace/rendering/renderengine.h>
-#include <openspace/rendering/transferfunction.h>
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/util/time.h>
 #include <openspace/util/updatestructures.h>
@@ -43,12 +42,9 @@
 #include <ghoul/opengl/textureunit.h>
 #include <algorithm>
 #include <array>
-#include <cstdint>
-#include <filesystem>
 #include <fstream>
 #include <iterator>
 #include <limits>
-#include <optional>
 #include <sstream>
 
 namespace {
diff --git a/modules/space/rendering/renderablehabitablezone.cpp b/modules/space/rendering/renderablehabitablezone.cpp
index 489fa2b49c..d58a95789c 100644
--- a/modules/space/rendering/renderablehabitablezone.cpp
+++ b/modules/space/rendering/renderablehabitablezone.cpp
@@ -36,7 +36,6 @@
 #include <ghoul/opengl/textureunit.h>
 #include <array>
 #include <cmath>
-#include <optional>
 
 namespace {
     constexpr openspace::properties::Property::PropertyInfo EffectiveTemperatureInfo = {
diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp
index a72e759cc4..b2d48f948e 100644
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -52,7 +52,6 @@
 #include <filesystem>
 #include <memory>
 #include <numeric>
-#include <optional>
 #include <random>
 #include <thread>
 
diff --git a/modules/space/rendering/renderablerings.cpp b/modules/space/rendering/renderablerings.cpp
index 725d66b5f8..574e7876e3 100644
--- a/modules/space/rendering/renderablerings.cpp
+++ b/modules/space/rendering/renderablerings.cpp
@@ -41,7 +41,6 @@
 #include <array>
 #include <cstddef>
 #include <filesystem>
-#include <optional>
 #include <utility>
 
 namespace {
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index 7ecd2a6c16..0609b159a7 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -25,10 +25,10 @@
 #include <modules/space/rendering/renderablestars.h>
 
 #include <openspace/documentation/documentation.h>
-#include <openspace/util/updatestructures.h>
-#include <openspace/util/distanceconstants.h>
 #include <openspace/engine/globals.h>
 #include <openspace/rendering/renderengine.h>
+#include <openspace/util/updatestructures.h>
+#include <openspace/util/distanceconstants.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/io/texture/texturereader.h>
@@ -45,7 +45,6 @@
 #include <cstddef>
 #include <filesystem>
 #include <limits>
-#include <optional>
 
 namespace {
     constexpr std::string_view _loggerCat = "RenderableStars";
diff --git a/modules/space/rendering/renderabletravelspeed.cpp b/modules/space/rendering/renderabletravelspeed.cpp
index 7227090742..cbd670d727 100644
--- a/modules/space/rendering/renderabletravelspeed.cpp
+++ b/modules/space/rendering/renderabletravelspeed.cpp
@@ -39,7 +39,6 @@
 #include <ghoul/misc/exception.h>
 #include <ghoul/opengl/programobject.h>
 #include <memory>
-#include <optional>
 
 namespace {
     constexpr openspace::properties::Property::PropertyInfo SpeedInfo = {
diff --git a/modules/space/spacemodule.cpp b/modules/space/spacemodule.cpp
index 273d9ca661..1cdfe70750 100644
--- a/modules/space/spacemodule.cpp
+++ b/modules/space/spacemodule.cpp
@@ -52,7 +52,6 @@
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/objectmanager.h>
 #include <ghoul/misc/templatefactory.h>
-#include <ghoul/opengl/programobjectmanager.h>
 #include <optional>
 
 #include "spacemodule_lua.inl"
diff --git a/modules/space/translation/spicetranslation.cpp b/modules/space/translation/spicetranslation.cpp
index 15a24d3d31..48f35545f9 100644
--- a/modules/space/translation/spicetranslation.cpp
+++ b/modules/space/translation/spicetranslation.cpp
@@ -30,7 +30,6 @@
 #include <openspace/util/updatestructures.h>
 #include <ghoul/misc/dictionary.h>
 #include <filesystem>
-#include <optional>
 #include <variant>
 
 namespace {
diff --git a/modules/spacecraftinstruments/rendering/renderablefov.cpp b/modules/spacecraftinstruments/rendering/renderablefov.cpp
index 200d6c1215..8df83725b6 100644
--- a/modules/spacecraftinstruments/rendering/renderablefov.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablefov.cpp
@@ -38,7 +38,6 @@
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/exception.h>
 #include <ghoul/opengl/programobject.h>
-#include <ghoul/opengl/uniformcache.h>
 #include <glm/gtx/projection.hpp>
 #include <optional>
 #include <algorithm>
diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
index 894ebaf40c..aef746a8a3 100644
--- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
@@ -24,7 +24,6 @@
 
 #include <modules/spacecraftinstruments/rendering/renderablemodelprojection.h>
 
-#include <modules/spacecraftinstruments/util/image.h>
 #include <modules/spacecraftinstruments/util/imagesequencer.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/engine/globals.h>
diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
index bde0b2b132..1adb06b48c 100644
--- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
@@ -30,7 +30,6 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/engine/globals.h>
 #include <openspace/rendering/renderengine.h>
-#include <openspace/util/sphere.h>
 #include <openspace/util/spicemanager.h>
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/filesystem.h>
diff --git a/modules/spacecraftinstruments/util/decoder.cpp b/modules/spacecraftinstruments/util/decoder.cpp
index 2513eecfe7..dff4bf836f 100644
--- a/modules/spacecraftinstruments/util/decoder.cpp
+++ b/modules/spacecraftinstruments/util/decoder.cpp
@@ -26,7 +26,6 @@
 
 #include <openspace/util/factorymanager.h>
 #include <ghoul/misc/dictionary.h>
-#include <ghoul/misc/exception.h>
 #include <ghoul/misc/templatefactory.h>
 
 namespace openspace {
diff --git a/modules/spacecraftinstruments/util/hongkangparser.cpp b/modules/spacecraftinstruments/util/hongkangparser.cpp
index 4396f20888..c796880869 100644
--- a/modules/spacecraftinstruments/util/hongkangparser.cpp
+++ b/modules/spacecraftinstruments/util/hongkangparser.cpp
@@ -33,7 +33,6 @@
 #include <ghoul/misc/exception.h>
 #include <ghoul/misc/stringhelper.h>
 #include <cstdlib>
-#include <filesystem>
 #include <fstream>
 #include <ios>
 #include <string_view>
diff --git a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
index 674f90edef..9d5cf4a855 100644
--- a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
+++ b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
@@ -35,9 +35,7 @@
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/stringhelper.h>
 #include <algorithm>
-#include <filesystem>
 #include <fstream>
-#include <regex>
 #include <string_view>
 
 namespace {
diff --git a/modules/spacecraftinstruments/util/projectioncomponent.cpp b/modules/spacecraftinstruments/util/projectioncomponent.cpp
index 7cde2bf5a6..d0d8600fdc 100644
--- a/modules/spacecraftinstruments/util/projectioncomponent.cpp
+++ b/modules/spacecraftinstruments/util/projectioncomponent.cpp
@@ -44,7 +44,6 @@
 #include <ghoul/opengl/texture.h>
 #include <ghoul/systemcapabilities/openglcapabilitiescomponent.h>
 #include <array>
-#include <optional>
 #include <utility>
 #include <variant>
 
diff --git a/modules/spout/renderableplanespout.cpp b/modules/spout/renderableplanespout.cpp
index 5de85be83c..424e8302eb 100644
--- a/modules/spout/renderableplanespout.cpp
+++ b/modules/spout/renderableplanespout.cpp
@@ -26,7 +26,6 @@
 
 #include <modules/spout/renderableplanespout.h>
 
-#include <modules/base/rendering/renderableplane.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/scene/scenegraphnode.h>
 #include <ghoul/format.h>
diff --git a/modules/spout/renderablespherespout.cpp b/modules/spout/renderablespherespout.cpp
index 102c1478ba..29bc9c75d1 100644
--- a/modules/spout/renderablespherespout.cpp
+++ b/modules/spout/renderablespherespout.cpp
@@ -26,7 +26,6 @@
 
 #include <modules/spout/renderablespherespout.h>
 
-#include <modules/base/rendering/renderablesphere.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/scene/scenegraphnode.h>
 #include <ghoul/format.h>
diff --git a/modules/statemachine/statemachinemodule.cpp b/modules/statemachine/statemachinemodule.cpp
index 3297373082..b02eb34838 100644
--- a/modules/statemachine/statemachinemodule.cpp
+++ b/modules/statemachine/statemachinemodule.cpp
@@ -25,7 +25,6 @@
 #include <modules/statemachine/statemachinemodule.h>
 
 #include <modules/statemachine/include/state.h>
-#include <modules/statemachine/include/statemachine.h>
 #include <modules/statemachine/include/transition.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/scripting/lualibrary.h>
@@ -34,7 +33,6 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
 #include <filesystem>
-#include <optional>
 #include <string>
 #include <utility>
 
diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp
index 1c04b3abc6..402b5f4837 100644
--- a/modules/sync/syncs/httpsynchronization.cpp
+++ b/modules/sync/syncs/httpsynchronization.cpp
@@ -42,7 +42,6 @@
 #include <sstream>
 #include <string_view>
 #include <system_error>
-#include <thread>
 #include <unordered_map>
 #include <utility>
 
diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp
index 00cd0627a4..73063fea0d 100644
--- a/modules/sync/syncs/urlsynchronization.cpp
+++ b/modules/sync/syncs/urlsynchronization.cpp
@@ -44,7 +44,6 @@
 #include <optional>
 #include <string_view>
 #include <system_error>
-#include <thread>
 #include <unordered_map>
 #include <utility>
 #include <variant>
diff --git a/modules/telemetry/src/general/nodestelemetry.cpp b/modules/telemetry/src/general/nodestelemetry.cpp
index cc7126ea4d..5229dfa280 100644
--- a/modules/telemetry/src/general/nodestelemetry.cpp
+++ b/modules/telemetry/src/general/nodestelemetry.cpp
@@ -32,9 +32,9 @@
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/scripting/lualibrary.h>
 #include <openspace/util/distanceconversion.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <cstdlib>
-#include <format>
 #include <limits>
 #include <utility>
 
diff --git a/modules/telemetry/src/specific/planetssonification.cpp b/modules/telemetry/src/specific/planetssonification.cpp
index e5d879155e..75f9b1f3ba 100644
--- a/modules/telemetry/src/specific/planetssonification.cpp
+++ b/modules/telemetry/src/specific/planetssonification.cpp
@@ -35,13 +35,13 @@
 #include <openspace/scripting/lualibrary.h>
 #include <openspace/util/distanceconversion.h>
 #include <openspace/util/memorymanager.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/dictionary.h>
 #include <osc/OscTypes.h>
 #include <cstdint>
 #include <cstdlib>
-#include <format>
 #include <limits>
 #include <optional>
 #include <utility>
diff --git a/modules/telemetry/telemetrymodule.h b/modules/telemetry/telemetrymodule.h
index 6a46b837b6..8288ca0ced 100644
--- a/modules/telemetry/telemetrymodule.h
+++ b/modules/telemetry/telemetrymodule.h
@@ -25,7 +25,7 @@
 #ifndef __OPENSPACE_MODULE_TELEMETRY___TELEMETRYMODULE___H__
 #define __OPENSPACE_MODULE_TELEMETRY___TELEMETRYMODULE___H__
 
-#include "openspace/util/openspacemodule.h"
+#include <openspace/util/openspacemodule.h>
 
 #include <openspace/properties/misc/optionproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
diff --git a/modules/touch/touchmodule.cpp b/modules/touch/touchmodule.cpp
index 419664e0fd..abbb2e4c6f 100644
--- a/modules/touch/touchmodule.cpp
+++ b/modules/touch/touchmodule.cpp
@@ -35,7 +35,6 @@
 #include <openspace/navigation/navigationhandler.h>
 #include <openspace/rendering/renderable.h>
 #include <openspace/util/factorymanager.h>
-#include <openspace/util/touch.h>
 #include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
diff --git a/modules/toyvolume/rendering/toyvolumeraycaster.cpp b/modules/toyvolume/rendering/toyvolumeraycaster.cpp
index 59815cca74..527257394d 100644
--- a/modules/toyvolume/rendering/toyvolumeraycaster.cpp
+++ b/modules/toyvolume/rendering/toyvolumeraycaster.cpp
@@ -27,7 +27,6 @@
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/format.h>
-#include <ghoul/glm.h>
 #include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/opengl/programobject.h>
 #include <cmath>
diff --git a/modules/video/src/videoplayer.cpp b/modules/video/src/videoplayer.cpp
index 5e7675e63d..23b0e754df 100644
--- a/modules/video/src/videoplayer.cpp
+++ b/modules/video/src/videoplayer.cpp
@@ -41,7 +41,6 @@
 #include <ghoul/opengl/openglstatecache.h>
 #include <render_gl.h>
 #include <ghoul/opengl/texture.h>
-#include <cstdint>
 #include <cstdlib>
 #include <optional>
 
diff --git a/modules/volume/rendering/basicvolumeraycaster.cpp b/modules/volume/rendering/basicvolumeraycaster.cpp
index 2cf88e5d0e..e97e8a3eaf 100644
--- a/modules/volume/rendering/basicvolumeraycaster.cpp
+++ b/modules/volume/rendering/basicvolumeraycaster.cpp
@@ -33,7 +33,6 @@
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/textureunit.h>
 #include <ghoul/opengl/texture.h>
-#include <filesystem>
 #include <string>
 #include <string_view>
 #include <utility>
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp
index 53a4b90023..eecacaf7f9 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.cpp
+++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp
@@ -27,7 +27,6 @@
 #include <modules/volume/rendering/basicvolumeraycaster.h>
 #include <modules/volume/rendering/volumeclipplanes.h>
 #include <modules/volume/rawvolume.h>
-#include <modules/volume/rawvolumemetadata.h>
 #include <modules/volume/rawvolumereader.h>
 #include <modules/volume/volumegridtype.h>
 #include <openspace/documentation/documentation.h>
@@ -46,7 +45,6 @@
 #include <ghoul/misc/exception.h>
 #include <ghoul/opengl/texture.h>
 #include <optional>
-#include <memory>
 #include <type_traits>
 #include <utility>
 
diff --git a/modules/volume/tasks/generaterawvolumefromfiletask.cpp b/modules/volume/tasks/generaterawvolumefromfiletask.cpp
index 822710767f..246322ff5b 100644
--- a/modules/volume/tasks/generaterawvolumefromfiletask.cpp
+++ b/modules/volume/tasks/generaterawvolumefromfiletask.cpp
@@ -38,7 +38,6 @@
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/dictionaryluaformatter.h>
 #include <algorithm>
-#include <filesystem>
 #include <fstream>
 #include <ios>
 #include <limits>
diff --git a/modules/volume/transferfunction.cpp b/modules/volume/transferfunction.cpp
index fc0456ebd4..f1b8d26e7b 100644
--- a/modules/volume/transferfunction.cpp
+++ b/modules/volume/transferfunction.cpp
@@ -30,9 +30,9 @@
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/dictionary.h>
 #include <algorithm>
+#include <cstring>
 #include <fstream>
 #include <iterator>
-#include <cstring>
 #include <string_view>
 
 namespace {
diff --git a/modules/volume/transferfunctionhandler.cpp b/modules/volume/transferfunctionhandler.cpp
index 07552b29c6..a49ecb52c9 100644
--- a/modules/volume/transferfunctionhandler.cpp
+++ b/modules/volume/transferfunctionhandler.cpp
@@ -24,7 +24,6 @@
 
 #include <modules/volume/transferfunctionhandler.h>
 
-#include <openspace/rendering/transferfunction.h>
 #include <ghoul/opengl/texture.h>
 #include <utility>
 
diff --git a/modules/webbrowser/src/browserclient.cpp b/modules/webbrowser/src/browserclient.cpp
index 8a83925537..0512072ae6 100644
--- a/modules/webbrowser/src/browserclient.cpp
+++ b/modules/webbrowser/src/browserclient.cpp
@@ -27,9 +27,9 @@
 #include <modules/webbrowser/include/defaultbrowserlauncher.h>
 #include <modules/webbrowser/include/webrenderhandler.h>
 #include <modules/webbrowser/include/webkeyboardhandler.h>
-#include <ghoul/misc/assert.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/windowdelegate.h>
+#include <ghoul/misc/assert.h>
 
 namespace openspace {
 
diff --git a/modules/webbrowser/src/screenspacebrowser.cpp b/modules/webbrowser/src/screenspacebrowser.cpp
index bf080cb549..fad1e9ab57 100644
--- a/modules/webbrowser/src/screenspacebrowser.cpp
+++ b/modules/webbrowser/src/screenspacebrowser.cpp
@@ -25,7 +25,6 @@
 #include <modules/webbrowser/include/screenspacebrowser.h>
 
 #include <modules/webbrowser/webbrowsermodule.h>
-#include <modules/webbrowser/include/webkeyboardhandler.h>
 #include <modules/webbrowser/include/browserinstance.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/engine/globals.h>
diff --git a/modules/webbrowser/src/webrenderhandler.cpp b/modules/webbrowser/src/webrenderhandler.cpp
index ec16da1950..502bfba868 100644
--- a/modules/webbrowser/src/webrenderhandler.cpp
+++ b/modules/webbrowser/src/webrenderhandler.cpp
@@ -26,7 +26,6 @@
 
 #include <modules/webbrowser/webbrowsermodule.h>
 #include <ghoul/format.h>
-#include <ghoul/glm.h>
 #include <ghoul/misc/assert.h>
 #include <algorithm>
 
diff --git a/modules/webgui/webguimodule.h b/modules/webgui/webguimodule.h
index 1f4cc3e882..86fd350976 100644
--- a/modules/webgui/webguimodule.h
+++ b/modules/webgui/webguimodule.h
@@ -34,10 +34,8 @@
 #include <ghoul/misc/process.h>
 #include <functional>
 #include <memory>
-#include <string>
 #include <unordered_map>
 #include <utility>
-#include <vector>
 
 namespace openspace {
 
diff --git a/src/data/csvloader.cpp b/src/data/csvloader.cpp
index f5b35792ed..06c9b50dcf 100644
--- a/src/data/csvloader.cpp
+++ b/src/data/csvloader.cpp
@@ -24,7 +24,6 @@
 
 #include <openspace/data/csvloader.h>
 
-#include <openspace/data/datamapping.h>
 #include <openspace/util/progressbar.h>
 #include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
diff --git a/src/data/dataloader.cpp b/src/data/dataloader.cpp
index e0858def55..b9a3f917fa 100644
--- a/src/data/dataloader.cpp
+++ b/src/data/dataloader.cpp
@@ -38,17 +38,12 @@
 #include <cmath>
 #include <cstdint>
 #include <cstring>
-#include <filesystem>
-#include <format>
 #include <fstream>
 #include <functional>
 #include <limits>
-#include <optional>
-#include <string>
 #include <string_view>
 #include <type_traits>
 #include <utility>
-#include <vector>
 
 namespace {
     constexpr int8_t DataCacheFileVersion = 13;
diff --git a/src/data/speckloader.cpp b/src/data/speckloader.cpp
index 07fdc06b60..1f65570a85 100644
--- a/src/data/speckloader.cpp
+++ b/src/data/speckloader.cpp
@@ -33,10 +33,8 @@
 #include <algorithm>
 #include <cctype>
 #include <cstdlib>
-#include <filesystem>
 #include <fstream>
 #include <limits>
-#include <optional>
 #include <sstream>
 #include <string>
 #include <string_view>
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index fde4b5c1e3..dc4dbfbe51 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -25,7 +25,6 @@
 #include <openspace/documentation/documentationengine.h>
 
 #include <openspace/documentation/core_registration.h>
-#include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/engine/globals.h>
@@ -35,9 +34,7 @@
 #include <openspace/interaction/action.h>
 #include <openspace/interaction/actionmanager.h>
 #include <openspace/interaction/keybindingmanager.h>
-#include <openspace/json.h>
 #include <openspace/properties/property.h>
-#include <openspace/properties/propertyowner.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/asset.h>
 #include <openspace/scene/assetmanager.h>
@@ -66,7 +63,6 @@
 #include <string_view>
 #include <unordered_map>
 #include <utility>
-#include <vector>
 
 namespace {
     constexpr std::string_view _loggerCat = "DocumentationEngine";
diff --git a/src/documentation/verifier.cpp b/src/documentation/verifier.cpp
index e7e04b0cd1..f3b32c03b6 100644
--- a/src/documentation/verifier.cpp
+++ b/src/documentation/verifier.cpp
@@ -24,10 +24,8 @@
 
 #include <openspace/documentation/verifier.h>
 
-#include <openspace/documentation/documentation.h>
 #include <openspace/documentation/documentationengine.h>
 #include <ghoul/format.h>
-#include <ghoul/glm.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/stringhelper.h>
@@ -36,14 +34,8 @@
 #include <ctime>
 #include <iomanip>
 #include <filesystem>
-#include <functional>
-#include <memory>
-#include <optional>
 #include <sstream>
-#include <string>
 #include <utility>
-#include <vector>
-#include <variant>
 
 namespace openspace::documentation {
 
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index ac4513befe..3c98bd5195 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -31,15 +31,13 @@
 #include <openspace/engine/moduleengine.h>
 #include <openspace/util/openspacemodule.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/lua/ghoul_lua.h>
 #include <ghoul/lua/lua_helper.h>
-#include <ghoul/lua/luastate.h>
 #include <ghoul/misc/assert.h>
-#include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/dictionaryjsonformatter.h>
 #include <ghoul/misc/exception.h>
 #include <ghoul/misc/stringconversion.h>
-#include <format>
 #include <memory>
 #include <new>
 #include <optional>
diff --git a/src/engine/downloadmanager.cpp b/src/engine/downloadmanager.cpp
index f73bcf2db2..5adf4bbbf4 100644
--- a/src/engine/downloadmanager.cpp
+++ b/src/engine/downloadmanager.cpp
@@ -32,10 +32,8 @@
 #include <ghoul/misc/thread.h>
 #include <curl/curl.h>
 #include <cerrno>
-#include <chrono>
 #include <cstdio>
 #include <cstring>
-#include <filesystem>
 #include <malloc.h>
 #include <sstream>
 #include <string_view>
diff --git a/src/engine/globals.cpp b/src/engine/globals.cpp
index f9c050a284..46c987b2f9 100644
--- a/src/engine/globals.cpp
+++ b/src/engine/globals.cpp
@@ -62,7 +62,6 @@
 #include <ghoul/misc/profiling.h>
 #include <algorithm>
 #include <array>
-#include <memory>
 
 namespace openspace {
 namespace {
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 2d3bb7be00..19191be8a3 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -31,7 +31,6 @@
 #include <openspace/documentation/documentationengine.h>
 #include <openspace/engine/configuration.h>
 #include <openspace/engine/globals.h>
-#include <openspace/engine/globalscallbacks.h>
 #include <openspace/engine/logfactory.h>
 #include <openspace/engine/moduleengine.h>
 #include <openspace/engine/settings.h>
@@ -55,7 +54,6 @@
 #include <openspace/rendering/luaconsole.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/assetmanager.h>
-#include <openspace/scene/profile.h>
 #include <openspace/scene/scene.h>
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/scene/sceneinitializer.h>
@@ -63,14 +61,11 @@
 #include <openspace/scripting/scriptscheduler.h>
 #include <openspace/scripting/scriptengine.h>
 #include <openspace/util/factorymanager.h>
-#include <openspace/util/keys.h>
 #include <openspace/util/memorymanager.h>
-#include <openspace/util/mouse.h>
 #include <openspace/util/openspacemodule.h>
 #include <openspace/util/spicemanager.h>
 #include <openspace/util/task.h>
 #include <openspace/util/timemanager.h>
-#include <openspace/util/touch.h>
 #include <openspace/util/transformationmanager.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/font/fontmanager.h>
@@ -103,20 +98,11 @@
 #include <glbinding-aux/types_to_string.h>
 #include <algorithm>
 #include <chrono>
-#include <cstddef>
-#include <cstdint>
-#include <filesystem>
-#include <functional>
-#include <future>
-#include <memory>
 #include <numeric>
 #include <sstream>
-#include <string>
 #include <string_view>
 #include <thread>
-#include <utility>
 #include <variant>
-#include <vector>
 
 #ifdef WIN32
 #include <Windows.h>
diff --git a/src/engine/settings.cpp b/src/engine/settings.cpp
index 6cb98eff25..f3a3440875 100644
--- a/src/engine/settings.cpp
+++ b/src/engine/settings.cpp
@@ -24,7 +24,6 @@
 
 #include <openspace/engine/settings.h>
 
-#include <openspace/engine/configuration.h>
 #include <openspace/json.h>
 #include <fstream>
 #include <sstream>
diff --git a/src/interaction/actionmanager.cpp b/src/interaction/actionmanager.cpp
index bba59dfbec..f95923676b 100644
--- a/src/interaction/actionmanager.cpp
+++ b/src/interaction/actionmanager.cpp
@@ -28,7 +28,6 @@
 #include <openspace/events/event.h>
 #include <openspace/events/eventengine.h>
 #include <openspace/engine/globals.h>
-#include <openspace/interaction/action.h>
 #include <openspace/scripting/lualibrary.h>
 #include <openspace/scripting/scriptengine.h>
 #include <ghoul/format.h>
@@ -39,7 +38,6 @@
 #include <ghoul/misc/dictionaryluaformatter.h>
 #include <string>
 #include <utility>
-#include <vector>
 
 #include "actionmanager_lua.inl"
 
diff --git a/src/interaction/keyframerecordinghandler.cpp b/src/interaction/keyframerecordinghandler.cpp
index e38b87b314..8c4cce060e 100644
--- a/src/interaction/keyframerecordinghandler.cpp
+++ b/src/interaction/keyframerecordinghandler.cpp
@@ -25,7 +25,6 @@
 #include <openspace/interaction/keyframerecordinghandler.h>
 
 #include <openspace/engine/globals.h>
-#include <openspace/interaction/sessionrecording.h>
 #include <openspace/interaction/sessionrecordinghandler.h>
 #include <openspace/navigation/keyframenavigator.h>
 #include <openspace/network/messagestructures.h>
@@ -37,12 +36,9 @@
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/exception.h>
 #include <algorithm>
-#include <filesystem>
 #include <optional>
-#include <string>
 #include <utility>
 #include <variant>
-#include <vector>
 
 #include "keyframerecordinghandler_lua.inl"
 
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 96c3181c25..f2770b00cb 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -33,17 +33,13 @@
 #include <array>
 #include <cstddef>
 #include <cstdint>
-#include <filesystem>
 #include <fstream>
 #include <istream>
 #include <optional>
 #include <ostream>
 #include <stdexcept>
-#include <string>
 #include <string_view>
 #include <utility>
-#include <variant>
-#include <vector>
 
 namespace {
     template <class... Ts> struct overloaded : Ts... { using Ts::operator()...; };
diff --git a/src/interaction/sessionrecordinghandler.cpp b/src/interaction/sessionrecordinghandler.cpp
index 59157a8bd9..39e4b489fb 100644
--- a/src/interaction/sessionrecordinghandler.cpp
+++ b/src/interaction/sessionrecordinghandler.cpp
@@ -30,7 +30,6 @@
 #include <openspace/engine/windowdelegate.h>
 #include <openspace/events/event.h>
 #include <openspace/events/eventengine.h>
-#include <openspace/interaction/sessionrecording.h>
 #include <openspace/navigation/keyframenavigator.h>
 #include <openspace/navigation/navigationhandler.h>
 #include <openspace/network/messagestructures.h>
@@ -42,7 +41,6 @@
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scene.h>
 #include <openspace/scene/scenegraphnode.h>
-#include <openspace/scripting/lualibrary.h>
 #include <openspace/scripting/scriptengine.h>
 #include <openspace/util/time.h>
 #include <openspace/util/timemanager.h>
@@ -55,17 +53,9 @@
 #include <ghoul/misc/profiling.h>
 #include <algorithm>
 #include <array>
-#include <chrono>
-#include <filesystem>
-#include <functional>
 #include <iterator>
 #include <memory>
-#include <optional>
-#include <string>
-#include <string_view>
-#include <utility>
 #include <variant>
-#include <vector>
 
 #ifdef WIN32
 #include <Windows.h>
diff --git a/src/interaction/tasks/convertrecformattask.cpp b/src/interaction/tasks/convertrecformattask.cpp
index bc1de89f7f..231425068e 100644
--- a/src/interaction/tasks/convertrecformattask.cpp
+++ b/src/interaction/tasks/convertrecformattask.cpp
@@ -25,7 +25,6 @@
 #include <openspace/interaction/tasks/convertrecformattask.h>
 
 #include <openspace/documentation/documentation.h>
-#include <openspace/interaction/sessionrecording.h>
 #include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
diff --git a/src/mission/mission.cpp b/src/mission/mission.cpp
index a399bf86e5..5247801376 100644
--- a/src/mission/mission.cpp
+++ b/src/mission/mission.cpp
@@ -31,15 +31,9 @@
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/exception.h>
-#include <openspace/util/time.h>
-#include <openspace/util/timerange.h>
 #include <algorithm>
 #include <filesystem>
-#include <functional>
-#include <optional>
-#include <string>
 #include <utility>
-#include <vector>
 
 namespace {
     struct [[codegen::Dictionary(MissionPhase)]] Parameters {
diff --git a/src/mission/missionmanager.cpp b/src/mission/missionmanager.cpp
index 280227f410..b567b1cf77 100644
--- a/src/mission/missionmanager.cpp
+++ b/src/mission/missionmanager.cpp
@@ -27,7 +27,6 @@
 #include <openspace/events/event.h>
 #include <openspace/events/eventengine.h>
 #include <openspace/engine/globals.h>
-#include <openspace/mission/mission.h>
 #include <openspace/scripting/lualibrary.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/exception.h>
diff --git a/src/navigation/keyframenavigator.cpp b/src/navigation/keyframenavigator.cpp
index e6315a99c2..13db350b90 100644
--- a/src/navigation/keyframenavigator.cpp
+++ b/src/navigation/keyframenavigator.cpp
@@ -30,8 +30,6 @@
 #include <openspace/network/messagestructures.h>
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/scene/scene.h>
-#include <openspace/util/time.h>
-#include <openspace/util/timemanager.h>
 #include <algorithm>
 #include <cmath>
 #include <utility>
diff --git a/src/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp
index bd25feb15a..7c5acb5af8 100644
--- a/src/navigation/navigationhandler.cpp
+++ b/src/navigation/navigationhandler.cpp
@@ -43,6 +43,7 @@
 #include <openspace/util/time.h>
 #include <openspace/util/timemanager.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/dictionary.h>
@@ -50,17 +51,10 @@
 #include <ghoul/misc/invariants.h>
 #include <ghoul/misc/profiling.h>
 #include <algorithm>
-#include <filesystem>
 #include <fstream>
-#include <format>
 #include <iterator>
 #include <limits>
-#include <optional>
-#include <string>
-#include <string_view>
 #include <utility>
-#include <variant>
-#include <vector>
 
 #include "navigationhandler_lua.inl"
 
diff --git a/src/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp
index a042ac9515..a886da047b 100644
--- a/src/navigation/orbitalnavigator.cpp
+++ b/src/navigation/orbitalnavigator.cpp
@@ -28,11 +28,8 @@
 #include <openspace/camera/camerapose.h>
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/engine/windowdelegate.h>
-#include <openspace/interaction/joystickcamerastates.h>
 #include <openspace/interaction/mouseinputstate.h>
 #include <openspace/interaction/keyboardinputstate.h>
-#include <openspace/interaction/scriptcamerastates.h>
-#include <openspace/interaction/websocketcamerastates.h>
 #include <openspace/properties/property.h>
 #include <openspace/properties/propertyowner.h>
 #include <openspace/scene/scenegraphnode.h>
@@ -43,7 +40,6 @@
 #include <openspace/engine/globals.h>
 #include <openspace/events/event.h>
 #include <openspace/events/eventengine.h>
-#include <ghoul/glm.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/easing.h>
diff --git a/src/navigation/path.cpp b/src/navigation/path.cpp
index d30d7d09ee..2efc55e5ca 100644
--- a/src/navigation/path.cpp
+++ b/src/navigation/path.cpp
@@ -38,6 +38,7 @@
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/query/query.h>
 #include <openspace/util/universalhelpers.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/interpolator.h>
@@ -49,7 +50,6 @@
 #include <algorithm>
 #include <cmath>
 #include <cstdlib>
-#include <format>
 #include <limits>
 #include <string_view>
 #include <utility>
diff --git a/src/navigation/pathcurve.cpp b/src/navigation/pathcurve.cpp
index 385194ba99..5fca650832 100644
--- a/src/navigation/pathcurve.cpp
+++ b/src/navigation/pathcurve.cpp
@@ -28,14 +28,11 @@
 #include <ghoul/misc/integration.h>
 #include <ghoul/misc/interpolator.h>
 #include <ghoul/misc/assert.h>
-#include <ghoul/misc/exception.h>
 #include <algorithm>
 #include <cstdlib>
 #include <iterator>
 #include <limits>
-#include <string>
 #include <utility>
-#include <vector>
 
 namespace {
     constexpr double LengthEpsilon = 100.0 * std::numeric_limits<double>::epsilon();
diff --git a/src/navigation/pathcurves/avoidcollisioncurve.cpp b/src/navigation/pathcurves/avoidcollisioncurve.cpp
index 4791706f30..8f1603f2de 100644
--- a/src/navigation/pathcurves/avoidcollisioncurve.cpp
+++ b/src/navigation/pathcurves/avoidcollisioncurve.cpp
@@ -26,19 +26,16 @@
 
 #include <openspace/engine/globals.h>
 #include <openspace/navigation/navigationhandler.h>
-#include <openspace/navigation/pathcurve.h>
 #include <openspace/navigation/pathnavigator.h>
 #include <openspace/navigation/waypoint.h>
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/util/collisionhelper.h>
-#include <ghoul/glm.h>
+#include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <glm/gtx/projection.hpp>
 #include <algorithm>
-#include <format>
 #include <string_view>
 #include <utility>
-#include <vector>
 
 namespace {
     constexpr std::string_view _loggerCat = "AvoidCollisionCurve";
diff --git a/src/navigation/pathcurves/zoomoutoverviewcurve.cpp b/src/navigation/pathcurves/zoomoutoverviewcurve.cpp
index 4e7d698098..4e4c9dc249 100644
--- a/src/navigation/pathcurves/zoomoutoverviewcurve.cpp
+++ b/src/navigation/pathcurves/zoomoutoverviewcurve.cpp
@@ -26,11 +26,9 @@
 
 #include <openspace/navigation/waypoint.h>
 #include <openspace/scene/scenegraphnode.h>
-#include <ghoul/glm.h>
 #include <ghoul/logging/logmanager.h>
 #include <glm/gtx/projection.hpp>
 #include <string_view>
-#include <vector>
 
 namespace {
     constexpr std::string_view _loggerCat = "ZoomOutOverviewCurve";
diff --git a/src/network/parallelconnection.cpp b/src/network/parallelconnection.cpp
index ed073ef905..e1ced19c75 100644
--- a/src/network/parallelconnection.cpp
+++ b/src/network/parallelconnection.cpp
@@ -25,7 +25,6 @@
 #include <openspace/network/parallelconnection.h>
 
 #include <ghoul/format.h>
-#include <ghoul/io/socket/tcpsocket.h>
 #include <ghoul/logging/logmanager.h>
 #include <string_view>
 #include <utility>
diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp
index 39726b705b..143ea3ab05 100644
--- a/src/network/parallelpeer.cpp
+++ b/src/network/parallelpeer.cpp
@@ -38,7 +38,6 @@
 #include <openspace/scripting/scriptengine.h>
 #include <openspace/util/time.h>
 #include <openspace/util/timeline.h>
-#include <openspace/util/timemanager.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/io/socket/tcpsocket.h>
 #include <ghoul/misc/profiling.h>
diff --git a/src/properties/misc/optionproperty.cpp b/src/properties/misc/optionproperty.cpp
index 9d53311769..a3655df501 100644
--- a/src/properties/misc/optionproperty.cpp
+++ b/src/properties/misc/optionproperty.cpp
@@ -24,7 +24,6 @@
 
 #include <openspace/properties/misc/optionproperty.h>
 
-#include <openspace/util/json_helper.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/lua_helper.h>
 
diff --git a/src/properties/misc/selectionproperty.cpp b/src/properties/misc/selectionproperty.cpp
index 7804fd2f4e..42b6ed000e 100644
--- a/src/properties/misc/selectionproperty.cpp
+++ b/src/properties/misc/selectionproperty.cpp
@@ -24,7 +24,6 @@
 
 #include <openspace/properties/misc/selectionproperty.h>
 
-#include <openspace/json.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
 #include <ghoul/lua/lua_helper.h>
diff --git a/src/properties/misc/stringproperty.cpp b/src/properties/misc/stringproperty.cpp
index 6ab82871bd..79401d7e6b 100644
--- a/src/properties/misc/stringproperty.cpp
+++ b/src/properties/misc/stringproperty.cpp
@@ -26,7 +26,6 @@
 
 #include <ghoul/lua/ghoul_lua.h>
 #include <ghoul/lua/lua_helper.h>
-#include <openspace/json.h>
 
 namespace openspace::properties {
 
diff --git a/src/properties/property.cpp b/src/properties/property.cpp
index 2c5b699e64..15b7ea799c 100644
--- a/src/properties/property.cpp
+++ b/src/properties/property.cpp
@@ -28,8 +28,8 @@
 #include <openspace/events/event.h>
 #include <openspace/events/eventengine.h>
 #include <openspace/properties/propertyowner.h>
-#include <algorithm>
 #include <ghoul/misc/profiling.h>
+#include <algorithm>
 
 namespace openspace::properties {
 
diff --git a/src/properties/vector/dvec3property.cpp b/src/properties/vector/dvec3property.cpp
index eb96491be4..516aff3f97 100644
--- a/src/properties/vector/dvec3property.cpp
+++ b/src/properties/vector/dvec3property.cpp
@@ -24,8 +24,6 @@
 
 #include <openspace/properties/vector/dvec3property.h>
 
-#include <ghoul/glm.h>
-
 namespace openspace::properties {
 
 DVec3Property::DVec3Property(Property::PropertyInfo info, glm::dvec3 value,
diff --git a/src/rendering/dashboard.cpp b/src/rendering/dashboard.cpp
index 09061ef8f3..dabe2281b1 100644
--- a/src/rendering/dashboard.cpp
+++ b/src/rendering/dashboard.cpp
@@ -24,7 +24,6 @@
 
 #include <openspace/rendering/dashboard.h>
 
-#include <openspace/rendering/dashboarditem.h>
 #include <openspace/scripting/lualibrary.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
diff --git a/src/rendering/dashboarditem.cpp b/src/rendering/dashboarditem.cpp
index 928a84ccc8..fe272e3b77 100644
--- a/src/rendering/dashboarditem.cpp
+++ b/src/rendering/dashboarditem.cpp
@@ -30,8 +30,6 @@
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/templatefactory.h>
 #include <optional>
-#include <string>
-#include <string_view>
 
 namespace {
     constexpr std::string_view KeyType = "Type";
diff --git a/src/rendering/dashboardtextitem.cpp b/src/rendering/dashboardtextitem.cpp
index 089535c70e..932281966d 100644
--- a/src/rendering/dashboardtextitem.cpp
+++ b/src/rendering/dashboardtextitem.cpp
@@ -30,7 +30,6 @@
 #include <ghoul/font/fontmanager.h>
 #include <ghoul/font/fontrenderer.h>
 #include <ghoul/misc/dictionary.h>
-#include <string_view>
 #include <optional>
 
 namespace {
diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp
index 77459188f4..503b3f00f1 100644
--- a/src/rendering/framebufferrenderer.cpp
+++ b/src/rendering/framebufferrenderer.cpp
@@ -27,9 +27,7 @@
 #include <openspace/camera/camera.h>
 #include <openspace/engine/globals.h>
 #include <openspace/rendering/deferredcaster.h>
-#include <openspace/rendering/deferredcasterlistener.h>
 #include <openspace/rendering/deferredcastermanager.h>
-#include <openspace/rendering/raycasterlistener.h>
 #include <openspace/rendering/raycastermanager.h>
 #include <openspace/rendering/renderable.h>
 #include <openspace/rendering/renderengine.h>
@@ -41,7 +39,6 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/profiling.h>
-#include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/openglstatecache.h>
 #include <ghoul/opengl/textureunit.h>
@@ -52,7 +49,6 @@
 #include <string>
 #include <string_view>
 #include <utility>
-#include <vector>
 
 namespace {
     constexpr std::string_view _loggerCat = "FramebufferRenderer";
diff --git a/src/rendering/labelscomponent.cpp b/src/rendering/labelscomponent.cpp
index 041cb6a2c7..686a346041 100644
--- a/src/rendering/labelscomponent.cpp
+++ b/src/rendering/labelscomponent.cpp
@@ -34,7 +34,6 @@
 #include <ghoul/logging/logmanager.h>
 #include <cmath>
 #include <optional>
-#include <string_view>
 
 namespace {
     constexpr std::string_view _loggerCat = "LabelsComponent";
diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp
index 2a2df6b9d3..e7ee890bf5 100644
--- a/src/rendering/renderable.cpp
+++ b/src/rendering/renderable.cpp
@@ -30,7 +30,6 @@
 #include <openspace/events/event.h>
 #include <openspace/events/eventengine.h>
 #include <openspace/navigation/navigationhandler.h>
-#include <openspace/scene/scenegraphnode.h>
 #include <openspace/util/ellipsoid.h>
 #include <openspace/util/factorymanager.h>
 #include <openspace/util/memorymanager.h>
@@ -40,8 +39,6 @@
 #include <ghoul/misc/profiling.h>
 #include <ghoul/misc/templatefactory.h>
 #include <variant>
-#include <vector>
-#include <string>
 #include <utility>
 
 namespace {
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index 185c716aa7..9731fe8ab4 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -43,10 +43,10 @@
 #include <algorithm>
 #include <cmath>
 #include <optional>
-#include <variant>
 #include <string>
-#include <vector>
 #include <utility>
+#include <variant>
+#include <vector>
 
 namespace {
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
diff --git a/src/rendering/screenspacerenderableframebuffer.cpp b/src/rendering/screenspacerenderableframebuffer.cpp
index 9cca414280..4013136187 100644
--- a/src/rendering/screenspacerenderableframebuffer.cpp
+++ b/src/rendering/screenspacerenderableframebuffer.cpp
@@ -29,8 +29,6 @@
 #include <openspace/engine/windowdelegate.h>
 #include <ghoul/format.h>
 #include <ghoul/misc/dictionary.h>
-#include <ghoul/opengl/framebufferobject.h>
-#include <ghoul/opengl/texture.h>
 #include <array>
 
 namespace {
diff --git a/src/rendering/screenspacerenderabletext.cpp b/src/rendering/screenspacerenderabletext.cpp
index 45ddea377a..a554d905cb 100644
--- a/src/rendering/screenspacerenderabletext.cpp
+++ b/src/rendering/screenspacerenderabletext.cpp
@@ -27,11 +27,7 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/windowdelegate.h>
-#include <ghoul/font/font.h>
 #include <ghoul/font/fontmanager.h>
-#include <ghoul/font/fontrenderer.h>
-#include <ghoul/opengl/framebufferobject.h>
-#include <ghoul/opengl/texture.h>
 #include <array>
 #include <optional>
 
diff --git a/src/rendering/texturecomponent.cpp b/src/rendering/texturecomponent.cpp
index b0d355acbc..ce8ee08404 100644
--- a/src/rendering/texturecomponent.cpp
+++ b/src/rendering/texturecomponent.cpp
@@ -27,7 +27,6 @@
 #include <ghoul/filesystem/file.h>
 #include <ghoul/io/texture/texturereader.h>
 #include <ghoul/logging/logmanager.h>
-#include <ghoul/opengl/texture.h>
 #include <string_view>
 #include <utility>
 
diff --git a/src/rendering/transferfunction.cpp b/src/rendering/transferfunction.cpp
index db5862dc24..7906b2b78d 100644
--- a/src/rendering/transferfunction.cpp
+++ b/src/rendering/transferfunction.cpp
@@ -32,7 +32,6 @@
 #include <ghoul/misc/stringhelper.h>
 #include <ghoul/opengl/texture.h>
 #include <cmath>
-#include <filesystem>
 #include <fstream>
 #include <sstream>
 #include <string>
diff --git a/src/scene/asset.cpp b/src/scene/asset.cpp
index f815750685..b4cc2bb3c9 100644
--- a/src/scene/asset.cpp
+++ b/src/scene/asset.cpp
@@ -38,10 +38,9 @@
 #include <ghoul/misc/invariants.h>
 #include <ghoul/misc/profiling.h>
 #include <algorithm>
-#include <filesystem>
+#include <functional>
 #include <string_view>
 #include <utility>
-#include <functional>
 
 namespace openspace {
 
diff --git a/src/scene/lightsource.cpp b/src/scene/lightsource.cpp
index 5638e1354d..88e69ee392 100644
--- a/src/scene/lightsource.cpp
+++ b/src/scene/lightsource.cpp
@@ -29,7 +29,6 @@
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/templatefactory.h>
 #include <optional>
-#include <string>
 
 namespace {
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
diff --git a/src/scene/profile.cpp b/src/scene/profile.cpp
index 8393f68bc0..172ee44db8 100644
--- a/src/scene/profile.cpp
+++ b/src/scene/profile.cpp
@@ -31,12 +31,10 @@
 #include <openspace/scripting/lualibrary.h>
 #include <openspace/properties/property.h>
 #include <openspace/properties/propertyowner.h>
-#include <openspace/util/keys.h>
 #include <openspace/util/timemanager.h>
 #include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
-#include <ghoul/misc/exception.h>
 #include <ghoul/misc/profiling.h>
 #include <algorithm>
 #include <filesystem>
diff --git a/src/scene/rotation.cpp b/src/scene/rotation.cpp
index 9d966e0d5b..2e979afcb4 100644
--- a/src/scene/rotation.cpp
+++ b/src/scene/rotation.cpp
@@ -32,7 +32,6 @@
 #include <openspace/util/updatestructures.h>
 #include <ghoul/misc/dictionary.h>
 #include <optional>
-#include <string>
 
 namespace {
     // A `Rotation` object describes a specific rotation for a scene graph node, which may
diff --git a/src/scene/scale.cpp b/src/scene/scale.cpp
index 5cbb5969b3..3ab7b65c99 100644
--- a/src/scene/scale.cpp
+++ b/src/scene/scale.cpp
@@ -31,7 +31,6 @@
 #include <openspace/util/updatestructures.h>
 #include <ghoul/misc/dictionary.h>
 #include <optional>
-#include <string>
 
 namespace {
     struct [[codegen::Dictionary(Scale)]] Parameters {
diff --git a/src/scene/translation.cpp b/src/scene/translation.cpp
index c74fdec0c8..9a868a0b0b 100644
--- a/src/scene/translation.cpp
+++ b/src/scene/translation.cpp
@@ -26,12 +26,10 @@
 
 #include <openspace/documentation/documentation.h>
 #include <openspace/engine/globals.h>
-#include <openspace/scene/timeframe.h>
 #include <openspace/util/factorymanager.h>
 #include <openspace/util/memorymanager.h>
 #include <openspace/util/updatestructures.h>
 #include <ghoul/misc/dictionary.h>
-#include <ghoul/misc/managedmemoryuniqueptr.h>
 #include <ghoul/misc/profiling.h>
 #include <optional>
 #include <string>
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index 2d3aa9f35b..fa6fe3bcd4 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -40,7 +40,6 @@
 #include <ghoul/misc/exception.h>
 #include <ghoul/misc/profiling.h>
 #include <algorithm>
-#include <filesystem>
 #include <fstream>
 #include <optional>
 #include <utility>
diff --git a/src/scripting/scriptscheduler.cpp b/src/scripting/scriptscheduler.cpp
index 7fe83cc455..17ff0fdf2c 100644
--- a/src/scripting/scriptscheduler.cpp
+++ b/src/scripting/scriptscheduler.cpp
@@ -32,7 +32,6 @@
 #include <ghoul/misc/dictionary.h>
 #include <algorithm>
 #include <iterator>
-#include <limits>
 #include <utility>
 
 #include "scriptscheduler_lua.inl"
diff --git a/src/util/distanceconversion.cpp b/src/util/distanceconversion.cpp
index d4329edd74..fabdbf6e45 100644
--- a/src/util/distanceconversion.cpp
+++ b/src/util/distanceconversion.cpp
@@ -24,7 +24,6 @@
 
 #include <openspace/util/distanceconversion.h>
 
-#include <openspace/util/distanceconstants.h>
 #include <openspace/util/timeconstants.h>
 #include <cstdlib>
 
diff --git a/src/util/dynamicfilesequencedownloader.cpp b/src/util/dynamicfilesequencedownloader.cpp
index 3266c41821..08c82312cf 100644
--- a/src/util/dynamicfilesequencedownloader.cpp
+++ b/src/util/dynamicfilesequencedownloader.cpp
@@ -25,7 +25,6 @@
 #include <openspace/util/dynamicfilesequencedownloader.h>
 
 #include <openspace/json.h>
-#include <openspace/util/httprequest.h>
 #include <openspace/util/time.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/format.h>
diff --git a/src/util/ellipsoid.cpp b/src/util/ellipsoid.cpp
index d5416cbdb3..78c3d4b8a7 100644
--- a/src/util/ellipsoid.cpp
+++ b/src/util/ellipsoid.cpp
@@ -29,7 +29,6 @@
 #include <array>
 #include <cmath>
 #include <cstdlib>
-#include <utility>
 
 namespace {
     constexpr size_t MaxIterations = 8;
diff --git a/src/util/histogram.cpp b/src/util/histogram.cpp
index 04ca696fda..df9b9e911f 100644
--- a/src/util/histogram.cpp
+++ b/src/util/histogram.cpp
@@ -29,7 +29,6 @@
 #include <algorithm>
 #include <cmath>
 #include <string_view>
-#include <utility>
 
 namespace {
     constexpr std::string_view _loggerCat = "Histogram";
diff --git a/src/util/httprequest.cpp b/src/util/httprequest.cpp
index 7214bb07de..6d8da8b8bf 100644
--- a/src/util/httprequest.cpp
+++ b/src/util/httprequest.cpp
@@ -28,9 +28,8 @@
 #include <ghoul/logging/logmanager.h>
 #include <curl/curl.h>
 #include <array>
-#include <filesystem>
-#include <utility>
 #include <cstdint>
+#include <utility>
 
 namespace openspace {
 
diff --git a/src/util/openspacemodule.cpp b/src/util/openspacemodule.cpp
index 0b5d80b699..b069a23d46 100644
--- a/src/util/openspacemodule.cpp
+++ b/src/util/openspacemodule.cpp
@@ -33,7 +33,6 @@
 #include <ghoul/misc/profiling.h>
 #include <ghoul/misc/stringhelper.h>
 #include <filesystem>
-#include <string_view>
 #include <utility>
 
 namespace {
diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp
index 71606eb710..2a012be87c 100644
--- a/src/util/spicemanager.cpp
+++ b/src/util/spicemanager.cpp
@@ -25,17 +25,13 @@
 #include <openspace/util/spicemanager.h>
 
 #include <openspace/scripting/lualibrary.h>
-#include <ghoul/logging/logmanager.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/misc/assert.h>
-#include <ghoul/misc/exception.h>
+#include <ghoul/format.h>
+#include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/profiling.h>
 #include <algorithm>
-#include <array>
 #include <cstring>
 #include <iterator>
-#include <filesystem>
-#include <format>
 #include <fstream>
 #include <string_view>
 #include <utility>
diff --git a/src/util/syncbuffer.cpp b/src/util/syncbuffer.cpp
index f528e0440b..6625be6169 100644
--- a/src/util/syncbuffer.cpp
+++ b/src/util/syncbuffer.cpp
@@ -24,7 +24,6 @@
 
 #include <openspace/util/syncbuffer.h>
 
-#include <ghoul/glm.h>
 #include <ghoul/misc/profiling.h>
 #include <cstdint>
 #include <cstring>
diff --git a/src/util/task.cpp b/src/util/task.cpp
index 8bd29f732f..b0805fc32b 100644
--- a/src/util/task.cpp
+++ b/src/util/task.cpp
@@ -28,7 +28,6 @@
 #include <openspace/util/factorymanager.h>
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/templatefactory.h>
-#include <string>
 
 namespace {
 
diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp
index f3d3b8743c..5e5d480abb 100644
--- a/src/util/timemanager.cpp
+++ b/src/util/timemanager.cpp
@@ -33,8 +33,6 @@
 #include <openspace/interaction/sessionrecordinghandler.h>
 #include <openspace/scene/profile.h>
 #include <openspace/scripting/scriptscheduler.h>
-#include <openspace/util/keys.h>
-#include <openspace/util/timeline.h>
 #include <ghoul/format.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>