diff --git a/configure.in b/configure.in
index 6dd1c8eec..818932b14 100644
--- a/configure.in
+++ b/configure.in
@@ -1136,6 +1136,7 @@ EL_ARG_ENABLE(CONFIG_FINGER, finger, [Finger protocol],
 dnl ===================================================================
 dnl FSP protocol
 dnl ===================================================================
+EL_SAVE_FLAGS
 
 if test "x${enable_fsp}" != xno; then
 	AC_CHECK_HEADERS(fsplib.h, HAVE_FSPLIB=yes, HAVE_FSPLIB=no)
@@ -1156,6 +1157,10 @@ fi
 EL_ARG_DEPEND(CONFIG_FSP, fsp, [HAVE_FSPLIB:yes], [FSP protocol],
 	      [  --enable-fsp            enable FSP protocol support])
 
+if test "x$CONFIG_FSP" = xno; then
+	EL_RESTORE_FLAGS
+fi
+
 EL_ARG_ENABLE(CONFIG_FTP, ftp, [FTP protocol],
 	      [  --disable-ftp           disable ftp protocol support])
 
diff --git a/src/main/object.h b/src/main/object.h
index e19c58003..ea206220c 100644
--- a/src/main/object.h
+++ b/src/main/object.h
@@ -15,8 +15,9 @@ struct object {
 };
 
 #define OBJECT_HEAD(type)						\
-	LIST_HEAD(type);						\
-	struct object object;
+	type *next;							\
+	type *prev;							\
+	struct object object
 
 struct object_head {
 	OBJECT_HEAD(struct object *);
diff --git a/src/network/connection.c b/src/network/connection.c
index b28a9630b..2eac88e2a 100644
--- a/src/network/connection.c
+++ b/src/network/connection.c
@@ -847,7 +847,7 @@ load_uri(struct uri *uri, struct uri *referrer, struct download *download,
 	struct cache_entry *cached;
 	struct connection *conn;
 	struct uri *proxy_uri, *proxied_uri;
-	enum connection_state connection_state = S_OK;
+	int connection_state = S_OK;
 
 	if (download) {
 		download->conn = NULL;
diff --git a/src/network/connection.h b/src/network/connection.h
index 621d3c1e4..0069f0ba4 100644
--- a/src/network/connection.h
+++ b/src/network/connection.h
@@ -86,8 +86,8 @@ int has_keepalive_connection(struct connection *);
 void add_keepalive_connection(struct connection *conn, long timeout_in_seconds,
 			      void (*done)(struct connection *));
 
-void abort_connection(struct connection *, int);
-void retry_connection(struct connection *, int);
+void abort_connection(struct connection *, enum connection_state);
+void retry_connection(struct connection *, enum connection_state);
 
 void change_connection(struct download *old, struct download *new,
 		       enum connection_priority newpri, int interrupt);
diff --git a/src/network/dns.c b/src/network/dns.c
index 9a3083800..3075fdcd9 100644
--- a/src/network/dns.c
+++ b/src/network/dns.c
@@ -77,7 +77,7 @@ static struct dnsquery *dns_queue = NULL;
 
 static INIT_LIST_HEAD(dns_cache);
 
-static void done_dns_lookup(struct dnsquery *query, int res);
+static void done_dns_lookup(struct dnsquery *query, enum dns_result res);
 
 
 /* DNS cache management: */
@@ -136,7 +136,7 @@ del_dns_cache_entry(struct dnsentry *dnsentry)
 
 /* Synchronous DNS lookup management: */
 
-int
+enum dns_result
 do_real_lookup(unsigned char *name, struct sockaddr_storage **addrs, int *addrno,
 	       int in_thread)
 {
diff --git a/src/network/state.c b/src/network/state.c
index 4f0833c81..5dfe6fcca 100644
--- a/src/network/state.c
+++ b/src/network/state.c
@@ -140,7 +140,7 @@ static INIT_LIST_HEAD(strerror_buf); /* struct strerror_val */
  * It never returns NULL (if one changes that, be warn that
  * callers may not test for this condition) --Zas */
 unsigned char *
-get_state_message(int state, struct terminal *term)
+get_state_message(enum connection_state state, struct terminal *term)
 {
 	unsigned char *e;
 	struct strerror_val *s;
diff --git a/src/protocol/ftp/ftp.c b/src/protocol/ftp/ftp.c
index ae07b7c34..439279df1 100644
--- a/src/protocol/ftp/ftp.c
+++ b/src/protocol/ftp/ftp.c
@@ -126,7 +126,7 @@ static void ftp_pass_info(struct socket *, struct read_buffer *);
 static void ftp_retr_file(struct socket *, struct read_buffer *);
 static void ftp_got_final_response(struct socket *, struct read_buffer *);
 static void got_something_from_data_connection(struct connection *);
-static void ftp_end_request(struct connection *, int);
+static void ftp_end_request(struct connection *, enum connection_state);
 static struct ftp_connection_info *add_file_cmd_to_str(struct connection *);
 static void ftp_data_accept(struct connection *conn);