diff --git a/src/libcglue/Makefile.am b/src/libcglue/Makefile.am
index afa9fbd6..9669213a 100644
--- a/src/libcglue/Makefile.am
+++ b/src/libcglue/Makefile.am
@@ -63,8 +63,8 @@ sys_nobase_includedir = @PSPSDK_INCLUDEDIR@/sys
 sys_nobase_include_HEADERS = sys/socket.h sys/ioctl.h
 
 libcglue_a_SOURCES = \
-	cwd.o \
-	errno.o \
+	cwd.c \
+	errno.c \
 	fdman.c \
 	glue.c \
 	init.c \
diff --git a/src/libcglue/sleep.c b/src/libcglue/sleep.c
index cdac35a4..0ab3870e 100644
--- a/src/libcglue/sleep.c
+++ b/src/libcglue/sleep.c
@@ -16,6 +16,9 @@
 
 #include <pspthreadman.h>
 
+/* Fuctions from errno.c */
+int __set_errno(int code);
+
 #ifdef F_nanosleep
 /* note: we don't use rem as we have no signals */
 int nanosleep(const struct timespec *req, struct timespec *rem)
diff --git a/src/libcglue/socket.c b/src/libcglue/socket.c
index f9b9c8c3..89e91ec7 100644
--- a/src/libcglue/socket.c
+++ b/src/libcglue/socket.c
@@ -22,26 +22,6 @@
 #include <pspnet_inet.h>
 #include "fdman.h"
 
-// To avoid warnings
-int	sceNetInetAccept(int s, struct sockaddr *addr, socklen_t *addrlen);
-int	sceNetInetBind(int s, const struct sockaddr *my_addr, socklen_t addrlen);
-int	sceNetInetConnect(int s, const struct sockaddr *serv_addr, socklen_t addrlen);
-int	sceNetInetGetsockopt(int s, int level, int optname, void *optval, socklen_t *optlen);
-int	sceNetInetListen(int s, int backlog);
-size_t	sceNetInetRecv(int s, void *buf, size_t len, int flags);
-size_t	sceNetInetRecvfrom(int s, void *buf, size_t flags, int, struct sockaddr *from, socklen_t *fromlen);
-size_t	sceNetInetSend(int s, const void *buf, size_t len, int flags);
-size_t	sceNetInetSendto(int s, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen);
-int	sceNetInetSetsockopt(int s, int level, int optname, const void *optval, socklen_t optlen);
-int	sceNetInetShutdown(int s, int how);
-int	sceNetInetSocket(int domain, int type, int protocol);
-int sceNetInetClose(int s);
-int sceNetInetGetErrno(void);
-int	sceNetInetGetpeername(int s, struct sockaddr *name, socklen_t *namelen);
-int	sceNetInetGetsockname(int s, struct sockaddr *name, socklen_t *namelen);
-ssize_t sceNetInetSendmsg(int s, const struct msghdr *msg, int flags);
-ssize_t sceNetInetRecvmsg(int s, struct msghdr *msg, int flags);
-
 #ifdef F_socket
 int	socket(int domain, int type, int protocol)
 {
diff --git a/src/net/pspnet_inet.h b/src/net/pspnet_inet.h
index 6b52554a..a4bb6a01 100644
--- a/src/net/pspnet_inet.h
+++ b/src/net/pspnet_inet.h
@@ -18,6 +18,8 @@
 extern "C" {
 #endif
 
+#include <sys/socket.h>
+
 /** 
  *  This struct is needed because tv_sec size is different from what newlib expect
  *  Newlib expects 64bits for seconds and PSP expects 32bits
@@ -31,9 +33,6 @@ int sceNetInetInit(void);
 int sceNetInetSelect(int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct SceNetInetTimeval *timeout);
 int sceNetInetTerm(void);
 int sceNetInetGetErrno(void);
-
-/* The real sceNetInet socket prototypes are in <sys/socket.h>. */
-#ifdef DOXYGEN
 int	sceNetInetAccept(int s, struct sockaddr *addr, socklen_t *addrlen);
 int	sceNetInetBind(int s, const struct sockaddr *my_addr, socklen_t addrlen);
 int	sceNetInetConnect(int s, const struct sockaddr *serv_addr, socklen_t addrlen);
@@ -48,7 +47,10 @@ int	sceNetInetShutdown(int s, int how);
 int	sceNetInetSocket(int domain, int type, int protocol);
 int sceNetInetClose(int s);
 int sceNetInetGetErrno(void);
-#endif /* DOXYGEN */
+int	sceNetInetGetpeername(int s, struct sockaddr *name, socklen_t *namelen);
+int	sceNetInetGetsockname(int s, struct sockaddr *name, socklen_t *namelen);
+ssize_t sceNetInetSendmsg(int s, const struct msghdr *msg, int flags);
+ssize_t sceNetInetRecvmsg(int s, struct msghdr *msg, int flags);
 
 #ifdef __cplusplus
 }