diff --git a/include/loot/game_interface.h b/include/loot/game_interface.h
index f2c6b707..ec40fe1f 100644
--- a/include/loot/game_interface.h
+++ b/include/loot/game_interface.h
@@ -24,8 +24,6 @@
 #ifndef LOOT_GAME_INTERFACE
 #define LOOT_GAME_INTERFACE
 
-#include <optional>
-
 #include "loot/database_interface.h"
 #include "loot/plugin_interface.h"
 
diff --git a/src/api/game/load_order_handler.h b/src/api/game/load_order_handler.h
index fe744560..016b730e 100644
--- a/src/api/game/load_order_handler.h
+++ b/src/api/game/load_order_handler.h
@@ -27,9 +27,7 @@
 
 #include <filesystem>
 #include <libloadorder.hpp>
-#include <list>
 #include <string>
-#include <unordered_set>
 #include <vector>
 
 #include "loot/enum/game_type.h"
diff --git a/src/api/helpers/collections.h b/src/api/helpers/collections.h
index cde55170..9602ad5b 100644
--- a/src/api/helpers/collections.h
+++ b/src/api/helpers/collections.h
@@ -25,7 +25,6 @@
 #ifndef LOOT_API_HELPERS_COLLECTIONS
 #define LOOT_API_HELPERS_COLLECTIONS
 
-#include <algorithm>
 #include <vector>
 
 namespace loot {
diff --git a/src/api/metadata/plugin_metadata.cpp b/src/api/metadata/plugin_metadata.cpp
index 1738ee70..0844e453 100644
--- a/src/api/metadata/plugin_metadata.cpp
+++ b/src/api/metadata/plugin_metadata.cpp
@@ -25,7 +25,6 @@
 #include "loot/metadata/plugin_metadata.h"
 
 #include <boost/algorithm/string.hpp>
-#include <filesystem>
 #include <regex>
 
 #include "api/game/game.h"
diff --git a/src/api/metadata/yaml/group.h b/src/api/metadata/yaml/group.h
index cfdfca2b..7713867d 100644
--- a/src/api/metadata/yaml/group.h
+++ b/src/api/metadata/yaml/group.h
@@ -28,10 +28,8 @@
 
 #include <yaml-cpp/yaml.h>
 
-#include <set>
 #include <string>
 
-#include "api/metadata/yaml/set.h"
 #include "loot/metadata/group.h"
 
 namespace YAML {
diff --git a/src/api/metadata_list.h b/src/api/metadata_list.h
index 8dd32929..ba46a722 100644
--- a/src/api/metadata_list.h
+++ b/src/api/metadata_list.h
@@ -29,7 +29,6 @@
 #include <optional>
 #include <string>
 #include <unordered_map>
-#include <unordered_set>
 #include <vector>
 
 #include "api/helpers/text.h"
diff --git a/src/api/plugin.h b/src/api/plugin.h
index 4112e1ef..b50d2968 100644
--- a/src/api/plugin.h
+++ b/src/api/plugin.h
@@ -29,7 +29,6 @@
 #include <list>
 #include <set>
 #include <string>
-#include <type_traits>
 #include <vector>
 
 #include "api/game/load_order_handler.h"
diff --git a/src/api/sorting/plugin_graph.cpp b/src/api/sorting/plugin_graph.cpp
index 81870474..44959734 100644
--- a/src/api/sorting/plugin_graph.cpp
+++ b/src/api/sorting/plugin_graph.cpp
@@ -28,7 +28,6 @@
 #include <boost/graph/breadth_first_search.hpp>
 #include <boost/graph/iteration_macros.hpp>
 #include <boost/graph/topological_sort.hpp>
-#include <cstdlib>
 #include <queue>
 
 #include "api/game/game.h"
diff --git a/src/api/sorting/plugin_sorting_data.h b/src/api/sorting/plugin_sorting_data.h
index 390a0e7a..8b9d759a 100644
--- a/src/api/sorting/plugin_sorting_data.h
+++ b/src/api/sorting/plugin_sorting_data.h
@@ -25,6 +25,8 @@
 #ifndef LOOT_API_SORTING_PLUGIN_SORTING_DATA
 #define LOOT_API_SORTING_PLUGIN_SORTING_DATA
 
+#include <unordered_set>
+
 #include "api/plugin.h"
 #include "loot/metadata/plugin_metadata.h"
 
diff --git a/src/tests/common_game_test_fixture.h b/src/tests/common_game_test_fixture.h
index 5b9dea93..0427981c 100644
--- a/src/tests/common_game_test_fixture.h
+++ b/src/tests/common_game_test_fixture.h
@@ -35,7 +35,6 @@ along with LOOT.  If not, see
 #include <filesystem>
 #include <fstream>
 #include <map>
-#include <unordered_set>
 
 #include "loot/enum/game_type.h"