diff --git a/df.building.xml b/df.building.xml
index 0d3b15056..824627a86 100644
--- a/df.building.xml
+++ b/df.building.xml
@@ -1040,8 +1040,8 @@
 
         <stl-vector name='home_general_hf' type-name='int32_t' ref-target='historical_figure'/>
         <stl-vector name='contained_buildings' pointer-type='building' comment='includes eg workshops and beds; **not sorted**'/>
-        <int32_t name='assigned_unit_id' ref-target='unit'/>
-        <pointer name='assigned_unit' type-name='unit'/>
+        <int32_t name='assigned_unit_id' ref-target='unit' init-value='-1' comment='bay12: owner_unid'/>
+        <int32_t name='owner_unit_cached_index' init-value='-1'/>
         <stl-vector name='squad_room_info' pointer-type='building_squad_infost'/>
         <int32_t name='retained_owner' ref-target='unit' comment='only used during save'/>
     </class-type>
diff --git a/df.d_init.xml b/df.d_init.xml
index f6f8d865f..a51fe3ae0 100644
--- a/df.d_init.xml
+++ b/df.d_init.xml
@@ -109,6 +109,14 @@
         <int32_t name='graze_coefficient' since='v0.40.13'/>
         <int32_t name='maximum_embark_dim' since='v0.50.01'/>
         <int32_t name='cull_dead_units_at' since='v0.50.06'/>
+        <int32_t name='horizontal_scroll_speed' since='v0.51.11'/>
+        <int32_t name='horizontal_scroll_speed_fast' since='v0.51.11'/>
+        <int32_t name='vertical_scroll_speed' since='v0.51.11'/>
+        <int32_t name='vertical_scroll_speed_fast' since='v0.51.11'/>
+        <int32_t name='horizontal_scroll_speed_world' since='v0.51.11'/>
+        <int32_t name='horizontal_scroll_speed_world_fast' since='v0.51.11'/>
+        <int32_t name='vertical_scroll_speed_world' since='v0.51.11'/>
+        <int32_t name='vertical_scroll_speed_world_fast' since='v0.51.11'/>
     </struct-type>
 
     <enum-type type-name='d_init_flags4'> bay12: InitFeatureFlagType
diff --git a/df.g_src.init.xml b/df.g_src.init.xml
index 1f65415e3..9a990f2ce 100644
--- a/df.g_src.init.xml
+++ b/df.g_src.init.xml
@@ -32,6 +32,7 @@
         <enum-item name='TEXT'/>
         <enum-item name='NOT_RESIZABLE'/>
         <enum-item name='INTERFACE_SCALING_TO_DESIRED_HEIGHT_WIDTH'/>
+        <enum-item name='LOAD_TITLE_GRAPHICS'/>
     </enum-type>
 
     <enum-type type-name='init_display_window_mode'> bay12: InitDisplayWindow
@@ -89,6 +90,7 @@
         <int32_t name='volume_music_adv'/>
         <int32_t name='volume_ambience_adv'/>
         <int32_t name='volume_sfx_adv'/>
+        <stl-string name='title_music_str'/>
     </struct-type>
 
     <enum-type type-name='init_input_flags'> bay12: InitInputFlag
diff --git a/df.itemdef.xml b/df.itemdef.xml
index e433b0d03..ca7e6b256 100644
--- a/df.itemdef.xml
+++ b/df.itemdef.xml
@@ -125,6 +125,9 @@
         <flag-bit name='type' count='6' type-name='item_weapon_graphics_type'/>
         <flag-bit name='wood'/>
         <flag-bit name='wood_grown'/>
+        <flag-bit name='stone'/>
+        <flag-bit name='artifact'/>
+        <flag-bit name='special_mat'/>
     </bitfield-type>
 
     <enum-type type-name='item_weapon_graphics_type' base-type='int32_t'> bay12: ITEM_WEAPON_GRAPHICS_TYPE_*
@@ -180,7 +183,7 @@
         <stl-vector name="attacks" pointer-type='weapon_attack'/>
         <int32_t name="shoot_force"/>
         <int32_t name="shoot_maxvel"/>
-        <static-array name='texpos' type-name='int32_t' count='25'/>
+        <static-array name='texpos' type-name='int32_t' count='28'/>
         <stl-vector name='graphics_info' pointer-type='itemdef_weapon_graphics_infost'/>
     </class-type>