3-6 C4

Removing winsock2 reference from unwanted headers in win32compat

contrib/win32/win32compat/ansiprsr.c

@@ -38,7 +38,7 @@
 #include <ctype.h>
 #include <string.h>
 
-#include <winsock2.h>
+
 #include <windows.h>
 
 #include "ansiprsr.h"

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

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>

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>

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"
 

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
 {

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>

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"
 

contrib/win32/win32compat/tncon.c

@@ -37,7 +37,7 @@
 #include <ctype.h>
 #include <string.h>
 
-#include <winsock2.h>
+
 #include <windows.h>
 
 #include "ansiprsr.h"

contrib/win32/win32compat/tnnet.c

@@ -38,7 +38,7 @@
 #include <ctype.h>
 #include <string.h>
 
-#include <winsock2.h>
+
 #include <windows.h>
 
 #include "ansiprsr.h"

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>