diff --git a/libretro-common/include/net/net_socket.h b/libretro-common/include/net/net_socket.h
index c32a2d6504..570b4b601a 100644
--- a/libretro-common/include/net/net_socket.h
+++ b/libretro-common/include/net/net_socket.h
@@ -27,6 +27,8 @@
 #include <boolean.h>
 #include <string.h>
 
+#include <net/net_compat.h>
+
 #include <retro_common_api.h>
 
 RETRO_BEGIN_DECLS
diff --git a/libretro-common/net/net_socket.c b/libretro-common/net/net_socket.c
index 182edf2727..e941e1df44 100644
--- a/libretro-common/net/net_socket.c
+++ b/libretro-common/net/net_socket.c
@@ -33,7 +33,6 @@
 
 #include <features/features_cpu.h>
 
-#include <net/net_compat.h>
 #include <net/net_socket.h>
 
 int socket_init(void **address, uint16_t port, const char *server, enum socket_type type)
@@ -466,7 +465,7 @@ bool socket_connect_with_timeout(int fd, void *data, unsigned timeout)
       int       error = -1;
       socklen_t errsz = sizeof(error);
 
-      getsockopt(fd, SOL_SOCKET, SO_ERROR, &error, &errsz);
+      getsockopt(fd, SOL_SOCKET, SO_ERROR, (char*)&error, &errsz);
       if (error)
          return false;
    }