--- addressbook/backends/file/e-book-backend-file.c
+++ addressbook/backends/file/e-book-backend-file.c
@@ -523,7 +523,7 @@
 	EDataBookView *book_view = data;
 	FileBackendSearchClosure *closure = get_closure (book_view);
 	if (!closure)
-		return;
+		return NULL;
 	EBookBackendFile *bf = closure->bf;
 	const char *query;
 	DB  *db;
--- libedataserverui/e-passwords.c
+++ libedataserverui/e-passwords.c
@@ -270,6 +270,7 @@
 }
 
 #if WITH_GNOME_KEYRING
+static void
 ep_forget_passwords(EPassMsg *msg)
 {
 	GnomeKeyringAttributeList *attributes;