diff --git a/dlls/kernel/tests/alloc.c b/dlls/kernel/tests/alloc.c
index 058b377e70b..49f7fcfa66b 100644
--- a/dlls/kernel/tests/alloc.c
+++ b/dlls/kernel/tests/alloc.c
@@ -18,9 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "wine/test.h"
 #include "winbase.h"
 #include "winerror.h"
-#include "wine/test.h"
 
 /* Currently Wine doesn't have macros for LocalDiscard and GlobalDiscard
    so I am disableing the checks for them.  These macros are equivalent
diff --git a/dlls/kernel/tests/file.c b/dlls/kernel/tests/file.c
index 25b599a897e..9d14c5fd828 100644
--- a/dlls/kernel/tests/file.c
+++ b/dlls/kernel/tests/file.c
@@ -19,14 +19,13 @@
  *
  */
 
-#include "winbase.h"
-#include "winerror.h"
-#include "wine/test.h"
-
-
 #include <stdlib.h>
 #include <time.h>
 
+#include "wine/test.h"
+#include "winbase.h"
+#include "winerror.h"
+
 
 LPCSTR filename = "testfile.xxx";
 LPCSTR sillytext =
diff --git a/dlls/kernel/tests/process.c b/dlls/kernel/tests/process.c
index 267a37b4842..f43f95e4b2b 100644
--- a/dlls/kernel/tests/process.c
+++ b/dlls/kernel/tests/process.c
@@ -21,9 +21,10 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
+
+#include "wine/test.h"
 #include "winbase.h"
 #include "winuser.h"
-#include "wine/test.h"
 
 static char     base[MAX_PATH];
 static char     selfname[MAX_PATH];
diff --git a/dlls/kernel/tests/thread.c b/dlls/kernel/tests/thread.c
index b5c1bbf6bcb..f61313b1955 100644
--- a/dlls/kernel/tests/thread.c
+++ b/dlls/kernel/tests/thread.c
@@ -18,6 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+/* Define _WIN32_WINNT to get SetThreadIdealProcessor on Windows */
+#define _WIN32_WINNT 0x0500
+
 #include "wine/test.h"
 #include <winbase.h>
 #include <winnt.h>
@@ -45,7 +48,7 @@
     #include "wine/exception.h"
   #endif
 #endif
-typedef HANDLE WINAPI (*OPENTHREADPTR)(DWORD,BOOL,DWORD);
+typedef HANDLE (WINAPI *OPENTHREADPTR)(DWORD,BOOL,DWORD);
 OPENTHREADPTR OpenThreadPtr;
 HANDLE WINAPI OpenThreadDefault(DWORD dwDesiredAccess,
                          BOOL bInheritHandle,
diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c
index 327f36d514d..e63ec6aed0e 100644
--- a/dlls/oleaut32/tests/vartest.c
+++ b/dlls/oleaut32/tests/vartest.c
@@ -57,22 +57,21 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <wingdi.h>
-#include <winnls.h>
-#include <winerror.h>
-#include <winnt.h>
-
-#include <oleauto.h>
-
 #include <math.h>
 #include <float.h>
 #include <time.h>
 
-#include <windef.h>
-
 #include "wine/test.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "wingdi.h"
+#include "winnls.h"
+#include "winerror.h"
+#include "winnt.h"
+
+#include "wtypes.h"
+#include "oleauto.h"
+
 
 #define MAX_BUFFER  1024
 
diff --git a/dlls/shlwapi/tests/shreg.c b/dlls/shlwapi/tests/shreg.c
index f2c01c12589..70ae1eca453 100644
--- a/dlls/shlwapi/tests/shreg.c
+++ b/dlls/shlwapi/tests/shreg.c
@@ -23,10 +23,9 @@
 
 #include "wine/test.h"
 #include "winbase.h"
+#include "winerror.h"
 #include "winreg.h"
 #include "winuser.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
 #include "shlwapi.h"
 
 static char * sTestpath1 = "%SYSTEMROOT%\\subdir1";
diff --git a/dlls/user/tests/class.c b/dlls/user/tests/class.c
index d964750080a..37c86ad8761 100644
--- a/dlls/user/tests/class.c
+++ b/dlls/user/tests/class.c
@@ -20,11 +20,12 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
+
+#include "wine/test.h"
 #include "winbase.h"
 #include "winreg.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "wine/test.h"
 
 #define NUMCLASSWORDS 4
 
diff --git a/dlls/user/tests/wsprintf.c b/dlls/user/tests/wsprintf.c
index 0180bb119bf..ba78ed24545 100644
--- a/dlls/user/tests/wsprintf.c
+++ b/dlls/user/tests/wsprintf.c
@@ -21,9 +21,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+
+#include "wine/test.h"
 #include "winbase.h"
 #include "winuser.h"
-#include "wine/test.h"
 
 static BOOL wsprintfATest (void)
 {
diff --git a/dlls/winsock/tests/sock.c b/dlls/winsock/tests/sock.c
index 8347015a665..983129fb490 100644
--- a/dlls/winsock/tests/sock.c
+++ b/dlls/winsock/tests/sock.c
@@ -623,45 +623,53 @@ static void do_test( test_setup *test )
 /************* Array containing the tests to run **********/
 
 #define STD_STREAM_SOCKET \
-            sock_type:   SOCK_STREAM, \
-            sock_prot:   0, \
-            inet_addr:   "127.0.0.1", \
-            inet_port:   9374
+            SOCK_STREAM, \
+            0, \
+            "127.0.0.1", \
+            9374
 
 static test_setup tests [NUM_TESTS] =
 {
     /* Test 0: synchronous client and server */
     {
-        general: {
+        {
             STD_STREAM_SOCKET,
-            chunk_size: 2048,
-            n_chunks:  16,
-            n_clients: 2
+            2048,
+            16,
+            2
         },
-        srv: simple_server,
-        srv_params: {
-            buflen:      64
+        simple_server,
+        {
+            NULL,
+            0,
+            64
         },
-        clt: simple_client,
-        clt_params: {
-            buflen:      128
+        simple_client,
+        {
+            NULL,
+            0,
+            128
         }
     },
     /* Test 1: event-driven client, synchronous server */
     {
-        general: {
+        {
             STD_STREAM_SOCKET,
-            chunk_size: 2048,
-            n_chunks:  16,
-            n_clients: 2
+            2048,
+            16,
+            2
         },
-        srv: simple_server,
-        srv_params: {
-            buflen:      64
+        simple_server,
+        {
+            NULL,
+            0,
+            64
         },
-        clt: event_client,
-        clt_params: {
-            buflen:      128
+        event_client,
+        {
+            NULL,
+            0,
+            128
         }
     }
 };