diff --git a/src/reflector/default_address_monitor.cpp b/src/reflector/default_address_monitor.cpp
index b29dd23..753bf42 100644
--- a/src/reflector/default_address_monitor.cpp
+++ b/src/reflector/default_address_monitor.cpp
@@ -14,14 +14,13 @@
 #include <cstring>
 #include <span>
 #include <vector>
+#include <net/if.h>
 #include <sys/socket.h>
-#include <unistd.h>
 
 #if defined(__linux__)
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 #else
-#include <net/if.h>
 #include <net/route.h>
 #endif
 
diff --git a/src/reflector/event_loop_dispatcher.cpp b/src/reflector/event_loop_dispatcher.cpp
index 76c04ee..d9c8842 100644
--- a/src/reflector/event_loop_dispatcher.cpp
+++ b/src/reflector/event_loop_dispatcher.cpp
@@ -9,7 +9,6 @@
 #include <ctime>
 #include <utility>
 #include <vector>
-#include <unistd.h>
 
 #if defined(__linux__)
 #include <sys/epoll.h>
diff --git a/src/reflector/interface_address.cpp b/src/reflector/interface_address.cpp
index 72bbd62..9d35e85 100644
--- a/src/reflector/interface_address.cpp
+++ b/src/reflector/interface_address.cpp
@@ -13,7 +13,10 @@
 #include <string_view>
 #include <vector>
 
+#include <ifaddrs.h>
 #include <net/if.h>
+#include <netinet/in.h>
+#include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <unistd.h>
 
@@ -22,13 +25,9 @@
 #include <linux/if_link.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
-#include <cerrno>
 #else
-#include <ifaddrs.h>
 #include <net/if_dl.h>
-#include <netinet/in.h>
 #include <netinet6/in6_var.h>
-#include <sys/ioctl.h>
 #endif
 
 namespace {
diff --git a/src/reflector/raw_socket.cpp b/src/reflector/raw_socket.cpp
index 03b31f0..53f24ce 100644
--- a/src/reflector/raw_socket.cpp
+++ b/src/reflector/raw_socket.cpp
@@ -27,13 +27,11 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <utility>
 
 #if defined(__linux__)
 #include <linux/filter.h>
 #include <linux/if_ether.h>
 #include <linux/if_packet.h>
-#include <sys/socket.h>
 // Added to the UAPI in Linux 4.20; define it for older build headers. At runtime the setsockopt may
 // still fail on a pre-4.20 kernel (or under user-mode QEMU), in which case Open falls back to dropping
 // our own outgoing frames inside the BPF filter (DROP_OUTGOING_PROLOGUE).
@@ -42,8 +40,6 @@
 #endif
 #else
 #include <net/bpf.h>
-#include <net/ethernet.h>
-#include <sys/uio.h>
 #endif
 
 namespace {
diff --git a/tests/default_address_monitor_test.cpp b/tests/default_address_monitor_test.cpp
index 2931fea..d46e82b 100644
--- a/tests/default_address_monitor_test.cpp
+++ b/tests/default_address_monitor_test.cpp
@@ -13,6 +13,7 @@
 #include <cstdint>
 #include <cstring>
 #include <fcntl.h>
+#include <net/if.h>
 #include <sys/socket.h>
 #include <unistd.h>
 #include <vector>
@@ -21,7 +22,6 @@
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 #else
-#include <net/if.h>
 #include <net/route.h>
 #endif
 
diff --git a/tests/interface_address_test.cpp b/tests/interface_address_test.cpp
index c65bbcb..ed49257 100644
--- a/tests/interface_address_test.cpp
+++ b/tests/interface_address_test.cpp
@@ -6,22 +6,20 @@
 
 #include <gtest/gtest.h>
 
+#include <array>
 #include <cstddef>
 #include <cstdint>
-#include <vector>
-
-#if defined(__linux__)
-#include <net/if.h>
-#include <string>
-#else
-#include <array>
 #include <cstring>
 #include <span>
+#include <string>
 #include <string_view>
+#include <vector>
 #include <net/if.h>
+#include <sys/socket.h>
+
+#if !defined(__linux__)
 #include <net/if_dl.h>
 #include <netinet6/in6_var.h>
-#include <sys/socket.h>
 #endif
 
 namespace {
diff --git a/tests/util/udp_socket.cpp b/tests/util/udp_socket.cpp
index 7959b02..b10ba7e 100644
--- a/tests/util/udp_socket.cpp
+++ b/tests/util/udp_socket.cpp
@@ -4,13 +4,11 @@
 #include "reflector/util/fd_util.h"
 
 #include <cerrno>
-#include <cstring>
 #include <format>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <string>
 #include <sys/socket.h>
-#include <unistd.h>
 
 namespace reflector {