diff --git a/src/server.c b/src/server.c
index 5575ffe..c5f840d 100644
--- a/src/server.c
+++ b/src/server.c
@@ -28,7 +28,6 @@
 #include <fcntl.h>
 #include <time.h>
 #include <zlib.h>
-#include <err.h>
 #include <ctype.h>
 
 #include "common.h"
@@ -55,6 +54,8 @@
 #ifdef WINDOWS32
 WORD req_version = MAKEWORD(2, 2);
 WSADATA wsa_data;
+#else
+#include <err.h>
 #endif
 
 /* Global server variables */
diff --git a/src/window.c b/src/window.c
index 79d2b65..72a0ad5 100644
--- a/src/window.c
+++ b/src/window.c
@@ -19,7 +19,9 @@
 #include <time.h>
 #include <sys/time.h>
 #include <stdio.h>
+#ifndef WINDOWS32
 #include <err.h>
+#endif
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/src/windows.h b/src/windows.h
index 2addd6e..cb7e399 100644
--- a/src/windows.h
+++ b/src/windows.h
@@ -20,6 +20,7 @@
 
 typedef unsigned int in_addr_t;
 
+#include <stdlib.h>
 #include <winsock2.h>
 #include <windows.h>
 #include <windns.h>