diff --git a/lib/host_instance.h b/lib/host_instance.h
index cfd50779..340a31a1 100644
--- a/lib/host_instance.h
+++ b/lib/host_instance.h
@@ -20,13 +20,15 @@ struct host_func {
 
 #define HOST_FUNC_PREFIX(FUNC_PREFIX, NAME, TYPE)                             \
         {                                                                     \
-                .name = NAME_FROM_CSTR_LITERAL(#NAME), .type = TYPE,          \
+                .name = NAME_FROM_CSTR_LITERAL(#NAME),                        \
+                .type = TYPE,                                                 \
                 .func = FUNC_PREFIX##NAME,                                    \
         }
 
 #define HOST_FUNC(NAME, FUNC, TYPE)                                           \
         {                                                                     \
-                .name = NAME_FROM_CSTR_LITERAL(NAME), .type = TYPE,           \
+                .name = NAME_FROM_CSTR_LITERAL(NAME),                         \
+                .type = TYPE,                                                 \
                 .func = FUNC,                                                 \
         }
 
diff --git a/lib/module.c b/lib/module.c
index 9acb478e..7c572714 100644
--- a/lib/module.c
+++ b/lib/module.c
@@ -1958,7 +1958,8 @@ enum dylink_subsection_type {
 
 #define DYLINK_TYPE(NAME)                                                     \
         {                                                                     \
-                .type = WASM_dylink_##NAME, .name = #NAME,                    \
+                .type = WASM_dylink_##NAME,                                   \
+                .name = #NAME,                                                \
                 .read = read_dylink_##NAME,                                   \
         }
 
diff --git a/lib/module_writer.c b/lib/module_writer.c
index ff25088c..9244cf7d 100644
--- a/lib/module_writer.c
+++ b/lib/module_writer.c
@@ -617,7 +617,8 @@ write_section(struct writer *w, uint8_t id,
 
 #define SECTION(n)                                                            \
         {                                                                     \
-                .id = SECTION_ID_##n, .write = write_##n##_section,           \
+                .id = SECTION_ID_##n,                                         \
+                .write = write_##n##_section,                                 \
         }
 
 const static struct section {
diff --git a/lib/type.h b/lib/type.h
index a28b2f33..6a891727 100644
--- a/lib/type.h
+++ b/lib/type.h
@@ -391,12 +391,14 @@ struct name {
 
 #define NAME_FROM_CSTR_LITERAL(C)                                             \
         {                                                                     \
-                .nbytes = sizeof(C) - 1, .data = C,                           \
+                .nbytes = sizeof(C) - 1,                                      \
+                .data = C,                                                    \
         }
 
 #define NAME_FROM_CSTR(C)                                                     \
         {                                                                     \
-                .nbytes = strlen(C), .data = C,                               \
+                .nbytes = strlen(C),                                          \
+                .data = C,                                                    \
         }
 
 struct import {
diff --git a/libwasi/wasi_path_subr.h b/libwasi/wasi_path_subr.h
index 78d25b5e..363839bd 100644
--- a/libwasi/wasi_path_subr.h
+++ b/libwasi/wasi_path_subr.h
@@ -7,7 +7,8 @@ struct path_info {
 
 #define PATH_INITIALIZER                                                      \
         {                                                                     \
-                NULL, NULL,                                                   \
+                NULL,                                                         \
+                NULL,                                                         \
         }
 
 struct exec_context;