diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 9dd12a46d6..0def547ba0 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -5,6 +5,7 @@
 #include <boost/weak_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 
+#include <sys/select.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/src/libutil/md5.h b/src/libutil/md5.h
index cecbf8bbfc..228d497232 100644
--- a/src/libutil/md5.h
+++ b/src/libutil/md5.h
@@ -45,20 +45,20 @@ struct MD5_CTX
 
 /* Initialize structure containing state of computation.
    (RFC 1321, 3.3: Step 3)  */
-extern void MD5_Init __P ((struct MD5_CTX *ctx));
+extern void MD5_Init (struct MD5_CTX *ctx);
 
 /* Starting with the result of former calls of this function (or the
    initialization function update the context for the next LEN bytes
    starting at BUFFER.
    It is necessary that LEN is a multiple of 64!!! */
-extern void md5_process_block __P ((const void *buffer, size_t len,
-				      struct MD5_CTX *ctx));
+extern void md5_process_block (const void *buffer, size_t len,
+				      struct MD5_CTX *ctx);
 
 /* Starting with the result of former calls of this function (or the
    initialization function update the context for the next LEN bytes
    starting at BUFFER.
    It is NOT required that LEN is a multiple of 64.  */
-extern void MD5_Update __P ((struct MD5_CTX *ctx, const void *buffer, size_t len));
+extern void MD5_Update (struct MD5_CTX *ctx, const void *buffer, size_t len);
 
 /* Process the remaining bytes in the buffer and put result from CTX
    in first 16 bytes following RESBUF.  The result is always in little
@@ -67,7 +67,7 @@ extern void MD5_Update __P ((struct MD5_CTX *ctx, const void *buffer, size_t len
 
    IMPORTANT: On some systems it is required that RESBUF is correctly
    aligned for a 32 bits value.  */
-extern void *MD5_Final __P ((void *resbuf, struct MD5_CTX *ctx));
+extern void *MD5_Final (void *resbuf, struct MD5_CTX *ctx);
 
 
 /* Put result from CTX in first 16 bytes following RESBUF.  The result is
@@ -76,7 +76,7 @@ extern void *MD5_Final __P ((void *resbuf, struct MD5_CTX *ctx));
 
    IMPORTANT: On some systems it is required that RESBUF is correctly
    aligned for a 32 bits value.  */
-extern void *md5_read_ctx __P ((const struct MD5_CTX *ctx, void *resbuf));
+extern void *md5_read_ctx (const struct MD5_CTX *ctx, void *resbuf);
 
 
 #endif /* md5.h */