diff --git a/src/bookmarks/bookmarks.c b/src/bookmarks/bookmarks.c
index a8ba412a..b42dfeb5 100644
--- a/src/bookmarks/bookmarks.c
+++ b/src/bookmarks/bookmarks.c
@@ -594,7 +594,7 @@ open_bookmark_folder(struct session *ses, unsigned char *foldername)
 		    || !*bookmark->url)
 			continue;
 
-		uri = get_translated_uri(bookmark->url, 0);
+		uri = get_translated_uri(bookmark->url, NULL);
 		if (!uri) continue;
 
 		/* Save the first bookmark for the current tab */
diff --git a/src/bookmarks/dialogs.c b/src/bookmarks/dialogs.c
index eaa81a93..1d9df2af 100644
--- a/src/bookmarks/dialogs.c
+++ b/src/bookmarks/dialogs.c
@@ -79,7 +79,7 @@ get_bookmark_uri(struct listbox_item *item)
 	struct bookmark *bookmark = item->udata;
 
 	return bookmark->url && *bookmark->url
-		? get_translated_uri(bookmark->url, 0) : NULL;
+		? get_translated_uri(bookmark->url, NULL) : NULL;
 }
 
 static struct listbox_item *
diff --git a/src/config/cmdline.c b/src/config/cmdline.c
index 9379d2ef..98b561af 100644
--- a/src/config/cmdline.c
+++ b/src/config/cmdline.c
@@ -491,7 +491,7 @@ print_full_help(struct option *tree, unsigned char *path)
 }
 
 static void
-print_short_help()
+print_short_help(void)
 {
 #define ALIGN_WIDTH 20
 	struct option *option;
diff --git a/src/main/timer.c b/src/main/timer.c
index 5a2b603d..7ecf21ab 100644
--- a/src/main/timer.c
+++ b/src/main/timer.c
@@ -25,7 +25,7 @@ struct timer {
 static INIT_LIST_HEAD(timers);
 
 int
-get_timers_count()
+get_timers_count(void)
 {
 	return list_size(&timers);
 
diff --git a/src/network/connection.c b/src/network/connection.c
index 6c9e0e22..996d20fb 100644
--- a/src/network/connection.c
+++ b/src/network/connection.c
@@ -452,7 +452,19 @@ done_connection(struct connection *conn)
 	check_queue_bugs();
 }
 
-static inline void add_to_queue(struct connection *conn);
+static inline void
+add_to_queue(struct connection *conn)
+{
+	struct connection *c;
+	enum connection_priority priority = get_priority(conn);
+
+	foreach (c, connection_queue)
+		if (get_priority(c) > priority)
+			break;
+
+	add_at_pos(c->prev, conn);
+}
+
 
 /* Returns zero if no callback was done and the keepalive connection should be
  * deleted or non-zero if the keepalive connection should not be deleted. */
@@ -647,19 +659,6 @@ abort_all_keepalive_connections(void)
 }
 
 
-static inline void
-add_to_queue(struct connection *conn)
-{
-	struct connection *c;
-	enum connection_priority priority = get_priority(conn);
-
-	foreach (c, connection_queue)
-		if (get_priority(c) > priority)
-			break;
-
-	add_at_pos(c->prev, conn);
-}
-
 static void
 sort_queue(void)
 {
diff --git a/src/network/state.c b/src/network/state.c
index 1b6263b3..4f0833c8 100644
--- a/src/network/state.c
+++ b/src/network/state.c
@@ -68,7 +68,6 @@ struct s_msg_dsc {
 				   "programs is not supported.")},
 
 	{S_HTTP_ERROR,		N_("Bad HTTP response")},
-	{S_HTTP_100,		N_("HTTP 100 (\?\?\?)")},
 	{S_HTTP_204,		N_("No content")},
 
 	{S_FILE_TYPE,		N_("Unknown file type")},
diff --git a/src/network/state.h b/src/network/state.h
index 583b26d5..1fa41616 100644
--- a/src/network/state.h
+++ b/src/network/state.h
@@ -71,8 +71,7 @@ enum connection_state {
 	S_NO_FORCED_DNS		= -100019,
 
 	S_HTTP_ERROR		= -100100,
-	S_HTTP_100		= -100101,
-	S_HTTP_204		= -100102,
+	S_HTTP_204		= -100101,
 
 	S_FILE_TYPE		= -100200,
 	S_FILE_ERROR		= -100201,
diff --git a/src/osdep/osdep.c b/src/osdep/osdep.c
index cae1c9c1..9e1af280 100644
--- a/src/osdep/osdep.c
+++ b/src/osdep/osdep.c
@@ -684,7 +684,7 @@ get_output_handle(void)
 }
 
 int
-get_ctl_handle()
+get_ctl_handle(void)
 {
 	static int fd = -1;
 
diff --git a/src/protocol/http/http.c b/src/protocol/http/http.c
index feacccdd..3efcdef5 100644
--- a/src/protocol/http/http.c
+++ b/src/protocol/http/http.c
@@ -228,7 +228,7 @@ struct module http_protocol_module = struct_module(
 
 
 static void
-done_http()
+done_http(void)
 {
 	mem_free_if(proxy_auth.realm);
 	mem_free_if(proxy_auth.nonce);
@@ -241,7 +241,7 @@ done_http()
 }
 
 static void
-init_accept_charset()
+init_accept_charset(void)
 {
 	struct string ac;
 	unsigned char *cs;
diff --git a/src/util/fastfind.c b/src/util/fastfind.c
index 785d35d3..004701d6 100644
--- a/src/util/fastfind.c
+++ b/src/util/fastfind.c
@@ -481,7 +481,7 @@ fastfind_index(struct fastfind_index *index, enum fastfind_flags flags)
 		info->count++;
 	}
 
-	if (!info->count) return 0;
+	if (!info->count) return NULL;
 
 	init_idxtab(info);