diff --git a/gtk/FileList.cc b/gtk/FileList.cc
index e64beaeae..e655c4eff 100644
--- a/gtk/FileList.cc
+++ b/gtk/FileList.cc
@@ -35,7 +35,6 @@
 #include <fmt/core.h>
 
 #include <algorithm>
-#include <list>
 #include <memory>
 #include <optional>
 #include <queue>
diff --git a/gtk/FilterBar.cc b/gtk/FilterBar.cc
index ab11e5eed..e2a993b27 100644
--- a/gtk/FilterBar.cc
+++ b/gtk/FilterBar.cc
@@ -38,8 +38,8 @@
 
 #include <algorithm> // std::transform()
 #include <array>
+#include <map>
 #include <memory>
-#include <set>
 #include <string>
 #include <unordered_map>
 
diff --git a/libtransmission/crypto-utils-mbedtls.cc b/libtransmission/crypto-utils-mbedtls.cc
index 2064239ae..fad55b40d 100644
--- a/libtransmission/crypto-utils-mbedtls.cc
+++ b/libtransmission/crypto-utils-mbedtls.cc
@@ -3,7 +3,6 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
-#include <memory>
 #include <mutex>
 
 #include <mbedtls/base64.h>
diff --git a/libtransmission/crypto-utils-openssl.cc b/libtransmission/crypto-utils-openssl.cc
index 494932e6b..03a3106d6 100644
--- a/libtransmission/crypto-utils-openssl.cc
+++ b/libtransmission/crypto-utils-openssl.cc
@@ -10,7 +10,6 @@
 
 #include <array>
 #include <cstddef> // size_t
-#include <memory>
 
 #include <openssl/crypto.h>
 #include <openssl/err.h>
diff --git a/libtransmission/crypto-utils-wolfssl.cc b/libtransmission/crypto-utils-wolfssl.cc
index 6bfafdef6..0438974ef 100644
--- a/libtransmission/crypto-utils-wolfssl.cc
+++ b/libtransmission/crypto-utils-wolfssl.cc
@@ -3,7 +3,6 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
-#include <memory>
 #include <mutex>
 
 #include <wolfssl/options.h>
diff --git a/libtransmission/crypto-utils.h b/libtransmission/crypto-utils.h
index 6736b7f78..af0f64b4a 100644
--- a/libtransmission/crypto-utils.h
+++ b/libtransmission/crypto-utils.h
@@ -10,7 +10,6 @@
 #include <cstddef> // size_t
 #include <cstdint>
 #include <limits>
-#include <memory>
 #include <optional>
 #include <random> // for std::uniform_int_distribution<T>
 #include <string>
diff --git a/libtransmission/log.cc b/libtransmission/log.cc
index 47a52ca90..e4f30e637 100644
--- a/libtransmission/log.cc
+++ b/libtransmission/log.cc
@@ -8,7 +8,6 @@
 #include <chrono>
 #include <cstddef> // size_t
 #include <iterator> // back_insert_iterator, empty
-#include <memory>
 #include <mutex>
 #include <optional>
 #include <string>
diff --git a/libtransmission/net.h b/libtransmission/net.h
index 99ccc4ccc..f8a832418 100644
--- a/libtransmission/net.h
+++ b/libtransmission/net.h
@@ -12,7 +12,6 @@
 #include <array>
 #include <cstddef> // size_t
 #include <cstdint> // uint16_t, uint32_t, uint8_t
-#include <functional>
 #include <optional>
 #include <string>
 #include <string_view>
diff --git a/libtransmission/peer-mgr.cc b/libtransmission/peer-mgr.cc
index 42d149dd4..9022dfe65 100644
--- a/libtransmission/peer-mgr.cc
+++ b/libtransmission/peer-mgr.cc
@@ -11,7 +11,6 @@
 #include <cstddef> // std::byte
 #include <cstdint>
 #include <ctime> // time_t
-#include <functional>
 #include <iterator> // std::back_inserter
 #include <memory>
 #include <optional>
diff --git a/libtransmission/quark.cc b/libtransmission/quark.cc
index 5c8468ffc..e6c53fdb3 100644
--- a/libtransmission/quark.cc
+++ b/libtransmission/quark.cc
@@ -8,7 +8,6 @@
 #include <cstddef>
 #include <iterator> // for std::distance()
 #include <optional>
-#include <string>
 #include <string_view>
 #include <vector>
 
