diff --git a/contrib/win32/win32compat/ansiprsr.c b/contrib/win32/win32compat/ansiprsr.c
index 659a997..92f3553 100644
--- a/contrib/win32/win32compat/ansiprsr.c
+++ b/contrib/win32/win32compat/ansiprsr.c
@@ -38,7 +38,7 @@
 #include <ctype.h>
 #include <string.h>
 
-#include <winsock2.h>
+
 #include <windows.h>
 
 #include "ansiprsr.h"
diff --git a/contrib/win32/win32compat/deskright.h b/contrib/win32/win32compat/deskright.h
index 3440f7e..8cfb167 100644
--- a/contrib/win32/win32compat/deskright.h
+++ b/contrib/win32/win32compat/deskright.h
@@ -34,7 +34,7 @@
 
 #include "includes.h"
 #include "Debug.h"
-#include <winsock2.h>
+
 #include <windows.h>
 
 #define ADD_RIGHT    1
diff --git a/contrib/win32/win32compat/homedirhelp.c b/contrib/win32/win32compat/homedirhelp.c
index 2fd5162..4f8e071 100644
--- a/contrib/win32/win32compat/homedirhelp.c
+++ b/contrib/win32/win32compat/homedirhelp.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include <winsock2.h>
+
 #include <windows.h>
 #include <Lmcons.h>
 #include <Lm.h>
diff --git a/contrib/win32/win32compat/kerberos.h b/contrib/win32/win32compat/kerberos.h
index 4584f99..da5889e 100644
--- a/contrib/win32/win32compat/kerberos.h
+++ b/contrib/win32/win32compat/kerberos.h
@@ -33,7 +33,7 @@
 #define Kerberos_H
 
 #include "Debug.h"
-#include <winsock2.h>
+
 #include <windows.h>
 #include <krb5.h>
 #include <gssapi/gssapi.h>
diff --git a/contrib/win32/win32compat/lsalogon.c b/contrib/win32/win32compat/lsalogon.c
index 8b1bb01..aaa59ab 100644
--- a/contrib/win32/win32compat/lsalogon.c
+++ b/contrib/win32/win32compat/lsalogon.c
@@ -29,11 +29,18 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
+#include "includes.h"
 #include "lsalogon.h"
+#include <stdio.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
+
+#include "Debug.h"
+#include "lsastring.h"
+#include "win32auth.h"
 #include "Debug.h"
 
-#include "includes.h"
+
 #include "log.h"
 #include "servconf.h"
 
diff --git a/contrib/win32/win32compat/lsalogon.h b/contrib/win32/win32compat/lsalogon.h
index 6a704c5..f8d43bf 100644
--- a/contrib/win32/win32compat/lsalogon.h
+++ b/contrib/win32/win32compat/lsalogon.h
@@ -32,16 +32,8 @@
 #ifndef LsaLogon_H
 #define LsaLogon_H
 
-#include <winsock2.h>
-#include <stdio.h>
-#include <openssl/rsa.h>
-#include <openssl/dsa.h>
 #include <windows.h>
-#include <Ntsecapi.h>
 
-#include "Debug.h"
-#include "lsastring.h"
-#include "win32auth.h"
 
 typedef struct _LsaAuth
 {
diff --git a/contrib/win32/win32compat/lsastring.h b/contrib/win32/win32compat/lsastring.h
index fa14aee..5f7a7fc 100644
--- a/contrib/win32/win32compat/lsastring.h
+++ b/contrib/win32/win32compat/lsastring.h
@@ -32,7 +32,7 @@
 #ifndef LsaString_H
 #define LsaString_H
 
-#include <winsock2.h>
+
 #include <stdio.h>
 #include <windows.h>
 #include <Ntsecapi.h>
diff --git a/contrib/win32/win32compat/stringhelp.c b/contrib/win32/win32compat/stringhelp.c
index 1ca3818..cd810b0 100644
--- a/contrib/win32/win32compat/stringhelp.c
+++ b/contrib/win32/win32compat/stringhelp.c
@@ -29,7 +29,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <winsock2.h>
+
 #include <Windows.h>
 #include "Debug.h"
 
diff --git a/contrib/win32/win32compat/tncon.c b/contrib/win32/win32compat/tncon.c
index 024b444..ac5be48 100644
--- a/contrib/win32/win32compat/tncon.c
+++ b/contrib/win32/win32compat/tncon.c
@@ -37,7 +37,7 @@
 #include <ctype.h>
 #include <string.h>
 
-#include <winsock2.h>
+
 #include <windows.h>
 
 #include "ansiprsr.h"
diff --git a/contrib/win32/win32compat/tnnet.c b/contrib/win32/win32compat/tnnet.c
index f1b3a6a..688035f 100644
--- a/contrib/win32/win32compat/tnnet.c
+++ b/contrib/win32/win32compat/tnnet.c
@@ -38,7 +38,7 @@
 #include <ctype.h>
 #include <string.h>
 
-#include <winsock2.h>
+
 #include <windows.h>
 
 #include "ansiprsr.h"
diff --git a/contrib/win32/win32compat/win32auth.h b/contrib/win32/win32compat/win32auth.h
index ec98955..a537528 100644
--- a/contrib/win32/win32compat/win32auth.h
+++ b/contrib/win32/win32compat/win32auth.h
@@ -32,7 +32,7 @@
 #ifndef WIN32AUTH_H
 #define WIN32AUTH_H 1
 
-#include <winsock2.h>
+
 #include <windows.h>
 #include <winnt.h>
 #include <Lmcons.h>