diff --git a/src/compat/compat.h b/src/compat/compat.h
index 8195bceaecb..f1c4dedc041 100644
--- a/src/compat/compat.h
+++ b/src/compat/compat.h
@@ -22,19 +22,19 @@
 #include <ws2tcpip.h>
 #include <cstdint>
 #else
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <sys/select.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <ifaddrs.h>
+#include <fcntl.h>// IWYU pragma: export
+#include <sys/mman.h>// IWYU pragma: export
+#include <sys/select.h>// IWYU pragma: export
+#include <sys/socket.h>// IWYU pragma: export
+#include <sys/types.h>// IWYU pragma: export
+#include <net/if.h>// IWYU pragma: export
+#include <netinet/in.h>// IWYU pragma: export
+#include <netinet/tcp.h>// IWYU pragma: export
+#include <arpa/inet.h>// IWYU pragma: export
+#include <ifaddrs.h>// IWYU pragma: export
 #include <limits.h>
-#include <netdb.h>
-#include <unistd.h>
+#include <netdb.h>// IWYU pragma: export
+#include <unistd.h>// IWYU pragma: export
 #endif
 
 // We map Linux / BSD error functions and codes, to the equivalent
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index d0630428c4c..5aaf52f5761 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -14,14 +14,26 @@
 #include <net.h>
 #include <netaddress.h>
 #include <netbase.h>
+#include <random.h>
+#include <tinyformat.h>
+#include <util/check.h>
+#include <util/fs.h>
 #include <util/readwritefile.h>
 #include <util/strencodings.h>
+#include <util/string.h>
 #include <util/thread.h>
 #include <util/time.h>
 
+#include <algorithm>
+#include <cassert>
+#include <cstdlib>
 #include <deque>
 #include <functional>
+#include <map>
+#include <optional>
 #include <set>
+#include <thread>
+#include <utility>
 #include <vector>
 
 #include <event2/buffer.h>
diff --git a/src/torcontrol.h b/src/torcontrol.h
index 8c48cc14e85..1a9065b01a9 100644
--- a/src/torcontrol.h
+++ b/src/torcontrol.h
@@ -11,18 +11,14 @@
 #include <netaddress.h>
 #include <util/fs.h>
 
+#include <event2/util.h>
 
-#include <event2/bufferevent.h>
-#include <event2/event.h>
-
-#include <cstdlib>
+#include <cstdint>
 #include <deque>
 #include <functional>
 #include <string>
 #include <vector>
 
-class CService;
-
 extern const std::string DEFAULT_TOR_CONTROL;
 static const bool DEFAULT_LISTEN_ONION = true;