diff --git a/libnvme/src/nvme/util.c b/libnvme/src/nvme/util.c
index 97f45fd280..c037e30859 100644
--- a/libnvme/src/nvme/util.c
+++ b/libnvme/src/nvme/util.c
@@ -17,12 +17,12 @@
 #include <unistd.h>
 
 #if defined(HAVE_NETDB) || defined(CONFIG_FABRICS)
-#include <sys/types.h>
 #include <ifaddrs.h>
-#endif
 
 #include <arpa/inet.h>
 #include <netdb.h>
+#endif
+
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/logging.c b/logging.c
index 3f4ddad463..9f4691541c 100644
--- a/logging.c
+++ b/logging.c
@@ -6,7 +6,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <sys/ioctl.h>
 #include <sys/time.h>
 
 #include <ccan/endian/endian.h>
diff --git a/nvme-print-json.c b/nvme-print-json.c
index e5b9a304a2..ef953156c5 100644
--- a/nvme-print-json.c
+++ b/nvme-print-json.c
@@ -4,8 +4,12 @@
 #include <errno.h>
 #include <time.h>
 #include <sys/types.h>
+
+#ifdef CONFIG_FABRICS
 #include <sys/socket.h>
 #include <arpa/inet.h>
+#endif
+
 #include <ccan/compiler/compiler.h>
 
 #include <libnvme.h>
diff --git a/nvme-print-stdout.c b/nvme-print-stdout.c
index acdf1d7749..6c4567f814 100644
--- a/nvme-print-stdout.c
+++ b/nvme-print-stdout.c
@@ -7,8 +7,12 @@
 #include <time.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+
+#ifdef CONFIG_FABRICS
 #include <sys/socket.h>
 #include <arpa/inet.h>
+#endif
+
 #include <ccan/strset/strset.h>
 #include <ccan/htable/htable_type.h>
 #include <ccan/htable/htable.h>