chore: misc-include-cleaner (partial) (#5738)

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"

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"

libtransmission/announcer.cc

@@ -5,7 +5,6 @@
 
 #include <algorithm>
 #include <array>
-#include <climits> // INT_MAX
 #include <cstdio>
 #include <ctime>
 #include <deque>

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"

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()

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;

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;

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

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;
 

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"
 

libtransmission/makemeta.cc

@@ -10,7 +10,6 @@
 #include <set>
 #include <string>
 #include <string_view>
-#include <thread>
 #include <utility>
 #include <vector>
 

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;
 

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
 {

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>
 

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"

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;

libtransmission/port-forwarding-natpmp.cc

@@ -5,7 +5,6 @@
 
 #include <array>
 #include <cerrno>
-#include <cstdint> // uint32_t
 
 #include <event2/util.h> /* evutil_inet_ntop() */
 

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"

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"

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"

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"

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;
 

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>

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;

libtransmission/tr-udp.cc

@@ -4,7 +4,6 @@
 
 #include <array>
 #include <cerrno>
-#include <cstdint>
 #include <cstring> /* memcmp(), memset() */
 
 #include <event2/event.h>

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>

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"

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

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>
 

libtransmission/web-utils.cc

@@ -7,7 +7,6 @@
 #include <array>
 #include <cctype>
 #include <cstdlib> // for strtoul()
-#include <cstddef>
 #include <limits>
 #include <optional>
 #include <string>