diff --git a/content/urldb.c b/content/urldb.c
index c4a5a6b22..d93cc5898 100644
--- a/content/urldb.c
+++ b/content/urldb.c
@@ -116,6 +116,11 @@
 #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/frontends/amiga/gui.c b/frontends/amiga/gui.c
index ae9945066..2c84d4d7a 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -40,6 +40,12 @@
 #include <proto/utility.h>
 #include <proto/wb.h>
 
+#ifdef WITH_AMISSL
+/* AmiSSL needs everything to use bsdsocket.library directly to avoid problems */
+#include <proto/bsdsocket.h>
+#define waitselect WaitSelect
+#endif
+
 /* Other OS includes */
 #include <datatypes/textclass.h>
 #include <devices/inputevent.h>