From c364abcb6f66ff7afb1508435f2aa7439a3983e6 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Thu, 6 Jul 2023 10:00:07 -0500
Subject: [PATCH] chore: misc-include-cleaner (partial) (#5738)

---
 libtransmission/announcer-http.cc         | 1 -
 libtransmission/announcer-udp.cc          | 4 +++-
 libtransmission/announcer.cc              | 1 -
 libtransmission/bitfield.cc               | 1 -
 libtransmission/cache.cc                  | 1 -
 libtransmission/crypto-utils-fallback.cc  | 6 ++----
 libtransmission/crypto-utils.cc           | 2 --
 libtransmission/error.cc                  | 1 -
 libtransmission/file.cc                   | 1 -
 libtransmission/magnet-metainfo.cc        | 1 -
 libtransmission/makemeta.cc               | 1 -
 libtransmission/net.cc                    | 3 ---
 libtransmission/peer-mgr-wishlist.cc      | 1 -
 libtransmission/peer-mse.cc               | 1 -
 libtransmission/peer-msgs.cc              | 1 -
 libtransmission/platform.cc               | 1 -
 libtransmission/port-forwarding-natpmp.cc | 1 -
 libtransmission/rpc-server.cc             | 2 --
 libtransmission/rpcimpl.cc                | 2 --
 libtransmission/session.cc                | 4 ----
 libtransmission/torrent-ctor.cc           | 1 -
 libtransmission/torrent-metainfo.cc       | 3 ---
 libtransmission/torrent.cc                | 1 -
 libtransmission/tr-assert.cc              | 6 ++----
 libtransmission/tr-udp.cc                 | 1 -
 libtransmission/utils-ev.cc               | 2 --
 libtransmission/variant-benc.cc           | 1 -
 libtransmission/variant.cc                | 2 --
 libtransmission/watchdir-inotify.cc       | 1 -
 libtransmission/web-utils.cc              | 1 -
 30 files changed, 7 insertions(+), 48 deletions(-)

diff --git a/libtransmission/announcer-http.cc b/libtransmission/announcer-http.cc
index 2c16c0f39..bc09add03 100644
--- a/libtransmission/announcer-http.cc
+++ b/libtransmission/announcer-http.cc
@@ -31,7 +31,6 @@
 #include "libtransmission/log.h"
 #include "libtransmission/net.h"
 #include "libtransmission/peer-mgr.h" /* pex */
-#include "libtransmission/quark.h"
 #include "libtransmission/torrent.h"
 #include "libtransmission/tr-assert.h"
 #include "libtransmission/utils.h"
diff --git a/libtransmission/announcer-udp.cc b/libtransmission/announcer-udp.cc
index c4b2ae032..09d22dbef 100644
--- a/libtransmission/announcer-udp.cc
+++ b/libtransmission/announcer-udp.cc
@@ -17,6 +17,8 @@
 #include <ws2tcpip.h>
 #undef gai_strerror
 #define gai_strerror gai_strerrorA
+#else
+#include <netdb.h> // gai_strerror()
 #endif
 
 #include <fmt/core.h>
@@ -29,7 +31,7 @@
 #include "libtransmission/announcer-common.h"
 #include "libtransmission/crypto-utils.h" // for tr_rand_obj()
 #include "libtransmission/log.h"
-#include "libtransmission/peer-io.h"
+#include "libtransmission/net.h"
 #include "libtransmission/peer-mgr.h" // for tr_pex::fromCompact4()
 #include "libtransmission/tr-assert.h"
 #include "libtransmission/tr-buffer.h"
diff --git a/libtransmission/announcer.cc b/libtransmission/announcer.cc
index 05217cb5e..287d0f3cc 100644
--- a/libtransmission/announcer.cc
+++ b/libtransmission/announcer.cc
@@ -5,7 +5,6 @@
 
 #include <algorithm>
 #include <array>
-#include <climits> // INT_MAX
 #include <cstdio>
 #include <ctime>
 #include <deque>
diff --git a/libtransmission/bitfield.cc b/libtransmission/bitfield.cc
index 5b4318ac2..434b33df2 100644
--- a/libtransmission/bitfield.cc
+++ b/libtransmission/bitfield.cc
@@ -4,7 +4,6 @@
 // License text can be found in the licenses/ folder.
 
 #include <algorithm>
-#include <climits> // SIZE_MAX
 #include <vector>
 
 #include "libtransmission/transmission.h"
diff --git a/libtransmission/cache.cc b/libtransmission/cache.cc
index 41cc239b5..e01a2b4c4 100644
--- a/libtransmission/cache.cc
+++ b/libtransmission/cache.cc
@@ -6,7 +6,6 @@
 #include <algorithm>
 #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()
diff --git a/libtransmission/crypto-utils-fallback.cc b/libtransmission/crypto-utils-fallback.cc
index 7f2c4a054..ff8801336 100644
--- a/libtransmission/crypto-utils-fallback.cc
+++ b/libtransmission/crypto-utils-fallback.cc
@@ -7,15 +7,13 @@
    implement missing (or duplicate) functionality without exposing internal
    details in header files. */
 
+#ifdef TR_CRYPTO_X509_FALLBACK
+
 #include "libtransmission/transmission.h"
 
 #include "libtransmission/crypto-utils.h"
 #include "libtransmission/tr-macros.h"
 
-// ---
-
-#ifdef TR_CRYPTO_X509_FALLBACK
-
 tr_x509_store_t tr_ssl_get_x509_store(tr_ssl_ctx_t /*handle*/)
 {
     return nullptr;
diff --git a/libtransmission/crypto-utils.cc b/libtransmission/crypto-utils.cc
index 642548d7a..060ce21ab 100644
--- a/libtransmission/crypto-utils.cc
+++ b/libtransmission/crypto-utils.cc
@@ -10,7 +10,6 @@
 #include <random>
 #include <string>
 #include <string_view>
-#include <type_traits>
 #include <vector>
 
 extern "C"
@@ -25,7 +24,6 @@ extern "C"
 
 #include "libtransmission/crypto-utils.h"
 #include "libtransmission/tr-assert.h"
-#include "libtransmission/tr-strbuf.h"
 #include "libtransmission/utils.h"
 
 using namespace std::literals;
diff --git a/libtransmission/error.cc b/libtransmission/error.cc
index a51c70ea7..f60f9f25e 100644
--- a/libtransmission/error.cc
+++ b/libtransmission/error.cc
@@ -12,7 +12,6 @@
 
 #include "libtransmission/error.h"
 #include "libtransmission/tr-assert.h"
-#include "libtransmission/tr-macros.h"
 #include "libtransmission/utils.h"
 
 namespace
diff --git a/libtransmission/file.cc b/libtransmission/file.cc
index b672c07c3..05bb7b3e2 100644
--- a/libtransmission/file.cc
+++ b/libtransmission/file.cc
@@ -12,7 +12,6 @@
 #include "libtransmission/error.h"
 #include "libtransmission/file.h"
 #include "libtransmission/tr-assert.h"
-#include "libtransmission/tr-strbuf.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/magnet-metainfo.cc b/libtransmission/magnet-metainfo.cc
index 11dc716fd..39615ceab 100644
--- a/libtransmission/magnet-metainfo.cc
+++ b/libtransmission/magnet-metainfo.cc
@@ -18,7 +18,6 @@
 #include "libtransmission/error.h"
 #include "libtransmission/error-types.h"
 #include "libtransmission/magnet-metainfo.h"
-#include "libtransmission/tr-assert.h"
 #include "libtransmission/utils.h"
 #include "libtransmission/web-utils.h"
 
diff --git a/libtransmission/makemeta.cc b/libtransmission/makemeta.cc
index 1f8dfc94a..99f7bbb4a 100644
--- a/libtransmission/makemeta.cc
+++ b/libtransmission/makemeta.cc
@@ -10,7 +10,6 @@
 #include <set>
 #include <string>
 #include <string_view>
-#include <thread>
 #include <utility>
 #include <vector>
 
diff --git a/libtransmission/net.cc b/libtransmission/net.cc
index e073a6354..9f44907e5 100644
--- a/libtransmission/net.cc
+++ b/libtransmission/net.cc
@@ -24,8 +24,6 @@
 
 #include <fmt/core.h>
 
-#include <libutp/utp.h>
-
 #include "libtransmission/transmission.h"
 
 #include "libtransmission/log.h"
@@ -36,7 +34,6 @@
 #include "libtransmission/tr-macros.h"
 #include "libtransmission/tr-utp.h"
 #include "libtransmission/utils.h"
-#include "libtransmission/variant.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/peer-mgr-wishlist.cc b/libtransmission/peer-mgr-wishlist.cc
index 7f4589ff1..60ccf7bd3 100644
--- a/libtransmission/peer-mgr-wishlist.cc
+++ b/libtransmission/peer-mgr-wishlist.cc
@@ -14,7 +14,6 @@
 
 #include "libtransmission/crypto-utils.h" // for tr_salt_shaker
 #include "libtransmission/peer-mgr-wishlist.h"
-#include "libtransmission/tr-assert.h"
 
 namespace
 {
diff --git a/libtransmission/peer-mse.cc b/libtransmission/peer-mse.cc
index 5e117d663..b1f56f640 100644
--- a/libtransmission/peer-mse.cc
+++ b/libtransmission/peer-mse.cc
@@ -4,7 +4,6 @@
 // License text can be found in the licenses/ folder.
 
 #include <array>
-#include <memory>
 
 #include <math/wide_integer/uintwide_t.h>
 
diff --git a/libtransmission/peer-msgs.cc b/libtransmission/peer-msgs.cc
index 68e2f8fad..bfd7c20ec 100644
--- a/libtransmission/peer-msgs.cc
+++ b/libtransmission/peer-msgs.cc
@@ -23,7 +23,6 @@
 
 #include "libtransmission/bitfield.h"
 #include "libtransmission/cache.h"
-#include "libtransmission/completion.h"
 #include "libtransmission/crypto-utils.h"
 #include "libtransmission/file.h"
 #include "libtransmission/log.h"
diff --git a/libtransmission/platform.cc b/libtransmission/platform.cc
index d65a4fa51..d80d29032 100644
--- a/libtransmission/platform.cc
+++ b/libtransmission/platform.cc
@@ -43,7 +43,6 @@
 #include "libtransmission/log.h"
 #include "libtransmission/platform.h"
 #include "libtransmission/session.h"
-#include "libtransmission/tr-assert.h"
 #include "libtransmission/utils.h"
 
 using namespace std::literals;
diff --git a/libtransmission/port-forwarding-natpmp.cc b/libtransmission/port-forwarding-natpmp.cc
index c1bf49b11..8cc0c2bc6 100644
--- a/libtransmission/port-forwarding-natpmp.cc
+++ b/libtransmission/port-forwarding-natpmp.cc
@@ -5,7 +5,6 @@
 
 #include <array>
 #include <cerrno>
-#include <cstdint> // uint32_t
 
 #include <event2/util.h> /* evutil_inet_ntop() */
 
diff --git a/libtransmission/rpc-server.cc b/libtransmission/rpc-server.cc
index 04dcc9f86..961ad562d 100644
--- a/libtransmission/rpc-server.cc
+++ b/libtransmission/rpc-server.cc
@@ -40,10 +40,8 @@
 #include "libtransmission/quark.h"
 #include "libtransmission/rpc-server.h"
 #include "libtransmission/rpcimpl.h"
-#include "libtransmission/session-id.h"
 #include "libtransmission/session.h"
 #include "libtransmission/timer.h"
-#include "libtransmission/tr-assert.h"
 #include "libtransmission/tr-strbuf.h"
 #include "libtransmission/utils.h"
 #include "libtransmission/variant.h"
diff --git a/libtransmission/rpcimpl.cc b/libtransmission/rpcimpl.cc
index 8e13bbfbe..960e0d390 100644
--- a/libtransmission/rpcimpl.cc
+++ b/libtransmission/rpcimpl.cc
@@ -22,7 +22,6 @@
 #include "libtransmission/transmission.h"
 
 #include "libtransmission/announcer.h"
-#include "libtransmission/completion.h"
 #include "libtransmission/crypto-utils.h"
 #include "libtransmission/error.h"
 #include "libtransmission/file.h"
@@ -30,7 +29,6 @@
 #include "libtransmission/peer-mgr.h"
 #include "libtransmission/quark.h"
 #include "libtransmission/rpcimpl.h"
-#include "libtransmission/session-id.h"
 #include "libtransmission/session.h"
 #include "libtransmission/torrent.h"
 #include "libtransmission/tr-assert.h"
diff --git a/libtransmission/session.cc b/libtransmission/session.cc
index 5c86f4277..7380d34ea 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 <climits> /* INT_MAX */
 #include <condition_variable>
 #include <csignal>
 #include <cstdint>
@@ -26,7 +25,6 @@
 
 #include <event2/event.h>
 
-#include <fmt/chrono.h>
 #include <fmt/format.h> // fmt::ptr
 
 #include "libtransmission/transmission.h"
@@ -36,8 +34,6 @@
 #include "libtransmission/blocklist.h"
 #include "libtransmission/cache.h"
 #include "libtransmission/crypto-utils.h"
-#include "libtransmission/error-types.h"
-#include "libtransmission/error.h"
 #include "libtransmission/file.h"
 #include "libtransmission/global-ip-cache.h"
 #include "libtransmission/log.h"
diff --git a/libtransmission/torrent-ctor.cc b/libtransmission/torrent-ctor.cc
index 1a56aab51..df9231b97 100644
--- a/libtransmission/torrent-ctor.cc
+++ b/libtransmission/torrent-ctor.cc
@@ -12,7 +12,6 @@
 
 #include "libtransmission/transmission.h"
 
-#include "libtransmission/error-types.h"
 #include "libtransmission/error.h"
 #include "libtransmission/magnet-metainfo.h"
 #include "libtransmission/session.h"
diff --git a/libtransmission/torrent-metainfo.cc b/libtransmission/torrent-metainfo.cc
index 8224782f7..77d674b86 100644
--- a/libtransmission/torrent-metainfo.cc
+++ b/libtransmission/torrent-metainfo.cc
@@ -15,16 +15,13 @@
 
 #include "libtransmission/benc.h"
 #include "libtransmission/crypto-utils.h"
-#include "libtransmission/error-types.h"
 #include "libtransmission/error.h"
 #include "libtransmission/file.h"
 #include "libtransmission/log.h"
-#include "libtransmission/quark.h"
 #include "libtransmission/torrent-metainfo.h"
 #include "libtransmission/tr-assert.h"
 #include "libtransmission/tr-strbuf.h"
 #include "libtransmission/utils.h"
-#include "libtransmission/web-utils.h"
 
 using namespace std::literals;
 
diff --git a/libtransmission/torrent.cc b/libtransmission/torrent.cc
index 58aaaaa42..caa118d1b 100644
--- a/libtransmission/torrent.cc
+++ b/libtransmission/torrent.cc
@@ -7,7 +7,6 @@
 #include <array>
 #include <cerrno> // EINVAL
 #include <climits> /* INT_MAX */
-#include <csignal> /* signal() */
 #include <ctime>
 #include <map>
 #include <sstream>
diff --git a/libtransmission/tr-assert.cc b/libtransmission/tr-assert.cc
index bad925391..3dc3e5cd5 100644
--- a/libtransmission/tr-assert.cc
+++ b/libtransmission/tr-assert.cc
@@ -3,15 +3,13 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
-#include <cstdio>
-#include <cstdlib>
+#if !defined(NDEBUG) || defined(TR_FORCE_ASSERTIONS)
+
 #include <iostream>
 #include <string_view>
 
 #include "libtransmission/tr-assert.h"
 
-#if !defined(NDEBUG) || defined(TR_FORCE_ASSERTIONS)
-
 [[noreturn]] bool tr_assert_report(std::string_view file, long line, std::string_view message)
 {
     std::cerr << "assertion failed: " << message << " (" << file << ':' << line << ')' << std::endl;
diff --git a/libtransmission/tr-udp.cc b/libtransmission/tr-udp.cc
index bbc867fc6..77afe7303 100644
--- a/libtransmission/tr-udp.cc
+++ b/libtransmission/tr-udp.cc
@@ -4,7 +4,6 @@
 
 #include <array>
 #include <cerrno>
-#include <cstdint>
 #include <cstring> /* memcmp(), memset() */
 
 #include <event2/event.h>
diff --git a/libtransmission/utils-ev.cc b/libtransmission/utils-ev.cc
index 2fb7b3edd..0ee2c7aa9 100644
--- a/libtransmission/utils-ev.cc
+++ b/libtransmission/utils-ev.cc
@@ -3,8 +3,6 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
-#include <memory>
-
 #include <event2/buffer.h>
 #include <event2/event.h>
 #include <event2/http.h>
diff --git a/libtransmission/variant-benc.cc b/libtransmission/variant-benc.cc
index 5855b04a3..03469922f 100644
--- a/libtransmission/variant-benc.cc
+++ b/libtransmission/variant-benc.cc
@@ -18,7 +18,6 @@
 
 #include "libtransmission/benc.h"
 #include "libtransmission/quark.h"
-#include "libtransmission/tr-assert.h"
 #include "libtransmission/tr-buffer.h"
 #include "libtransmission/utils.h"
 #include "libtransmission/variant-common.h"
diff --git a/libtransmission/variant.cc b/libtransmission/variant.cc
index 7b06eab0b..a66caf045 100644
--- a/libtransmission/variant.cc
+++ b/libtransmission/variant.cc
@@ -5,10 +5,8 @@
 
 #include <algorithm> // std::sort
 #include <cstring>
-#include <stack>
 #include <string>
 #include <string_view>
-#include <utility>
 #include <vector>
 
 #ifdef _WIN32
diff --git a/libtransmission/watchdir-inotify.cc b/libtransmission/watchdir-inotify.cc
index a4a9d8281..ed6c0978e 100644
--- a/libtransmission/watchdir-inotify.cc
+++ b/libtransmission/watchdir-inotify.cc
@@ -4,7 +4,6 @@
 // License text can be found in the licenses/ folder.
 
 #include <cerrno>
-#include <climits> /* NAME_MAX */
 #include <memory>
 #include <utility>
 
diff --git a/libtransmission/web-utils.cc b/libtransmission/web-utils.cc
index da895932f..84a8d933b 100644
--- a/libtransmission/web-utils.cc
+++ b/libtransmission/web-utils.cc
@@ -7,7 +7,6 @@
 #include <array>
 #include <cctype>
 #include <cstdlib> // for strtoul()
-#include <cstddef>
 #include <limits>
 #include <optional>
 #include <string>