diff --git a/files/dos_fs.c b/files/dos_fs.c
index 5c1da9a8f34..6db2181474e 100644
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -1489,7 +1489,7 @@ int DOSFS_FindNext( const char *path, const char *short_mask,
                     const char *long_mask, int drive, BYTE attr,
                     int skip, WIN32_FIND_DATAA *entry )
 {
-    static FIND_FIRST_INFO info = { NULL };
+    static FIND_FIRST_INFO info;
     LPCSTR short_name, long_name;
     int count;
 
diff --git a/msdos/dosconf.c b/msdos/dosconf.c
index eea01704fce..963d429d926 100644
--- a/msdos/dosconf.c
+++ b/msdos/dosconf.c
@@ -54,7 +54,6 @@ DOSCONF DOSCONF_config =
 typedef struct {
     const char *tag_name;
     int (*tag_handler)(char **p);
-    void *data;
 } TAG_ENTRY;
 
 
diff --git a/server/registry.c b/server/registry.c
index 3ca1c3716c9..3375e50a78a 100644
--- a/server/registry.c
+++ b/server/registry.c
@@ -1052,7 +1052,7 @@ static int get_data_type( const char *buffer, int *type, int *parse_type )
         { "hex:",      4,   REG_BINARY,          REG_BINARY },
         { "dword:",    6,   REG_DWORD,           REG_DWORD },
         { "hex(",      4,   -1,                  REG_BINARY },
-        { NULL, }
+        { NULL,        0,    0,                  0 }
     };
 
     const struct data_type *ptr;
diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c
index 8564036204d..427de761245 100644
--- a/tools/winebuild/main.c
+++ b/tools/winebuild/main.c
@@ -103,7 +103,7 @@ static const struct option option_table[] =
     { "-spec",  1, do_spec,   "-spec file.spec  Build a .c file from a spec file" },
     { "-glue",  1, do_glue,   "-glue file.c     Build the 16-bit glue for a .c file" },
     { "-relay", 0, do_relay,  "-relay           Build the relay assembly routines" },
-    { NULL }
+    { NULL,     0, NULL,      NULL }
 };
 
 static void do_pic(void)
diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c
index f685a001ffc..b50fe3b7d5f 100644
--- a/tools/winebuild/spec32.c
+++ b/tools/winebuild/spec32.c
@@ -255,7 +255,7 @@ static void output_exports( FILE *outfile, int nr_exports, int nr_names, int fwd
                 assert(0);
             }
         }
-        else fprintf( outfile, "    { 0, }" );
+        else fprintf( outfile, "    { 0, { 0,0,0,0 }, 0, 0, 0, 0 }" );
 
         if (i < Limit) fprintf( outfile, ",\n" );
     }
diff --git a/windows/x11drv/keyboard.c b/windows/x11drv/keyboard.c
index d7abd4f2eb4..a0bcd66b971 100644
--- a/windows/x11drv/keyboard.c
+++ b/windows/x11drv/keyboard.c
@@ -401,7 +401,7 @@ static const struct {
  {"Japanese 106 keyboard layout", 932, &main_key_JA_jp106, &main_key_scan_qwerty, &main_key_vkey_qwerty},
  {"Japanese pc98x1 keyboard layout", 932, &main_key_JA_pc98x1, &main_key_scan_qwerty, &main_key_vkey_qwerty},
 
- {0} /* sentinel */
+ {NULL, 0, NULL, NULL, NULL} /* sentinel */
 };
 static unsigned kbd_layout=0; /* index into above table of layouts */