diff --git a/Common.pm b/Common.pm
index 2f14b5e9..3e11badb 100644
--- a/Common.pm
+++ b/Common.pm
@@ -209,7 +209,8 @@ sub get_primitive_base($;$) {
     if ($base =~ /u?int[136]?[2468]_t/) {
         header_ref("cstdint");
     }
-    $primitive_types{$base} or die "Must be primitive: $base\n";
+
+    $base = primitive_type_name($base);
 
     return $base;
 }
diff --git a/changelog.txt b/changelog.txt
index 267a4685..3dafa786 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -19,6 +19,10 @@ Template for new versions:
 # Future
 
 ## Structures
+- reorganize all structure definitions to match bay12 header layouts
+- promote all bay12 structures, enums, and bitfields to top-level types
+- fill in a bunch of structures that were missing
+- fix various structure errors
 
 # 51.02-r1
 
diff --git a/df.d_interface.xml b/df.d_interface.xml
index c3d64361..ee5064b4 100644
--- a/df.d_interface.xml
+++ b/df.d_interface.xml
@@ -5749,7 +5749,7 @@
         <int16_t name='amount'/>
     </struct-type>
 
-    <struct-type type-name='lookinfo_spoorst'> 
+    <struct-type type-name='lookinfo_spoorst'>
         <bitfield name='flag' type-name='spoor_flag'/>
         <enum name='type' type-name='spoor_type'/>
         <int32_t name='id1'/>
diff --git a/df.itemdef.xml b/df.itemdef.xml
index 61b4918d..e433b0d0 100644
--- a/df.itemdef.xml
+++ b/df.itemdef.xml
@@ -332,7 +332,7 @@
         <flag-bit name='water'/>
         <flag-bit name='dirt'/>
         <flag-bit name='color_index' count='8'/>
-        <flag-bit name='localdef_shape_index' count='6'/> supposed to be 8, but the struct itself uses int32_t and only has room for 6
+        <flag-bit name='localdef_shape_index' count='5'/> supposed to be 8, but the struct itself uses int32_t and only has room for 5
     </bitfield-type>
 
     <enum-type type-name='item_tool_graphics_flag_material' base-type='int32_t'> bay12: ITEM_TOOL_GRAPHICS_FLAG_MATERIAL_*
diff --git a/df.region.xml b/df.region.xml
index b5f1c032..d9733b80 100644
--- a/df.region.xml
+++ b/df.region.xml
@@ -675,7 +675,7 @@
         <int32_t name='y'/>
     </struct-type>
 
-    <struct-type type-name='open_list_binary_heap_2Dst' since='v0.40.01'> bay12: 
+    <struct-type type-name='open_list_binary_heap_2Dst' since='v0.40.01'>
         <static-array name='node' count='80000' type-name='open_list_node_2Dst'/>
         <int32_t name='size'/>
         <int32_t name='x1'/>
diff --git a/df.site.xml b/df.site.xml
index ffd3ab3f..4db08f73 100644
--- a/df.site.xml
+++ b/df.site.xml
@@ -168,7 +168,7 @@
         <int32_t name="year"/>
         <int32_t name="year_tick" init-value='-1' comment='bay12: season_count'/>
         <bitfield name="flags" base-type='uint32_t' type-name='site_architecture_flag'/>
-        <compound is-union='true' union-tag-field='type'>
+        <compound name='spec_flag' is-union='true' union-tag-field='type'>
             <bitfield name="GENERALIZED_DAMAGE" base-type='uint32_t' type-name='site_architecture_flag_generalized_damage'/>
             <bitfield name="GENERALIZED_DEATH" base-type='uint32_t' type-name='site_architecture_flag_generalized_death'/>
         </compound>