4 files changed, 19 insertions, 1 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 65cbd1b777..a72a961495 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -70,6 +70,14 @@
 #include <varargs.h>
 #endif
 
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+
 /* we support ADS if we want it and have krb5 and ldap libs */
 #if defined(WITH_ADS) && defined(HAVE_KRB5) && defined(HAVE_LDAP)
 #define HAVE_ADS
diff --git a/source4/include/system/glob.h b/source4/include/system/glob.h
index 676030b799..9de3168032 100644
--- a/source4/include/system/glob.h
+++ b/source4/include/system/glob.h
@@ -24,4 +24,6 @@
 #include <glob.h>
 #endif
 
+#ifdef HAVE_FNMATCH_H
 #include <fnmatch.h>
+#endif
diff --git a/source4/include/system/network.h b/source4/include/system/network.h
index b1da60e69e..3d833780ec 100644
--- a/source4/include/system/network.h
+++ b/source4/include/system/network.h
@@ -28,9 +28,16 @@
 #include <sys/un.h>
 #endif
 
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
+#endif
+
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
 
 #ifdef HAVE_NETINET_TCP_H
 #include <netinet/tcp.h>
diff --git a/source4/include/system/passwd.h b/source4/include/system/passwd.h
index 8a5402131a..f994df542f 100644
--- a/source4/include/system/passwd.h
+++ b/source4/include/system/passwd.h
@@ -20,8 +20,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifdef HAVE_PWD_H
 #include <pwd.h>
-
+#endif
 #ifdef HAVE_GRP_H
 #include <grp.h>
 #endif