fix: resolve path types for 'both' style

src/bindgen/library.rs

@@ -308,7 +308,7 @@ impl Library {
     }
 
     fn resolve_declaration_types(&mut self) {
-        if self.config.style.generate_typedef() {
+        if !self.config.style.generate_tag() {
             return;
         }
 

tests/expectations/alias.both.c

@@ -17,18 +17,18 @@ typedef struct Dep {
 typedef struct Foo_i32 {
   int32_t a;
   int32_t b;
-  Dep c;
+  struct Dep c;
 } Foo_i32;
 
-typedef Foo_i32 IntFoo;
+typedef struct Foo_i32 IntFoo;
 
 typedef struct Foo_f64 {
   double a;
   double b;
-  Dep c;
+  struct Dep c;
 } Foo_f64;
 
-typedef Foo_f64 DoubleFoo;
+typedef struct Foo_f64 DoubleFoo;
 
 typedef int32_t Unit;
 

tests/expectations/alias.both.compat.c

@@ -23,18 +23,18 @@ typedef struct Dep {
 typedef struct Foo_i32 {
   int32_t a;
   int32_t b;
-  Dep c;
+  struct Dep c;
 } Foo_i32;
 
-typedef Foo_i32 IntFoo;
+typedef struct Foo_i32 IntFoo;
 
 typedef struct Foo_f64 {
   double a;
   double b;
-  Dep c;
+  struct Dep c;
 } Foo_f64;
 
-typedef Foo_f64 DoubleFoo;
+typedef struct Foo_f64 DoubleFoo;
 
 typedef int32_t Unit;
 

tests/expectations/annotation.both.c

@@ -66,4 +66,4 @@ typedef struct H {
   };
 } H;
 
-void root(A x, B y, C z, F f, H h);
+void root(struct A x, struct B y, C z, union F f, struct H h);

tests/expectations/annotation.both.compat.c

@@ -88,7 +88,7 @@ typedef struct H {
 extern "C" {
 #endif // __cplusplus
 
-void root(A x, B y, C z, F f, H h);
+void root(struct A x, struct B y, C z, union F f, struct H h);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/array.both.c

@@ -18,4 +18,4 @@ typedef struct Foo {
   };
 } Foo;
 
-void root(Foo a);
+void root(struct Foo a);

tests/expectations/array.both.compat.c

@@ -22,7 +22,7 @@ typedef struct Foo {
 extern "C" {
 #endif // __cplusplus
 
-void root(Foo a);
+void root(struct Foo a);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/asserted_cast.both.c

@@ -81,4 +81,4 @@ typedef union K {
   K_Bar_Body bar;
 } K;
 
-void foo(H h, I i, J j, K k);
+void foo(struct H h, struct I i, struct J j, union K k);

tests/expectations/asserted_cast.both.compat.c

@@ -103,7 +103,7 @@ typedef union K {
 extern "C" {
 #endif // __cplusplus
 
-void foo(H h, I i, J j, K k);
+void foo(struct H h, struct I i, struct J j, union K k);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/assoc_constant.both.c

@@ -9,4 +9,4 @@ typedef struct Foo {
 #define Foo_GA 10
 #define Foo_ZO 3.14
 
-void root(Foo x);
+void root(struct Foo x);

tests/expectations/assoc_constant.both.compat.c

@@ -13,7 +13,7 @@ typedef struct Foo {
 extern "C" {
 #endif // __cplusplus
 
-void root(Foo x);
+void root(struct Foo x);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/associated_in_body.both.c

@@ -32,4 +32,4 @@ typedef struct StyleAlignFlags {
  */
 #define StyleAlignFlags_FLEX_START (StyleAlignFlags){ .bits = (uint8_t)(1 << 3) }
 
-void root(StyleAlignFlags flags);
+void root(struct StyleAlignFlags flags);

tests/expectations/associated_in_body.both.compat.c

@@ -36,7 +36,7 @@ typedef struct StyleAlignFlags {
 extern "C" {
 #endif // __cplusplus
 
-void root(StyleAlignFlags flags);
+void root(struct StyleAlignFlags flags);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/bitfield.both.c

@@ -8,4 +8,4 @@ typedef struct HasBitfields {
   uint64_t bar: 56;
 } HasBitfields;
 
-void root(const HasBitfields*);
+void root(const struct HasBitfields*);

tests/expectations/bitfield.both.compat.c

@@ -12,7 +12,7 @@ typedef struct HasBitfields {
 extern "C" {
 #endif // __cplusplus
 
-void root(const HasBitfields*);
+void root(const struct HasBitfields*);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/bitflags.both.c

@@ -40,4 +40,4 @@ typedef struct DebugFlags {
  */
 #define DebugFlags_BIGGEST_ALLOWED (DebugFlags){ .bits = (uint32_t)(1 << 31) }
 
-void root(AlignFlags flags, DebugFlags bigger_flags);
+void root(struct AlignFlags flags, struct DebugFlags bigger_flags);

tests/expectations/bitflags.both.compat.c

@@ -44,7 +44,7 @@ typedef struct DebugFlags {
 extern "C" {
 #endif // __cplusplus
 
-void root(AlignFlags flags, DebugFlags bigger_flags);
+void root(struct AlignFlags flags, struct DebugFlags bigger_flags);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/body.both.c

@@ -91,11 +91,11 @@ typedef union MyUnion_Prepended {
   uint32_t u;
 } MyUnion_Prepended;
 
-void root(MyFancyStruct s,
-          MyFancyEnum e,
-          MyCLikeEnum c,
-          MyUnion u,
-          MyFancyStruct_Prepended sp,
-          MyFancyEnum_Prepended ep,
-          MyCLikeEnum_Prepended cp,
-          MyUnion_Prepended up);
+void root(struct MyFancyStruct s,
+          struct MyFancyEnum e,
+          enum MyCLikeEnum c,
+          union MyUnion u,
+          struct MyFancyStruct_Prepended sp,
+          struct MyFancyEnum_Prepended ep,
+          enum MyCLikeEnum_Prepended cp,
+          union MyUnion_Prepended up);

tests/expectations/body.both.compat.c

@@ -95,14 +95,14 @@ typedef union MyUnion_Prepended {
 extern "C" {
 #endif // __cplusplus
 
-void root(MyFancyStruct s,
-          MyFancyEnum e,
-          MyCLikeEnum c,
-          MyUnion u,
-          MyFancyStruct_Prepended sp,
-          MyFancyEnum_Prepended ep,
-          MyCLikeEnum_Prepended cp,
-          MyUnion_Prepended up);
+void root(struct MyFancyStruct s,
+          struct MyFancyEnum e,
+          enum MyCLikeEnum c,
+          union MyUnion u,
+          struct MyFancyStruct_Prepended sp,
+          struct MyFancyEnum_Prepended ep,
+          enum MyCLikeEnum_Prepended cp,
+          union MyUnion_Prepended up);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/box.both.c

@@ -19,13 +19,13 @@ using Box = T*;
 
 typedef struct NotReprC_Box_i32 NotReprC_Box_i32;
 
-typedef NotReprC_Box_i32 Foo;
+typedef struct NotReprC_Box_i32 Foo;
 
 typedef struct MyStruct {
   int32_t *number;
 } MyStruct;
 
-void root(const Foo *a, const MyStruct *with_box);
+void root(const Foo *a, const struct MyStruct *with_box);
 
 void drop_box(int32_t *x);
 

tests/expectations/box.both.compat.c

@@ -19,7 +19,7 @@ using Box = T*;
 
 typedef struct NotReprC_Box_i32 NotReprC_Box_i32;
 
-typedef NotReprC_Box_i32 Foo;
+typedef struct NotReprC_Box_i32 Foo;
 
 typedef struct MyStruct {
   int32_t *number;
@@ -29,7 +29,7 @@ typedef struct MyStruct {
 extern "C" {
 #endif // __cplusplus
 
-void root(const Foo *a, const MyStruct *with_box);
+void root(const Foo *a, const struct MyStruct *with_box);
 
 void drop_box(int32_t *x);
 

tests/expectations/cell.both.c

@@ -5,10 +5,10 @@
 
 typedef struct NotReprC_RefCell_i32 NotReprC_RefCell_i32;
 
-typedef NotReprC_RefCell_i32 Foo;
+typedef struct NotReprC_RefCell_i32 Foo;
 
 typedef struct MyStruct {
   int32_t number;
 } MyStruct;
 
-void root(const Foo *a, const MyStruct *with_cell);
+void root(const Foo *a, const struct MyStruct *with_cell);

tests/expectations/cell.both.compat.c

@@ -5,7 +5,7 @@
 
 typedef struct NotReprC_RefCell_i32 NotReprC_RefCell_i32;
 
-typedef NotReprC_RefCell_i32 Foo;
+typedef struct NotReprC_RefCell_i32 Foo;
 
 typedef struct MyStruct {
   int32_t number;
@@ -15,7 +15,7 @@ typedef struct MyStruct {
 extern "C" {
 #endif // __cplusplus
 
-void root(const Foo *a, const MyStruct *with_cell);
+void root(const Foo *a, const struct MyStruct *with_cell);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/cfg.both.c

@@ -72,9 +72,9 @@ typedef struct BarHandle {
 #endif
 
 #if (defined(PLATFORM_UNIX) && defined(X11))
-void root(FooHandle a, C c);
+void root(struct FooHandle a, union C c);
 #endif
 
 #if (defined(PLATFORM_WIN) || defined(M_32))
-void root(BarHandle a, C c);
+void root(struct BarHandle a, union C c);
 #endif

tests/expectations/cfg.both.compat.c

@@ -94,11 +94,11 @@ extern "C" {
 #endif // __cplusplus
 
 #if (defined(PLATFORM_UNIX) && defined(X11))
-void root(FooHandle a, C c);
+void root(struct FooHandle a, union C c);
 #endif
 
 #if (defined(PLATFORM_WIN) || defined(M_32))
-void root(BarHandle a, C c);
+void root(struct BarHandle a, union C c);
 #endif
 
 #ifdef __cplusplus

tests/expectations/cfg_2.both.c

@@ -25,18 +25,18 @@ typedef struct Foo {
 
 #if defined(NOT_DEFINED)
 typedef struct Bar {
-  Foo y;
+  struct Foo y;
 } Bar;
 #endif
 
 #if defined(DEFINED)
 typedef struct Bar {
-  Foo z;
+  struct Foo z;
 } Bar;
 #endif
 
 typedef struct Root {
-  Bar w;
+  struct Bar w;
 } Root;
 
-void root(Root a);
+void root(struct Root a);

tests/expectations/cfg_2.both.compat.c

@@ -25,25 +25,25 @@ typedef struct Foo {
 
 #if defined(NOT_DEFINED)
 typedef struct Bar {
-  Foo y;
+  struct Foo y;
 } Bar;
 #endif
 
 #if defined(DEFINED)
 typedef struct Bar {
-  Foo z;
+  struct Foo z;
 } Bar;
 #endif
 
 typedef struct Root {
-  Bar w;
+  struct Bar w;
 } Root;
 
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
 
-void root(Root a);
+void root(struct Root a);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/char.both.c

@@ -7,4 +7,4 @@ typedef struct Foo {
   uint32_t a;
 } Foo;
 
-void root(Foo a);
+void root(struct Foo a);

tests/expectations/char.both.compat.c

@@ -11,7 +11,7 @@ typedef struct Foo {
 extern "C" {
 #endif // __cplusplus
 
-void root(Foo a);
+void root(struct Foo a);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/constant.both.c

@@ -52,4 +52,4 @@ typedef struct Foo {
   int32_t x[FOO];
 } Foo;
 
-void root(Foo x);
+void root(struct Foo x);

tests/expectations/constant.both.compat.c

@@ -56,7 +56,7 @@ typedef struct Foo {
 extern "C" {
 #endif // __cplusplus
 
-void root(Foo x);
+void root(struct Foo x);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/cython_options.pyx

@@ -3,8 +3,8 @@ from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
 cdef extern from *:
   ctypedef bint bool
   ctypedef struct va_list
-from libc.stddef cimport *
 from libc.stdint cimport int8_t, int16_t
+from libc.stddef cimport *
 
 cdef extern from "my_header.h":
   pass

tests/expectations/dep_v2.both.c

@@ -8,4 +8,4 @@ typedef struct dep_struct {
   double y;
 } dep_struct;
 
-uint32_t get_x(const dep_struct *dep_struct);
+uint32_t get_x(const struct dep_struct *dep_struct);

tests/expectations/dep_v2.both.compat.c

@@ -12,7 +12,7 @@ typedef struct dep_struct {
 extern "C" {
 #endif // __cplusplus
 
-uint32_t get_x(const dep_struct *dep_struct);
+uint32_t get_x(const struct dep_struct *dep_struct);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/derive_eq.both.c

@@ -18,7 +18,7 @@ typedef uint8_t Bar_Tag;
 
 typedef struct Bazz_Body {
   Bar_Tag tag;
-  Foo named;
+  struct Foo named;
 } Bazz_Body;
 
 typedef struct FooNamed_Body {
@@ -30,7 +30,7 @@ typedef struct FooNamed_Body {
 typedef struct FooParen_Body {
   Bar_Tag tag;
   int32_t _0;
-  Foo _1;
+  struct Foo _1;
 } FooParen_Body;
 
 typedef union Bar {
@@ -40,4 +40,4 @@ typedef union Bar {
   FooParen_Body foo_paren;
 } Bar;
 
-Foo root(Bar aBar);
+struct Foo root(union Bar aBar);

tests/expectations/derive_eq.both.compat.c

@@ -24,7 +24,7 @@ typedef uint8_t Bar_Tag;
 
 typedef struct Bazz_Body {
   Bar_Tag tag;
-  Foo named;
+  struct Foo named;
 } Bazz_Body;
 
 typedef struct FooNamed_Body {
@@ -36,7 +36,7 @@ typedef struct FooNamed_Body {
 typedef struct FooParen_Body {
   Bar_Tag tag;
   int32_t _0;
-  Foo _1;
+  struct Foo _1;
 } FooParen_Body;
 
 typedef union Bar {
@@ -50,7 +50,7 @@ typedef union Bar {
 extern "C" {
 #endif // __cplusplus
 
-Foo root(Bar aBar);
+struct Foo root(union Bar aBar);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/derive_ostream.both.c

@@ -21,7 +21,7 @@ typedef struct B {
 typedef struct D {
   uint8_t List;
   uintptr_t Of;
-  B Things;
+  struct B Things;
 } D;
 
 enum F_Tag {
@@ -90,4 +90,4 @@ typedef struct I {
   };
 } I;
 
-void root(A a, B b, C c, D d, F f, H h, I i);
+void root(struct A a, struct B b, C c, struct D d, union F f, struct H h, struct I i);

tests/expectations/derive_ostream.both.compat.c

@@ -27,7 +27,7 @@ typedef struct B {
 typedef struct D {
   uint8_t List;
   uintptr_t Of;
-  B Things;
+  struct B Things;
 } D;
 
 enum F_Tag
@@ -118,7 +118,7 @@ typedef struct I {
 extern "C" {
 #endif // __cplusplus
 
-void root(A a, B b, C c, D d, F f, H h, I i);
+void root(struct A a, struct B b, C c, struct D d, union F f, struct H h, struct I i);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/destructor_and_copy_ctor.both.c

@@ -24,7 +24,7 @@ typedef struct OwnedSlice_u32 {
 
 typedef struct Polygon_u32 {
   FillRule fill;
-  OwnedSlice_u32 coordinates;
+  struct OwnedSlice_u32 coordinates;
 } Polygon_u32;
 
 /**
@@ -47,25 +47,25 @@ enum Foo_u32_Tag {
 typedef uint8_t Foo_u32_Tag;
 
 typedef struct Polygon1_Body_u32 {
-  Polygon_u32 _0;
+  struct Polygon_u32 _0;
 } Polygon1_Body_u32;
 
 typedef struct Slice1_Body_u32 {
-  OwnedSlice_u32 _0;
+  struct OwnedSlice_u32 _0;
 } Slice1_Body_u32;
 
 typedef struct Slice2_Body_u32 {
-  OwnedSlice_i32 _0;
+  struct OwnedSlice_i32 _0;
 } Slice2_Body_u32;
 
 typedef struct Slice3_Body_u32 {
   FillRule fill;
-  OwnedSlice_u32 coords;
+  struct OwnedSlice_u32 coords;
 } Slice3_Body_u32;
 
 typedef struct Slice4_Body_u32 {
   FillRule fill;
-  OwnedSlice_i32 coords;
+  struct OwnedSlice_i32 coords;
 } Slice4_Body_u32;
 
 typedef struct Foo_u32 {
@@ -81,7 +81,7 @@ typedef struct Foo_u32 {
 
 typedef struct Polygon_i32 {
   FillRule fill;
-  OwnedSlice_i32 coordinates;
+  struct OwnedSlice_i32 coordinates;
 } Polygon_i32;
 
 enum Baz_i32_Tag {
@@ -96,29 +96,29 @@ typedef uint8_t Baz_i32_Tag;
 
 typedef struct Polygon21_Body_i32 {
   Baz_i32_Tag tag;
-  Polygon_i32 _0;
+  struct Polygon_i32 _0;
 } Polygon21_Body_i32;
 
 typedef struct Slice21_Body_i32 {
   Baz_i32_Tag tag;
-  OwnedSlice_i32 _0;
+  struct OwnedSlice_i32 _0;
 } Slice21_Body_i32;
 
 typedef struct Slice22_Body_i32 {
   Baz_i32_Tag tag;
-  OwnedSlice_i32 _0;
+  struct OwnedSlice_i32 _0;
 } Slice22_Body_i32;
 
 typedef struct Slice23_Body_i32 {
   Baz_i32_Tag tag;
   FillRule fill;
-  OwnedSlice_i32 coords;
+  struct OwnedSlice_i32 coords;
 } Slice23_Body_i32;
 
 typedef struct Slice24_Body_i32 {
   Baz_i32_Tag tag;
   FillRule fill;
-  OwnedSlice_i32 coords;
+  struct OwnedSlice_i32 coords;
 } Slice24_Body_i32;
 
 typedef union Baz_i32 {
@@ -144,7 +144,7 @@ typedef struct Taz1_Body {
 
 typedef struct Taz3_Body {
   Taz_Tag tag;
-  OwnedSlice_i32 _0;
+  struct OwnedSlice_i32 _0;
 } Taz3_Body;
 
 typedef union Taz {
@@ -229,10 +229,10 @@ typedef union Qux {
   Qux2_Body qux2;
 } Qux;
 
-void root(const Foo_u32 *a,
-          const Baz_i32 *b,
-          const Taz *c,
-          Tazz d,
-          const Tazzz *e,
-          const Tazzzz *f,
-          const Qux *g);
+void root(const struct Foo_u32 *a,
+          const union Baz_i32 *b,
+          const union Taz *c,
+          union Tazz d,
+          const union Tazzz *e,
+          const union Tazzzz *f,
+          const union Qux *g);

tests/expectations/destructor_and_copy_ctor.both.compat.c

@@ -30,7 +30,7 @@ typedef struct OwnedSlice_u32 {
 
 typedef struct Polygon_u32 {
   FillRule fill;
-  OwnedSlice_u32 coordinates;
+  struct OwnedSlice_u32 coordinates;
 } Polygon_u32;
 
 /**
@@ -59,25 +59,25 @@ typedef uint8_t Foo_u32_Tag;
 #endif // __cplusplus
 
 typedef struct Polygon1_Body_u32 {
-  Polygon_u32 _0;
+  struct Polygon_u32 _0;
 } Polygon1_Body_u32;
 
 typedef struct Slice1_Body_u32 {
-  OwnedSlice_u32 _0;
+  struct OwnedSlice_u32 _0;
 } Slice1_Body_u32;
 
 typedef struct Slice2_Body_u32 {
-  OwnedSlice_i32 _0;
+  struct OwnedSlice_i32 _0;
 } Slice2_Body_u32;
 
 typedef struct Slice3_Body_u32 {
   FillRule fill;
-  OwnedSlice_u32 coords;
+  struct OwnedSlice_u32 coords;
 } Slice3_Body_u32;
 
 typedef struct Slice4_Body_u32 {
   FillRule fill;
-  OwnedSlice_i32 coords;
+  struct OwnedSlice_i32 coords;
 } Slice4_Body_u32;
 
 typedef struct Foo_u32 {
@@ -93,7 +93,7 @@ typedef struct Foo_u32 {
 
 typedef struct Polygon_i32 {
   FillRule fill;
-  OwnedSlice_i32 coordinates;
+  struct OwnedSlice_i32 coordinates;
 } Polygon_i32;
 
 enum Baz_i32_Tag
@@ -114,29 +114,29 @@ typedef uint8_t Baz_i32_Tag;
 
 typedef struct Polygon21_Body_i32 {
   Baz_i32_Tag tag;
-  Polygon_i32 _0;
+  struct Polygon_i32 _0;
 } Polygon21_Body_i32;
 
 typedef struct Slice21_Body_i32 {
   Baz_i32_Tag tag;
-  OwnedSlice_i32 _0;
+  struct OwnedSlice_i32 _0;
 } Slice21_Body_i32;
 
 typedef struct Slice22_Body_i32 {
   Baz_i32_Tag tag;
-  OwnedSlice_i32 _0;
+  struct OwnedSlice_i32 _0;
 } Slice22_Body_i32;
 
 typedef struct Slice23_Body_i32 {
   Baz_i32_Tag tag;
   FillRule fill;
-  OwnedSlice_i32 coords;
+  struct OwnedSlice_i32 coords;
 } Slice23_Body_i32;
 
 typedef struct Slice24_Body_i32 {
   Baz_i32_Tag tag;
   FillRule fill;
-  OwnedSlice_i32 coords;
+  struct OwnedSlice_i32 coords;
 } Slice24_Body_i32;
 
 typedef union Baz_i32 {
@@ -168,7 +168,7 @@ typedef struct Taz1_Body {
 
 typedef struct Taz3_Body {
   Taz_Tag tag;
-  OwnedSlice_i32 _0;
+  struct OwnedSlice_i32 _0;
 } Taz3_Body;
 
 typedef union Taz {
@@ -281,13 +281,13 @@ typedef union Qux {
 extern "C" {
 #endif // __cplusplus
 
-void root(const Foo_u32 *a,
-          const Baz_i32 *b,
-          const Taz *c,
-          Tazz d,
-          const Tazzz *e,
-          const Tazzzz *f,
-          const Qux *g);
+void root(const struct Foo_u32 *a,
+          const union Baz_i32 *b,
+          const union Taz *c,
+          union Tazz d,
+          const union Tazzz *e,
+          const union Tazzzz *f,
+          const union Qux *g);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/display_list.both.c

@@ -26,14 +26,14 @@ typedef uint8_t DisplayItem_Tag;
 
 typedef struct Fill_Body {
   DisplayItem_Tag tag;
-  Rect _0;
-  Color _1;
+  struct Rect _0;
+  struct Color _1;
 } Fill_Body;
 
 typedef struct Image_Body {
   DisplayItem_Tag tag;
   uint32_t id;
-  Rect bounds;
+  struct Rect bounds;
 } Image_Body;
 
 typedef union DisplayItem {
@@ -42,4 +42,4 @@ typedef union DisplayItem {
   Image_Body image;
 } DisplayItem;
 
-bool push_item(DisplayItem item);
+bool push_item(union DisplayItem item);

tests/expectations/display_list.both.compat.c

@@ -32,14 +32,14 @@ typedef uint8_t DisplayItem_Tag;
 
 typedef struct Fill_Body {
   DisplayItem_Tag tag;
-  Rect _0;
-  Color _1;
+  struct Rect _0;
+  struct Color _1;
 } Fill_Body;
 
 typedef struct Image_Body {
   DisplayItem_Tag tag;
   uint32_t id;
-  Rect bounds;
+  struct Rect bounds;
 } Image_Body;
 
 typedef union DisplayItem {
@@ -52,7 +52,7 @@ typedef union DisplayItem {
 extern "C" {
 #endif // __cplusplus
 
-bool push_item(DisplayItem item);
+bool push_item(union DisplayItem item);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/enum.both.c

@@ -181,23 +181,23 @@ typedef struct P {
   };
 } P;
 
-void root(Opaque *opaque,
+void root(struct Opaque *opaque,
           A a,
           B b,
           C c,
           D d,
           E e,
           F f,
-          G g,
-          H h,
-          I i,
-          J j,
-          K k,
-          L l,
+          union G g,
+          struct H h,
+          struct I i,
+          struct J j,
+          struct K k,
+          enum L l,
           M m,
-          N n,
+          enum N n,
           O o,
-          P p);
+          struct P p);
 
 #if 0
 ''' '

tests/expectations/enum.both.compat.c

@@ -251,23 +251,23 @@ typedef struct P {
 extern "C" {
 #endif // __cplusplus
 
-void root(Opaque *opaque,
+void root(struct Opaque *opaque,
           A a,
           B b,
           C c,
           D d,
           E e,
           F f,
-          G g,
-          H h,
-          I i,
-          J j,
-          K k,
-          L l,
+          union G g,
+          struct H h,
+          struct I i,
+          struct J j,
+          struct K k,
+          enum L l,
           M m,
-          N n,
+          enum N n,
           O o,
-          P p);
+          struct P p);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/enum_self.both.c

@@ -16,12 +16,12 @@ typedef uint8_t Bar_Tag;
 
 typedef struct Min_Body {
   Bar_Tag tag;
-  Foo_Bar _0;
+  struct Foo_Bar _0;
 } Min_Body;
 
 typedef struct Max_Body {
   Bar_Tag tag;
-  Foo_Bar _0;
+  struct Foo_Bar _0;
 } Max_Body;
 
 typedef union Bar {
@@ -30,4 +30,4 @@ typedef union Bar {
   Max_Body max;
 } Bar;
 
-void root(Bar b);
+void root(union Bar b);

tests/expectations/enum_self.both.compat.c

@@ -22,12 +22,12 @@ typedef uint8_t Bar_Tag;
 
 typedef struct Min_Body {
   Bar_Tag tag;
-  Foo_Bar _0;
+  struct Foo_Bar _0;
 } Min_Body;
 
 typedef struct Max_Body {
   Bar_Tag tag;
-  Foo_Bar _0;
+  struct Foo_Bar _0;
 } Max_Body;
 
 typedef union Bar {
@@ -40,7 +40,7 @@ typedef union Bar {
 extern "C" {
 #endif // __cplusplus
 
-void root(Bar b);
+void root(union Bar b);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/euclid.both.c

@@ -11,9 +11,9 @@ typedef struct TypedLength_f32__LayoutUnit {
   float _0;
 } TypedLength_f32__LayoutUnit;
 
-typedef TypedLength_f32__UnknownUnit Length_f32;
+typedef struct TypedLength_f32__UnknownUnit Length_f32;
 
-typedef TypedLength_f32__LayoutUnit LayoutLength;
+typedef struct TypedLength_f32__LayoutUnit LayoutLength;
 
 typedef struct TypedSideOffsets2D_f32__UnknownUnit {
   float top;
@@ -29,9 +29,9 @@ typedef struct TypedSideOffsets2D_f32__LayoutUnit {
   float left;
 } TypedSideOffsets2D_f32__LayoutUnit;
 
-typedef TypedSideOffsets2D_f32__UnknownUnit SideOffsets2D_f32;
+typedef struct TypedSideOffsets2D_f32__UnknownUnit SideOffsets2D_f32;
 
-typedef TypedSideOffsets2D_f32__LayoutUnit LayoutSideOffsets2D;
+typedef struct TypedSideOffsets2D_f32__LayoutUnit LayoutSideOffsets2D;
 
 typedef struct TypedSize2D_f32__UnknownUnit {
   float width;
@@ -43,9 +43,9 @@ typedef struct TypedSize2D_f32__LayoutUnit {
   float height;
 } TypedSize2D_f32__LayoutUnit;
 
-typedef TypedSize2D_f32__UnknownUnit Size2D_f32;
+typedef struct TypedSize2D_f32__UnknownUnit Size2D_f32;
 
-typedef TypedSize2D_f32__LayoutUnit LayoutSize2D;
+typedef struct TypedSize2D_f32__LayoutUnit LayoutSize2D;
 
 typedef struct TypedPoint2D_f32__UnknownUnit {
   float x;
@@ -57,23 +57,23 @@ typedef struct TypedPoint2D_f32__LayoutUnit {
   float y;
 } TypedPoint2D_f32__LayoutUnit;
 
-typedef TypedPoint2D_f32__UnknownUnit Point2D_f32;
+typedef struct TypedPoint2D_f32__UnknownUnit Point2D_f32;
 
-typedef TypedPoint2D_f32__LayoutUnit LayoutPoint2D;
+typedef struct TypedPoint2D_f32__LayoutUnit LayoutPoint2D;
 
 typedef struct TypedRect_f32__UnknownUnit {
-  TypedPoint2D_f32__UnknownUnit origin;
-  TypedSize2D_f32__UnknownUnit size;
+  struct TypedPoint2D_f32__UnknownUnit origin;
+  struct TypedSize2D_f32__UnknownUnit size;
 } TypedRect_f32__UnknownUnit;
 
 typedef struct TypedRect_f32__LayoutUnit {
-  TypedPoint2D_f32__LayoutUnit origin;
-  TypedSize2D_f32__LayoutUnit size;
+  struct TypedPoint2D_f32__LayoutUnit origin;
+  struct TypedSize2D_f32__LayoutUnit size;
 } TypedRect_f32__LayoutUnit;
 
-typedef TypedRect_f32__UnknownUnit Rect_f32;
+typedef struct TypedRect_f32__UnknownUnit Rect_f32;
 
-typedef TypedRect_f32__LayoutUnit LayoutRect;
+typedef struct TypedRect_f32__LayoutUnit LayoutRect;
 
 typedef struct TypedTransform2D_f32__UnknownUnit__LayoutUnit {
   float m11;
@@ -93,25 +93,25 @@ typedef struct TypedTransform2D_f32__LayoutUnit__UnknownUnit {
   float m32;
 } TypedTransform2D_f32__LayoutUnit__UnknownUnit;
 
-void root(TypedLength_f32__UnknownUnit length_a,
-          TypedLength_f32__LayoutUnit length_b,
+void root(struct TypedLength_f32__UnknownUnit length_a,
+          struct TypedLength_f32__LayoutUnit length_b,
           Length_f32 length_c,
           LayoutLength length_d,
-          TypedSideOffsets2D_f32__UnknownUnit side_offsets_a,
-          TypedSideOffsets2D_f32__LayoutUnit side_offsets_b,
+          struct TypedSideOffsets2D_f32__UnknownUnit side_offsets_a,
+          struct TypedSideOffsets2D_f32__LayoutUnit side_offsets_b,
           SideOffsets2D_f32 side_offsets_c,
           LayoutSideOffsets2D side_offsets_d,
-          TypedSize2D_f32__UnknownUnit size_a,
-          TypedSize2D_f32__LayoutUnit size_b,
+          struct TypedSize2D_f32__UnknownUnit size_a,
+          struct TypedSize2D_f32__LayoutUnit size_b,
           Size2D_f32 size_c,
           LayoutSize2D size_d,
-          TypedPoint2D_f32__UnknownUnit point_a,
-          TypedPoint2D_f32__LayoutUnit point_b,
+          struct TypedPoint2D_f32__UnknownUnit point_a,
+          struct TypedPoint2D_f32__LayoutUnit point_b,
           Point2D_f32 point_c,
           LayoutPoint2D point_d,
-          TypedRect_f32__UnknownUnit rect_a,
-          TypedRect_f32__LayoutUnit rect_b,
+          struct TypedRect_f32__UnknownUnit rect_a,
+          struct TypedRect_f32__LayoutUnit rect_b,
           Rect_f32 rect_c,
           LayoutRect rect_d,
-          TypedTransform2D_f32__UnknownUnit__LayoutUnit transform_a,
-          TypedTransform2D_f32__LayoutUnit__UnknownUnit transform_b);
+          struct TypedTransform2D_f32__UnknownUnit__LayoutUnit transform_a,
+          struct TypedTransform2D_f32__LayoutUnit__UnknownUnit transform_b);

tests/expectations/euclid.both.compat.c

@@ -11,9 +11,9 @@ typedef struct TypedLength_f32__LayoutUnit {
   float _0;
 } TypedLength_f32__LayoutUnit;
 
-typedef TypedLength_f32__UnknownUnit Length_f32;
+typedef struct TypedLength_f32__UnknownUnit Length_f32;
 
-typedef TypedLength_f32__LayoutUnit LayoutLength;
+typedef struct TypedLength_f32__LayoutUnit LayoutLength;
 
 typedef struct TypedSideOffsets2D_f32__UnknownUnit {
   float top;
@@ -29,9 +29,9 @@ typedef struct TypedSideOffsets2D_f32__LayoutUnit {
   float left;
 } TypedSideOffsets2D_f32__LayoutUnit;
 
-typedef TypedSideOffsets2D_f32__UnknownUnit SideOffsets2D_f32;
+typedef struct TypedSideOffsets2D_f32__UnknownUnit SideOffsets2D_f32;
 
-typedef TypedSideOffsets2D_f32__LayoutUnit LayoutSideOffsets2D;
+typedef struct TypedSideOffsets2D_f32__LayoutUnit LayoutSideOffsets2D;
 
 typedef struct TypedSize2D_f32__UnknownUnit {
   float width;
@@ -43,9 +43,9 @@ typedef struct TypedSize2D_f32__LayoutUnit {
   float height;
 } TypedSize2D_f32__LayoutUnit;
 
-typedef TypedSize2D_f32__UnknownUnit Size2D_f32;
+typedef struct TypedSize2D_f32__UnknownUnit Size2D_f32;
 
-typedef TypedSize2D_f32__LayoutUnit LayoutSize2D;
+typedef struct TypedSize2D_f32__LayoutUnit LayoutSize2D;
 
 typedef struct TypedPoint2D_f32__UnknownUnit {
   float x;
@@ -57,23 +57,23 @@ typedef struct TypedPoint2D_f32__LayoutUnit {
   float y;
 } TypedPoint2D_f32__LayoutUnit;
 
-typedef TypedPoint2D_f32__UnknownUnit Point2D_f32;
+typedef struct TypedPoint2D_f32__UnknownUnit Point2D_f32;
 
-typedef TypedPoint2D_f32__LayoutUnit LayoutPoint2D;
+typedef struct TypedPoint2D_f32__LayoutUnit LayoutPoint2D;
 
 typedef struct TypedRect_f32__UnknownUnit {
-  TypedPoint2D_f32__UnknownUnit origin;
-  TypedSize2D_f32__UnknownUnit size;
+  struct TypedPoint2D_f32__UnknownUnit origin;
+  struct TypedSize2D_f32__UnknownUnit size;
 } TypedRect_f32__UnknownUnit;
 
 typedef struct TypedRect_f32__LayoutUnit {
-  TypedPoint2D_f32__LayoutUnit origin;
-  TypedSize2D_f32__LayoutUnit size;
+  struct TypedPoint2D_f32__LayoutUnit origin;
+  struct TypedSize2D_f32__LayoutUnit size;
 } TypedRect_f32__LayoutUnit;
 
-typedef TypedRect_f32__UnknownUnit Rect_f32;
+typedef struct TypedRect_f32__UnknownUnit Rect_f32;
 
-typedef TypedRect_f32__LayoutUnit LayoutRect;
+typedef struct TypedRect_f32__LayoutUnit LayoutRect;
 
 typedef struct TypedTransform2D_f32__UnknownUnit__LayoutUnit {
   float m11;
@@ -97,28 +97,28 @@ typedef struct TypedTransform2D_f32__LayoutUnit__UnknownUnit {
 extern "C" {
 #endif // __cplusplus
 
-void root(TypedLength_f32__UnknownUnit length_a,
-          TypedLength_f32__LayoutUnit length_b,
+void root(struct TypedLength_f32__UnknownUnit length_a,
+          struct TypedLength_f32__LayoutUnit length_b,
           Length_f32 length_c,
           LayoutLength length_d,
-          TypedSideOffsets2D_f32__UnknownUnit side_offsets_a,
-          TypedSideOffsets2D_f32__LayoutUnit side_offsets_b,
+          struct TypedSideOffsets2D_f32__UnknownUnit side_offsets_a,
+          struct TypedSideOffsets2D_f32__LayoutUnit side_offsets_b,
           SideOffsets2D_f32 side_offsets_c,
           LayoutSideOffsets2D side_offsets_d,
-          TypedSize2D_f32__UnknownUnit size_a,
-          TypedSize2D_f32__LayoutUnit size_b,
+          struct TypedSize2D_f32__UnknownUnit size_a,
+          struct TypedSize2D_f32__LayoutUnit size_b,
           Size2D_f32 size_c,
           LayoutSize2D size_d,
-          TypedPoint2D_f32__UnknownUnit point_a,
-          TypedPoint2D_f32__LayoutUnit point_b,
+          struct TypedPoint2D_f32__UnknownUnit point_a,
+          struct TypedPoint2D_f32__LayoutUnit point_b,
           Point2D_f32 point_c,
           LayoutPoint2D point_d,
-          TypedRect_f32__UnknownUnit rect_a,
-          TypedRect_f32__LayoutUnit rect_b,
+          struct TypedRect_f32__UnknownUnit rect_a,
+          struct TypedRect_f32__LayoutUnit rect_b,
           Rect_f32 rect_c,
           LayoutRect rect_d,
-          TypedTransform2D_f32__UnknownUnit__LayoutUnit transform_a,
-          TypedTransform2D_f32__LayoutUnit__UnknownUnit transform_b);
+          struct TypedTransform2D_f32__UnknownUnit__LayoutUnit transform_a,
+          struct TypedTransform2D_f32__LayoutUnit__UnknownUnit transform_b);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/exclude_generic_monomorph.both.c

@@ -25,4 +25,4 @@ typedef struct Bar {
   Option_Foo foo;
 } Bar;
 
-void root(Bar f);
+void root(struct Bar f);

tests/expectations/exclude_generic_monomorph.both.compat.c

@@ -29,7 +29,7 @@ typedef struct Bar {
 extern "C" {
 #endif // __cplusplus
 
-void root(Bar f);
+void root(struct Bar f);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/expand.both.c

@@ -7,4 +7,4 @@ typedef struct Foo {
 
 } Foo;
 
-void root(Foo a);
+void root(struct Foo a);

tests/expectations/expand.both.compat.c

@@ -11,7 +11,7 @@ typedef struct Foo {
 extern "C" {
 #endif // __cplusplus
 
-void root(Foo a);
+void root(struct Foo a);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/expand_default_features.both.c

@@ -9,4 +9,4 @@ typedef struct Foo {
 
 void extra_debug_fn(void);
 
-void root(Foo a);
+void root(struct Foo a);

tests/expectations/expand_default_features.both.compat.c

@@ -13,7 +13,7 @@ extern "C" {
 
 void extra_debug_fn(void);
 
-void root(Foo a);
+void root(struct Foo a);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/expand_dep.both.c

@@ -8,4 +8,4 @@ typedef struct dep_struct {
   double y;
 } dep_struct;
 
-uint32_t get_x(const dep_struct *dep_struct);
+uint32_t get_x(const struct dep_struct *dep_struct);

tests/expectations/expand_dep.both.compat.c

@@ -12,7 +12,7 @@ typedef struct dep_struct {
 extern "C" {
 #endif // __cplusplus
 
-uint32_t get_x(const dep_struct *dep_struct);
+uint32_t get_x(const struct dep_struct *dep_struct);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/expand_dep_v2.both.c

@@ -8,4 +8,4 @@ typedef struct dep_struct {
   double y;
 } dep_struct;
 
-uint32_t get_x(const dep_struct *dep_struct);
+uint32_t get_x(const struct dep_struct *dep_struct);

tests/expectations/expand_dep_v2.both.compat.c

@@ -12,7 +12,7 @@ typedef struct dep_struct {
 extern "C" {
 #endif // __cplusplus
 
-uint32_t get_x(const dep_struct *dep_struct);
+uint32_t get_x(const struct dep_struct *dep_struct);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/expand_features.both.c

@@ -11,4 +11,4 @@ void extra_debug_fn(void);
 
 void cbindgen(void);
 
-void root(Foo a);
+void root(struct Foo a);

tests/expectations/expand_features.both.compat.c

@@ -15,7 +15,7 @@ void extra_debug_fn(void);
 
 void cbindgen(void);
 
-void root(Foo a);
+void root(struct Foo a);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/expand_no_default_features.both.c

@@ -7,4 +7,4 @@ typedef struct Foo {
 
 } Foo;
 
-void root(Foo a);
+void root(struct Foo a);

tests/expectations/expand_no_default_features.both.compat.c

@@ -11,7 +11,7 @@ typedef struct Foo {
 extern "C" {
 #endif // __cplusplus
 
-void root(Foo a);
+void root(struct Foo a);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/extern.both.c

@@ -10,4 +10,4 @@ typedef struct Normal {
 
 extern int32_t foo(void);
 
-extern void bar(Normal a);
+extern void bar(struct Normal a);

tests/expectations/extern.both.compat.c

@@ -14,7 +14,7 @@ extern "C" {
 
 extern int32_t foo(void);
 
-extern void bar(Normal a);
+extern void bar(struct Normal a);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/external_workspace_child.both.c

@@ -7,4 +7,4 @@ typedef struct ExtType {
   uint32_t data;
 } ExtType;
 
-void consume_ext(ExtType _ext);
+void consume_ext(struct ExtType _ext);

tests/expectations/external_workspace_child.both.compat.c

@@ -11,7 +11,7 @@ typedef struct ExtType {
 extern "C" {
 #endif // __cplusplus
 
-void consume_ext(ExtType _ext);
+void consume_ext(struct ExtType _ext);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/fns.both.c

@@ -11,6 +11,6 @@ typedef struct Fns {
   int8_t (*namedArgsWildcards)(int32_t _, int16_t named, int64_t _1);
 } Fns;
 
-void root(Fns _fns);
+void root(struct Fns _fns);
 
 void no_return(void);

tests/expectations/fns.both.compat.c

@@ -15,7 +15,7 @@ typedef struct Fns {
 extern "C" {
 #endif // __cplusplus
 
-void root(Fns _fns);
+void root(struct Fns _fns);
 
 void no_return(void);
 

tests/expectations/forward_declaration.both.c

@@ -0,0 +1,52 @@
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+/* ANONYMOUS STRUCTS DO NOT SUPPORT FORWARD DECLARATIONS!
+#endif
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct StructInfo {
+  const struct TypeInfo *const *fields;
+  uintptr_t num_fields;
+} StructInfo;
+
+typedef enum TypeData_Tag {
+  Primitive,
+  Struct,
+} TypeData_Tag;
+
+typedef struct Struct_Body {
+  struct StructInfo _0;
+} Struct_Body;
+
+typedef struct TypeData {
+  TypeData_Tag tag;
+  union {
+    Struct_Body struct_;
+  };
+} TypeData;
+
+typedef struct TypeInfo {
+  struct TypeData data;
+} TypeInfo;
+
+void root(struct TypeInfo x);
+
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+*/
+#endif
+#if 0
+' '''
+#endif

tests/expectations/forward_declaration.both.compat.c

@@ -0,0 +1,60 @@
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+/* ANONYMOUS STRUCTS DO NOT SUPPORT FORWARD DECLARATIONS!
+#endif
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct StructInfo {
+  const struct TypeInfo *const *fields;
+  uintptr_t num_fields;
+} StructInfo;
+
+typedef enum TypeData_Tag {
+  Primitive,
+  Struct,
+} TypeData_Tag;
+
+typedef struct Struct_Body {
+  struct StructInfo _0;
+} Struct_Body;
+
+typedef struct TypeData {
+  TypeData_Tag tag;
+  union {
+    Struct_Body struct_;
+  };
+} TypeData;
+
+typedef struct TypeInfo {
+  struct TypeData data;
+} TypeInfo;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct TypeInfo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
+
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+*/
+#endif
+#if 0
+' '''
+#endif

tests/expectations/forward_declaration.c

@@ -0,0 +1,52 @@
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+/* ANONYMOUS STRUCTS DO NOT SUPPORT FORWARD DECLARATIONS!
+#endif
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  const TypeInfo *const *fields;
+  uintptr_t num_fields;
+} StructInfo;
+
+typedef enum {
+  Primitive,
+  Struct,
+} TypeData_Tag;
+
+typedef struct {
+  StructInfo _0;
+} Struct_Body;
+
+typedef struct {
+  TypeData_Tag tag;
+  union {
+    Struct_Body struct_;
+  };
+} TypeData;
+
+typedef struct {
+  TypeData data;
+} TypeInfo;
+
+void root(TypeInfo x);
+
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+*/
+#endif
+#if 0
+' '''
+#endif

tests/expectations/forward_declaration.compat.c

@@ -0,0 +1,60 @@
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+/* ANONYMOUS STRUCTS DO NOT SUPPORT FORWARD DECLARATIONS!
+#endif
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  const TypeInfo *const *fields;
+  uintptr_t num_fields;
+} StructInfo;
+
+typedef enum {
+  Primitive,
+  Struct,
+} TypeData_Tag;
+
+typedef struct {
+  StructInfo _0;
+} Struct_Body;
+
+typedef struct {
+  TypeData_Tag tag;
+  union {
+    Struct_Body struct_;
+  };
+} TypeData;
+
+typedef struct {
+  TypeData data;
+} TypeInfo;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(TypeInfo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
+
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+*/
+#endif
+#if 0
+' '''
+#endif

tests/expectations/forward_declaration.cpp

@@ -0,0 +1,57 @@
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+/* ANONYMOUS STRUCTS DO NOT SUPPORT FORWARD DECLARATIONS!
+#endif
+#if 0
+' '''
+#endif
+
+
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+struct StructInfo {
+  const TypeInfo *const *fields;
+  uintptr_t num_fields;
+};
+
+struct TypeData {
+  enum class Tag {
+    Primitive,
+    Struct,
+  };
+
+  struct Struct_Body {
+    StructInfo _0;
+  };
+
+  Tag tag;
+  union {
+    Struct_Body struct_;
+  };
+};
+
+struct TypeInfo {
+  TypeData data;
+};
+
+extern "C" {
+
+void root(TypeInfo x);
+
+} // extern "C"
+
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+*/
+#endif
+#if 0
+' '''
+#endif

tests/expectations/forward_declaration.pyx

@@ -0,0 +1,48 @@
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+/* ANONYMOUS STRUCTS DO NOT SUPPORT FORWARD DECLARATIONS!
+#endif
+#if 0
+' '''
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct StructInfo:
+    const TypeInfo *const *fields;
+    uintptr_t num_fields;
+
+  ctypedef enum TypeData_Tag:
+    Primitive,
+    Struct,
+
+  ctypedef struct Struct_Body:
+    StructInfo _0;
+
+  ctypedef struct TypeData:
+    TypeData_Tag tag;
+    Struct_Body struct_;
+
+  ctypedef struct TypeInfo:
+    TypeData data;
+
+  void root(TypeInfo x);
+
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+*/
+#endif
+#if 0
+' '''
+#endif

tests/expectations/forward_declaration.tag.c

@@ -0,0 +1,52 @@
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+/* ANONYMOUS STRUCTS DO NOT SUPPORT FORWARD DECLARATIONS!
+#endif
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct StructInfo {
+  const struct TypeInfo *const *fields;
+  uintptr_t num_fields;
+};
+
+enum TypeData_Tag {
+  Primitive,
+  Struct,
+};
+
+struct Struct_Body {
+  struct StructInfo _0;
+};
+
+struct TypeData {
+  enum TypeData_Tag tag;
+  union {
+    struct Struct_Body struct_;
+  };
+};
+
+struct TypeInfo {
+  struct TypeData data;
+};
+
+void root(struct TypeInfo x);
+
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+*/
+#endif
+#if 0
+' '''
+#endif

tests/expectations/forward_declaration.tag.compat.c

@@ -0,0 +1,60 @@
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+/* ANONYMOUS STRUCTS DO NOT SUPPORT FORWARD DECLARATIONS!
+#endif
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct StructInfo {
+  const struct TypeInfo *const *fields;
+  uintptr_t num_fields;
+};
+
+enum TypeData_Tag {
+  Primitive,
+  Struct,
+};
+
+struct Struct_Body {
+  struct StructInfo _0;
+};
+
+struct TypeData {
+  enum TypeData_Tag tag;
+  union {
+    struct Struct_Body struct_;
+  };
+};
+
+struct TypeInfo {
+  struct TypeData data;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct TypeInfo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
+
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+*/
+#endif
+#if 0
+' '''
+#endif

tests/expectations/forward_declaration.tag.pyx

@@ -0,0 +1,48 @@
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+/* ANONYMOUS STRUCTS DO NOT SUPPORT FORWARD DECLARATIONS!
+#endif
+#if 0
+' '''
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct StructInfo:
+    const TypeInfo *const *fields;
+    uintptr_t num_fields;
+
+  cdef enum TypeData_Tag:
+    Primitive,
+    Struct,
+
+  cdef struct Struct_Body:
+    StructInfo _0;
+
+  cdef struct TypeData:
+    TypeData_Tag tag;
+    Struct_Body struct_;
+
+  cdef struct TypeInfo:
+    TypeData data;
+
+  void root(TypeInfo x);
+
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+*/
+#endif
+#if 0
+' '''
+#endif

tests/expectations/generic_pointer.both.c

@@ -7,6 +7,6 @@ typedef struct Foo_____u8 {
   uint8_t *a;
 } Foo_____u8;
 
-typedef Foo_____u8 Boo;
+typedef struct Foo_____u8 Boo;
 
 void root(Boo x);

tests/expectations/generic_pointer.both.compat.c

@@ -7,7 +7,7 @@ typedef struct Foo_____u8 {
   uint8_t *a;
 } Foo_____u8;
 
-typedef Foo_____u8 Boo;
+typedef struct Foo_____u8 Boo;
 
 #ifdef __cplusplus
 extern "C" {

tests/expectations/include_item.both.compat.c

@@ -9,5 +9,5 @@ typedef struct A {
 } A;
 
 typedef struct B {
-  A data;
+  struct A data;
 } B;

tests/expectations/inner_mod.both.c

@@ -7,4 +7,4 @@ typedef struct Foo {
   float x;
 } Foo;
 
-void root(Foo a);
+void root(struct Foo a);

tests/expectations/inner_mod.both.compat.c

@@ -11,7 +11,7 @@ typedef struct Foo {
 extern "C" {
 #endif // __cplusplus
 
-void root(Foo a);
+void root(struct Foo a);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/lifetime_arg.both.c

@@ -23,4 +23,4 @@ typedef struct E {
   };
 } E;
 
-void root(A _a, E _e);
+void root(struct A _a, struct E _e);

tests/expectations/lifetime_arg.both.compat.c

@@ -27,7 +27,7 @@ typedef struct E {
 extern "C" {
 #endif // __cplusplus
 
-void root(A _a, E _e);
+void root(struct A _a, struct E _e);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/linestyle_cr.both.c

@@ -1 +1 @@
-#include <stdarg.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>

typedef struct Dummy {
  int32_t x;
  float y;
} Dummy;

void root(Dummy d);
+#include <stdarg.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>

typedef struct Dummy {
  int32_t x;
  float y;
} Dummy;

void root(struct Dummy d);

tests/expectations/linestyle_cr.both.compat.c

@@ -1 +1 @@
-#include <stdarg.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>

typedef struct Dummy {
  int32_t x;
  float y;
} Dummy;

#ifdef __cplusplus
extern "C" {
#endif // __cplusplus

void root(Dummy d);

#ifdef __cplusplus
} // extern "C"
#endif // __cplusplus
+#include <stdarg.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>

typedef struct Dummy {
  int32_t x;
  float y;
} Dummy;

#ifdef __cplusplus
extern "C" {
#endif // __cplusplus

void root(struct Dummy d);

#ifdef __cplusplus
} // extern "C"
#endif // __cplusplus

tests/expectations/linestyle_crlf.both.c

@@ -8,4 +8,4 @@ typedef struct Dummy {
   float y;
 } Dummy;
 
-void root(Dummy d);
+void root(struct Dummy d);

tests/expectations/linestyle_crlf.both.compat.c

@@ -12,7 +12,7 @@ typedef struct Dummy {
 extern "C" {
 #endif // __cplusplus
 
-void root(Dummy d);
+void root(struct Dummy d);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/linestyle_lf.both.c

@@ -8,4 +8,4 @@ typedef struct Dummy {
   float y;
 } Dummy;
 
-void root(Dummy d);
+void root(struct Dummy d);

tests/expectations/linestyle_lf.both.compat.c

@@ -12,7 +12,7 @@ typedef struct Dummy {
 extern "C" {
 #endif // __cplusplus
 
-void root(Dummy d);
+void root(struct Dummy d);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/mangle.both.c

@@ -7,6 +7,6 @@ typedef struct FooU8 {
   uint8_t a;
 } FooU8;
 
-typedef FooU8 Boo;
+typedef struct FooU8 Boo;
 
 void root(Boo x);

tests/expectations/mangle.both.compat.c

@@ -7,7 +7,7 @@ typedef struct FooU8 {
   uint8_t a;
 } FooU8;
 
-typedef FooU8 Boo;
+typedef struct FooU8 Boo;
 
 #ifdef __cplusplus
 extern "C" {

tests/expectations/manuallydrop.both.c

@@ -19,7 +19,7 @@ using ManuallyDrop = T;
 
 typedef struct NotReprC_ManuallyDrop_Point NotReprC_ManuallyDrop_Point;
 
-typedef NotReprC_ManuallyDrop_Point Foo;
+typedef struct NotReprC_ManuallyDrop_Point Foo;
 
 typedef struct Point {
   int32_t x;
@@ -27,9 +27,9 @@ typedef struct Point {
 } Point;
 
 typedef struct MyStruct {
-  Point point;
+  struct Point point;
 } MyStruct;
 
-void root(const Foo *a, const MyStruct *with_manual_drop);
+void root(const Foo *a, const struct MyStruct *with_manual_drop);
 
-void take(Point with_manual_drop);
+void take(struct Point with_manual_drop);

tests/expectations/manuallydrop.both.compat.c

@@ -19,7 +19,7 @@ using ManuallyDrop = T;
 
 typedef struct NotReprC_ManuallyDrop_Point NotReprC_ManuallyDrop_Point;
 
-typedef NotReprC_ManuallyDrop_Point Foo;
+typedef struct NotReprC_ManuallyDrop_Point Foo;
 
 typedef struct Point {
   int32_t x;
@@ -27,16 +27,16 @@ typedef struct Point {
 } Point;
 
 typedef struct MyStruct {
-  Point point;
+  struct Point point;
 } MyStruct;
 
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
 
-void root(const Foo *a, const MyStruct *with_manual_drop);
+void root(const Foo *a, const struct MyStruct *with_manual_drop);
 
-void take(Point with_manual_drop);
+void take(struct Point with_manual_drop);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/maybeuninit.both.c

@@ -19,10 +19,10 @@ using MaybeUninit = T;
 
 typedef struct NotReprC_MaybeUninit______i32 NotReprC_MaybeUninit______i32;
 
-typedef NotReprC_MaybeUninit______i32 Foo;
+typedef struct NotReprC_MaybeUninit______i32 Foo;
 
 typedef struct MyStruct {
   const int32_t *number;
 } MyStruct;
 
-void root(const Foo *a, const MyStruct *with_maybe_uninit);
+void root(const Foo *a, const struct MyStruct *with_maybe_uninit);

tests/expectations/maybeuninit.both.compat.c

@@ -19,7 +19,7 @@ using MaybeUninit = T;
 
 typedef struct NotReprC_MaybeUninit______i32 NotReprC_MaybeUninit______i32;
 
-typedef NotReprC_MaybeUninit______i32 Foo;
+typedef struct NotReprC_MaybeUninit______i32 Foo;
 
 typedef struct MyStruct {
   const int32_t *number;
@@ -29,7 +29,7 @@ typedef struct MyStruct {
 extern "C" {
 #endif // __cplusplus
 
-void root(const Foo *a, const MyStruct *with_maybe_uninit);
+void root(const Foo *a, const struct MyStruct *with_maybe_uninit);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/mod_2015.both.c

@@ -9,4 +9,4 @@ typedef struct ExportMe {
   uint64_t val;
 } ExportMe;
 
-void export_me(ExportMe *val);
+void export_me(struct ExportMe *val);

tests/expectations/mod_2015.both.compat.c

@@ -13,7 +13,7 @@ typedef struct ExportMe {
 extern "C" {
 #endif // __cplusplus
 
-void export_me(ExportMe *val);
+void export_me(struct ExportMe *val);
 
 #ifdef __cplusplus
 } // extern "C"

tests/expectations/mod_2018.both.c

@@ -9,4 +9,4 @@ typedef struct ExportMe {
   uint64_t val;
 } ExportMe;
 
-void export_me(ExportMe *val);
+void export_me(struct ExportMe *val);

tests/expectations/mod_2018.both.compat.c

@@ -13,7 +13,7 @@ typedef struct ExportMe {
 extern "C" {
 #endif // __cplusplus
 
-void export_me(ExportMe *val);
+void export_me(struct ExportMe *val);
 
 #ifdef __cplusplus
 } // extern "C"