diff --git a/include/irc.h b/include/irc.h
index 2f67cfb..3673e95 100644
--- a/include/irc.h
+++ b/include/irc.h
@@ -60,8 +60,13 @@ extern char	thing_star[4];
 #  include <gtk/gtkmenu.h>
 #endif
 
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
diff --git a/include/irc_std.h b/include/irc_std.h
index 85fa07e..b189c5b 100644
--- a/include/irc_std.h
+++ b/include/irc_std.h
@@ -37,7 +37,9 @@
 /*
  * Everybody needs these INET headers...
  */
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
diff --git a/include/struct.h b/include/struct.h
index a7bf8c7..1847b66 100644
--- a/include/struct.h
+++ b/include/struct.h
@@ -19,7 +19,9 @@
 #include "hash.h"
 #include "config.h"
 #include "ssl.h"
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 
 /*
  * struct sockaddr_storage isn't avaiable on all ipv6-ready-systems, bleh ;(
diff --git a/source/cdns.c b/source/cdns.c
index d7d7105..1da6e7c 100644
--- a/source/cdns.c
+++ b/source/cdns.c
@@ -21,9 +21,6 @@
  * $Id$
  */
 
-#include <sys/types.h>
-#include <netinet/in.h>
-
 #include "cdns.h"
 #include "irc.h"	/* To pick up our next #define checks */
 static char cvsrevision[] = "$Id$";