diff --git a/src/cdi_util.c b/src/cdi_util.c
index 187cf2c530db3c7c1d9229384cfcf5c050d74ca1..2d69b4eb7e2e9bf0c105dec484467a3753fc7ecc 100644
--- a/src/cdi_util.c
+++ b/src/cdi_util.c
@@ -2,8 +2,6 @@
 #include "config.h"
 #endif
 
-#include <unistd.h>
-
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/iterator_fallback.c b/src/iterator_fallback.c
index eb561f4d11716a67f6e37fa39993e2f2a4962361..a2252bd8a39703bdc634fad595eb971b93ef6056 100644
--- a/src/iterator_fallback.c
+++ b/src/iterator_fallback.c
@@ -19,6 +19,7 @@
 #include <assert.h>
 #include <limits.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 struct CdiFallbackIterator
 {
diff --git a/src/stream_cdf_i.c b/src/stream_cdf_i.c
index 94e6c6430b569a80e6aa896594ce556378acbf71..708565eca2d203f3921481b4e1b13fec86ada144 100644
--- a/src/stream_cdf_i.c
+++ b/src/stream_cdf_i.c
@@ -6,7 +6,7 @@
 
 #include <ctype.h>
 #include <limits.h>
-#include <strings.h>
+#include <unistd.h>
 
 #include "dmemory.h"
 #include "cdi_int.h"