diff --git a/src/core/libircclient/include/libircclient.h b/src/core/libircclient/include/libircclient.h
index cec9eede..03ea5045 100644
--- a/src/core/libircclient/include/libircclient.h
+++ b/src/core/libircclient/include/libircclient.h
@@ -51,6 +51,10 @@
 #else
 	#include <winsock2.h>
 	#include <ws2tcpip.h>
+	#if defined (ENABLE_IPV6)
+		typedef int  (WSAAPI * getaddrinfo_ptr_t)  (const char *, const char* , const struct addrinfo *, struct addrinfo **);
+		typedef void (WSAAPI * freeaddrinfo_ptr_t) (struct addrinfo*);
+	#endif
 #endif
 
 #ifdef	__cplusplus
diff --git a/src/core/libircclient/src/colors.c b/src/core/libircclient/src/colors.c
index e14c705e..71158a09 100644
--- a/src/core/libircclient/src/colors.c
+++ b/src/core/libircclient/src/colors.c
@@ -14,6 +14,8 @@
  * $Id: colors.c 42 2004-10-10 16:16:15Z gyunaev $
  */
 
+#include <ctype.h>
+
 #define LIBIRC_COLORPARSER_BOLD			(1<<1)
 #define LIBIRC_COLORPARSER_UNDERLINE	(1<<2)
 #define LIBIRC_COLORPARSER_REVERSE		(1<<3)
diff --git a/src/core/libircclient/src/libircclient.c b/src/core/libircclient/src/libircclient.c
index c33e1cbb..42a3803a 100644
--- a/src/core/libircclient/src/libircclient.c
+++ b/src/core/libircclient/src/libircclient.c
@@ -27,7 +27,6 @@
 
 #ifdef _MSC_VER
 	/*
-
 	 * The debugger of MSVC 2005 does not like strdup.
 	 * It complains about heap corruption when free is called.
 	 * Use _strdup instead.
@@ -188,12 +187,6 @@ int irc_connect (irc_session_t * session,
 }
 
 
-
-#if defined (ENABLE_IPV6) && defined (_WIN32)
-	typedef int  (WSAAPI * getaddrinfo_ptr_t)  (const char *, const char* , const struct addrinfo *, struct addrinfo **);
-	typedef void (WSAAPI * freeaddrinfo_ptr_t) (struct addrinfo*);
-#endif
-
 int irc_connect6 (irc_session_t * session,
 			const char * server, 
 			unsigned short port,