diff --git a/common/stringbucket.c b/common/stringbucket.c
line changes: +2/-0
index d892541..27c1023
--- a/common/stringbucket.c
+++ b/common/stringbucket.c

@@ -8,6 +8,7 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <string.h>
 #include <stringbucket.h>
 

@@ -91,6 +92,7 @@ int stringbucket_delete(struct stringbucket *sb, const char *string) {
 
 	/* We doin' it DOS style! */
 	sb->list[pos] = 0;
+	return 1;
 }
 
 void stringbucket_iterate(struct stringbucket *sb, void (*iter)(char *, void *), void *stuff) {

diff --git a/database/database.c b/database/database.c
line changes: +1/-0
index 0386132..033875b
--- a/database/database.c
+++ b/database/database.c

@@ -15,6 +15,7 @@
 #include "database.h"
 #include "configuration.h"
 #include "subscription.h"
+#include "tags.h"
 #include "util.h"
 #include "config.h"
 

diff --git a/database/subscription.c b/database/subscription.c
line changes: +2/-0
index b2c89d4..aac7acf
--- a/database/subscription.c
+++ b/database/subscription.c

@@ -5,11 +5,13 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <string.h>
 #include "subscription.h"
 #include "stringbucket.h"
+#include "util.h"
 #include "config.h"
 #include "configuration.h"
 

diff --git a/database/tags.c b/database/tags.c
line changes: +1/-0
index 07aa0e9..3e3b14f
--- a/database/tags.c
+++ b/database/tags.c

@@ -59,6 +59,7 @@ tag_scan_start:
 		tag_add(author, taglist[i], record);
 		free(taglist[i]);
 	}
+	return 1;
 }
 
 int tag_add(const char *author, const char *tag, uint64_t record) {