diff --git a/dlls/gdi/tests/generated.c b/dlls/gdi/tests/generated.c
index ebb142f4dc4..d90efbbb3a7 100644
--- a/dlls/gdi/tests/generated.c
+++ b/dlls/gdi/tests/generated.c
@@ -27,7 +27,7 @@
  * Windows API extension
  */
 
-#if (_MSC_VER >= 1300) && defined(__cplusplus)
+#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
 # define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field)
 #elif defined(__GNUC__)
 # define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field)
@@ -35,7 +35,7 @@
 /* FIXME: Not sure if is possible to do without compiler extension */
 #endif
 
-#if (_MSC_VER >= 1300) && defined(__cplusplus)
+#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
 # define _TYPE_ALIGNMENT(type) __alignof(type)
 #elif defined(__GNUC__)
 # define _TYPE_ALIGNMENT(type) __alignof__(type)
@@ -58,7 +58,7 @@
 #ifdef FIELD_ALIGNMENT
 # define TEST_FIELD_ALIGNMENT(type, field, align) \
    ok(FIELD_ALIGNMENT(type, field) == align, \
-       "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")", \
+       "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \
            FIELD_ALIGNMENT(type, field))
 #else
 # define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0)
@@ -66,7 +66,7 @@
 
 #define TEST_FIELD_OFFSET(type, field, offset) \
     ok(FIELD_OFFSET(type, field) == offset, \
-        "FIELD_OFFSET(" #type ", " #field ") == %ld (expected " #offset ")", \
+        "FIELD_OFFSET(" #type ", " #field ") == %ld (expected " #offset ")\n", \
              FIELD_OFFSET(type, field))
 
 #ifdef _TYPE_ALIGNMENT
@@ -78,13 +78,13 @@
 
 #ifdef TYPE_ALIGNMENT
 #define TEST_TYPE_ALIGNMENT(type, align) \
