Index: dll/win32/winhttp/CMakeLists.txt
===================================================================
--- dll/win32/winhttp/CMakeLists.txt	(revision 56842)
+++ dll/win32/winhttp/CMakeLists.txt	(working copy)
@@ -18,8 +18,8 @@
 
 set_module_type(winhttp win32dll)
 target_link_libraries(winhttp wine)
-add_delay_importlibs(winhttp crypt32)
-add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt advapi32 kernel32 ntdll)
+add_delay_importlibs(winhttp crypt32 ws2_32)
+add_importlibs(winhttp shlwapi wininet msvcrt advapi32 kernel32 ntdll)
 
 add_cd_file(TARGET winhttp DESTINATION reactos/system32 FOR all)
 
Index: dll/win32/winhttp/session.c
===================================================================
--- dll/win32/winhttp/session.c	(revision 56842)
+++ dll/win32/winhttp/session.c	(working copy)
@@ -91,9 +91,6 @@
     heap_free( session->proxy_username );
     heap_free( session->proxy_password );
     heap_free( session );
-#ifdef __REACTOS__
-    WSACleanup();
-#endif
 }
 
 static BOOL session_query_option( object_header_t *hdr, DWORD option, LPVOID buffer, LPDWORD buflen )
@@ -204,7 +201,7 @@
     HINTERNET handle = NULL;
 #ifdef __REACTOS__
     WSADATA wsaData;
-    int error = WSAStartup(MAKEWORD(2, 2), &wsaData);
+    int error = WSAStartup(MAKEWORD(1, 1), &wsaData);
     if (error) ERR("WSAStartup failed: %d\n", error);
 #endif
 
Index: dll/win32/wininet/CMakeLists.txt
===================================================================
--- dll/win32/wininet/CMakeLists.txt	(revision 56842)
+++ dll/win32/wininet/CMakeLists.txt	(working copy)
@@ -29,6 +29,6 @@
 
 set_module_type(wininet win32dll)
 target_link_libraries(wininet wine ${PSEH_LIB} zlib)
-add_delay_importlibs(wininet secur32 crypt32 cryptui)
-add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 ws2_32 msvcrt kernel32 ntdll)
+add_delay_importlibs(wininet secur32 crypt32 cryptui ws2_32)
+add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET wininet DESTINATION reactos/system32 FOR all)
Index: dll/win32/wininet/internet.c
===================================================================
--- dll/win32/wininet/internet.c	(revision 56842)
+++ dll/win32/wininet/internet.c	(working copy)
@@ -747,9 +747,6 @@
     heap_free(lpwai->proxyBypass);
     heap_free(lpwai->proxyUsername);
     heap_free(lpwai->proxyPassword);
-#ifdef __REACTOS__
-    WSACleanup();
-#endif
 }
 
 static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode)
Index: modules/rostests/apitests/winhttp/WinHttpOpen.c
===================================================================
--- modules/rostests/apitests/winhttp/WinHttpOpen.c	(revision 56828)
+++ modules/rostests/apitests/winhttp/WinHttpOpen.c	(working copy)
@@ -119,6 +119,6 @@
     FreeLibrary(ModuleHandle);
 
     ok(IsWinsockLoaded(), "Winsock unloaded after winhttp unload\n");
-    trace("Winsock %sinitialized after winhttp unload (should be uninitialized in 2003, still initialized in 7)\n",
+    ok(0, "Winsock %sinitialized after winhttp unload (should be uninitialized in 2003, still initialized in 7)\n",
           IsWinsockInitialized() ? "" : "un");
 }
Index: modules/rostests/apitests/wininet/InternetOpen.c
===================================================================
--- modules/rostests/apitests/wininet/InternetOpen.c	(revision 56828)
+++ modules/rostests/apitests/wininet/InternetOpen.c	(working copy)
@@ -109,6 +109,6 @@
     FreeLibrary(ModuleHandle);
 
     ok(IsWinsockLoaded(), "Winsock unloaded after wininet unload\n");
-    trace("Winsock %sinitialized after wininet unload (should be uninitialized in 2003, still initialized in 7)\n",
+    ok(0, "Winsock %sinitialized after wininet unload (should be uninitialized in 2003, still initialized in 7)\n",
           IsWinsockInitialized() ? "" : "un");
 }