From 29f57bc296382c9f3b94411743a079fa910f4594 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Wed, 17 Aug 2022 11:08:36 -0500
Subject: [PATCH] chore: iwyu headers (#3661)

---
 daemon/daemon.cc                               | 2 +-
 gtk/Application.cc                             | 3 +++
 gtk/DetailsDialog.cc                           | 1 +
 gtk/FileList.cc                                | 1 +
 gtk/IconCache.cc                               | 1 +
 gtk/MainWindow.cc                              | 1 +
 gtk/MakeDialog.cc                              | 1 +
 gtk/MessageLogWindow.cc                        | 1 +
 gtk/Notify.cc                                  | 1 +
 gtk/OptionsDialog.cc                           | 1 +
 gtk/Prefs.cc                                   | 1 -
 gtk/PrefsDialog.cc                             | 1 +
 gtk/Session.cc                                 | 1 +
 gtk/SystemTrayIcon.cc                          | 1 +
 gtk/Utils.cc                                   | 2 ++
 gtk/Utils.h                                    | 1 +
 libtransmission/announce-list.cc               | 1 -
 libtransmission/announcer-http.cc              | 1 +
 libtransmission/announcer.cc                   | 1 +
 libtransmission/blocklist.cc                   | 1 -
 libtransmission/blocklist.h                    | 2 ++
 libtransmission/cache.cc                       | 1 +
 libtransmission/cache.h                        | 7 ++++---
 libtransmission/completion.cc                  | 1 +
 libtransmission/crypto-utils-cyassl.cc         | 1 +
 libtransmission/crypto-utils-openssl.cc        | 2 ++
 libtransmission/crypto-utils-polarssl.cc       | 1 +
 libtransmission/crypto-utils.h                 | 1 +
 libtransmission/file-win32.cc                  | 1 +
 libtransmission/handshake.cc                   | 1 +
 libtransmission/handshake.h                    | 1 +
 libtransmission/history.h                      | 5 +++--
 libtransmission/lru-cache.h                    | 1 +
 libtransmission/makemeta.cc                    | 2 ++
 libtransmission/makemeta.h                     | 1 +
 libtransmission/natpmp_local.h                 | 1 +
 libtransmission/net.h                          | 2 +-
 libtransmission/open-files.cc                  | 2 +-
 libtransmission/open-files.h                   | 3 ++-
 libtransmission/peer-mgr-wishlist.cc           | 1 -
 libtransmission/peer-mgr.h                     | 1 +
 libtransmission/peer-msgs.cc                   | 1 +
 libtransmission/peer-msgs.h                    | 1 +
 libtransmission/platform.cc                    | 2 +-
 libtransmission/port-forwarding.cc             | 1 +
 libtransmission/rpc-server.cc                  | 3 ++-
 libtransmission/rpcimpl.cc                     | 1 +
 libtransmission/session.cc                     | 2 +-
 libtransmission/stats.h                        | 1 +
 libtransmission/subprocess-win32.cc            | 1 -
 libtransmission/timer-ev.cc                    | 1 +
 libtransmission/timer-ev.h                     | 2 ++
 libtransmission/timer.h                        | 1 +
 libtransmission/torrent-ctor.cc                | 1 +
 libtransmission/torrent-files.cc               | 1 +
 libtransmission/torrent-metainfo.cc            | 1 +
 libtransmission/torrent.cc                     | 1 +
 libtransmission/torrent.h                      | 1 +
 libtransmission/torrents.h                     | 1 +
 libtransmission/tr-assert.mm                   | 2 ++
 libtransmission/tr-dht.cc                      | 6 ++++--
 libtransmission/tr-lpd.cc                      | 1 +
 libtransmission/tr-popcount.h                  | 6 +++++-
 libtransmission/tr-strbuf.h                    | 1 +
 libtransmission/tr-udp.cc                      | 1 +
 libtransmission/trevent.cc                     | 1 +
 libtransmission/upnp.cc                        | 1 +
 libtransmission/utils.cc                       | 1 +
 libtransmission/variant.cc                     | 1 -
 libtransmission/watchdir-base.h                | 3 +++
 libtransmission/watchdir-generic.cc            | 2 ++
 libtransmission/watchdir-inotify.cc            | 4 ++--
 libtransmission/watchdir-kqueue.cc             | 3 ++-
 libtransmission/watchdir-win32.cc              | 2 ++
 libtransmission/web-utils.cc                   | 2 ++
 libtransmission/web.cc                         | 1 +
 libtransmission/web.h                          | 1 +
 libtransmission/webseed.cc                     | 1 +
 macosx/CreatorWindowController.mm              | 1 +
 qt/DetailsDialog.cc                            | 1 +
 qt/FileTreeItem.cc                             | 1 +
 qt/FilterBar.cc                                | 1 +
 qt/MakeDialog.cc                               | 1 +
 qt/OptionsDialog.cc                            | 1 +
 qt/Prefs.cc                                    | 2 +-
 qt/RelocateDialog.cc                           | 2 ++
 qt/Torrent.cc                                  | 1 -
 qt/TorrentDelegate.cc                          | 2 ++
 qt/TorrentDelegateMin.cc                       | 1 +
 qt/TorrentModel.cc                             | 2 ++
 qt/TorrentModel.h                              | 1 +
 qt/Utils.cc                                    | 4 ----
 qt/Utils.h                                     | 1 +
 tests/libtransmission/copy-test.cc             | 1 +
 tests/libtransmission/handshake-test.cc        | 1 -
 tests/libtransmission/json-test.cc             | 1 -
 tests/libtransmission/makemeta-test.cc         | 1 -
 tests/libtransmission/peer-msgs-test.cc        | 2 ++
 tests/libtransmission/rename-test.cc           | 1 -
 tests/libtransmission/strbuf-test.cc           | 1 +
 tests/libtransmission/torrent-metainfo-test.cc | 1 -
 tests/libtransmission/torrents-test.cc         | 1 -
 tests/libtransmission/utils-test.cc            | 1 +
 utils/create.cc                                | 3 ++-
 utils/show.cc                                  | 1 -
 105 files changed, 124 insertions(+), 38 deletions(-)

diff --git a/daemon/daemon.cc b/daemon/daemon.cc
index b0256eed9..7a53558d0 100644
--- a/daemon/daemon.cc
+++ b/daemon/daemon.cc
@@ -8,9 +8,9 @@
 #include <cstdio> /* printf */
 #include <cstdlib> /* atoi */
 #include <iostream>
+#include <memory>
 #include <string>
 #include <string_view>
-#include <utility>
 
 #ifdef HAVE_SYSLOG
 #include <syslog.h>
diff --git a/gtk/Application.cc b/gtk/Application.cc
index 8b7cd2019..5e5cb0e2f 100644
--- a/gtk/Application.cc
+++ b/gtk/Application.cc
@@ -5,10 +5,13 @@
 #include <algorithm>
 #include <cstdlib> // exit()
 #include <ctime>
+#include <iterator> // for std::back_inserter
 #include <map>
+#include <memory>
 #include <sstream>
 #include <string>
 #include <thread>
+#include <utility>
 #include <vector>
 
 #include <locale.h>
diff --git a/gtk/DetailsDialog.cc b/gtk/DetailsDialog.cc
index 9cc71f6f7..8efc2fa8d 100644
--- a/gtk/DetailsDialog.cc
+++ b/gtk/DetailsDialog.cc
@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <array>
 #include <limits.h> /* INT_MAX */
+#include <memory>
 #include <numeric>
 #include <sstream>
 #include <stddef.h>
diff --git a/gtk/FileList.cc b/gtk/FileList.cc
index 1887e0a49..91fd2b654 100644
--- a/gtk/FileList.cc
+++ b/gtk/FileList.cc
@@ -7,6 +7,7 @@
 #include <climits> /* INT_MAX */
 #include <cstddef>
 #include <list>
+#include <memory>
 #include <string>
 #include <string_view>
 #include <unordered_map>
diff --git a/gtk/IconCache.cc b/gtk/IconCache.cc
index ce64f8dc5..93f7d2c1e 100644
--- a/gtk/IconCache.cc
+++ b/gtk/IconCache.cc
@@ -11,6 +11,7 @@
 #include <memory>
 #include <string>
 #include <string_view>
+#include <utility>
 
 #include <glibmm.h>
 #include <giomm.h>
diff --git a/gtk/MainWindow.cc b/gtk/MainWindow.cc
index b5948e284..bf42aa73d 100644
--- a/gtk/MainWindow.cc
+++ b/gtk/MainWindow.cc
@@ -3,6 +3,7 @@
 // License text can be found in the licenses/ folder.
 
 #include <array>
+#include <memory>
 #include <string>
 
 #include <glibmm/i18n.h>
diff --git a/gtk/MakeDialog.cc b/gtk/MakeDialog.cc
index 333396ef1..673688a27 100644
--- a/gtk/MakeDialog.cc
+++ b/gtk/MakeDialog.cc
@@ -8,6 +8,7 @@
 #include <memory>
 #include <string>
 #include <string_view>
+#include <utility>
 
 #include <glibmm.h>
 #include <glibmm/i18n.h>
diff --git a/gtk/MessageLogWindow.cc b/gtk/MessageLogWindow.cc
index 74250ea64..6c4dd88aa 100644
--- a/gtk/MessageLogWindow.cc
+++ b/gtk/MessageLogWindow.cc
@@ -6,6 +6,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <map>
+#include <memory>
 
 #include <glibmm.h>
 #include <glibmm/i18n.h>
diff --git a/gtk/Notify.cc b/gtk/Notify.cc
index 0f6c35974..3ffab3832 100644
--- a/gtk/Notify.cc
+++ b/gtk/Notify.cc
@@ -4,6 +4,7 @@
 // License text can be found in the licenses/ folder.
 
 #include <map>
+#include <utility>
 #include <vector>
 
 #include <giomm.h>
diff --git a/gtk/OptionsDialog.cc b/gtk/OptionsDialog.cc
index c6e52c7e2..aafaa6f56 100644
--- a/gtk/OptionsDialog.cc
+++ b/gtk/OptionsDialog.cc
@@ -5,6 +5,7 @@
 
 #include <list>
 #include <memory>
+#include <utility>
 
 #include <glibmm.h>
 #include <glibmm/i18n.h>
diff --git a/gtk/Prefs.cc b/gtk/Prefs.cc
index d00aa2c53..e00e58b50 100644
--- a/gtk/Prefs.cc
+++ b/gtk/Prefs.cc
@@ -3,7 +3,6 @@
 // License text can be found in the licenses/ folder.
 
 #include <errno.h>
-#include <stdlib.h> /* strtol() */
 #include <string>
 #include <string_view>
 
diff --git a/gtk/PrefsDialog.cc b/gtk/PrefsDialog.cc
index f1a3d45a5..c3e0dd4e1 100644
--- a/gtk/PrefsDialog.cc
+++ b/gtk/PrefsDialog.cc
@@ -4,6 +4,7 @@
 // License text can be found in the licenses/ folder.
 
 #include <climits> /* USHRT_MAX, INT_MAX */
+#include <memory>
 #include <sstream>
 #include <string>
 
diff --git a/gtk/Session.cc b/gtk/Session.cc
index b995ddd55..68abbbadd 100644
--- a/gtk/Session.cc
+++ b/gtk/Session.cc
@@ -12,6 +12,7 @@
 #include <memory>
 #include <string>
 #include <string_view>
+#include <utility>
 
 #include <glibmm/i18n.h>
 
diff --git a/gtk/SystemTrayIcon.cc b/gtk/SystemTrayIcon.cc
index 349284842..3c4d62a89 100644
--- a/gtk/SystemTrayIcon.cc
+++ b/gtk/SystemTrayIcon.cc
@@ -8,6 +8,7 @@
 // We're using deprecated Gtk::StatusItem ourselves as well
 #undef GTKMM_DISABLE_DEPRECATED
 
+#include <memory>
 #include <string>
 
 #include <glibmm.h>
diff --git a/gtk/Utils.cc b/gtk/Utils.cc
index 11bd228cd..3d5a0eff0 100644
--- a/gtk/Utils.cc
+++ b/gtk/Utils.cc
@@ -8,6 +8,8 @@
 #include <errno.h>
 #include <functional>
 #include <limits.h> /* INT_MAX */
+#include <memory>
+#include <utility>
 
 #include <giomm.h> /* g_file_trash() */
 #include <glibmm/i18n.h>
diff --git a/gtk/Utils.h b/gtk/Utils.h
index 9cfa1f24c..a3e70bf02 100644
--- a/gtk/Utils.h
+++ b/gtk/Utils.h
@@ -9,6 +9,7 @@
 #include <ctime>
 #include <functional>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <sys/types.h>
diff --git a/libtransmission/announce-list.cc b/libtransmission/announce-list.cc
index 47e5f09f1..411e95df1 100644
--- a/libtransmission/announce-list.cc
+++ b/libtransmission/announce-list.cc
@@ -4,7 +4,6 @@
 // License text can be found in the licenses/ folder.
 
 #include <algorithm>
-#include <set>
 #include <string>
 #include <string_view>
 
diff --git a/libtransmission/announcer-http.cc b/libtransmission/announcer-http.cc
index 9c725ffb9..ddfb373f8 100644
--- a/libtransmission/announcer-http.cc
+++ b/libtransmission/announcer-http.cc
@@ -11,6 +11,7 @@
 #include <optional>
 #include <string>
 #include <string_view>
+#include <utility>
 
 #include <curl/curl.h>
 
diff --git a/libtransmission/announcer.cc b/libtransmission/announcer.cc
index f75b88a64..19e117524 100644
--- a/libtransmission/announcer.cc
+++ b/libtransmission/announcer.cc
@@ -12,6 +12,7 @@
 #include <deque>
 #include <iterator>
 #include <map>
+#include <memory>
 #include <numeric>
 #include <set>
 #include <string>
diff --git a/libtransmission/blocklist.cc b/libtransmission/blocklist.cc
index 69ccd4eae..e5ef98392 100644
--- a/libtransmission/blocklist.cc
+++ b/libtransmission/blocklist.cc
@@ -4,7 +4,6 @@
 // License text can be found in the licenses/ folder.
 
 #include <algorithm>
-#include <cerrno>
 #include <cstdio>
 #include <cstdlib> // bsearch()
 #include <string_view>
diff --git a/libtransmission/blocklist.h b/libtransmission/blocklist.h
index 6c767b923..39105b5fc 100644
--- a/libtransmission/blocklist.h
+++ b/libtransmission/blocklist.h
@@ -9,6 +9,8 @@
 #error only libtransmission should #include this header.
 #endif
 
+#include <cstddef> // for size_t
+#include <cstdint>
 #include <string>
 #include <string_view>
 #include <vector>
diff --git a/libtransmission/cache.cc b/libtransmission/cache.cc
index 7a99ba5e8..4549e96cc 100644
--- a/libtransmission/cache.cc
+++ b/libtransmission/cache.cc
@@ -6,6 +6,7 @@
 #include <cstdlib> // std::lldiv()
 #include <iterator> // std::distance(), std::next(), std::prev()
 #include <limits> // std::numeric_limits<size_t>::max()
+#include <memory>
 #include <numeric> // std::accumulate()
 #include <utility> // std::make_pair()
 #include <vector>
diff --git a/libtransmission/cache.h b/libtransmission/cache.h
index d55504a0a..a25e2a9a9 100644
--- a/libtransmission/cache.h
+++ b/libtransmission/cache.h
@@ -9,10 +9,11 @@
 #error only libtransmission should #include this header.
 #endif
 
-#include <cstdint> // intX_t, uintX_t
+#include <cstdint> // for size_t
+#include <cstdint> // for intX_t, uintX_t
 #include <ctime>
-#include <memory> // std::unique_ptr
-#include <utility> // std::pair
+#include <memory> // for std::unique_ptr
+#include <utility> // for std::pair
 #include <vector>
 
 #include "transmission.h"
diff --git a/libtransmission/completion.cc b/libtransmission/completion.cc
index 9b81249b8..a0e9b92ba 100644
--- a/libtransmission/completion.cc
+++ b/libtransmission/completion.cc
@@ -5,6 +5,7 @@
 
 #include <algorithm>
 #include <memory>
+#include <utility>
 #include <vector>
 
 #include "transmission.h"
diff --git a/libtransmission/crypto-utils-cyassl.cc b/libtransmission/crypto-utils-cyassl.cc
index cdef68392..99fa57a79 100644
--- a/libtransmission/crypto-utils-cyassl.cc
+++ b/libtransmission/crypto-utils-cyassl.cc
@@ -3,6 +3,7 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include <memory>
 #include <mutex>
 
 #if defined(CYASSL_IS_WOLFSSL)
diff --git a/libtransmission/crypto-utils-openssl.cc b/libtransmission/crypto-utils-openssl.cc
index c2d9c9ede..17bee1ab8 100644
--- a/libtransmission/crypto-utils-openssl.cc
+++ b/libtransmission/crypto-utils-openssl.cc
@@ -8,6 +8,8 @@
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
+#include <memory>
+
 #include <openssl/crypto.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
diff --git a/libtransmission/crypto-utils-polarssl.cc b/libtransmission/crypto-utils-polarssl.cc
index caf8356f7..1e4ac2c4c 100644
--- a/libtransmission/crypto-utils-polarssl.cc
+++ b/libtransmission/crypto-utils-polarssl.cc
@@ -3,6 +3,7 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include <memory>
 #include <mutex>
 
 #if defined(POLARSSL_IS_MBEDTLS)
diff --git a/libtransmission/crypto-utils.h b/libtransmission/crypto-utils.h
index f58dda200..01f1cba54 100644
--- a/libtransmission/crypto-utils.h
+++ b/libtransmission/crypto-utils.h
@@ -8,6 +8,7 @@
 
 #include <array>
 #include <cstddef> // size_t
+#include <cstdint>
 #include <memory>
 #include <optional>
 #include <string>
diff --git a/libtransmission/file-win32.cc b/libtransmission/file-win32.cc
index 88dd9e02e..ecd71f379 100644
--- a/libtransmission/file-win32.cc
+++ b/libtransmission/file-win32.cc
@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <array>
 #include <cctype> // for isalpha()
+#include <iterator> // for std::back_inserter
 #include <string>
 #include <string_view>
 
diff --git a/libtransmission/handshake.cc b/libtransmission/handshake.cc
index 812b5dfd4..51f2e634e 100644
--- a/libtransmission/handshake.cc
+++ b/libtransmission/handshake.cc
@@ -9,6 +9,7 @@
 #include <chrono>
 #include <cstring>
 #include <string_view>
+#include <utility>
 
 #include <event2/buffer.h>
 
diff --git a/libtransmission/handshake.h b/libtransmission/handshake.h
index d2b738c4a..74c31b600 100644
--- a/libtransmission/handshake.h
+++ b/libtransmission/handshake.h
@@ -9,6 +9,7 @@
 #error only libtransmission should #include this header.
 #endif
 
+#include <cstddef> // for size_t
 #include <optional>
 #include <memory>
 
diff --git a/libtransmission/history.h b/libtransmission/history.h
index 97903416a..cbc66ade8 100644
--- a/libtransmission/history.h
+++ b/libtransmission/history.h
@@ -10,8 +10,9 @@
 #endif
 
 #include <array>
-#include <cstdint>
-#include <ctime> // time_t
+#include <cstddef> // for size_t
+#include <cstdint> // for uint32_t
+#include <ctime> // for time_t
 
 /**
  * A short-term memory object that remembers how many times something
diff --git a/libtransmission/lru-cache.h b/libtransmission/lru-cache.h
index 5b38a1477..e68ec54e0 100644
--- a/libtransmission/lru-cache.h
+++ b/libtransmission/lru-cache.h
@@ -10,6 +10,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <functional>
+#include <utility>
 
 // A fixed-size cache that erases least-recently-used items to make room for new ones.
 template<typename Key, typename Val, std::size_t N>
diff --git a/libtransmission/makemeta.cc b/libtransmission/makemeta.cc
index 5c07927ba..640ba3617 100644
--- a/libtransmission/makemeta.cc
+++ b/libtransmission/makemeta.cc
@@ -3,11 +3,13 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include <cerrno> // for ENOENT
 #include <optional>
 #include <set>
 #include <string>
 #include <string_view>
 #include <thread>
+#include <utility>
 #include <vector>
 
 #include <fmt/format.h>
diff --git a/libtransmission/makemeta.h b/libtransmission/makemeta.h
index 9edc93940..995b5305a 100644
--- a/libtransmission/makemeta.h
+++ b/libtransmission/makemeta.h
@@ -7,6 +7,7 @@
 
 #include <algorithm> // std::move
 #include <cstddef> // std::byte
+#include <cstdint>
 #include <future>
 #include <string>
 #include <string_view>
diff --git a/libtransmission/natpmp_local.h b/libtransmission/natpmp_local.h
index 7a29def27..fe4513230 100644
--- a/libtransmission/natpmp_local.h
+++ b/libtransmission/natpmp_local.h
@@ -10,6 +10,7 @@
 #endif
 
 #include <ctime> // time_t
+#include <cstdint>
 
 #include "transmission.h" // tr_port_forwarding
 
diff --git a/libtransmission/net.h b/libtransmission/net.h
index c1ec76f54..168612870 100644
--- a/libtransmission/net.h
+++ b/libtransmission/net.h
@@ -18,7 +18,7 @@
 #ifdef _WIN32
 #include <ws2tcpip.h>
 #else
-#include <errno.h>
+#include <cerrno>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #endif
diff --git a/libtransmission/open-files.cc b/libtransmission/open-files.cc
index 93fc5b5be..7ffa1a7e9 100644
--- a/libtransmission/open-files.cc
+++ b/libtransmission/open-files.cc
@@ -5,9 +5,9 @@
 
 #include <algorithm>
 #include <array>
-#include <cerrno>
 #include <cstdint> // uint8_t, uint64_t
 #include <string_view>
+#include <utility>
 
 #include <fmt/core.h>
 
diff --git a/libtransmission/open-files.h b/libtransmission/open-files.h
index c65f8fcc8..9c3751d68 100644
--- a/libtransmission/open-files.h
+++ b/libtransmission/open-files.h
@@ -9,7 +9,8 @@
 #error only libtransmission should #include this header.
 #endif
 
-#include <cstdint>
+#include <cstddef> // for size_t
+#include <cstdint> // for uintX_t
 #include <optional>
 #include <string_view>
 #include <utility>
diff --git a/libtransmission/peer-mgr-wishlist.cc b/libtransmission/peer-mgr-wishlist.cc
index 62acb172a..581a04587 100644
--- a/libtransmission/peer-mgr-wishlist.cc
+++ b/libtransmission/peer-mgr-wishlist.cc
@@ -5,7 +5,6 @@
 
 #include <algorithm>
 #include <cstddef>
-#include <iterator>
 #include <set>
 #include <utility>
 #include <vector>
diff --git a/libtransmission/peer-mgr.h b/libtransmission/peer-mgr.h
index 86e7b281f..610f88ca6 100644
--- a/libtransmission/peer-mgr.h
+++ b/libtransmission/peer-mgr.h
@@ -12,6 +12,7 @@
 #include <cstddef> // size_t
 #include <cstdint> // uint8_t, uint64_t
 #include <string>
+#include <utility>
 #include <vector>
 
 #ifdef _WIN32
diff --git a/libtransmission/peer-msgs.cc b/libtransmission/peer-msgs.cc
index f0cf1627e..2adbb90b9 100644
--- a/libtransmission/peer-msgs.cc
+++ b/libtransmission/peer-msgs.cc
@@ -13,6 +13,7 @@
 #include <map>
 #include <memory> // std::unique_ptr
 #include <optional>
+#include <utility>
 #include <vector>
 
 #include <event2/buffer.h>
diff --git a/libtransmission/peer-msgs.h b/libtransmission/peer-msgs.h
index 70a5b56a4..93a889bce 100644
--- a/libtransmission/peer-msgs.h
+++ b/libtransmission/peer-msgs.h
@@ -12,6 +12,7 @@
 #include <cstdint> // int8_t
 #include <cstddef> // size_t
 #include <ctime> // time_t
+#include <utility>
 
 #include "bitfield.h"
 #include "peer-common.h"
diff --git a/libtransmission/platform.cc b/libtransmission/platform.cc
index a03a5cf31..d580ace82 100644
--- a/libtransmission/platform.cc
+++ b/libtransmission/platform.cc
@@ -5,10 +5,10 @@
 
 #include <algorithm>
 #include <array>
-#include <iterator>
 #include <list>
 #include <string>
 #include <string_view>
+#include <utility>
 #include <vector>
 
 #ifdef __HAIKU__
diff --git a/libtransmission/port-forwarding.cc b/libtransmission/port-forwarding.cc
index aab627034..a2d267661 100644
--- a/libtransmission/port-forwarding.cc
+++ b/libtransmission/port-forwarding.cc
@@ -5,6 +5,7 @@
 
 #include <algorithm>
 #include <chrono>
+#include <memory>
 
 #include <fmt/core.h>
 
diff --git a/libtransmission/rpc-server.cc b/libtransmission/rpc-server.cc
index 64011ab49..c39dd66d8 100644
--- a/libtransmission/rpc-server.cc
+++ b/libtransmission/rpc-server.cc
@@ -5,12 +5,13 @@
 
 #include <algorithm>
 #include <array>
-#include <cerrno>
 #include <chrono>
 #include <cstring> /* memcpy */
 #include <ctime>
+#include <memory>
 #include <string>
 #include <string_view>
+#include <utility>
 #include <vector>
 
 #ifndef _WIN32
diff --git a/libtransmission/rpcimpl.cc b/libtransmission/rpcimpl.cc
index 0b9a707f3..8794d883a 100644
--- a/libtransmission/rpcimpl.cc
+++ b/libtransmission/rpcimpl.cc
@@ -8,6 +8,7 @@
 #include <cerrno>
 #include <ctime>
 #include <iterator>
+#include <memory>
 #include <numeric>
 #include <set>
 #include <string_view>
diff --git a/libtransmission/session.cc b/libtransmission/session.cc
index f65032ca8..473039726 100644
--- a/libtransmission/session.cc
+++ b/libtransmission/session.cc
@@ -4,7 +4,6 @@
 // License text can be found in the licenses/ folder.
 
 #include <algorithm> // std::partial_sort(), std::min(), std::max()
-#include <cerrno> /* ENOENT */
 #include <climits> /* INT_MAX */
 #include <condition_variable>
 #include <csignal>
@@ -18,6 +17,7 @@
 #include <string>
 #include <string_view>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
 #ifndef _WIN32
diff --git a/libtransmission/stats.h b/libtransmission/stats.h
index 1694678ca..0f87b112f 100644
--- a/libtransmission/stats.h
+++ b/libtransmission/stats.h
@@ -9,6 +9,7 @@
 #error only libtransmission should #include this header.
 #endif
 
+#include <cstdint>
 #include <ctime>
 #include <string>
 #include <string_view>
diff --git a/libtransmission/subprocess-win32.cc b/libtransmission/subprocess-win32.cc
index f75221a5a..a2961bdac 100644
--- a/libtransmission/subprocess-win32.cc
+++ b/libtransmission/subprocess-win32.cc
@@ -5,7 +5,6 @@
 
 #include <algorithm>
 #include <climits>
-#include <cstdlib>
 #include <cstring>
 #include <cwchar>
 #include <map>
diff --git a/libtransmission/timer-ev.cc b/libtransmission/timer-ev.cc
index 016392f7d..e873de5b9 100644
--- a/libtransmission/timer-ev.cc
+++ b/libtransmission/timer-ev.cc
@@ -5,6 +5,7 @@
 
 #include <chrono>
 #include <memory>
+#include <utility>
 
 #include <event2/event.h>
 
diff --git a/libtransmission/timer-ev.h b/libtransmission/timer-ev.h
index 7d3a2053e..e53bbea56 100644
--- a/libtransmission/timer-ev.h
+++ b/libtransmission/timer-ev.h
@@ -5,6 +5,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "timer.h"
 
 extern "C"
diff --git a/libtransmission/timer.h b/libtransmission/timer.h
index 5bcb8bf56..d60954de4 100644
--- a/libtransmission/timer.h
+++ b/libtransmission/timer.h
@@ -8,6 +8,7 @@
 #include <chrono>
 #include <functional>
 #include <memory>
+#include <utility>
 
 namespace libtransmission
 {
diff --git a/libtransmission/torrent-ctor.cc b/libtransmission/torrent-ctor.cc
index 42fa620e1..026f3400b 100644
--- a/libtransmission/torrent-ctor.cc
+++ b/libtransmission/torrent-ctor.cc
@@ -7,6 +7,7 @@
 #include <optional>
 #include <string>
 #include <string_view>
+#include <utility>
 #include <vector>
 
 #include "transmission.h"
diff --git a/libtransmission/torrent-files.cc b/libtransmission/torrent-files.cc
index 7a3feded7..ebf868079 100644
--- a/libtransmission/torrent-files.cc
+++ b/libtransmission/torrent-files.cc
@@ -10,6 +10,7 @@
 #include <set>
 #include <string>
 #include <string_view>
+#include <utility>
 
 #include <fmt/format.h>
 
diff --git a/libtransmission/torrent-metainfo.cc b/libtransmission/torrent-metainfo.cc
index 339d180a9..48226b6b8 100644
--- a/libtransmission/torrent-metainfo.cc
+++ b/libtransmission/torrent-metainfo.cc
@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <array>
 #include <cctype>
+#include <cerrno> // for EINVAL
 #include <string>
 #include <string_view>
 #include <vector>
diff --git a/libtransmission/torrent.cc b/libtransmission/torrent.cc
index 96d93d5d5..1712b5d06 100644
--- a/libtransmission/torrent.cc
+++ b/libtransmission/torrent.cc
@@ -14,6 +14,7 @@
 #include <string>
 #include <string_view>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
 #ifndef _WIN32
diff --git a/libtransmission/torrent.h b/libtransmission/torrent.h
index 686c6b15a..5a7d71ee4 100644
--- a/libtransmission/torrent.h
+++ b/libtransmission/torrent.h
@@ -14,6 +14,7 @@
 #include <optional>
 #include <string>
 #include <string_view>
+#include <utility>
 #include <vector>
 
 #include "transmission.h"
diff --git a/libtransmission/torrents.h b/libtransmission/torrents.h
index 6da3354ee..274af37db 100644
--- a/libtransmission/torrents.h
+++ b/libtransmission/torrents.h
@@ -11,6 +11,7 @@
 
 #include <ctime>
 #include <string_view>
+#include <utility>
 #include <vector>
 
 #include "transmission.h"
diff --git a/libtransmission/tr-assert.mm b/libtransmission/tr-assert.mm
index 8debe3bf5..338a1503a 100644
--- a/libtransmission/tr-assert.mm
+++ b/libtransmission/tr-assert.mm
@@ -5,6 +5,8 @@
 
 #import <Foundation/Foundation.h>
 
+#include <cstdlib> // for abort()
+
 #include <fmt/format.h>
 
 #include "tr-assert.h"
diff --git a/libtransmission/tr-dht.cc b/libtransmission/tr-dht.cc
index e566be56d..6dfafe4d9 100644
--- a/libtransmission/tr-dht.cc
+++ b/libtransmission/tr-dht.cc
@@ -5,11 +5,13 @@
 #include <algorithm>
 #include <cerrno>
 #include <chrono>
-#include <csignal> /* sig_atomic_t */
+#include <csignal> // for sig_atomic_t
+#include <cstdlib> // for abort()
 #include <cstdio>
-#include <cstring> /* memcpy(), memset() */
+#include <cstring> // for memcpy(), memset()
 #include <ctime>
 #include <fstream>
+#include <memory>
 #include <sstream>
 #include <string>
 #include <string_view>
diff --git a/libtransmission/tr-lpd.cc b/libtransmission/tr-lpd.cc
index 1faa8610b..5530c31b3 100644
--- a/libtransmission/tr-lpd.cc
+++ b/libtransmission/tr-lpd.cc
@@ -7,6 +7,7 @@
 #include <chrono>
 #include <csignal> /* sig_atomic_t */
 #include <cstring> /* strlen(), strncpy(), strstr(), memset() */
+#include <memory>
 #include <type_traits>
 
 #ifdef _WIN32
diff --git a/libtransmission/tr-popcount.h b/libtransmission/tr-popcount.h
index 9e6068ebb..b8de20d34 100644
--- a/libtransmission/tr-popcount.h
+++ b/libtransmission/tr-popcount.h
@@ -3,10 +3,14 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#ifndef __TRANSMISSION__
+#error only libtransmission should #include this header.
+#endif
+
 #ifndef TR_POPCNT_H
 #define TR_POPCNT_H
 
-#include <stdint.h>
+#include <cstdint>
 
 /* Avoid defining irrelevant helpers that might interfere with other
  * preprocessor logic. */
diff --git a/libtransmission/tr-strbuf.h b/libtransmission/tr-strbuf.h
index c60eb2b69..dc8dd042e 100644
--- a/libtransmission/tr-strbuf.h
+++ b/libtransmission/tr-strbuf.h
@@ -7,6 +7,7 @@
 
 #include <cstddef>
 #include <string_view>
+#include <utility>
 
 #include <fmt/format.h>
 
diff --git a/libtransmission/tr-udp.cc b/libtransmission/tr-udp.cc
index dc42c8ea7..739b97190 100644
--- a/libtransmission/tr-udp.cc
+++ b/libtransmission/tr-udp.cc
@@ -2,6 +2,7 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
+#include <cerrno>
 #include <cstdint>
 #include <cstring> /* memcmp(), memcpy(), memset() */
 #include <cstdlib> /* malloc(), free() */
diff --git a/libtransmission/trevent.cc b/libtransmission/trevent.cc
index c4db11613..86450d75c 100644
--- a/libtransmission/trevent.cc
+++ b/libtransmission/trevent.cc
@@ -9,6 +9,7 @@
 #include <mutex>
 #include <shared_mutex>
 #include <thread>
+#include <utility>
 
 #include <csignal>
 
diff --git a/libtransmission/upnp.cc b/libtransmission/upnp.cc
index f84080f75..b6a7eb07d 100644
--- a/libtransmission/upnp.cc
+++ b/libtransmission/upnp.cc
@@ -8,6 +8,7 @@
 #include <mutex>
 #include <string>
 #include <thread>
+#include <utility>
 
 #include <fmt/core.h>
 
diff --git a/libtransmission/utils.cc b/libtransmission/utils.cc
index ab6afaee9..ae6d4eb61 100644
--- a/libtransmission/utils.cc
+++ b/libtransmission/utils.cc
@@ -13,6 +13,7 @@
 #include <cstdlib> // getenv()
 #include <cstring> /* strerror() */
 #include <ctime> // nanosleep()
+#include <iterator> // for std::back_inserter
 #include <set>
 #include <string>
 #include <string_view>
diff --git a/libtransmission/variant.cc b/libtransmission/variant.cc
index 6941bf836..27fab3482 100644
--- a/libtransmission/variant.cc
+++ b/libtransmission/variant.cc
@@ -4,7 +4,6 @@
 // License text can be found in the licenses/ folder.
 
 #include <algorithm> // std::sort
-#include <cerrno>
 #include <cstring>
 #include <stack>
 #include <string>
diff --git a/libtransmission/watchdir-base.h b/libtransmission/watchdir-base.h
index 679bf0d7e..b4e33bd40 100644
--- a/libtransmission/watchdir-base.h
+++ b/libtransmission/watchdir-base.h
@@ -7,11 +7,14 @@
 
 #include <algorithm>
 #include <chrono>
+#include <cstddef> // for size_t
 #include <map>
 #include <memory>
 #include <optional>
 #include <set>
 #include <string>
+#include <string_view>
+#include <utility>
 
 #include "timer.h"
 #include "watchdir.h"
diff --git a/libtransmission/watchdir-generic.cc b/libtransmission/watchdir-generic.cc
index 8a2e5ca59..3813ea495 100644
--- a/libtransmission/watchdir-generic.cc
+++ b/libtransmission/watchdir-generic.cc
@@ -5,6 +5,8 @@
 
 #define LIBTRANSMISSION_WATCHDIR_MODULE
 
+#include <utility>
+
 #include "transmission.h"
 
 #include "watchdir-base.h"
diff --git a/libtransmission/watchdir-inotify.cc b/libtransmission/watchdir-inotify.cc
index 451c3d6f7..87c5f8a74 100644
--- a/libtransmission/watchdir-inotify.cc
+++ b/libtransmission/watchdir-inotify.cc
@@ -5,8 +5,8 @@
 
 #include <cerrno>
 #include <climits> /* NAME_MAX */
-
-#include <iostream> // NOCOMMIT
+#include <memory>
+#include <utility>
 
 #include <unistd.h> /* close() */
 
diff --git a/libtransmission/watchdir-kqueue.cc b/libtransmission/watchdir-kqueue.cc
index 6045fa984..5200e8647 100644
--- a/libtransmission/watchdir-kqueue.cc
+++ b/libtransmission/watchdir-kqueue.cc
@@ -4,8 +4,9 @@
 // License text can be found in the licenses/ folder.
 
 #include <cerrno> // for errno
+#include <memory>
 #include <string>
-#include <unordered_set>
+#include <utility>
 
 #include <fcntl.h> // for open()
 #include <unistd.h> // for close()
diff --git a/libtransmission/watchdir-win32.cc b/libtransmission/watchdir-win32.cc
index 105a3b8eb..8412b96ae 100644
--- a/libtransmission/watchdir-win32.cc
+++ b/libtransmission/watchdir-win32.cc
@@ -6,6 +6,8 @@
 #include <array>
 #include <cerrno>
 #include <cstddef> // for offsetof
+#include <memory>
+#include <utility>
 
 #include <process.h> // for _beginthreadex()
 
diff --git a/libtransmission/web-utils.cc b/libtransmission/web-utils.cc
index bfe6f2e30..02dda8b4f 100644
--- a/libtransmission/web-utils.cc
+++ b/libtransmission/web-utils.cc
@@ -6,11 +6,13 @@
 #include <algorithm>
 #include <array>
 #include <cctype>
+#include <cstdlib> // for strtoul()
 #include <cstddef>
 #include <limits>
 #include <optional>
 #include <string>
 #include <string_view>
+#include <utility>
 
 #include <fmt/format.h>
 
diff --git a/libtransmission/web.cc b/libtransmission/web.cc
index 31c3e4144..d3f1dd58f 100644
--- a/libtransmission/web.cc
+++ b/libtransmission/web.cc
@@ -11,6 +11,7 @@
 #include <mutex>
 #include <string>
 #include <thread>
+#include <utility>
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/libtransmission/web.h b/libtransmission/web.h
index e529e9149..a7d221a49 100644
--- a/libtransmission/web.h
+++ b/libtransmission/web.h
@@ -11,6 +11,7 @@
 #include <optional>
 #include <string>
 #include <string_view>
+#include <utility>
 
 struct evbuffer;
 
diff --git a/libtransmission/webseed.cc b/libtransmission/webseed.cc
index 6c4e34c52..193a1e700 100644
--- a/libtransmission/webseed.cc
+++ b/libtransmission/webseed.cc
@@ -11,6 +11,7 @@
 #include <set>
 #include <string>
 #include <string_view>
+#include <utility>
 #include <vector>
 
 #include <event2/buffer.h>
diff --git a/macosx/CreatorWindowController.mm b/macosx/CreatorWindowController.mm
index 023751fdb..95e1bda80 100644
--- a/macosx/CreatorWindowController.mm
+++ b/macosx/CreatorWindowController.mm
@@ -6,6 +6,7 @@
 #include <cmath>
 #include <future>
 #include <optional>
+#include <utility>
 
 #include <libtransmission/transmission.h>
 
diff --git a/qt/DetailsDialog.cc b/qt/DetailsDialog.cc
index fd7c795c0..b01c50058 100644
--- a/qt/DetailsDialog.cc
+++ b/qt/DetailsDialog.cc
@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <cassert>
 #include <ctime>
+#include <utility>
 
 #include <QDateTime>
 #include <QDesktopServices>
diff --git a/qt/FileTreeItem.cc b/qt/FileTreeItem.cc
index 04a6a219b..b5eea8a3a 100644
--- a/qt/FileTreeItem.cc
+++ b/qt/FileTreeItem.cc
@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <cassert>
 #include <set>
+#include <utility>
 
 #include <QApplication>
 #include <QStyle>
diff --git a/qt/FilterBar.cc b/qt/FilterBar.cc
index 408a15910..05ed7488f 100644
--- a/qt/FilterBar.cc
+++ b/qt/FilterBar.cc
@@ -8,6 +8,7 @@
 #include <cstdint> // uint64_t
 #include <map>
 #include <unordered_map>
+#include <utility>
 
 #include <QHBoxLayout>
 #include <QLabel>
diff --git a/qt/MakeDialog.cc b/qt/MakeDialog.cc
index 754c8efe3..72fc879cd 100644
--- a/qt/MakeDialog.cc
+++ b/qt/MakeDialog.cc
@@ -7,6 +7,7 @@
 
 #include <chrono>
 #include <future>
+#include <utility>
 #include <vector>
 
 #include <QDir>
diff --git a/qt/OptionsDialog.cc b/qt/OptionsDialog.cc
index 98b73db17..c4ddad37f 100644
--- a/qt/OptionsDialog.cc
+++ b/qt/OptionsDialog.cc
@@ -4,6 +4,7 @@
 // License text can be found in the licenses/ folder.
 
 #include <algorithm>
+#include <utility>
 
 #include <QFileInfo>
 #include <QPushButton>
diff --git a/qt/Prefs.cc b/qt/Prefs.cc
index 0c578fff3..2192d9355 100644
--- a/qt/Prefs.cc
+++ b/qt/Prefs.cc
@@ -6,8 +6,8 @@
 #include <algorithm>
 #include <array>
 #include <cassert>
-#include <cstdlib>
 #include <string_view>
+#include <utility>
 
 #include <QDateTime>
 #include <QDir>
diff --git a/qt/RelocateDialog.cc b/qt/RelocateDialog.cc
index 53bafcfea..3f35dfe3d 100644
--- a/qt/RelocateDialog.cc
+++ b/qt/RelocateDialog.cc
@@ -3,6 +3,8 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include <utility>
+
 #include <QDir>
 
 #include "RelocateDialog.h"
diff --git a/qt/Torrent.cc b/qt/Torrent.cc
index 39b1a2fdb..0ae4a1900 100644
--- a/qt/Torrent.cc
+++ b/qt/Torrent.cc
@@ -4,7 +4,6 @@
 // License text can be found in the licenses/ folder.
 
 #include <algorithm>
-#include <iterator>
 #include <set>
 
 #include <QApplication>
diff --git a/qt/TorrentDelegate.cc b/qt/TorrentDelegate.cc
index de2d6168b..e8ccfde60 100644
--- a/qt/TorrentDelegate.cc
+++ b/qt/TorrentDelegate.cc
@@ -3,6 +3,8 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include <utility>
+
 #include <QApplication>
 #include <QFont>
 #include <QFontMetrics>
diff --git a/qt/TorrentDelegateMin.cc b/qt/TorrentDelegateMin.cc
index bcada2c80..0a87ca5bb 100644
--- a/qt/TorrentDelegateMin.cc
+++ b/qt/TorrentDelegateMin.cc
@@ -4,6 +4,7 @@
 // License text can be found in the licenses/ folder.
 
 #include <algorithm>
+#include <utility>
 
 #include <QApplication>
 #include <QBrush>
diff --git a/qt/TorrentModel.cc b/qt/TorrentModel.cc
index 947326221..9074e53c4 100644
--- a/qt/TorrentModel.cc
+++ b/qt/TorrentModel.cc
@@ -5,6 +5,8 @@
 
 #include <algorithm>
 #include <cassert>
+#include <iterator> // for std::back_inserter
+#include <set>
 #include <string_view>
 
 #include <libtransmission/transmission.h>
diff --git a/qt/TorrentModel.h b/qt/TorrentModel.h
index dfe88e4e6..9e76de2f3 100644
--- a/qt/TorrentModel.h
+++ b/qt/TorrentModel.h
@@ -6,6 +6,7 @@
 #pragma once
 
 #include <optional>
+#include <utility>
 #include <vector>
 
 #include <QAbstractListModel>
diff --git a/qt/Utils.cc b/qt/Utils.cc
index 02c421793..df1357906 100644
--- a/qt/Utils.cc
+++ b/qt/Utils.cc
@@ -3,10 +3,6 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
-#include <set>
-#include <unordered_map>
-#include <unordered_set>
-
 #include <QAbstractItemView>
 #include <QApplication>
 #include <QColor>
diff --git a/qt/Utils.h b/qt/Utils.h
index a7054b5da..c18bf9ab0 100644
--- a/qt/Utils.h
+++ b/qt/Utils.h
@@ -6,6 +6,7 @@
 #pragma once
 
 #include <cstddef> // size_t
+#include <utility>
 
 #include <QHash>
 #include <QPointer>
diff --git a/tests/libtransmission/copy-test.cc b/tests/libtransmission/copy-test.cc
index fb2c79de9..b1cfa7d99 100644
--- a/tests/libtransmission/copy-test.cc
+++ b/tests/libtransmission/copy-test.cc
@@ -4,6 +4,7 @@
 // License text can be found in the licenses/ folder.
 
 #include <algorithm>
+#include <cstring>
 #include <vector>
 
 #include "transmission.h"
diff --git a/tests/libtransmission/handshake-test.cc b/tests/libtransmission/handshake-test.cc
index 6e74035f1..558cab523 100644
--- a/tests/libtransmission/handshake-test.cc
+++ b/tests/libtransmission/handshake-test.cc
@@ -6,7 +6,6 @@
 #include <algorithm>
 #include <array>
 #include <cassert>
-#include <cstring>
 #include <string_view>
 
 #include <event2/util.h>
diff --git a/tests/libtransmission/json-test.cc b/tests/libtransmission/json-test.cc
index 551a74ab3..11753f54b 100644
--- a/tests/libtransmission/json-test.cc
+++ b/tests/libtransmission/json-test.cc
@@ -6,7 +6,6 @@
 #define LIBTRANSMISSION_VARIANT_MODULE
 
 #include <clocale> // setlocale()
-#include <cstring> // strlen()
 #include <string>
 #include <string_view>
 
diff --git a/tests/libtransmission/makemeta-test.cc b/tests/libtransmission/makemeta-test.cc
index 14f8aca65..66cc2f256 100644
--- a/tests/libtransmission/makemeta-test.cc
+++ b/tests/libtransmission/makemeta-test.cc
@@ -6,7 +6,6 @@
 #include <algorithm>
 #include <array>
 #include <cstdlib> // mktemp()
-#include <cstring> // strlen()
 #include <numeric>
 #include <string>
 #include <string_view>
diff --git a/tests/libtransmission/peer-msgs-test.cc b/tests/libtransmission/peer-msgs-test.cc
index a58f0dd25..40170cc17 100644
--- a/tests/libtransmission/peer-msgs-test.cc
+++ b/tests/libtransmission/peer-msgs-test.cc
@@ -3,6 +3,8 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include <cstring>
+
 #include "transmission.h"
 #include "peer-msgs.h"
 
diff --git a/tests/libtransmission/rename-test.cc b/tests/libtransmission/rename-test.cc
index d21520af7..17d6efbb8 100644
--- a/tests/libtransmission/rename-test.cc
+++ b/tests/libtransmission/rename-test.cc
@@ -17,7 +17,6 @@
 #include <array>
 #include <cerrno>
 #include <cstdio> // fopen()
-#include <cstring> // strcmp()
 #include <string>
 #include <string_view>
 
diff --git a/tests/libtransmission/strbuf-test.cc b/tests/libtransmission/strbuf-test.cc
index 7b3140699..ecead8a20 100644
--- a/tests/libtransmission/strbuf-test.cc
+++ b/tests/libtransmission/strbuf-test.cc
@@ -3,6 +3,7 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include <cstring>
 #include <string_view>
 
 #include "transmission.h"
diff --git a/tests/libtransmission/torrent-metainfo-test.cc b/tests/libtransmission/torrent-metainfo-test.cc
index 31c93dbe9..1d9cf6c86 100644
--- a/tests/libtransmission/torrent-metainfo-test.cc
+++ b/tests/libtransmission/torrent-metainfo-test.cc
@@ -4,7 +4,6 @@
 // License text can be found in the licenses/ folder.
 
 #include <array>
-#include <cstring>
 #include <string_view>
 
 #include "transmission.h"
diff --git a/tests/libtransmission/torrents-test.cc b/tests/libtransmission/torrents-test.cc
index ba59543e5..99bcca35e 100644
--- a/tests/libtransmission/torrents-test.cc
+++ b/tests/libtransmission/torrents-test.cc
@@ -3,7 +3,6 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
-#include <cstring>
 #include <set>
 #include <string_view>
 
diff --git a/tests/libtransmission/utils-test.cc b/tests/libtransmission/utils-test.cc
index 065ea4e87..489c233ab 100644
--- a/tests/libtransmission/utils-test.cc
+++ b/tests/libtransmission/utils-test.cc
@@ -7,6 +7,7 @@
 #include <array>
 #include <cmath> // sqrt()
 #include <cstdlib> // setenv(), unsetenv()
+#include <cstring>
 #include <iostream>
 #include <sstream>
 #include <string>
diff --git a/utils/create.cc b/utils/create.cc
index 4c8e6c4da..c248eae94 100644
--- a/utils/create.cc
+++ b/utils/create.cc
@@ -4,8 +4,9 @@
 // License text can be found in the licenses/ folder.
 
 #include <array>
+#include <cstdlib> // for strtoul()
 #include <chrono>
-#include <cstdint> // uint32_t
+#include <cstdint> // for uint32_t
 #include <future>
 #include <string>
 #include <string_view>
diff --git a/utils/show.cc b/utils/show.cc
index 143c29ba0..f6db7547b 100644
--- a/utils/show.cc
+++ b/utils/show.cc
@@ -8,7 +8,6 @@
 #include <cinttypes> // PRIu64
 #include <cstdio>
 #include <ctime>
-#include <iterator>
 #include <string>
 #include <string_view>