-    ok(TYPE_ALIGNMENT(type) == align, "TYPE_ALIGNMENT(" #type ") == %d (expected " #align ")", TYPE_ALIGNMENT(type))
+    ok(TYPE_ALIGNMENT(type) == align, "TYPE_ALIGNMENT(" #type ") == %d (expected " #align ")\n", TYPE_ALIGNMENT(type))
 #else
 # define TEST_TYPE_ALIGNMENT(type, align) do { } while (0)
 #endif
 
 #define TEST_TYPE_SIZE(type, size) \
-    ok(sizeof(type) == size, "sizeof(" #type ") == %d (expected " #size ")", sizeof(type))
+    ok(sizeof(type) == size, "sizeof(" #type ") == %d (expected " #size ")\n", sizeof(type))
 
 /***********************************************************************
  * Test macros
@@ -104,10 +104,10 @@
     TEST_TYPE_SIZE(*(type)0, size)
 
 #define TEST_TYPE_SIGNED(type) \
-    ok((type) -1 < 0, "(" #type ") -1 < 0");
+    ok((type) -1 < 0, "(" #type ") -1 < 0\n");
 
 #define TEST_TYPE_UNSIGNED(type) \
-     ok((type) -1 > 0, "(" #type ") -1 > 0");
+     ok((type) -1 > 0, "(" #type ") -1 > 0\n");
 
 static void test_pack_ABC(void)
 {
diff --git a/dlls/shlwapi/tests/generated.c b/dlls/shlwapi/tests/generated.c
index 6997e64302d..2c3e3897e93 100644
--- a/dlls/shlwapi/tests/generated.c
+++ b/dlls/shlwapi/tests/generated.c
@@ -12,7 +12,6 @@
 #define WINE_NOWINSOCK
 
 #include <stdarg.h>
-
 #include "windef.h"
 #include "winbase.h"
 #include "wtypes.h"
@@ -33,7 +32,7 @@
  * Windows API extension
  */
 
-#if (_MSC_VER >= 1300) && defined(__cplusplus)
+#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
 # define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field)
 #elif defined(__GNUC__)
 # define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field)
@@ -41,7 +40,7 @@
 /* FIXME: Not sure if is possible to do without compiler extension */
 #endif
 
-#if (_MSC_VER >= 1300) && defined(__cplusplus)
+#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
 # define _TYPE_ALIGNMENT(type) __alignof(type)
 #elif defined(__GNUC__)
 # define _TYPE_ALIGNMENT(type) __alignof__(type)
@@ -64,7 +63,7 @@
 #ifdef FIELD_ALIGNMENT
 # define TEST_FIELD_ALIGNMENT(type, field, align) \
    ok(FIELD_ALIGNMENT(type, field) == align, \
-       "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")", \
+       "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \
            FIELD_ALIGNMENT(type, field))
 #else
 # define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0)
@@ -72,7 +71,7 @@
 
 #define TEST_FIELD_OFFSET(type, field, offset) \
     ok(FIELD_OFFSET(type, field) == offset, \
-        "FIELD_OFFSET(" #type ", " #field ") == %ld (expected " #offset ")", \
+        "FIELD_OFFSET(" #type ", " #field ") == %ld (expected " #offset ")\n", \
              FIELD_OFFSET(type, field))
 
 #ifdef _TYPE_ALIGNMENT
@@ -84,13 +83,13 @@
 
 #ifdef TYPE_ALIGNMENT
 #define TEST_TYPE_ALIGNMENT(type, align) \
-    ok(TYPE_ALIGNMENT(type) == align, "TYPE_ALIGNMENT(" #type ") == %d (expected " #align ")", TYPE_ALIGNMENT(type))
+    ok(TYPE_ALIGNMENT(type) == align, "TYPE_ALIGNMENT(" #type ") == %d (expected " #align ")\n", TYPE_ALIGNMENT(type))
 #else
 # define TEST_TYPE_ALIGNMENT(type, align) do { } while (0)
 #endif
 
 #define TEST_TYPE_SIZE(type, size) \
-    ok(sizeof(type) == size, "sizeof(" #type ") == %d (expected " #size ")", sizeof(type))
+    ok(sizeof(type) == size, "sizeof(" #type ") == %d (expected " #size ")\n", sizeof(type))
 
 /***********************************************************************
  * Test macros
@@ -110,10 +109,10 @@
     TEST_TYPE_SIZE(*(type)0, size)
 
 #define TEST_TYPE_SIGNED(type) \
-    ok((type) -1 < 0, "(" #type ") -1 < 0");
+    ok((type) -1 < 0, "(" #type ") -1 < 0\n");
 
 #define TEST_TYPE_UNSIGNED(type) \
-     ok((type) -1 > 0, "(" #type ") -1 > 0");
+     ok((type) -1 > 0, "(" #type ") -1 > 0\n");
 
 static void test_pack_DLLGETVERSIONPROC(void)
 {
diff --git a/dlls/urlmon/tests/generated.c b/dlls/urlmon/tests/generated.c
index 26025375a94..b750360666c 100644
--- a/dlls/urlmon/tests/generated.c
+++ b/dlls/urlmon/tests/generated.c
@@ -12,7 +12,6 @@
 #define WINE_NOWINSOCK
 
 #include <stdarg.h>
-
 #include "windef.h"
 #include "winbase.h"
 #include "urlmon.h"
@@ -31,7 +30,7 @@
  * Windows API extension
  */
 
-#if (_MSC_VER >= 1300) && defined(__cplusplus)
+#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
 # define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field)
 #elif defined(__GNUC__)
 # define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field)
@@ -39,7 +38,7 @@
 /* FIXME: Not sure if is possible to do without compiler extension */
 #endif
 
-#if (_MSC_VER >= 1300) && defined(__cplusplus)
+#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
 # define _TYPE_ALIGNMENT(type) __alignof(type)
 #elif defined(__GNUC__)
 # define _TYPE_ALIGNMENT(type) __alignof__(type)
@@ -62,7 +61,7 @@
 #ifdef FIELD_ALIGNMENT
 # define TEST_FIELD_ALIGNMENT(type, field, align) \
    ok(FIELD_ALIGNMENT(type, field) == align, \
-       "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")", \
+       "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \
            FIELD_ALIGNMENT(type, field))
 #else
 # define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0)
@@ -70,7 +69,7 @@
 
 #define TEST_FIELD_OFFSET(type, field, offset) \
     ok(FIELD_OFFSET(type, field) == offset, \
-        "FIELD_OFFSET(" #type ", " #field ") == %ld (expected " #offset ")", \
+        "FIELD_OFFSET(" #type ", " #field ") == %ld (expected " #offset ")\n", \
              FIELD_OFFSET(type, field))
 
 #ifdef _TYPE_ALIGNMENT
@@ -82,13 +81,13 @@
 
 #ifdef TYPE_ALIGNMENT
 #define TEST_TYPE_ALIGNMENT(type, align) \
-    ok(TYPE_ALIGNMENT(type) == align, "TYPE_ALIGNMENT(" #type ") == %d (expected " #align ")", TYPE_ALIGNMENT(type))
+    ok(TYPE_ALIGNMENT(type) == align, "TYPE_ALIGNMENT(" #type ") == %d (expected " #align ")\n", TYPE_ALIGNMENT(type))
 #else
 # define TEST_TYPE_ALIGNMENT(type, align) do { } while (0)
 #endif
 
 #define TEST_TYPE_SIZE(type, size) \
-    ok(sizeof(type) == size, "sizeof(" #type ") == %d (expected " #size ")", sizeof(type))
+    ok(sizeof(type) == size, "sizeof(" #type ") == %d (expected " #size ")\n", sizeof(type))
 
 /***********************************************************************
  * Test macros
@@ -108,10 +107,10 @@
     TEST_TYPE_SIZE(*(type)0, size)
 
 #define TEST_TYPE_SIGNED(type) \
-    ok((type) -1 < 0, "(" #type ") -1 < 0");
+    ok((type) -1 < 0, "(" #type ") -1 < 0\n");
 
 #define TEST_TYPE_UNSIGNED(type) \
-     ok((type) -1 > 0, "(" #type ") -1 > 0");
+     ok((type) -1 > 0, "(" #type ") -1 > 0\n");
 
 static void test_pack_BINDINFO(void)
 {
diff --git a/dlls/user/tests/generated.c b/dlls/user/tests/generated.c
index 24898c4227c..2eb40ee611b 100644
--- a/dlls/user/tests/generated.c
+++ b/dlls/user/tests/generated.c
@@ -27,7 +27,7 @@
  * Windows API extension
  */
 
-#if (_MSC_VER >= 1300) && defined(__cplusplus)
+#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
 # define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field)
 #elif defined(__GNUC__)
 # define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field)
@@ -35,7 +35,7 @@
 /* FIXME: Not sure if is possible to do without compiler extension */
 #endif
 
-#if (_MSC_VER >= 1300) && defined(__cplusplus)
+#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
 # define _TYPE_ALIGNMENT(type) __alignof(type)
 #elif defined(__GNUC__)
 # define _TYPE_ALIGNMENT(type) __alignof__(type)
@@ -58,7 +58,7 @@
 #ifdef FIELD_ALIGNMENT
 # define TEST_FIELD_ALIGNMENT(type, field, align) \
    ok(FIELD_ALIGNMENT(type, field) == align, \
-       "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")", \
+       "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \
            FIELD_ALIGNMENT(type, field))
 #else
 # define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0)
@@ -66,7 +66,7 @@
 
 #define TEST_FIELD_OFFSET(type, field, offset) \
     ok(FIELD_OFFSET(type, field) == offset, \
-        "FIELD_OFFSET(" #type ", " #field ") == %ld (expected " #offset ")", \
+        "FIELD_OFFSET(" #type ", " #field ") == %ld (expected " #offset ")\n", \
              FIELD_OFFSET(type, field))
 
 #ifdef _TYPE_ALIGNMENT
@@ -78,13 +78,13 @@
 
 #ifdef TYPE_ALIGNMENT
 #define TEST_TYPE_ALIGNMENT(type, align) \
-    ok(TYPE_ALIGNMENT(type) == align, "TYPE_ALIGNMENT(" #type ") == %d (expected " #align ")", TYPE_ALIGNMENT(type))
+    ok(TYPE_ALIGNMENT(type) == align, "TYPE_ALIGNMENT(" #type ") == %d (expected " #align ")\n", TYPE_ALIGNMENT(type))
 #else
 # define TEST_TYPE_ALIGNMENT(type, align) do { } while (0)
 #endif
 
 #define TEST_TYPE_SIZE(type, size) \
-    ok(sizeof(type) == size, "sizeof(" #type ") == %d (expected " #size ")", sizeof(type))
+    ok(sizeof(type) == size, "sizeof(" #type ") == %d (expected " #size ")\n", sizeof(type))
 
 /***********************************************************************
  * Test macros
@@ -104,10 +104,10 @@
     TEST_TYPE_SIZE(*(type)0, size)
 
 #define TEST_TYPE_SIGNED(type) \
-    ok((type) -1 < 0, "(" #type ") -1 < 0");
+    ok((type) -1 < 0, "(" #type ") -1 < 0\n");
 
 #define TEST_TYPE_UNSIGNED(type) \
-     ok((type) -1 > 0, "(" #type ") -1 > 0");
+     ok((type) -1 > 0, "(" #type ") -1 > 0\n");
 
 static void test_pack_ACCEL(void)
 {
diff --git a/dlls/wininet/tests/generated.c b/dlls/wininet/tests/generated.c
index 8c446f1f652..ce304052c35 100644
--- a/dlls/wininet/tests/generated.c
+++ b/dlls/wininet/tests/generated.c
@@ -12,7 +12,6 @@
 #define WINE_NOWINSOCK
 
 #include <stdarg.h>
-
 #include "windef.h"
 #include "winbase.h"
 #include "wininet.h"
@@ -31,7 +30,7 @@
  * Windows API extension
  */
 
-#if (_MSC_VER >= 1300) && defined(__cplusplus)
+#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
 # define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field)
 #elif defined(__GNUC__)
 # define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field)
@@ -39,7 +38,7 @@
 /* FIXME: Not sure if is possible to do without compiler extension */
 #endif
 
-#if (_MSC_VER >= 1300) && defined(__cplusplus)
+#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
 # define _TYPE_ALIGNMENT(type) __alignof(type)
 #elif defined(__GNUC__)
 # define _TYPE_ALIGNMENT(type) __alignof__(type)
@@ -62,7 +61,7 @@
 #ifdef FIELD_ALIGNMENT
 # define TEST_FIELD_ALIGNMENT(type, field, align) \
    ok(FIELD_ALIGNMENT(type, field) == align, \
-       "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")", \
+       "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \
            FIELD_ALIGNMENT(type, field))
 #else
 # define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0)
@@ -70,7 +69,7 @@
 
 #define TEST_FIELD_OFFSET(type, field, offset) \
     ok(FIELD_OFFSET(type, field) == offset, \
-        "FIELD_OFFSET(" #type ", " #field ") == %ld (expected " #offset ")", \
+        "FIELD_OFFSET(" #type ", " #field ") == %ld (expected " #offset ")\n", \
              FIELD_OFFSET(type, field))
 
 #ifdef _TYPE_ALIGNMENT
@@ -82,13 +81,13 @@
 
 #ifdef TYPE_ALIGNMENT
 #define TEST_TYPE_ALIGNMENT(type, align) \
-    ok(TYPE_ALIGNMENT(type) == align, "TYPE_ALIGNMENT(" #type ") == %d (expected " #align ")", TYPE_ALIGNMENT(type))
+    ok(TYPE_ALIGNMENT(type) == align, "TYPE_ALIGNMENT(" #type ") == %d (expected " #align ")\n", TYPE_ALIGNMENT(type))
 #else
 # define TEST_TYPE_ALIGNMENT(type, align) do { } while (0)
 #endif
 
 #define TEST_TYPE_SIZE(type, size) \
-    ok(sizeof(type) == size, "sizeof(" #type ") == %d (expected " #size ")", sizeof(type))
+    ok(sizeof(type) == size, "sizeof(" #type ") == %d (expected " #size ")\n", sizeof(type))
 
 /***********************************************************************
  * Test macros
@@ -108,10 +107,10 @@
     TEST_TYPE_SIZE(*(type)0, size)
 
 #define TEST_TYPE_SIGNED(type) \
-    ok((type) -1 < 0, "(" #type ") -1 < 0");
+    ok((type) -1 < 0, "(" #type ") -1 < 0\n");
 
 #define TEST_TYPE_UNSIGNED(type) \
-     ok((type) -1 > 0, "(" #type ") -1 > 0");
+     ok((type) -1 > 0, "(" #type ") -1 > 0\n");
 
 static void test_pack_GOPHER_FIND_DATAA(void)
 {