--- src/conffile.c.orig	2011-03-25 17:12:51.000000000 +0100
+++ src/conffile.c	2011-12-03 15:30:21.609001023 +0100
@@ -22,6 +22,7 @@
 #include <sys/types.h>
 #include <pwd.h>
 #include <grp.h>
+#include <unistd.h>
 
 #include "conffile.h"
 #include "config.h"
@@ -683,6 +684,7 @@
   default:
     break;
   }
+  return 0;
 }
 
 
--- src/luks.c.orig	2010-10-12 23:55:30.000000000 +0200
+++ src/luks.c	2011-12-03 15:30:21.626001025 +0100
@@ -14,7 +14,9 @@
 #include "policy.h"
 #include <stdio.h>
 #include <limits.h>
+#include <sys/types.h>
 #include <sys/stat.h>
+#include <fcntl.h>
 #include <libintl.h>
 
 
--- src/loop.c.orig	2011-03-25 17:12:51.000000000 +0100
+++ src/loop.c	2011-12-03 15:30:21.634001025 +0100
@@ -52,6 +52,7 @@
     }
     devices++;
   }
+  return NULL;
 }
 
 int loopdev_is_whitelisted(const char * device)