diff --git a/df.d_basics.xml b/df.d_basics.xml
index 7a32b6bfb8..8df05d98a3 100644
--- a/df.d_basics.xml
+++ b/df.d_basics.xml
@@ -488,6 +488,8 @@
         <enum-item name='Site'/>
         <enum-item name='Entity'/>
         <enum-item name='ArtImage'/>
+        <enum-item name='GenericHistfig'/>
+        <enum-item name='GenericCreature'/>
     </enum-type>
 
     <struct-type type-name='adv_art_specifierst'>
diff --git a/df.d_interface.xml b/df.d_interface.xml
index 4ebd58a99e..139db335a0 100644
--- a/df.d_interface.xml
+++ b/df.d_interface.xml
@@ -1641,6 +1641,7 @@
         <enum-item name='ENGRAVING_PLANNED'/>
         <enum-item name='UNIT_LIST'/>
         <enum-item name='ITEM_LIST'/>
+        <enum-item name='VERMIN'/>
     </enum-type>
 
     <struct-type type-name='view_sheets_interfacest'>
@@ -1653,6 +1654,7 @@
         <stl-vector type-name='int32_t' name='viewing_unid'/>
         <stl-vector type-name='int32_t' name='viewing_itid'/>
         <int32_t name='viewing_bldid'/>
+        <stl-vector type-name='int32_t' name='viewing_vermin_combined_id' comment='creature_handler.list_creature/list_cache'/>
         <int32_t name='viewing_x'/>
         <int32_t name='viewing_y'/>
         <int32_t name='viewing_z'/>
@@ -1660,6 +1662,9 @@
         <int32_t name='scroll_position'/>
         <bool name='scrolling'/>
 
+        <int32_t name='vermin_portrait_texpos'/>
+        <compound name='vermin_text' type-name='curses_text_boxst'/>
+
         <stl-vector type-name='view_sheet_type' name='tab'/>
         <stl-vector type-name='int32_t' name='tab_id'/>
         <int32_t name='active_sub_tab'/>
diff --git a/df.g_src.graphics.xml b/df.g_src.graphics.xml
index d77afc45a3..4694f8849d 100644
--- a/df.g_src.graphics.xml
+++ b/df.g_src.graphics.xml
@@ -797,7 +797,7 @@
         <compound type-name='interface_setst' name='graphical_interface'/>
         <compound type-name='interface_setst' name='classic_interface'/>
 
-        <static-array type-name='int32_t' count='16976' name='texture_indices3'/>
+        <static-array type-name='int32_t' count='20192' name='texture_indices3'/>
         <stl-vector type-name='int32_t' name='texpos_boulder'/>
         <static-array type-name='int32_t' count='4508' name='texture_indices4'/>
         <static-array name='texpos_item_door_debris' count='4'><stl-vector type-name='int32_t'/></static-array>
diff --git a/df.itemdef.xml b/df.itemdef.xml
index 5e0dc2acbd..414ab08f87 100644
--- a/df.itemdef.xml
+++ b/df.itemdef.xml
@@ -123,7 +123,7 @@
 
     <bitfield-type type-name='item_weapon_graphics_flag' base-type='int32_t'> bay12: ITEM_WEAPON_GRAPHICS_FLAG_*
         <flag-bit name='material_color_index' count='8'/>
-        <flag-bit name='type' count='6' type-name='item_weapon_graphics_type'/>
+        <flag-bit name='type' count='5' type-name='item_weapon_graphics_type'/>
         <flag-bit name='wood'/>
         <flag-bit name='wood_grown'/>
         <flag-bit name='stone'/>