diff --git a/tftpd/recvfrom.c b/tftpd/recvfrom.c
index 50b788b..320678d 100644
--- a/tftpd/recvfrom.c
+++ b/tftpd/recvfrom.c
@@ -26,10 +26,12 @@
 
 #if defined(HAVE_RECVMSG) && defined(HAVE_MSGHDR_MSG_CONTROL)
 
-#include <sys/uio.h>
+#ifdef HAVE_SYS_UIO_H
+# include <sys/uio.h>
+#endif
 
 #ifdef IP_PKTINFO
-# ifndef HAVE_STRUCT_IN_PKTINFO
+# ifndef HAVE_STRUCT_IN_PKTINFO_IPI_ADDR
 #  ifdef __linux__
 /* Assume this version of glibc simply lacks the definition */
 struct in_pktinfo {