diff --git a/content/urldb.c b/content/urldb.c
index 7352d67c3..881f76f6d 100644
--- a/content/urldb.c
+++ b/content/urldb.c
@@ -115,11 +115,6 @@
 #include "content/content.h"
 #include "content/urldb.h"
 
-#ifdef WITH_AMISSL
-/* AmiSSL needs everything to be using bsdsocket directly to avoid conflicts */
-#include <proto/bsdsocket.h>
-#endif
-
 /**
  * cookie entry.
  *
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index c9dcd8b2b..d93508890 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -21,12 +21,11 @@
 #include <stdbool.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
 
 #include "utils/config.h"
 #include "utils/errors.h"
 #include "utils/file.h"
+#include "utils/inet.h"
 #include "netsurf/bitmap.h"
 #include "content/hlcache.h"
 #include "content/backing_store.h"
diff --git a/utils/inet.h b/utils/inet.h
index da1798432..e385982c1 100644
--- a/utils/inet.h
+++ b/utils/inet.h
@@ -40,6 +40,11 @@
 #include <arpa/inet.h>
 #include <sys/select.h>
 
+#ifdef WITH_AMISSL
+/* AmiSSL needs everything to be using bsdsocket directly to avoid conflicts */
+#include <proto/bsdsocket.h>
+#endif
+
 #else
 
 #include <winsock2.h>