From 205abbbcceed577aa52b9adc0b8ad5097ed0084e Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Thu, 7 Apr 2022 20:50:26 -0500
Subject: [PATCH] refactor: iwyu string, vector, cstdint (#2898)

* refactor: use cstdint for intX_t types

* refactor: iwyu sstring_view

* refactor: iwyu <cstring>

* refactor: iwyu <vector>
---
 daemon/daemon-posix.cc                          | 2 ++
 daemon/daemon.cc                                | 1 +
 gtk/Application.h                               | 1 +
 gtk/Prefs.cc                                    | 1 +
 gtk/Prefs.h                                     | 2 +-
 gtk/Session.cc                                  | 1 +
 gtk/SystemTrayIcon.cc                           | 2 ++
 gtk/TorrentCellRenderer.cc                      | 1 +
 gtk/Utils.h                                     | 1 +
 libtransmission/announcer-common.h              | 1 +
 libtransmission/announcer.cc                    | 3 ++-
 libtransmission/announcer.h                     | 1 +
 libtransmission/bandwidth.h                     | 2 +-
 libtransmission/block-info.h                    | 2 ++
 libtransmission/crypto-utils.h                  | 2 +-
 libtransmission/crypto.h                        | 4 ++--
 libtransmission/fdlimit.cc                      | 2 +-
 libtransmission/fdlimit.h                       | 3 +++
 libtransmission/file-piece-map.h                | 1 +
 libtransmission/file-posix.cc                   | 1 +
 libtransmission/file.h                          | 4 ++--
 libtransmission/inout.h                         | 2 ++
 libtransmission/log.cc                          | 1 +
 libtransmission/makemeta.h                      | 2 ++
 libtransmission/natpmp.cc                       | 3 +--
 libtransmission/net.h                           | 1 -
 libtransmission/peer-common.h                   | 2 ++
 libtransmission/peer-io.h                       | 1 +
 libtransmission/peer-mgr.h                      | 2 +-
 libtransmission/peer-msgs.h                     | 6 +++---
 libtransmission/port-forwarding.cc              | 1 -
 libtransmission/session.cc                      | 1 +
 libtransmission/torrent-magnet.h                | 4 ++--
 libtransmission/torrent-metainfo.h              | 1 +
 libtransmission/tr-dht.cc                       | 1 -
 libtransmission/tr-lpd.cc                       | 1 -
 libtransmission/tr-macros.h                     | 3 +--
 libtransmission/tr-udp.cc                       | 1 -
 libtransmission/tr-udp.h                        | 2 +-
 libtransmission/tr-utp.cc                       | 1 -
 libtransmission/utils.h                         | 6 +++---
 libtransmission/variant-common.h                | 1 +
 libtransmission/variant.h                       | 2 +-
 libtransmission/watchdir-generic.cc             | 1 -
 libtransmission/watchdir-inotify.cc             | 1 -
 libtransmission/watchdir-kqueue.cc              | 1 -
 qt/Filters.h                                    | 2 ++
 qt/RpcClient.h                                  | 1 +
 qt/Session.h                                    | 1 +
 qt/Torrent.h                                    | 1 +
 qt/VariantHelpers.cc                            | 1 +
 qt/VariantHelpers.h                             | 1 +
 tests/libtransmission/file-test.cc              | 1 +
 tests/libtransmission/peer-mgr-wishlist-test.cc | 1 +
 tests/libtransmission/rename-test.cc            | 1 +
 tests/libtransmission/session-test.cc           | 1 +
 tests/libtransmission/subprocess-test.cc        | 2 ++
 tests/libtransmission/test-fixtures.h           | 1 +
 tests/libtransmission/torrents-test.cc          | 1 +
 tests/libtransmission/watchdir-test.cc          | 1 -
 utils/create.cc                                 | 4 +++-
 utils/remote.cc                                 | 1 +
 utils/show.cc                                   | 1 +
 63 files changed, 73 insertions(+), 35 deletions(-)

diff --git a/daemon/daemon-posix.cc b/daemon/daemon-posix.cc
index 876a9f6f9..35a6d2bed 100644
--- a/daemon/daemon-posix.cc
+++ b/daemon/daemon-posix.cc
@@ -11,6 +11,8 @@
 #include <fcntl.h> /* open() */
 #include <unistd.h> /* fork(), setsid(), chdir(), dup2(), close(), pipe() */
 
+#include <string_view>
+
 #include <fmt/format.h>
 
 #include <libtransmission/transmission.h>
diff --git a/daemon/daemon.cc b/daemon/daemon.cc
index a8e7ba727..9e50cce10 100644
--- a/daemon/daemon.cc
+++ b/daemon/daemon.cc
@@ -8,6 +8,7 @@
 #include <cstdio> /* printf */
 #include <cstdlib> /* atoi */
 #include <iostream>
+#include <string>
 #include <string_view>
 #include <utility>
 
diff --git a/gtk/Application.h b/gtk/Application.h
index ded753c37..092d213e3 100644
--- a/gtk/Application.h
+++ b/gtk/Application.h
@@ -6,6 +6,7 @@
 
 #include <memory>
 #include <string>
+#include <vector>
 
 #include <glibmm.h>
 #include <gtkmm.h>
diff --git a/gtk/Prefs.cc b/gtk/Prefs.cc
index dc285edca..41fc735bb 100644
--- a/gtk/Prefs.cc
+++ b/gtk/Prefs.cc
@@ -4,6 +4,7 @@
 
 #include <errno.h>
 #include <stdlib.h> /* strtol() */
+#include <string>
 #include <string_view>
 
 #include <glibmm.h>
diff --git a/gtk/Prefs.h b/gtk/Prefs.h
index 8940ae849..1a1c6fe6b 100644
--- a/gtk/Prefs.h
+++ b/gtk/Prefs.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <inttypes.h>
+#include <cstdint> // int64_t
 #include <string>
 #include <string_view>
 #include <vector>
diff --git a/gtk/Session.cc b/gtk/Session.cc
index 98171c479..07f1d44a0 100644
--- a/gtk/Session.cc
+++ b/gtk/Session.cc
@@ -5,6 +5,7 @@
 #include <algorithm>
 #include <cmath> // pow()
 #include <cstring> // strstr
+#include <cinttypes> // PRId64
 #include <functional>
 #include <iostream>
 #include <map>
diff --git a/gtk/SystemTrayIcon.cc b/gtk/SystemTrayIcon.cc
index b35098ee5..349284842 100644
--- a/gtk/SystemTrayIcon.cc
+++ b/gtk/SystemTrayIcon.cc
@@ -8,6 +8,8 @@
 // We're using deprecated Gtk::StatusItem ourselves as well
 #undef GTKMM_DISABLE_DEPRECATED
 
+#include <string>
+
 #include <glibmm.h>
 #include <glibmm/i18n.h>
 
diff --git a/gtk/TorrentCellRenderer.cc b/gtk/TorrentCellRenderer.cc
index 9171ba020..f81acd888 100644
--- a/gtk/TorrentCellRenderer.cc
+++ b/gtk/TorrentCellRenderer.cc
@@ -7,6 +7,7 @@
 #include <cstring> // strchr()
 #include <memory>
 #include <optional>
+#include <string>
 
 #include <glibmm.h>
 #include <glibmm/i18n.h>
diff --git a/gtk/Utils.h b/gtk/Utils.h
index 9a14bc2b2..a6d71420a 100644
--- a/gtk/Utils.h
+++ b/gtk/Utils.h
@@ -8,6 +8,7 @@
 #include <ctime>
 #include <functional>
 #include <string>
+#include <vector>
 
 #include <sys/types.h>
 
diff --git a/libtransmission/announcer-common.h b/libtransmission/announcer-common.h
index 0870e493f..1479c7e02 100644
--- a/libtransmission/announcer-common.h
+++ b/libtransmission/announcer-common.h
@@ -10,6 +10,7 @@
 #endif
 
 #include <array>
+#include <cstdint> // uint64_t
 #include <cstddef> // size_t
 #include <string>
 #include <string_view>
diff --git a/libtransmission/announcer.cc b/libtransmission/announcer.cc
index 76e4124ee..da681b09d 100644
--- a/libtransmission/announcer.cc
+++ b/libtransmission/announcer.cc
@@ -5,7 +5,8 @@
 
 #include <algorithm>
 #include <array>
-#include <climits> /* INT_MAX */
+#include <cinttypes> // PRIu64
+#include <climits> // INT_MAX
 #include <cstdio>
 #include <cstring>
 #include <ctime>
diff --git a/libtransmission/announcer.h b/libtransmission/announcer.h
index 7ab41f462..5c91d2ffa 100644
--- a/libtransmission/announcer.h
+++ b/libtransmission/announcer.h
@@ -10,6 +10,7 @@
 #endif
 
 #include <cstddef> // size_t
+#include <cstdint> // uint32_t
 #include <ctime>
 #include <string_view>
 #include <vector>
diff --git a/libtransmission/bandwidth.h b/libtransmission/bandwidth.h
index 1b9fa3dc3..19461e7c0 100644
--- a/libtransmission/bandwidth.h
+++ b/libtransmission/bandwidth.h
@@ -11,8 +11,8 @@
 
 #include <array>
 #include <cstddef> // size_t
+#include <cstdint> // uint64_t
 #include <vector>
-#include <string>
 
 #include "transmission.h"
 
diff --git a/libtransmission/block-info.h b/libtransmission/block-info.h
index 42f0654a8..a5643e87a 100644
--- a/libtransmission/block-info.h
+++ b/libtransmission/block-info.h
@@ -5,6 +5,8 @@
 
 #pragma once
 
+#include <cstdint> // uint32_t, uint64_t
+
 #include "transmission.h"
 
 #include "tr-assert.h"
diff --git a/libtransmission/crypto-utils.h b/libtransmission/crypto-utils.h
index d5a86ddec..ba17ecf20 100644
--- a/libtransmission/crypto-utils.h
+++ b/libtransmission/crypto-utils.h
@@ -6,7 +6,7 @@
 #ifndef TR_CRYPTO_UTILS_H
 #define TR_CRYPTO_UTILS_H
 
-#include <cinttypes> // intX_t
+#include <cstdint> // uint8_t
 #include <cstddef> // size_t
 #include <optional>
 #include <string>
diff --git a/libtransmission/crypto.h b/libtransmission/crypto.h
index d9c1f430c..7ff90a13f 100644
--- a/libtransmission/crypto.h
+++ b/libtransmission/crypto.h
@@ -11,8 +11,8 @@
 #error only libtransmission should #include this header.
 #endif
 
-#include <cinttypes> // uintX_t
-#include <cstddef>
+#include <cstddef> // size_t
+#include <cstdint> // uint8_t
 #include <optional>
 
 #include "crypto-utils.h"
diff --git a/libtransmission/fdlimit.cc b/libtransmission/fdlimit.cc
index 0cbd12801..b337ae254 100644
--- a/libtransmission/fdlimit.cc
+++ b/libtransmission/fdlimit.cc
@@ -6,7 +6,7 @@
 #include <algorithm>
 #include <array>
 #include <cerrno>
-#include <cinttypes>
+#include <cstdint> // uint8_t, uint64_t
 #include <ctime>
 
 #include <fmt/core.h>
diff --git a/libtransmission/fdlimit.h b/libtransmission/fdlimit.h
index c7c072a7f..c98fcdc3b 100644
--- a/libtransmission/fdlimit.h
+++ b/libtransmission/fdlimit.h
@@ -9,7 +9,10 @@
 #error only libtransmission should #include this header.
 #endif
 
+#include <cstdint> // uint64_t
+
 #include "transmission.h"
+
 #include "file.h"
 #include "net.h"
 
diff --git a/libtransmission/file-piece-map.h b/libtransmission/file-piece-map.h
index b9648d016..513198c93 100644
--- a/libtransmission/file-piece-map.h
+++ b/libtransmission/file-piece-map.h
@@ -9,6 +9,7 @@
 #error only libtransmission should #include this header.
 #endif
 
+#include <cstdint> // uint64_t
 #include <cstddef> // size_t
 #include <vector>
 
diff --git a/libtransmission/file-posix.cc b/libtransmission/file-posix.cc
index ce95bb68f..9b6816469 100644
--- a/libtransmission/file-posix.cc
+++ b/libtransmission/file-posix.cc
@@ -15,6 +15,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <string_view>
+#include <string>
 #include <vector>
 
 #include <dirent.h>
diff --git a/libtransmission/file.h b/libtransmission/file.h
index d5bc7dc29..eef92fb4a 100644
--- a/libtransmission/file.h
+++ b/libtransmission/file.h
@@ -6,8 +6,8 @@
 #pragma once
 
 #include <cstddef> // size_t
-#include <cinttypes> // uintX_t
-#include <ctime>
+#include <cstdint> // uint64_t
+#include <ctime> // time_t
 #include <string>
 #include <string_view>
 
diff --git a/libtransmission/inout.h b/libtransmission/inout.h
index e06ecc5e8..51e81b601 100644
--- a/libtransmission/inout.h
+++ b/libtransmission/inout.h
@@ -9,6 +9,8 @@
 #error only libtransmission should #include this header.
 #endif
 
+#include <cstdint> // uint8_t, uint32_t
+
 #include "transmission.h"
 
 #include "block-info.h"
diff --git a/libtransmission/log.cc b/libtransmission/log.cc
index d582c6a10..52de32dc2 100644
--- a/libtransmission/log.cc
+++ b/libtransmission/log.cc
@@ -8,6 +8,7 @@
 #include <cstdio>
 #include <map>
 #include <mutex>
+#include <string>
 #include <string_view>
 #include <utility>
 
diff --git a/libtransmission/makemeta.h b/libtransmission/makemeta.h
index af97e8df5..d1d022070 100644
--- a/libtransmission/makemeta.h
+++ b/libtransmission/makemeta.h
@@ -5,6 +5,8 @@
 
 #pragma once
 
+#include <cstdint> // uint32_t, uint64_t
+
 #include "transmission.h"
 
 struct tr_metainfo_builder_file
diff --git a/libtransmission/natpmp.cc b/libtransmission/natpmp.cc
index 0d0dcb475..d76f3a253 100644
--- a/libtransmission/natpmp.cc
+++ b/libtransmission/natpmp.cc
@@ -5,8 +5,7 @@
 
 #include <cerrno>
 #include <ctime>
-#include <cinttypes>
-#include <string_view>
+#include <cstdint> // uint32_t
 
 #include <event2/util.h> /* evutil_inet_ntop() */
 
diff --git a/libtransmission/net.h b/libtransmission/net.h
index 8dd41c392..2b7fee444 100644
--- a/libtransmission/net.h
+++ b/libtransmission/net.h
@@ -14,7 +14,6 @@
 #include <string_view>
 
 #ifdef _WIN32
-#include <inttypes.h>
 #include <ws2tcpip.h>
 #else
 #include <errno.h>
diff --git a/libtransmission/peer-common.h b/libtransmission/peer-common.h
index c831a72cd..8359b7532 100644
--- a/libtransmission/peer-common.h
+++ b/libtransmission/peer-common.h
@@ -9,6 +9,8 @@
 #error only libtransmission should #include this header.
 #endif
 
+#include <cstdint> // uint8_t, uint32_t, uint64_t
+
 #include "transmission.h"
 
 #include "bitfield.h"
diff --git a/libtransmission/peer-io.h b/libtransmission/peer-io.h
index 7c4ed5cd8..6c7876d26 100644
--- a/libtransmission/peer-io.h
+++ b/libtransmission/peer-io.h
@@ -18,6 +18,7 @@
 #include <ctime>
 #include <memory>
 #include <optional>
+#include <string>
 
 #include <event2/buffer.h>
 
diff --git a/libtransmission/peer-mgr.h b/libtransmission/peer-mgr.h
index b4c848477..ad8be371e 100644
--- a/libtransmission/peer-mgr.h
+++ b/libtransmission/peer-mgr.h
@@ -10,8 +10,8 @@
 #endif
 
 #include <array>
-#include <cinttypes> // uintX_t
 #include <cstddef> // size_t
+#include <cstdint> // uint8_t, uint64_t
 #include <string>
 #include <string_view>
 #include <vector>
diff --git a/libtransmission/peer-msgs.h b/libtransmission/peer-msgs.h
index c6eab2886..2e7eb4f6d 100644
--- a/libtransmission/peer-msgs.h
+++ b/libtransmission/peer-msgs.h
@@ -9,9 +9,9 @@
 #error only libtransmission should #include this header.
 #endif
 
-#include <cinttypes>
-#include <cstddef>
-#include <ctime>
+#include <cstdint> // int8_t
+#include <cstddef> // size_t
+#include <ctime> // time_t
 
 #include "peer-common.h"
 
diff --git a/libtransmission/port-forwarding.cc b/libtransmission/port-forwarding.cc
index ab0d5ca19..a40e02091 100644
--- a/libtransmission/port-forwarding.cc
+++ b/libtransmission/port-forwarding.cc
@@ -4,7 +4,6 @@
 // License text can be found in the licenses/ folder.
 
 #include <algorithm>
-#include <string_view>
 
 #include <sys/types.h>
 
diff --git a/libtransmission/session.cc b/libtransmission/session.cc
index 64904d8dd..b8564e8cb 100644
--- a/libtransmission/session.cc
+++ b/libtransmission/session.cc
@@ -15,6 +15,7 @@
 #include <list>
 #include <memory>
 #include <numeric> // std::acumulate()
+#include <string>
 #include <string_view>
 #include <tuple>
 #include <unordered_set>
diff --git a/libtransmission/torrent-magnet.h b/libtransmission/torrent-magnet.h
index 621ca3f00..7613add54 100644
--- a/libtransmission/torrent-magnet.h
+++ b/libtransmission/torrent-magnet.h
@@ -9,9 +9,9 @@
 #error only libtransmission should #include this header.
 #endif
 
-#include <cinttypes> // intX_t
+#include <cstdint> // int64_t
 #include <cstddef> // size_t
-#include <ctime>
+#include <ctime> // time_t
 
 #include "transmission.h"
 
diff --git a/libtransmission/torrent-metainfo.h b/libtransmission/torrent-metainfo.h
index fbc268bd6..8ff3d958b 100644
--- a/libtransmission/torrent-metainfo.h
+++ b/libtransmission/torrent-metainfo.h
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <cstdint> // uint32_t, uint64_t
 #include <ctime>
 #include <string>
 #include <string_view>
diff --git a/libtransmission/tr-dht.cc b/libtransmission/tr-dht.cc
index 9849dad91..f5819948e 100644
--- a/libtransmission/tr-dht.cc
+++ b/libtransmission/tr-dht.cc
@@ -16,7 +16,6 @@
 #include <thread>
 
 #ifdef _WIN32
-#include <inttypes.h>
 #include <ws2tcpip.h>
 #undef gai_strerror
 #define gai_strerror gai_strerrorA
diff --git a/libtransmission/tr-lpd.cc b/libtransmission/tr-lpd.cc
index 69bb75d46..580ee580d 100644
--- a/libtransmission/tr-lpd.cc
+++ b/libtransmission/tr-lpd.cc
@@ -10,7 +10,6 @@
 #include <type_traits>
 
 #ifdef _WIN32
-#include <inttypes.h>
 #include <ws2tcpip.h>
 using in_port_t = uint16_t; /* all missing */
 #else
diff --git a/libtransmission/tr-macros.h b/libtransmission/tr-macros.h
index 48ae63184..3387465a6 100644
--- a/libtransmission/tr-macros.h
+++ b/libtransmission/tr-macros.h
@@ -6,8 +6,7 @@
 #pragma once
 
 #include <array>
-#include <cstddef>
-#include <cstdint>
+#include <cstddef> // size_t
 
 /***
 ****
diff --git a/libtransmission/tr-udp.cc b/libtransmission/tr-udp.cc
index fc3142c92..9d5301114 100644
--- a/libtransmission/tr-udp.cc
+++ b/libtransmission/tr-udp.cc
@@ -5,7 +5,6 @@
 #include <cstdint>
 #include <cstring> /* memcmp(), memcpy(), memset() */
 #include <cstdlib> /* malloc(), free() */
-#include <string_view>
 
 #ifdef _WIN32
 #include <io.h> /* dup2() */
diff --git a/libtransmission/tr-udp.h b/libtransmission/tr-udp.h
index c52981295..b78de3cf4 100644
--- a/libtransmission/tr-udp.h
+++ b/libtransmission/tr-udp.h
@@ -9,7 +9,7 @@
 #endif
 
 #include <cstddef> // size_t
-#include <cstdint> // uintX_t
+#include <cstdint> // uint8_t
 
 struct tr_session;
 
diff --git a/libtransmission/tr-utp.cc b/libtransmission/tr-utp.cc
index cfdbed2c6..842c3fa36 100644
--- a/libtransmission/tr-utp.cc
+++ b/libtransmission/tr-utp.cc
@@ -3,7 +3,6 @@
 // License text can be found in the licenses/ folder.
 
 #include <cstdint>
-#include <string_view>
 
 #include <event2/event.h>
 
diff --git a/libtransmission/utils.h b/libtransmission/utils.h
index ec7df0aa6..43655281f 100644
--- a/libtransmission/utils.h
+++ b/libtransmission/utils.h
@@ -7,9 +7,9 @@
 
 #include <algorithm>
 #include <cctype>
-#include <cinttypes>
-#include <cstddef>
-#include <ctime>
+#include <cstdint> // uint8_t, uint32_t, uint64_t
+#include <cstddef> // size_t
+#include <ctime> // time_t
 #include <optional>
 #include <string>
 #include <string_view>
diff --git a/libtransmission/variant-common.h b/libtransmission/variant-common.h
index 667b18ff4..0933a0eea 100644
--- a/libtransmission/variant-common.h
+++ b/libtransmission/variant-common.h
@@ -9,6 +9,7 @@
 #error only libtransmission/variant-*.c should #include this header.
 #endif
 
+#include <cstdint> // int64_t
 #include <optional>
 #include <string_view>
 
diff --git a/libtransmission/variant.h b/libtransmission/variant.h
index 748330a42..20f5be6ac 100644
--- a/libtransmission/variant.h
+++ b/libtransmission/variant.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <cinttypes> // int64_t
 #include <cstddef> // size_t
+#include <cstdint> // int64_t
 #include <string>
 #include <string_view>
 
diff --git a/libtransmission/watchdir-generic.cc b/libtransmission/watchdir-generic.cc
index 264c79a34..bd7a9dfe6 100644
--- a/libtransmission/watchdir-generic.cc
+++ b/libtransmission/watchdir-generic.cc
@@ -5,7 +5,6 @@
 
 #include <cerrno>
 #include <string>
-#include <string_view>
 #include <unordered_set>
 
 #include <event2/event.h>
diff --git a/libtransmission/watchdir-inotify.cc b/libtransmission/watchdir-inotify.cc
index 2a2e8a2b7..29ae82ff3 100644
--- a/libtransmission/watchdir-inotify.cc
+++ b/libtransmission/watchdir-inotify.cc
@@ -5,7 +5,6 @@
 
 #include <cerrno>
 #include <climits> /* NAME_MAX */
-#include <string_view>
 
 #include <unistd.h> /* close() */
 
diff --git a/libtransmission/watchdir-kqueue.cc b/libtransmission/watchdir-kqueue.cc
index ae0fce43a..000df4262 100644
--- a/libtransmission/watchdir-kqueue.cc
+++ b/libtransmission/watchdir-kqueue.cc
@@ -5,7 +5,6 @@
 
 #include <cerrno> /* errno */
 #include <string>
-#include <string_view>
 #include <unordered_set>
 
 #include <fcntl.h> /* open() */
diff --git a/qt/Filters.h b/qt/Filters.h
index 1933b5df3..0bb59a1b8 100644
--- a/qt/Filters.h
+++ b/qt/Filters.h
@@ -5,6 +5,8 @@
 
 #pragma once
 
+#include <cstdint> // uint64_t
+
 #include "Torrent.h"
 
 class FilterMode
diff --git a/qt/RpcClient.h b/qt/RpcClient.h
index 633b8486f..1498e8a97 100644
--- a/qt/RpcClient.h
+++ b/qt/RpcClient.h
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <cstdint> // int64_t
 #include <memory>
 #include <optional>
 #include <string_view>
diff --git a/qt/Session.h b/qt/Session.h
index 20a9bec74..1fd3b00b7 100644
--- a/qt/Session.h
+++ b/qt/Session.h
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <cstdint> // int64_t
 #include <map>
 #include <string_view>
 #include <vector>
diff --git a/qt/Torrent.h b/qt/Torrent.h
index 07dab668e..ca5438d12 100644
--- a/qt/Torrent.h
+++ b/qt/Torrent.h
@@ -6,6 +6,7 @@
 #pragma once
 
 #include <bitset>
+#include <cstdint> // uint64_t
 #include <ctime> // time_t
 #include <optional>
 #include <vector>
diff --git a/qt/VariantHelpers.cc b/qt/VariantHelpers.cc
index 08d47c4e5..0e127b0ab 100644
--- a/qt/VariantHelpers.cc
+++ b/qt/VariantHelpers.cc
@@ -7,6 +7,7 @@
 
 #include <cmath>
 #include <limits>
+#include <string_view>
 
 #include <QUrl>
 
diff --git a/qt/VariantHelpers.h b/qt/VariantHelpers.h
index fc10c2733..6971313a7 100644
--- a/qt/VariantHelpers.h
+++ b/qt/VariantHelpers.h
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <cstdint> // int64_t
 #include <ctime>
 #include <optional>
 #include <string_view>
diff --git a/tests/libtransmission/file-test.cc b/tests/libtransmission/file-test.cc
index a3abd8a4d..8fec5a510 100644
--- a/tests/libtransmission/file-test.cc
+++ b/tests/libtransmission/file-test.cc
@@ -7,6 +7,7 @@
 #include <cstring>
 #include <ostream>
 #include <string>
+#include <string_view>
 
 #ifndef _WIN32
 #include <sys/types.h>
diff --git a/tests/libtransmission/peer-mgr-wishlist-test.cc b/tests/libtransmission/peer-mgr-wishlist-test.cc
index 58f21484f..d1a0838f3 100644
--- a/tests/libtransmission/peer-mgr-wishlist-test.cc
+++ b/tests/libtransmission/peer-mgr-wishlist-test.cc
@@ -4,6 +4,7 @@
 // License text can be found in the licenses/ folder.
 
 #include <algorithm>
+#include <map>
 #include <type_traits>
 
 #define LIBTRANSMISSION_PEER_MODULE
diff --git a/tests/libtransmission/rename-test.cc b/tests/libtransmission/rename-test.cc
index 9e83923d0..3bd462dc8 100644
--- a/tests/libtransmission/rename-test.cc
+++ b/tests/libtransmission/rename-test.cc
@@ -20,6 +20,7 @@
 #include <cstdio> // fopen()
 #include <cstring> // strcmp()
 #include <string>
+#include <string_view>
 
 using namespace std::literals;
 
diff --git a/tests/libtransmission/session-test.cc b/tests/libtransmission/session-test.cc
index d755b352b..bea09001b 100644
--- a/tests/libtransmission/session-test.cc
+++ b/tests/libtransmission/session-test.cc
@@ -16,6 +16,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <string>
+#include <string_view>
 
 using namespace std::literals;
 
diff --git a/tests/libtransmission/subprocess-test.cc b/tests/libtransmission/subprocess-test.cc
index 36dbc75bb..b766602f3 100644
--- a/tests/libtransmission/subprocess-test.cc
+++ b/tests/libtransmission/subprocess-test.cc
@@ -16,7 +16,9 @@
 
 #include <array>
 #include <cstdlib>
+#include <map>
 #include <string>
+#include <string_view>
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/tests/libtransmission/test-fixtures.h b/tests/libtransmission/test-fixtures.h
index d5a67797e..733cd5aca 100644
--- a/tests/libtransmission/test-fixtures.h
+++ b/tests/libtransmission/test-fixtures.h
@@ -12,6 +12,7 @@
 #include <memory>
 #include <mutex> // std::once_flag()
 #include <string>
+#include <string_view>
 #include <thread>
 
 #include "crypto-utils.h" // tr_base64_decode()
diff --git a/tests/libtransmission/torrents-test.cc b/tests/libtransmission/torrents-test.cc
index b3ca7b5b1..90c08be96 100644
--- a/tests/libtransmission/torrents-test.cc
+++ b/tests/libtransmission/torrents-test.cc
@@ -5,6 +5,7 @@
 
 #include <cstring>
 #include <set>
+#include <string_view>
 
 #include "transmission.h"
 
diff --git a/tests/libtransmission/watchdir-test.cc b/tests/libtransmission/watchdir-test.cc
index 5abc02841..df3ed5d57 100644
--- a/tests/libtransmission/watchdir-test.cc
+++ b/tests/libtransmission/watchdir-test.cc
@@ -3,7 +3,6 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
-#include <map>
 #include <memory>
 #include <string>
 
diff --git a/utils/create.cc b/utils/create.cc
index 363cafacb..dca3f4075 100644
--- a/utils/create.cc
+++ b/utils/create.cc
@@ -4,11 +4,13 @@
 // License text can be found in the licenses/ folder.
 
 #include <array>
-#include <cinttypes>
+#include <cinttypes> // PRIu32
+#include <cstdint> // uint32_t
 #include <cstdio>
 #include <cstdlib>
 #include <iostream>
 #include <string>
+#include <string_view>
 
 #include <libtransmission/transmission.h>
 
diff --git a/utils/remote.cc b/utils/remote.cc
index 51bb1c247..2ad55357d 100644
--- a/utils/remote.cc
+++ b/utils/remote.cc
@@ -6,6 +6,7 @@
 #include <array>
 #include <cassert>
 #include <cctype> /* isspace */
+#include <cinttypes> // PRId64
 #include <cerrno>
 #include <cmath>
 #include <cstdio>
diff --git a/utils/show.cc b/utils/show.cc
index 11929fbc5..ea8a871f1 100644
--- a/utils/show.cc
+++ b/utils/show.cc
@@ -5,6 +5,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cinttypes> // PRIu64
 #include <cstdio>
 #include <ctime>
 #include <iterator>