diff --git a/include/common/buf.h b/include/common/buf.h
index d39de7112..cc670bf38 100644
--- a/include/common/buf.h
+++ b/include/common/buf.h
@@ -30,6 +30,7 @@
 
 #include <stdint.h>
 #include <string.h>
+#include <unistd.h>
 
 /* Structure defining a buffer's head */
 struct buffer {
diff --git a/include/common/ist.h b/include/common/ist.h
index 7c60c68f3..cfab1e32c 100644
--- a/include/common/ist.h
+++ b/include/common/ist.h
@@ -30,6 +30,7 @@
 
 #include <ctype.h>
 #include <string.h>
+#include <unistd.h>
 
 #include <common/config.h>
 
diff --git a/include/common/memory.h b/include/common/memory.h
index b854ebb0b..57d6ba63e 100644
--- a/include/common/memory.h
+++ b/include/common/memory.h
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
+#include <unistd.h>
 
 #include <common/config.h>
 #include <common/mini-clist.h>
diff --git a/include/proto/htx.h b/include/proto/htx.h
index dd525fed3..779aab6d5 100644
--- a/include/proto/htx.h
+++ b/include/proto/htx.h
@@ -440,10 +440,10 @@ static inline void htx_dump(struct htx *htx)
 {
         int32_t pos;
 
-        fprintf(stderr, "htx:%p [ size=%u - data=%u - used=%u - wrap=%s - extra=%lu]\n",
+        fprintf(stderr, "htx:%p [ size=%u - data=%u - used=%u - wrap=%s - extra=%llu]\n",
                 htx, htx->size, htx->data, htx->used,
                 (!htx->used || htx->tail+1 == htx->wrap) ? "NO" : "YES",
-		(unsigned long)htx->extra);
+		(unsigned long long)htx->extra);
         fprintf(stderr, "\thead=%d - tail=%u - front=%u - wrap=%u\n",
                 htx_get_head(htx), htx->tail, htx->front, htx->wrap);