diff --git a/authd/getaddrinfo.c b/authd/getaddrinfo.c
index 482e648b..f7642875 100644
--- a/authd/getaddrinfo.c
+++ b/authd/getaddrinfo.c
@@ -28,7 +28,7 @@
  */
 
 #ifdef _WIN32
-#include <ratbox_lib.h>
+#include <rb_lib.h>
 #include "getaddrinfo.h"
 
 /*  $Id$ */
diff --git a/authd/getnameinfo.c b/authd/getnameinfo.c
index eba0181a..f34fffcf 100644
--- a/authd/getnameinfo.c
+++ b/authd/getnameinfo.c
@@ -42,7 +42,7 @@
  */
 
 #ifdef _WIN32
-#include <ratbox_lib.h>
+#include <rb_lib.h>
 #include "getaddrinfo.h"
 #include "getnameinfo.h"
 
diff --git a/authd/reslib.c b/authd/reslib.c
index 59ea43f3..248f753d 100644
--- a/authd/reslib.c
+++ b/authd/reslib.c
@@ -79,7 +79,11 @@
 #include <rb_lib.h>
 
 #ifndef _WIN32
+
 #include <netdb.h>
+
+typedef struct addrinfo rb_addrinfo;
+
 #else
 #include "getaddrinfo.h"
 #include "getnameinfo.h"
@@ -88,6 +92,7 @@
 #define freeaddrinfo rb_freeaddrinfo
 
 extern const char * get_windows_nameservers(void);
+typedef struct rb_addrinfo rb_addrinfo;
 #endif
 
 #include "stdinc.h"
@@ -235,7 +240,7 @@ parse_resvconf(void)
 static void
 add_nameserver(const char *arg)
 {
-  struct addrinfo hints, *res;
+  rb_addrinfo hints, *res;
 
   /* Done max number of nameservers? */
   if (irc_nscount >= IRCD_MAXNS)
diff --git a/authd/reslist.c b/authd/reslist.c
index d18a0699..7fb97f5e 100644
--- a/authd/reslist.c
+++ b/authd/reslist.c
@@ -29,7 +29,7 @@
  */
 
 #ifdef _WIN32
-#include <ratbox_lib.h>
+#include <rb_lib.h>
 
 #include <windows.h>
 #include <iphlpapi.h>