diff --git a/src/common-setup.h b/src/common-setup.h
index 8c9a7be0..097f814a 100644
--- a/src/common-setup.h
+++ b/src/common-setup.h
@@ -50,9 +50,6 @@ IRCNET_REC;
 extern GList *setupservers; /* list of local servers */
 extern GList *ircnets; /* list of available ircnets */
 
-extern IPADDR source_host_ip; /* Resolved address */
-extern gboolean source_host_ok; /* Use source_host_ip .. */
-
 /* channels */
 typedef struct
 {
diff --git a/src/common.h b/src/common.h
index 282bc5f0..47c56e92 100644
--- a/src/common.h
+++ b/src/common.h
@@ -40,35 +40,13 @@
 #endif
 #include <fcntl.h>
 
-#ifdef HAVE_SOCKS_H
-#include <socks.h>
-#endif
-
-#include <netdb.h>
-#include <sys/socket.h>
-#include <signal.h>
-#include <sys/signal.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
 #include <glib.h>
 #include <gmodule.h>
 
-typedef struct
-{
-    gushort family;
-#ifdef HAVE_IPV6
-    struct in6_addr addr;
-#else
-    struct in_addr addr;
-#endif
-}
-IPADDR;
-
 #include "irc-base/memdebug.h"
 #include "lib-config/irssi-config.h"
 #include "common-setup.h"
+#include "nls.h"
 
 typedef enum
 {