diff --git a/libtransmission/session.h b/libtransmission/session.h
index 477f102db..ecff5a430 100644
--- a/libtransmission/session.h
+++ b/libtransmission/session.h
@@ -17,7 +17,6 @@
 #include <cstddef> // size_t
 #include <cstdint> // uintX_t
 #include <ctime> // time_t
-#include <functional>
 #include <future>
 #include <memory>
 #include <mutex>
diff --git a/libtransmission/settings.cc b/libtransmission/settings.cc
index 24f0a5034..993386d25 100644
--- a/libtransmission/settings.cc
+++ b/libtransmission/settings.cc
@@ -7,7 +7,6 @@
 #include <chrono>
 #include <cstddef> // size_t
 #include <cstdint> // int64_t, uint32_t
-#include <optional>
 #include <string>
 #include <string_view>
 #include <utility>
diff --git a/libtransmission/torrent-magnet.h b/libtransmission/torrent-magnet.h
index dbe6dac3a..75bd5af4d 100644
--- a/libtransmission/torrent-magnet.h
+++ b/libtransmission/torrent-magnet.h
@@ -14,7 +14,6 @@
 #include <ctime> // time_t
 #include <deque>
 #include <limits>
-#include <memory>
 #include <optional>
 #include <string>
 #include <string_view>
diff --git a/libtransmission/tr-lpd.cc b/libtransmission/tr-lpd.cc
index 8d3dfa4d8..f179ffe65 100644
--- a/libtransmission/tr-lpd.cc
+++ b/libtransmission/tr-lpd.cc
@@ -9,7 +9,6 @@
 #include <cstdint> // uint16_t
 #include <cstring>
 #include <ctime> // time_t
-#include <functional>
 #include <memory>
 #include <optional>
 #include <string>
diff --git a/libtransmission/utils.cc b/libtransmission/utils.cc
index 060deafe7..e39aff71e 100644
--- a/libtransmission/utils.cc
+++ b/libtransmission/utils.cc
@@ -18,7 +18,6 @@
 #include <locale>
 #include <memory>
 #include <optional>
-#include <set>
 #include <stdexcept> // std::runtime_error
 #include <string>
 #include <string_view>
diff --git a/libtransmission/watchdir-kqueue.cc b/libtransmission/watchdir-kqueue.cc
index 4980e70ad..ca10f3051 100644
--- a/libtransmission/watchdir-kqueue.cc
+++ b/libtransmission/watchdir-kqueue.cc
@@ -5,7 +5,6 @@
 
 #include <cerrno> // for errno
 #include <memory>
-#include <string>
 #include <utility>
 
 #include <fcntl.h> // for open()
diff --git a/qt/FilterBar.cc b/qt/FilterBar.cc
index 9ae57a00f..12bc16949 100644
--- a/qt/FilterBar.cc
+++ b/qt/FilterBar.cc
@@ -6,7 +6,6 @@
 #include "FilterBar.h"
 
 #include <cstdint> // uint64_t
-#include <map>
 #include <unordered_map>
 #include <utility>
 
diff --git a/qt/OptionsDialog.h b/qt/OptionsDialog.h
index b723be999..f2b967c3d 100644
--- a/qt/OptionsDialog.h
+++ b/qt/OptionsDialog.h
@@ -5,7 +5,6 @@
 
 #pragma once
 
-#include <map>
 #include <optional>
 #include <vector>
 
diff --git a/qt/Prefs.h b/qt/Prefs.h
index 62bdb2d5a..e395329e0 100644
--- a/qt/Prefs.h
+++ b/qt/Prefs.h
@@ -6,7 +6,6 @@
 #pragma once
 
 #include <array>
-#include <set>
 
 #include <QObject>
 #include <QString>
diff --git a/qt/Session.cc b/qt/Session.cc
index f7992995c..8f6baa5a6 100644
--- a/qt/Session.cc
+++ b/qt/Session.cc
@@ -6,7 +6,6 @@
 #include <algorithm>
 #include <array>
 #include <cassert>
-#include <optional>
 #include <string_view>
 #include <utility>
 
diff --git a/qt/TorrentModel.cc b/qt/TorrentModel.cc
index 00472c086..b3341903d 100644
--- a/qt/TorrentModel.cc
+++ b/qt/TorrentModel.cc
@@ -8,7 +8,6 @@
 #include <cstddef>
 #include <ctime>
 #include <iterator> // for std::back_inserter
-#include <set>
 #include <string_view>
 #include <vector>