diff --git a/lib/scsi-lowlevel.c b/lib/scsi-lowlevel.c
index ac53d22..37ba28b 100644
--- a/lib/scsi-lowlevel.c
+++ b/lib/scsi-lowlevel.c
@@ -44,6 +44,7 @@
 #include <strings.h>
 #endif
 
+#include <sys/socket.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
diff --git a/lib/socket.c b/lib/socket.c
index 041c25e..da8ff9d 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -57,6 +57,7 @@
 #include <sys/filio.h>
 #endif
 
+#include <sys/uio.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/test-tool/test_inquiry_block_limits.c b/test-tool/test_inquiry_block_limits.c
index d298c37..3b2d108 100644
--- a/test-tool/test_inquiry_block_limits.c
+++ b/test-tool/test_inquiry_block_limits.c
@@ -43,6 +43,10 @@ test_inquiry_block_limits(void)
 		      1, SCSI_INQUIRY_PAGECODE_BLOCK_LIMITS,
 		      64, &bl_task);
 	CU_ASSERT_EQUAL(ret, 0);
+	if (ret != 0) {
+		logging(LOG_NORMAL, "[FAILURE] failed to send inquiry.");
+		goto finished;
+	}
 
 	bl = scsi_datain_unmarshall(bl_task);
 	if (bl == NULL) {