diff --git a/df.building.xml b/df.building.xml
index 4b3d22d8d..53c2202e1 100644
--- a/df.building.xml
+++ b/df.building.xml
@@ -1660,6 +1660,7 @@
     <class-type type-name='building_tradedepotst' inherits-from='building_actual'>
         <bitfield name='trade_flags' base-type='uint32_t' type-name='building_tradedepot_flag'/>
         <int32_t name='times_used'/>
+        <int32_t name='times_wagon_completed_dropoff'/>
         <bool name='accessible'/>
     </class-type>
 
diff --git a/df.d_init.xml b/df.d_init.xml
index f2382fd04..3504185f1 100644
--- a/df.d_init.xml
+++ b/df.d_init.xml
@@ -33,7 +33,7 @@
     <struct-type type-name='d_init_displayst'>
         <df-flagarray name='flags' index-enum='d_init_flags1'/>
 
-        <static-array name='nickname' count='10' index-enum='game_type'><enum type-name='d_init_nickname'/></static-array>
+        <static-array name='nickname' count='11' index-enum='game_type'><enum type-name='d_init_nickname'/></static-array>
 
         <uint8_t name='sky_tile'/>
         <static-array name='sky_color' type-name='int16_t' count='3'/>
diff --git a/df.d_interface.xml b/df.d_interface.xml
index 75656b6a0..f17c1a6b0 100644
--- a/df.d_interface.xml
+++ b/df.d_interface.xml
@@ -6530,7 +6530,7 @@
 
     <class-type type-name='viewscreen_choose_game_typest' inherits-from='viewscreen'>
         <stl-vector type-name="game_type" name="gametypes"/>
-        <static-array name='game_type_box' index-enum='game_type' count='10' type-name='curses_text_boxst'/>
+        <static-array name='game_type_box' index-enum='game_type' count='11' type-name='curses_text_boxst'/>
     </class-type>
 
     <enum-type type-name='choose_start_site_view_mode'> bay12: ChooseStartSiteViewMode, no base type!
diff --git a/df.g_src.basics.xml b/df.g_src.basics.xml
index 56966197d..9b0f30298 100644
--- a/df.g_src.basics.xml
+++ b/df.g_src.basics.xml
@@ -17,6 +17,7 @@
         <enum-item name='DWARF_TUTORIAL'/>
         <enum-item name='DWARF_UNRETIRE'/>
         <enum-item name='ADVENTURE_WORLD_DEBUG'/>
+        <enum-item name='DWARF_TESTING'/>
         <enum-item name='num'/>
         <enum-item name='NONE'/> not -1
     </enum-type>
diff --git a/df.unit.xml b/df.unit.xml
index 2b1987320..17fbf13aa 100644
--- a/df.unit.xml
+++ b/df.unit.xml
@@ -3076,6 +3076,7 @@
                 <ret-type> <pointer type-name='nemesis_record'/> </ret-type>
                 <int8_t name='important'/>
                 <int8_t name='inplay'/>
+                <bool name='just_born'/>
             </vmethod>
         </virtual-methods>
     </class-type>
diff --git a/df.world.xml b/df.world.xml
index 926964b39..9fd596fc0 100644
--- a/df.world.xml
+++ b/df.world.xml
@@ -198,6 +198,10 @@
         <stl-vector name='level' pointer-type='arena_profile_levelst'/>
     </struct-type>
 
+    -- Skipped: ArenaTestType
+    -- Skipped: TestStateType
+    -- Skipped: testing_arenast
+
     <bitfield-type type-name='arena_flag' base-type='uint32_t'> bay12: ARENA_FLAG_*
         <flag-bit name='morale_enable'/>
     </bitfield-type>