diff --git a/include/berry_data.h b/include/berry_data.h
index 49f6033cf2..07d0698c54 100644
--- a/include/berry_data.h
+++ b/include/berry_data.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_BERRY_DATA_H
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_berry_data_decl.h"
 
 #define FIRMNESS_VERY_SOFT     1
diff --git a/include/item.h b/include/item.h
index 60e08c181b..9ced56764f 100644
--- a/include/item.h
+++ b/include/item.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_UNK_0207CDEC_H
 #define POKEPLATINUM_UNK_0207CDEC_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_itemdata_decl.h"
 
 typedef struct ItemPartyParam {
diff --git a/include/overlay006/ov6_022489E4.h b/include/overlay006/ov6_022489E4.h
index 3121e75561..4f208da876 100644
--- a/include/overlay006/ov6_022489E4.h
+++ b/include/overlay006/ov6_022489E4.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV6_022489E4_H
 #define POKEPLATINUM_OV6_022489E4_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 #include "struct_defs/struct_020954F0.h"
 #include "struct_defs/struct_02095C48.h"
diff --git a/include/overlay007/struct_ov7_0224D008.h b/include/overlay007/struct_ov7_0224D008.h
index e9e20253c0..d03e297c05 100644
--- a/include/overlay007/struct_ov7_0224D008.h
+++ b/include/overlay007/struct_ov7_0224D008.h
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020203AC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_decls/struct_0202B628_decl.h"
diff --git a/include/overlay008/ov8_02249960.h b/include/overlay008/ov8_02249960.h
index b7ad173bae..b96ac37ea2 100644
--- a/include/overlay008/ov8_02249960.h
+++ b/include/overlay008/ov8_02249960.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV8_02249960_H
 
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "struct_defs/struct_0205AA50.h"
 
diff --git a/include/overlay010/struct_ov10_0221F800.h b/include/overlay010/struct_ov10_0221F800.h
index 2bab3f9e6f..f310ffaaca 100644
--- a/include/overlay010/struct_ov10_0221F800.h
+++ b/include/overlay010/struct_ov10_0221F800.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV10_0221F800_H
 #define POKEPLATINUM_STRUCT_OV10_0221F800_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_party_decl.h"
 #include "overlay006/battle_params.h"
 
diff --git a/include/overlay013/struct_ov13_022213F0.h b/include/overlay013/struct_ov13_022213F0.h
index 7868188d33..f5ea9e93ff 100644
--- a/include/overlay013/struct_ov13_022213F0.h
+++ b/include/overlay013/struct_ov13_022213F0.h
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_0200D0F4_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay013/struct_ov13_0221FC20.h"
 #include "overlay013/struct_ov13_02221ED0.h"
diff --git a/include/overlay013/struct_ov13_02227244.h b/include/overlay013/struct_ov13_02227244.h
index 5e799b5b62..05b65f9218 100644
--- a/include/overlay013/struct_ov13_02227244.h
+++ b/include/overlay013/struct_ov13_02227244.h
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_0200D0F4_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0207CDEC.h"
 #include "overlay013/struct_ov13_022264F4.h"
diff --git a/include/overlay016/ov16_0223DF00.h b/include/overlay016/ov16_0223DF00.h
index b1f9127499..c81cf31564 100644
--- a/include/overlay016/ov16_0223DF00.h
+++ b/include/overlay016/ov16_0223DF00.h
@@ -11,7 +11,7 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02015F84_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02026324_decl.h"
 #include "struct_defs/struct_020279FC.h"
diff --git a/include/overlay017/ov17_0223F118.h b/include/overlay017/ov17_0223F118.h
index 4b58c70f35..e4346497af 100644
--- a/include/overlay017/ov17_0223F118.h
+++ b/include/overlay017/ov17_0223F118.h
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02012744_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0207C690.h"
 #include "struct_defs/struct_02095C48.h"
 #include "overlay017/struct_ov17_0223F2E4.h"
diff --git a/include/overlay017/struct_ov17_0223F88C.h b/include/overlay017/struct_ov17_0223F88C.h
index d3f7580915..f59fad8961 100644
--- a/include/overlay017/struct_ov17_0223F88C.h
+++ b/include/overlay017/struct_ov17_0223F88C.h
@@ -11,7 +11,7 @@
 #include "struct_decls/struct_0200D0F4_decl.h"
 #include "struct_decls/struct_02012744_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02095C48_sub1.h"
 #include "overlay012/struct_ov12_0221FCDC_decl.h"
diff --git a/include/overlay017/struct_ov17_022476F8.h b/include/overlay017/struct_ov17_022476F8.h
index 219dba63e3..f1b818c589 100644
--- a/include/overlay017/struct_ov17_022476F8.h
+++ b/include/overlay017/struct_ov17_022476F8.h
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_0200D0F4_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02095C48_sub1.h"
 #include "overlay016/struct_ov16_0223E0C8.h"
diff --git a/include/overlay017/struct_ov17_0224A1EC.h b/include/overlay017/struct_ov17_0224A1EC.h
index 5897376976..f0263c1c60 100644
--- a/include/overlay017/struct_ov17_0224A1EC.h
+++ b/include/overlay017/struct_ov17_0224A1EC.h
@@ -12,7 +12,7 @@
 #include "struct_decls/struct_02012744_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02095C48_sub1.h"
 #include "overlay016/struct_ov16_0223E0C8.h"
diff --git a/include/overlay017/struct_ov17_022507C4.h b/include/overlay017/struct_ov17_022507C4.h
index 43cf69baa1..4ef5f9f2e4 100644
--- a/include/overlay017/struct_ov17_022507C4.h
+++ b/include/overlay017/struct_ov17_022507C4.h
@@ -12,7 +12,7 @@
 #include "struct_decls/struct_02012744_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02095C48_sub1.h"
 #include "overlay016/struct_ov16_0223E0C8.h"
diff --git a/include/overlay019/struct_ov19_021D4F5C.h b/include/overlay019/struct_ov19_021D4F5C.h
index c6f67ee078..f9c8f7eb3f 100644
--- a/include/overlay019/struct_ov19_021D4F5C.h
+++ b/include/overlay019/struct_ov19_021D4F5C.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV19_021D4F5C_H
 #define POKEPLATINUM_STRUCT_OV19_021D4F5C_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 typedef struct {
     u8 unk_00;
diff --git a/include/overlay019/struct_ov19_021D5BAC.h b/include/overlay019/struct_ov19_021D5BAC.h
index 82e6b411bf..8832480ae9 100644
--- a/include/overlay019/struct_ov19_021D5BAC.h
+++ b/include/overlay019/struct_ov19_021D5BAC.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV19_021D5BAC_H
 #define POKEPLATINUM_STRUCT_OV19_021D5BAC_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 typedef struct {
     void * unk_00;
diff --git a/include/overlay019/struct_ov19_021D5FAC.h b/include/overlay019/struct_ov19_021D5FAC.h
index 29f8c473a9..208271c33d 100644
--- a/include/overlay019/struct_ov19_021D5FAC.h
+++ b/include/overlay019/struct_ov19_021D5FAC.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV19_021D5FAC_H
 #define POKEPLATINUM_STRUCT_OV19_021D5FAC_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 typedef struct {
     void * unk_00;
diff --git a/include/overlay019/struct_ov19_021DA9E0.h b/include/overlay019/struct_ov19_021DA9E0.h
index e8037b6122..4fae266e4d 100644
--- a/include/overlay019/struct_ov19_021DA9E0.h
+++ b/include/overlay019/struct_ov19_021DA9E0.h
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
diff --git a/include/overlay019/struct_ov19_021DB6F0.h b/include/overlay019/struct_ov19_021DB6F0.h
index 9ea2681fd4..e0112200e8 100644
--- a/include/overlay019/struct_ov19_021DB6F0.h
+++ b/include/overlay019/struct_ov19_021DB6F0.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
diff --git a/include/overlay019/struct_ov19_021DBA9C.h b/include/overlay019/struct_ov19_021DBA9C.h
index 4ca2a0ec45..03147b28c5 100644
--- a/include/overlay019/struct_ov19_021DBA9C.h
+++ b/include/overlay019/struct_ov19_021DBA9C.h
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
diff --git a/include/overlay020/ov20_021D0D80.h b/include/overlay020/ov20_021D0D80.h
index 4938426cdf..9dcf0fe964 100644
--- a/include/overlay020/ov20_021D0D80.h
+++ b/include/overlay020/ov20_021D0D80.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV20_021D0D80_H
 
 #include "struct_decls/struct_020067E8_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay020/struct_ov20_021D16E8_decl.h"
 
 int ov20_021D0D80(UnkStruct_020067E8 * param0, int * param1);
diff --git a/include/overlay020/ov20_021D5044.h b/include/overlay020/ov20_021D5044.h
index e4a869ac72..d611648ebd 100644
--- a/include/overlay020/ov20_021D5044.h
+++ b/include/overlay020/ov20_021D5044.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV20_021D5044_H
 #define POKEPLATINUM_OV20_021D5044_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 u32 ov20_021D5044(void);
 void ov20_021D5048(u32 param0, Strbuf *param1);
diff --git a/include/overlay021/ov21_021D0D80.h b/include/overlay021/ov21_021D0D80.h
index 3b730c2db3..226d7bc7e1 100644
--- a/include/overlay021/ov21_021D0D80.h
+++ b/include/overlay021/ov21_021D0D80.h
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
 #include "struct_defs/union_02022594_020225E0.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay021/struct_ov21_021D0D80_1.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
diff --git a/include/overlay021/ov21_021D3208.h b/include/overlay021/ov21_021D3208.h
index 4126b6dd16..dcc8a3f907 100644
--- a/include/overlay021/ov21_021D3208.h
+++ b/include/overlay021/ov21_021D3208.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV21_021D3208_H
 #define POKEPLATINUM_OV21_021D3208_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay021/struct_ov21_021D3208.h"
 #include "overlay021/struct_ov21_021D3320.h"
 #include "overlay021/struct_ov21_021D37DC.h"
diff --git a/include/overlay021/ov21_021D4C0C.h b/include/overlay021/ov21_021D4C0C.h
index 520949008c..c8e047bd10 100644
--- a/include/overlay021/ov21_021D4C0C.h
+++ b/include/overlay021/ov21_021D4C0C.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV21_021D4C0C_H
 #define POKEPLATINUM_OV21_021D4C0C_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay021/struct_ov21_021D1FA4.h"
 #include "overlay021/struct_ov21_021D4C0C_decl.h"
diff --git a/include/overlay021/ov21_021D5600.h b/include/overlay021/ov21_021D5600.h
index fce92ace7e..02b6c0be1e 100644
--- a/include/overlay021/ov21_021D5600.h
+++ b/include/overlay021/ov21_021D5600.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV21_021D5600_H
 #define POKEPLATINUM_OV21_021D5600_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 void ov21_021D5600(Strbuf *param0);
 int ov21_021D5608(int param0);
diff --git a/include/overlay021/struct_ov21_021D3320.h b/include/overlay021/struct_ov21_021D3320.h
index 8bdef2ca71..ff978fe62f 100644
--- a/include/overlay021/struct_ov21_021D3320.h
+++ b/include/overlay021/struct_ov21_021D3320.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV21_021D3320_H
 #define POKEPLATINUM_STRUCT_OV21_021D3320_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02026324_decl.h"
 #include "struct_decls/struct_02098700_decl.h"
 #include "overlay021/struct_ov21_021D3A60.h"
diff --git a/include/overlay022/struct_ov22_0225A428.h b/include/overlay022/struct_ov22_0225A428.h
index 253968c880..b722dad7a1 100644
--- a/include/overlay022/struct_ov22_0225A428.h
+++ b/include/overlay022/struct_ov22_0225A428.h
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay022/struct_ov22_022597BC.h"
 #include "overlay022/struct_ov22_0225A914.h"
diff --git a/include/overlay023/ov23_0223E140.h b/include/overlay023/ov23_0223E140.h
index a14c262ce2..47492968ec 100644
--- a/include/overlay023/ov23_0223E140.h
+++ b/include/overlay023/ov23_0223E140.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV23_0223E140_H
 #define POKEPLATINUM_OV23_0223E140_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "overlay023/struct_ov23_0224271C_decl.h"
 
diff --git a/include/overlay023/ov23_022416A8.h b/include/overlay023/ov23_022416A8.h
index 237078de8c..6d94914a5a 100644
--- a/include/overlay023/ov23_022416A8.h
+++ b/include/overlay023/ov23_022416A8.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV23_022416A8_H
 #define POKEPLATINUM_OV23_022416A8_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "overlay023/struct_ov23_02241A80.h"
 #include "overlay023/struct_ov23_02241A88.h"
diff --git a/include/overlay023/ov23_02241F74.h b/include/overlay023/ov23_02241F74.h
index 156898f0d2..acdd8e50b7 100644
--- a/include/overlay023/ov23_02241F74.h
+++ b/include/overlay023/ov23_02241F74.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV23_02241F74_H
 
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02029894_decl.h"
 #include "struct_decls/struct_0203CDB0_decl.h"
diff --git a/include/overlay023/ov23_0224340C.h b/include/overlay023/ov23_0224340C.h
index 16e29f5888..6e65dfbe84 100644
--- a/include/overlay023/ov23_0224340C.h
+++ b/include/overlay023/ov23_0224340C.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV23_0224340C_H
 
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "overlay023/struct_ov23_0224271C_decl.h"
 
diff --git a/include/overlay023/ov23_0224B05C.h b/include/overlay023/ov23_0224B05C.h
index 7231900cf0..a0283518e3 100644
--- a/include/overlay023/ov23_0224B05C.h
+++ b/include/overlay023/ov23_0224B05C.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV23_0224B05C_H
 #define POKEPLATINUM_OV23_0224B05C_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02029894_decl.h"
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
diff --git a/include/overlay023/struct_ov23_02250CD4.h b/include/overlay023/struct_ov23_02250CD4.h
index 2074e61100..e59433d890 100644
--- a/include/overlay023/struct_ov23_02250CD4.h
+++ b/include/overlay023/struct_ov23_02250CD4.h
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_0200D0F4_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0206A844.h"
diff --git a/include/overlay062/funcptr_ov62_022349A8.h b/include/overlay062/funcptr_ov62_022349A8.h
index 27291a3a6f..9707ba5edc 100644
--- a/include/overlay062/funcptr_ov62_022349A8.h
+++ b/include/overlay062/funcptr_ov62_022349A8.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_FUNCPTR_OV62_022349A8_H
 #define POKEPLATINUM_FUNCPTR_OV62_022349A8_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 typedef void (* UnkFuncPtr_ov62_022349A8)(void *, Strbuf *);
 
diff --git a/include/overlay062/ov62_02231690.h b/include/overlay062/ov62_02231690.h
index ad23e99974..093d7d039f 100644
--- a/include/overlay062/ov62_02231690.h
+++ b/include/overlay062/ov62_02231690.h
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_0200D0F4_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202F41C_decl.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0208B878.h"
diff --git a/include/overlay062/struct_ov62_022349A8.h b/include/overlay062/struct_ov62_022349A8.h
index 1e1f3f0057..a3de144acf 100644
--- a/include/overlay062/struct_ov62_022349A8.h
+++ b/include/overlay062/struct_ov62_022349A8.h
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay061/struct_ov61_0222B138.h"
 #include "overlay061/struct_ov61_0222B920.h"
diff --git a/include/overlay062/struct_ov62_02246B00.h b/include/overlay062/struct_ov62_02246B00.h
index eeab7e70ee..deb008758d 100644
--- a/include/overlay062/struct_ov62_02246B00.h
+++ b/include/overlay062/struct_ov62_02246B00.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV62_02246B00_H
 #define POKEPLATINUM_STRUCT_OV62_02246B00_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_020279FC.h"
 
 typedef struct {
diff --git a/include/overlay065/struct_ov65_0222EBE0_t.h b/include/overlay065/struct_ov65_0222EBE0_t.h
index 6badc12e2a..f8bc8b5f6d 100644
--- a/include/overlay065/struct_ov65_0222EBE0_t.h
+++ b/include/overlay065/struct_ov65_0222EBE0_t.h
@@ -12,7 +12,7 @@
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202B370_decl.h"
 #include "struct_defs/struct_0205AA50.h"
diff --git a/include/overlay066/ov66_0223177C.h b/include/overlay066/ov66_0223177C.h
index f0a0df12b4..8eb2ddc343 100644
--- a/include/overlay066/ov66_0223177C.h
+++ b/include/overlay066/ov66_0223177C.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV66_0223177C_H
 #define POKEPLATINUM_OV66_0223177C_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay066/struct_ov66_02231428.h"
 #include "overlay066/struct_ov66_0223177C_decl.h"
 #include "overlay066/struct_ov66_0223185C.h"
diff --git a/include/overlay070/ov70_0225D9A4.h b/include/overlay070/ov70_0225D9A4.h
index a14fbcc91d..6f41e5c25d 100644
--- a/include/overlay070/ov70_0225D9A4.h
+++ b/include/overlay070/ov70_0225D9A4.h
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_020067E8_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay066/struct_ov66_0222DFF8_decl.h"
 #include "overlay070/struct_ov70_0225C894_decl.h"
 #include "overlay070/struct_ov70_0225CA20_decl.h"
diff --git a/include/overlay071/ov71_0223C69C.h b/include/overlay071/ov71_0223C69C.h
index a783d0ded0..353734c4b1 100644
--- a/include/overlay071/ov71_0223C69C.h
+++ b/include/overlay071/ov71_0223C69C.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV71_0223C69C_H
 
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02072014.h"
 
diff --git a/include/overlay071/struct_ov71_0223B620.h b/include/overlay071/struct_ov71_0223B620.h
index b0cfc349ca..4c18a715bd 100644
--- a/include/overlay071/struct_ov71_0223B620.h
+++ b/include/overlay071/struct_ov71_0223B620.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_OV71_0223B620_H
 
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02072014.h"
 #include "overlay071/struct_ov71_0223C444.h"
diff --git a/include/overlay072/struct_ov72_0223DB98_t.h b/include/overlay072/struct_ov72_0223DB98_t.h
index 9133023227..d2f3a68bd3 100644
--- a/include/overlay072/struct_ov72_0223DB98_t.h
+++ b/include/overlay072/struct_ov72_0223DB98_t.h
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_decls/struct_0202CD88_decl.h"
 #include "struct_defs/struct_0205AA50.h"
diff --git a/include/overlay079/struct_ov79_021D0E1C_sub1.h b/include/overlay079/struct_ov79_021D0E1C_sub1.h
index 07fd06a5fd..f237799b1c 100644
--- a/include/overlay079/struct_ov79_021D0E1C_sub1.h
+++ b/include/overlay079/struct_ov79_021D0E1C_sub1.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_OV79_021D0E1C_SUB1_H
 
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 typedef struct {
     UnkStruct_0200B358 * unk_00;
diff --git a/include/overlay079/struct_ov79_021D38D0.h b/include/overlay079/struct_ov79_021D38D0.h
index c0e2543797..08ca59b6f4 100644
--- a/include/overlay079/struct_ov79_021D38D0.h
+++ b/include/overlay079/struct_ov79_021D38D0.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV79_021D38D0_H
 #define POKEPLATINUM_STRUCT_OV79_021D38D0_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 
 typedef struct {
diff --git a/include/overlay080/struct_ov80_021D2A08.h b/include/overlay080/struct_ov80_021D2A08.h
index 339a40ffe4..87f5e501ff 100644
--- a/include/overlay080/struct_ov80_021D2A08.h
+++ b/include/overlay080/struct_ov80_021D2A08.h
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_0200D0F4_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02039EBC_decl.h"
 #include "struct_defs/struct_0203D8AC.h"
 #include "overlay080/struct_ov80_021D259C.h"
diff --git a/include/overlay081/struct_ov81_021D1610.h b/include/overlay081/struct_ov81_021D1610.h
index 98919c27a9..136fd5803a 100644
--- a/include/overlay081/struct_ov81_021D1610.h
+++ b/include/overlay081/struct_ov81_021D1610.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202B628_decl.h"
 #include "struct_defs/struct_0205AA50.h"
diff --git a/include/overlay083/struct_ov83_0223DEA0.h b/include/overlay083/struct_ov83_0223DEA0.h
index 3b2a791d12..59f23a9f88 100644
--- a/include/overlay083/struct_ov83_0223DEA0.h
+++ b/include/overlay083/struct_ov83_0223DEA0.h
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 typedef struct {
     UnkStruct_0200B144 * unk_00;
diff --git a/include/overlay084/struct_ov84_0223B5A0.h b/include/overlay084/struct_ov84_0223B5A0.h
index f74d99f457..97e55af0b5 100644
--- a/include/overlay084/struct_ov84_0223B5A0.h
+++ b/include/overlay084/struct_ov84_0223B5A0.h
@@ -12,7 +12,7 @@
 #include "struct_decls/struct_0200D0F4_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_defs/struct_0205AA50.h"
diff --git a/include/overlay087/struct_ov87_021D1640.h b/include/overlay087/struct_ov87_021D1640.h
index deaf7a52c0..36f6543b26 100644
--- a/include/overlay087/struct_ov87_021D1640.h
+++ b/include/overlay087/struct_ov87_021D1640.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV87_021D1640_H
 #define POKEPLATINUM_STRUCT_OV87_021D1640_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 typedef struct {
     Strbuf* unk_00;
diff --git a/include/overlay088/ov88_0223E9C4.h b/include/overlay088/ov88_0223E9C4.h
index fac1b5dc6a..b11632bff1 100644
--- a/include/overlay088/ov88_0223E9C4.h
+++ b/include/overlay088/ov88_0223E9C4.h
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_defs/struct_0205AA50.h"
 
diff --git a/include/overlay092/ov92_021D0D80.h b/include/overlay092/ov92_021D0D80.h
index 7c1851eff9..04d006d8df 100644
--- a/include/overlay092/ov92_021D0D80.h
+++ b/include/overlay092/ov92_021D0D80.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV92_021D0D80_H
 
 #include "struct_decls/struct_020067E8_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 int ov92_021D0D80(UnkStruct_020067E8 * param0, int * param1);
 int ov92_021D0EB8(UnkStruct_020067E8 * param0, int * param1);
diff --git a/include/overlay094/ov94_02244950.h b/include/overlay094/ov94_02244950.h
index 68580a25f1..919018dbd2 100644
--- a/include/overlay094/ov94_02244950.h
+++ b/include/overlay094/ov94_02244950.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV94_02244950_H
 
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay094/struct_ov94_0223FD4C_decl.h"
 
diff --git a/include/overlay094/struct_ov94_0223FD4C.h b/include/overlay094/struct_ov94_0223FD4C.h
index 48f78b3dcf..63a1e30791 100644
--- a/include/overlay094/struct_ov94_0223FD4C.h
+++ b/include/overlay094/struct_ov94_0223FD4C.h
@@ -14,7 +14,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202B370_decl.h"
 #include "struct_defs/struct_0203E0FC.h"
diff --git a/include/overlay094/struct_ov94_0223FD4C_sub3.h b/include/overlay094/struct_ov94_0223FD4C_sub3.h
index ff37b3de6c..7c8abe73df 100644
--- a/include/overlay094/struct_ov94_0223FD4C_sub3.h
+++ b/include/overlay094/struct_ov94_0223FD4C_sub3.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV94_0223FD4C_SUB3_H
 #define POKEPLATINUM_STRUCT_OV94_0223FD4C_SUB3_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 typedef struct {
     Strbuf **unk_00;
diff --git a/include/overlay096/ov96_0223BCE0.h b/include/overlay096/ov96_0223BCE0.h
index 07f4dbd49c..01dc796474 100644
--- a/include/overlay096/ov96_0223BCE0.h
+++ b/include/overlay096/ov96_0223BCE0.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV96_0223BCE0_H
 #define POKEPLATINUM_OV96_0223BCE0_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay096/struct_ov96_0223BF40_decl.h"
 
diff --git a/include/overlay096/struct_ov96_0223BF40_t.h b/include/overlay096/struct_ov96_0223BF40_t.h
index 25b49462f5..a9682475ab 100644
--- a/include/overlay096/struct_ov96_0223BF40_t.h
+++ b/include/overlay096/struct_ov96_0223BF40_t.h
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0206BC70.h"
 #include "struct_defs/box_pokemon.h"
diff --git a/include/overlay097/struct_ov97_0222D04C.h b/include/overlay097/struct_ov97_0222D04C.h
index 451e94d28b..d9d77783e6 100644
--- a/include/overlay097/struct_ov97_0222D04C.h
+++ b/include/overlay097/struct_ov97_0222D04C.h
@@ -11,7 +11,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_decls/struct_021C0794_decl.h"
diff --git a/include/overlay098/ov98_022499C8.h b/include/overlay098/ov98_022499C8.h
index afe9aac361..3d428784b7 100644
--- a/include/overlay098/ov98_022499C8.h
+++ b/include/overlay098/ov98_022499C8.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV98_022499C8_H
 #define POKEPLATINUM_OV98_022499C8_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 void ov98_022499C8(Strbuf *param0, char * param1, int param2);
 void ov98_02249A80(void);
diff --git a/include/overlay098/struct_ov98_02246E88.h b/include/overlay098/struct_ov98_02246E88.h
index c031659539..750b4f5776 100644
--- a/include/overlay098/struct_ov98_02246E88.h
+++ b/include/overlay098/struct_ov98_02246E88.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_OV98_02246E88_H
 
 #include "struct_decls/struct_020067E8_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay096/struct_ov96_0223B574.h"
diff --git a/include/overlay104/struct_ov104_022320B4_t.h b/include/overlay104/struct_ov104_022320B4_t.h
index 448289c7f3..c840c085ce 100644
--- a/include/overlay104/struct_ov104_022320B4_t.h
+++ b/include/overlay104/struct_ov104_022320B4_t.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02001AF4_decl.h"
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_decls/struct_0209B75C_decl.h"
 #include "overlay104/struct_ov104_0222E8C8.h"
diff --git a/include/overlay109/struct_ov109_021D5140.h b/include/overlay109/struct_ov109_021D5140.h
index 80bd382fea..466731e8a9 100644
--- a/include/overlay109/struct_ov109_021D5140.h
+++ b/include/overlay109/struct_ov109_021D5140.h
@@ -11,7 +11,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0209BDF8.h"
diff --git a/include/overlay117/ov117_02263AF0.h b/include/overlay117/ov117_02263AF0.h
index d29e2cac8e..c8d6663bc9 100644
--- a/include/overlay117/ov117_02263AF0.h
+++ b/include/overlay117/ov117_02263AF0.h
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_0200D0F4_decl.h"
 #include "struct_decls/struct_02012744_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay117/struct_ov117_02261280_decl.h"
 #include "overlay117/struct_ov117_02263DAC.h"
 #include "overlay117/struct_ov117_02264E84.h"
diff --git a/include/overlay117/struct_ov117_02261280.h b/include/overlay117/struct_ov117_02261280.h
index 13910b4254..e95f7db60c 100644
--- a/include/overlay117/struct_ov117_02261280.h
+++ b/include/overlay117/struct_ov117_02261280.h
@@ -11,7 +11,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020203AC_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0207C690.h"
 #include "overlay114/struct_ov114_0225CAD4_decl.h"
diff --git a/include/strbuf.h b/include/strbuf.h
index b746cfcca2..8a3b43b124 100644
--- a/include/strbuf.h
+++ b/include/strbuf.h
@@ -1,14 +1,12 @@
 #ifndef POKEPLATINUM_STRBUF_H
 #define POKEPLATINUM_STRBUF_H
 
-#include "struct_decls/struct_02023790_decl.h"
-
 typedef u16 charcode_t;
 
 /**
  * Managed string buffer.
  */
-struct Strbuf {
+typedef struct Strbuf {
     /// Maximum allocated size of the buffer.
     u16 maxSize;
 
@@ -24,7 +22,7 @@ struct Strbuf {
     /// incorrectly in order to match the original byte-code. The correct
     /// definition method would be as `data[]`.
     charcode_t data[1];
-};
+} Strbuf;
 
 /**
  * Control codes for how to pad numeric strings.
diff --git a/include/struct_defs/struct_020158A8.h b/include/struct_defs/struct_020158A8.h
index fc03cb7e71..a6a66a40a4 100644
--- a/include/struct_defs/struct_020158A8.h
+++ b/include/struct_defs/struct_020158A8.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_020158A8_H
 
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 typedef struct {
     UnkStruct_0200B144 * unk_00;
diff --git a/include/struct_defs/struct_0201D738.h b/include/struct_defs/struct_0201D738.h
index eab8fcebff..4125c030c2 100644
--- a/include/struct_defs/struct_0201D738.h
+++ b/include/struct_defs/struct_0201D738.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_0201D738_H
 #define POKEPLATINUM_STRUCT_0201D738_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 
 typedef struct {
diff --git a/include/struct_defs/struct_0202EE10_sub1.h b/include/struct_defs/struct_0202EE10_sub1.h
index b3a1351579..abdde39d86 100644
--- a/include/struct_defs/struct_0202EE10_sub1.h
+++ b/include/struct_defs/struct_0202EE10_sub1.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_0202EE10_SUB1_H
 #define POKEPLATINUM_STRUCT_0202EE10_SUB1_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 typedef struct {
     u32 unk_00;
diff --git a/include/struct_defs/struct_0205C924.h b/include/struct_defs/struct_0205C924.h
index 9940e82b5e..76d8e62158 100644
--- a/include/struct_defs/struct_0205C924.h
+++ b/include/struct_defs/struct_0205C924.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_0205C924_H
 
 #include "struct_defs/struct_02014A84.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 typedef struct {
     Strbuf* unk_00;
diff --git a/include/struct_defs/struct_0207ADB4_t.h b/include/struct_defs/struct_0207ADB4_t.h
index 266b3837d5..e9ed9ae52d 100644
--- a/include/struct_defs/struct_0207ADB4_t.h
+++ b/include/struct_defs/struct_0207ADB4_t.h
@@ -11,7 +11,7 @@
 #include "struct_decls/struct_02015F84_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02026324_decl.h"
 #include "struct_defs/struct_020279FC.h"
diff --git a/include/struct_defs/struct_0207AE68_t.h b/include/struct_defs/struct_0207AE68_t.h
index e0c49f76eb..27bcad4f18 100644
--- a/include/struct_defs/struct_0207AE68_t.h
+++ b/include/struct_defs/struct_0207AE68_t.h
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02015F84_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02026324_decl.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_decls/struct_0202CD88_decl.h"
diff --git a/include/struct_defs/struct_0207F248.h b/include/struct_defs/struct_0207F248.h
index 041e5fa8d1..5891e69562 100644
--- a/include/struct_defs/struct_0207F248.h
+++ b/include/struct_defs/struct_0207F248.h
@@ -11,7 +11,7 @@
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0207C690.h"
 #include "functypes/funcptr_0207F248.h"
diff --git a/include/struct_defs/struct_020831B4.h b/include/struct_defs/struct_020831B4.h
index b6fbfdb1d8..6e23ead896 100644
--- a/include/struct_defs/struct_020831B4.h
+++ b/include/struct_defs/struct_020831B4.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_020831B4_H
 
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 typedef struct {
     Strbuf* unk_00;
diff --git a/include/struct_defs/struct_0208737C.h b/include/struct_defs/struct_0208737C.h
index b900378a41..10a4bfb088 100644
--- a/include/struct_defs/struct_0208737C.h
+++ b/include/struct_defs/struct_0208737C.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_0208737C_H
 #define POKEPLATINUM_STRUCT_0208737C_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_decls/struct_020797DC_decl.h"
 
diff --git a/include/struct_defs/struct_02089438.h b/include/struct_defs/struct_02089438.h
index 057745b8d5..f5f5518315 100644
--- a/include/struct_defs/struct_02089438.h
+++ b/include/struct_defs/struct_02089438.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_02089438_H
 #define POKEPLATINUM_STRUCT_02089438_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_020279FC.h"
 
 typedef struct {
diff --git a/include/struct_defs/struct_0208D1D4.h b/include/struct_defs/struct_0208D1D4.h
index b5d3b550bf..0938e460b6 100644
--- a/include/struct_defs/struct_0208D1D4.h
+++ b/include/struct_defs/struct_0208D1D4.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_0208D1D4_H
 #define POKEPLATINUM_STRUCT_0208D1D4_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 typedef struct {
     Strbuf* unk_00;
diff --git a/include/struct_defs/struct_0208D7BC.h b/include/struct_defs/struct_0208D7BC.h
index 894be36ca2..f2105e3aa8 100644
--- a/include/struct_defs/struct_0208D7BC.h
+++ b/include/struct_defs/struct_0208D7BC.h
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_0200D0F4_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0208D1D4.h"
 #include "struct_defs/struct_0208D7BC_sub1.h"
diff --git a/include/struct_defs/struct_02090800_sub1.h b/include/struct_defs/struct_02090800_sub1.h
index d84a068725..74baf68cdc 100644
--- a/include/struct_defs/struct_02090800_sub1.h
+++ b/include/struct_defs/struct_02090800_sub1.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_02090800_SUB1_H
 #define POKEPLATINUM_STRUCT_02090800_SUB1_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 typedef struct {
     int unk_00;
diff --git a/include/struct_defs/struct_02093800.h b/include/struct_defs/struct_02093800.h
index d30e23510d..415923f0ba 100644
--- a/include/struct_defs/struct_02093800.h
+++ b/include/struct_defs/struct_02093800.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_02093800_H
 #define POKEPLATINUM_STRUCT_02093800_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_decls/struct_0202A750_decl.h"
diff --git a/include/struct_defs/struct_02095C48_sub1.h b/include/struct_defs/struct_02095C48_sub1.h
index 34602a8f74..be2ef96b0e 100644
--- a/include/struct_defs/struct_02095C48_sub1.h
+++ b/include/struct_defs/struct_02095C48_sub1.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_02095C48_SUB1_H
 #define POKEPLATINUM_STRUCT_02095C48_SUB1_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02029C88_decl.h"
 #include "struct_defs/pokemon.h"
 #include "struct_defs/struct_020954F0.h"
diff --git a/include/struct_defs/struct_02095E80_t.h b/include/struct_defs/struct_02095E80_t.h
index fd8ac8b491..7f0700c4f2 100644
--- a/include/struct_defs/struct_02095E80_t.h
+++ b/include/struct_defs/struct_02095E80_t.h
@@ -15,7 +15,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_02027F8C.h"
 #include "struct_decls/struct_02027F8C_decl.h"
 #include "struct_decls/struct_0202B370_decl.h"
diff --git a/include/struct_defs/struct_02095EAC_t.h b/include/struct_defs/struct_02095EAC_t.h
index fb55df320d..3e4ef3a3b1 100644
--- a/include/struct_defs/struct_02095EAC_t.h
+++ b/include/struct_defs/struct_02095EAC_t.h
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_defs/struct_0203DDFC.h"
 #include "struct_defs/struct_0205AA50.h"
diff --git a/include/struct_defs/struct_020961E8_t.h b/include/struct_defs/struct_020961E8_t.h
index 76896cbda3..c3581965d1 100644
--- a/include/struct_defs/struct_020961E8_t.h
+++ b/include/struct_defs/struct_020961E8_t.h
@@ -11,7 +11,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_defs/struct_0203DE34.h"
 #include "struct_defs/struct_0205AA50.h"
diff --git a/include/struct_defs/struct_020978D8.h b/include/struct_defs/struct_020978D8.h
index 12db258b81..347ac75ac0 100644
--- a/include/struct_defs/struct_020978D8.h
+++ b/include/struct_defs/struct_020978D8.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_020978D8_H
 
 #include "struct_defs/struct_02014A84.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_defs/union_02028328.h"
 
diff --git a/include/unk_02002B7C.h b/include/unk_02002B7C.h
index 782f198d49..b09846ac09 100644
--- a/include/unk_02002B7C.h
+++ b/include/unk_02002B7C.h
@@ -3,7 +3,7 @@
 
 #include "struct_defs/struct_02002328.h"
 #include "struct_defs/struct_0201D834.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 void sub_02002B7C(void);
 void sub_02002BB8(int param0, u32 param1);
diff --git a/include/unk_0200AC5C.h b/include/unk_0200AC5C.h
index 3022f291cf..ca77f187d3 100644
--- a/include/unk_0200AC5C.h
+++ b/include/unk_0200AC5C.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_0200AC5C_decl.h"
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 UnkStruct_0200AC5C * sub_0200AC5C(u32 param0, u32 param1, u32 param2);
 void sub_0200AC64(UnkStruct_0200AC5C * param0);
diff --git a/include/unk_0200B29C.h b/include/unk_0200B29C.h
index 69587efe31..b40a0a6a07 100644
--- a/include/unk_0200B29C.h
+++ b/include/unk_0200B29C.h
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 Strbuf* sub_0200B29C(UnkStruct_0200B358 * param0, UnkStruct_0200B144 * param1, u32 param2, u32 param3);
 Strbuf* sub_0200B2EC(u32 param0, u32 param1);
diff --git a/include/unk_0200B358.h b/include/unk_0200B358.h
index 3dfa9e4806..3fd6c07471 100644
--- a/include/unk_0200B358.h
+++ b/include/unk_0200B358.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_UNK_0200B358_H
 
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_defs/box_pokemon.h"
 #include "struct_decls/struct_020797DC_decl.h"
diff --git a/include/unk_02013A04.h b/include/unk_02013A04.h
index 3bd23d0090..df53c9542f 100644
--- a/include/unk_02013A04.h
+++ b/include/unk_02013A04.h
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 UnkStruct_02013A04 * sub_02013A04(u32 param0, u32 param1);
 void sub_02013A3C(UnkStruct_02013A04 * param0);
diff --git a/include/unk_02014A84.h b/include/unk_02014A84.h
index e50816e075..5d122efacf 100644
--- a/include/unk_02014A84.h
+++ b/include/unk_02014A84.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_UNK_02014A84_H
 
 #include "struct_defs/struct_02014A84.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 void sub_02014A84(UnkStruct_02014A84 * param0);
 void sub_02014A9C(UnkStruct_02014A84 * param0, u32 param1);
diff --git a/include/unk_02014D38.h b/include/unk_02014D38.h
index a80775cd36..0bdc719eb7 100644
--- a/include/unk_02014D38.h
+++ b/include/unk_02014D38.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02014D38_decl.h"
 #include "struct_decls/struct_02014EC4_decl.h"
 #include "struct_decls/struct_02014FB0_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 UnkStruct_02014D38 * sub_02014D38(u32 param0);
diff --git a/include/unk_020158A8.h b/include/unk_020158A8.h
index 9d767bd4c7..a6e5d77d98 100644
--- a/include/unk_020158A8.h
+++ b/include/unk_020158A8.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_UNK_020158A8_H
 
 #include "struct_defs/struct_020158A8.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 UnkStruct_020158A8 * sub_020158A8(int param0);
 void sub_020158F4(UnkStruct_020158A8 * param0);
diff --git a/include/unk_0201D670.h b/include/unk_0201D670.h
index 7b468a9fa1..7158b15377 100644
--- a/include/unk_0201D670.h
+++ b/include/unk_0201D670.h
@@ -5,7 +5,7 @@
 #include "struct_defs/struct_0201D738.h"
 #include "struct_defs/struct_0201D834.h"
 #include "functypes/funcptr_0201D834.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 
 void sub_0201D670(const UnkStruct_0201D670 * param0);
diff --git a/include/unk_02025E68.h b/include/unk_02025E68.h
index 6115ec424b..3d2b98ec6f 100644
--- a/include/unk_02025E68.h
+++ b/include/unk_02025E68.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_UNK_02025E68_H
 #define POKEPLATINUM_UNK_02025E68_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 
 int sub_02025E68(void);
diff --git a/include/unk_0202602C.h b/include/unk_0202602C.h
index 22192e57c5..78271e1789 100644
--- a/include/unk_0202602C.h
+++ b/include/unk_0202602C.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_UNK_0202602C_H
 #define POKEPLATINUM_UNK_0202602C_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02026030_decl.h"
 #include "struct_defs/struct_0202610C.h"
 #include "struct_decls/struct_021C0794_decl.h"
diff --git a/include/unk_02026150.h b/include/unk_02026150.h
index e6b1980ae1..b66cc968fb 100644
--- a/include/unk_02026150.h
+++ b/include/unk_02026150.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_UNK_02026150_H
 #define POKEPLATINUM_UNK_02026150_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_0202610C.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
diff --git a/include/unk_020277A4.h b/include/unk_020277A4.h
index b03f9316d7..7fda67bacb 100644
--- a/include/unk_020277A4.h
+++ b/include/unk_020277A4.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_UNK_020277A4_H
 
 #include "struct_defs/struct_02014A84.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202783C_decl.h"
 #include "struct_decls/struct_02027854_decl.h"
 #include "struct_decls/struct_02027860_decl.h"
diff --git a/include/unk_020298BC.h b/include/unk_020298BC.h
index 3368008456..3c56b27799 100644
--- a/include/unk_020298BC.h
+++ b/include/unk_020298BC.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_UNK_020298BC_H
 #define POKEPLATINUM_UNK_020298BC_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_020298D8.h"
 #include "struct_decls/struct_02029C68_decl.h"
 #include "struct_decls/struct_02029C88_decl.h"
diff --git a/include/unk_0202ACE0.h b/include/unk_0202ACE0.h
index d21b04a24c..e2ea98d0ed 100644
--- a/include/unk_0202ACE0.h
+++ b/include/unk_0202ACE0.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_UNK_0202ACE0_H
 #define POKEPLATINUM_UNK_0202ACE0_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202B370_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
diff --git a/include/unk_0202B37C.h b/include/unk_0202B37C.h
index 18b2ea640a..73cb24596b 100644
--- a/include/unk_0202B37C.h
+++ b/include/unk_0202B37C.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_UNK_0202B37C_H
 #define POKEPLATINUM_UNK_0202B37C_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202B4A0_decl.h"
 #include "struct_defs/struct_0202B510.h"
 #include "struct_decls/struct_021C0794_decl.h"
diff --git a/include/unk_02030A80.h b/include/unk_02030A80.h
index 8b5251484b..5c19699c72 100644
--- a/include/unk_02030A80.h
+++ b/include/unk_02030A80.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_UNK_02030A80_H
 
 #include "struct_defs/struct_02014A84.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02030A80_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
diff --git a/include/unk_0205D8CC.h b/include/unk_0205D8CC.h
index 477abeb4fa..89c6c11bc7 100644
--- a/include/unk_0205D8CC.h
+++ b/include/unk_0205D8CC.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_UNK_0205D8CC_H
 
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_defs/struct_0205AA50.h"
 
diff --git a/include/unk_02071CFC.h b/include/unk_02071CFC.h
index e5e8f2eae2..de03a7dbbb 100644
--- a/include/unk_02071CFC.h
+++ b/include/unk_02071CFC.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_UNK_02071CFC_H
 
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 u32 sub_02071CFC(UnkStruct_0200B144 * param0, const int param1, Strbuf *param2);
 void sub_02071D10(const int param0, const u32 param1, Strbuf *param2);
diff --git a/include/unk_02079170.h b/include/unk_02079170.h
index d927f9b234..9bcd536874 100644
--- a/include/unk_02079170.h
+++ b/include/unk_02079170.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_UNK_02079170_H
 #define POKEPLATINUM_UNK_02079170_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/trainer_data.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay006/battle_params.h"
diff --git a/include/unk_020797C8.h b/include/unk_020797C8.h
index 85c4df9aa1..7f4cadb620 100644
--- a/include/unk_020797C8.h
+++ b/include/unk_020797C8.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_UNK_020797C8_H
 #define POKEPLATINUM_UNK_020797C8_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/box_pokemon.h"
 #include "struct_decls/struct_020797DC_decl.h"
 
diff --git a/include/unk_0207CB08.h b/include/unk_0207CB08.h
index 0b9117c7b4..1b5ef0b2dc 100644
--- a/include/unk_0207CB08.h
+++ b/include/unk_0207CB08.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_UNK_0207CB08_H
 #define POKEPLATINUM_UNK_0207CB08_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0207CB08_decl.h"
 #include "struct_defs/struct_0207CDEC.h"
 #include "struct_decls/struct_021C0794_decl.h"
diff --git a/include/unk_020998EC.h b/include/unk_020998EC.h
index 7aed081c8c..4290de3415 100644
--- a/include/unk_020998EC.h
+++ b/include/unk_020998EC.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_UNK_020998EC_H
 #define POKEPLATINUM_UNK_020998EC_H
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0209747C_decl.h"
 #include "struct_decls/struct_020998EC_decl.h"
 
diff --git a/src/berry_data.c b/src/berry_data.c
index b706a8fbc9..509c810dbd 100644
--- a/src/berry_data.c
+++ b/src/berry_data.c
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "narc.h"
 #include "unk_0200AC5C.h"
diff --git a/src/error_message_reset.c b/src/error_message_reset.c
index 539d242829..db05d5c54a 100644
--- a/src/error_message_reset.c
+++ b/src/error_message_reset.c
@@ -5,7 +5,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_02017E74.h"
 #include "struct_defs/struct_0205AA50.h"
diff --git a/src/item.c b/src/item.c
index 6db98a6d11..e5ed9d15fa 100644
--- a/src/item.c
+++ b/src/item.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0207CDEC.h"
 
diff --git a/src/overlay005/ov5_021DC018.c b/src/overlay005/ov5_021DC018.c
index 024b14d14d..0005b11f63 100644
--- a/src/overlay005/ov5_021DC018.c
+++ b/src/overlay005/ov5_021DC018.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay005/struct_ov5_021DC1A4_decl.h"
 
 #include "struct_defs/struct_02013A04_t.h"
diff --git a/src/overlay005/ov5_021DD42C.c b/src/overlay005/ov5_021DD42C.c
index 89d0475e73..9290b969ba 100644
--- a/src/overlay005/ov5_021DD42C.c
+++ b/src/overlay005/ov5_021DD42C.c
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0203E724_decl.h"
 
 #include "struct_defs/struct_02014A84.h"
diff --git a/src/overlay005/ov5_021DD6FC.c b/src/overlay005/ov5_021DD6FC.c
index 2350bafc3f..b9c7aac480 100644
--- a/src/overlay005/ov5_021DD6FC.c
+++ b/src/overlay005/ov5_021DD6FC.c
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0203CDB0.h"
 #include "struct_defs/struct_0203CDB0_sub2_t.h"
diff --git a/src/overlay005/ov5_021E1D20.c b/src/overlay005/ov5_021E1D20.c
index edbfbd0c9e..19ebe93de6 100644
--- a/src/overlay005/ov5_021E1D20.c
+++ b/src/overlay005/ov5_021E1D20.c
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E5C_decl.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02026324_decl.h"
diff --git a/src/overlay005/ov5_021E2338.c b/src/overlay005/ov5_021E2338.c
index 81af612259..35585f048d 100644
--- a/src/overlay005/ov5_021E2338.c
+++ b/src/overlay005/ov5_021E2338.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020203AC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "overlay005/struct_ov5_021DDF74_decl.h"
 #include "overlay005/struct_ov5_021DE374_decl.h"
diff --git a/src/overlay005/ov5_021E622C.c b/src/overlay005/ov5_021E622C.c
index 0d5d733953..87e27f49b8 100644
--- a/src/overlay005/ov5_021E622C.c
+++ b/src/overlay005/ov5_021E622C.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02026218_decl.h"
 #include "struct_decls/struct_02026224_decl.h"
diff --git a/src/overlay005/ov5_021EA874.c b/src/overlay005/ov5_021EA874.c
index 8fc8af51fb..a879db9888 100644
--- a/src/overlay005/ov5_021EA874.c
+++ b/src/overlay005/ov5_021EA874.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202B370_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
diff --git a/src/overlay005/ov5_021F08CC.c b/src/overlay005/ov5_021F08CC.c
index b6a46d6feb..d673cee100 100644
--- a/src/overlay005/ov5_021F08CC.c
+++ b/src/overlay005/ov5_021F08CC.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202CD88_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_decls/struct_0205E884_decl.h"
diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c
index e2dac64ee7..eb4564a427 100644
--- a/src/overlay005/ov5_021F6454.c
+++ b/src/overlay005/ov5_021F6454.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020216E0_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202783C_decl.h"
 #include "struct_decls/struct_0202C878_decl.h"
 #include "struct_decls/struct_0202CD88_decl.h"
diff --git a/src/overlay005/ov5_021F77A8.c b/src/overlay005/ov5_021F77A8.c
index 0c7bc6ef25..3d3d99ca92 100644
--- a/src/overlay005/ov5_021F77A8.c
+++ b/src/overlay005/ov5_021F77A8.c
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0203E724_decl.h"
 #include "struct_defs/pokemon.h"
 #include "struct_decls/struct_0207D3C0_decl.h"
diff --git a/src/overlay006/ov6_02246184.c b/src/overlay006/ov6_02246184.c
index 10145101fb..d3de9315bd 100644
--- a/src/overlay006/ov6_02246184.c
+++ b/src/overlay006/ov6_02246184.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_defs/pokemon.h"
 #include "struct_decls/struct_party_decl.h"
diff --git a/src/overlay006/ov6_02247A0C.c b/src/overlay006/ov6_02247A0C.c
index 3182cba8e9..ee4ec18e68 100644
--- a/src/overlay006/ov6_02247A0C.c
+++ b/src/overlay006/ov6_02247A0C.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
diff --git a/src/overlay006/ov6_022489E4.c b/src/overlay006/ov6_022489E4.c
index 780669e2c2..aa1d9a4d48 100644
--- a/src/overlay006/ov6_022489E4.c
+++ b/src/overlay006/ov6_022489E4.c
@@ -1,7 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 
 #include "struct_defs/struct_020954F0.h"
diff --git a/src/overlay007/ov7_02249960.c b/src/overlay007/ov7_02249960.c
index d254219329..4737477f08 100644
--- a/src/overlay007/ov7_02249960.c
+++ b/src/overlay007/ov7_02249960.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 
 #include "struct_defs/struct_02013A04_t.h"
diff --git a/src/overlay007/ov7_0224B4E8.c b/src/overlay007/ov7_0224B4E8.c
index b7cd0d040b..4dc5deedb3 100644
--- a/src/overlay007/ov7_0224B4E8.c
+++ b/src/overlay007/ov7_0224B4E8.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_02098700_decl.h"
diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c
index cd5c514b1d..47bb7dde9e 100644
--- a/src/overlay007/ov7_0224BE9C.c
+++ b/src/overlay007/ov7_0224BE9C.c
@@ -14,7 +14,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02029D04_decl.h"
 #include "struct_decls/struct_0207D3C0_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c
index fef957b5cb..63ae2910fb 100644
--- a/src/overlay007/ov7_0224CD28.c
+++ b/src/overlay007/ov7_0224CD28.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202CD88_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_decls/struct_0207D3C0_decl.h"
diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c
index 38c3d8ce12..96d4a9309d 100644
--- a/src/overlay008/ov8_02249960.c
+++ b/src/overlay008/ov8_02249960.c
@@ -5,7 +5,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02027860_decl.h"
 #include "struct_decls/struct_020507E4_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c
index 2a693b7736..05d8fc6faf 100644
--- a/src/overlay010/ov10_0221F800.c
+++ b/src/overlay010/ov10_0221F800.c
@@ -17,7 +17,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020203AC_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_defs/pokemon.h"
 #include "struct_decls/struct_party_decl.h"
diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c
index 77ad419062..3e8590b45b 100644
--- a/src/overlay013/ov13_0221FC20.c
+++ b/src/overlay013/ov13_0221FC20.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0207ADB4_decl.h"
 
 #include "struct_defs/union_02022594_020225E0.h"
diff --git a/src/overlay013/ov13_02221A88.c b/src/overlay013/ov13_02221A88.c
index 0c725e910e..fa5b425a3a 100644
--- a/src/overlay013/ov13_02221A88.c
+++ b/src/overlay013/ov13_02221A88.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 
 #include "struct_defs/struct_0205AA50.h"
diff --git a/src/overlay013/ov13_022264F4.c b/src/overlay013/ov13_022264F4.c
index c4fe1e16b8..4019e22609 100644
--- a/src/overlay013/ov13_022264F4.c
+++ b/src/overlay013/ov13_022264F4.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 #include "struct_decls/struct_020797DC_decl.h"
 #include "struct_decls/struct_party_decl.h"
diff --git a/src/overlay013/ov13_02227288.c b/src/overlay013/ov13_02227288.c
index 06e3a573fd..86ff12195e 100644
--- a/src/overlay013/ov13_02227288.c
+++ b/src/overlay013/ov13_02227288.c
@@ -1,7 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay013/struct_ov13_02227244.h"
diff --git a/src/overlay016/ov16_0223B140.c b/src/overlay016/ov16_0223B140.c
index 5e0f401b65..bda876af42 100644
--- a/src/overlay016/ov16_0223B140.c
+++ b/src/overlay016/ov16_0223B140.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0207ADB4_decl.h"
 #include "struct_decls/struct_0207AE68_decl.h"
 #include "battle/battle_context.h"
diff --git a/src/overlay016/ov16_0223DF00.c b/src/overlay016/ov16_0223DF00.c
index 64bd09af0b..013bf71815 100644
--- a/src/overlay016/ov16_0223DF00.c
+++ b/src/overlay016/ov16_0223DF00.c
@@ -13,7 +13,7 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02015F84_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02026324_decl.h"
 #include "struct_decls/struct_0202CC84_decl.h"
diff --git a/src/overlay016/ov16_022405FC.c b/src/overlay016/ov16_022405FC.c
index 42bd4457c6..e543f4c81d 100644
--- a/src/overlay016/ov16_022405FC.c
+++ b/src/overlay016/ov16_022405FC.c
@@ -12,7 +12,7 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_020797DC_decl.h"
 #include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207ADB4_decl.h"
diff --git a/src/overlay016/ov16_0225177C.c b/src/overlay016/ov16_0225177C.c
index 44460560b5..fb0e125394 100644
--- a/src/overlay016/ov16_0225177C.c
+++ b/src/overlay016/ov16_0225177C.c
@@ -1,7 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_defs/pokemon.h"
 #include "struct_decls/struct_party_decl.h"
diff --git a/src/overlay016/ov16_02266F1C.c b/src/overlay016/ov16_02266F1C.c
index 5a71797e52..12ebac8d03 100644
--- a/src/overlay016/ov16_02266F1C.c
+++ b/src/overlay016/ov16_02266F1C.c
@@ -13,7 +13,7 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 #include "struct_defs/box_pokemon.h"
 
diff --git a/src/overlay016/ov16_0226871C.c b/src/overlay016/ov16_0226871C.c
index 94d300f682..fcde35af01 100644
--- a/src/overlay016/ov16_0226871C.c
+++ b/src/overlay016/ov16_0226871C.c
@@ -17,7 +17,7 @@
 #include "struct_decls/struct_02012CE0_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 #include "struct_defs/box_pokemon.h"
 #include "struct_decls/struct_0207ADB4_decl.h"
diff --git a/src/overlay017/ov17_0223F118.c b/src/overlay017/ov17_0223F118.c
index 3ec3b3ffab..6c25001ff5 100644
--- a/src/overlay017/ov17_0223F118.c
+++ b/src/overlay017/ov17_0223F118.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_02012CE0_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0200D0F4.h"
 #include "struct_defs/struct_020127E8.h"
diff --git a/src/overlay017/ov17_0223F7E4.c b/src/overlay017/ov17_0223F7E4.c
index ecdc4be321..9e4dc009b8 100644
--- a/src/overlay017/ov17_0223F7E4.c
+++ b/src/overlay017/ov17_0223F7E4.c
@@ -12,7 +12,7 @@
 #include "struct_decls/struct_02012CE0_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay017/struct_ov17_02252B48_decl.h"
 
 #include "struct_defs/struct_0200D0F4.h"
diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c
index 4d3498965b..390ad85b16 100644
--- a/src/overlay017/ov17_022413D8.c
+++ b/src/overlay017/ov17_022413D8.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "overlay017/const_ov17_022536B4.h"
 
diff --git a/src/overlay017/ov17_022476F8.c b/src/overlay017/ov17_022476F8.c
index ebe8bed119..6cff2fa788 100644
--- a/src/overlay017/ov17_022476F8.c
+++ b/src/overlay017/ov17_022476F8.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_02008A90.h"
 #include "struct_defs/struct_0200D0F4.h"
diff --git a/src/overlay017/ov17_022492DC.c b/src/overlay017/ov17_022492DC.c
index cc438e6900..6dba6a0de8 100644
--- a/src/overlay017/ov17_022492DC.c
+++ b/src/overlay017/ov17_022492DC.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_02012CE0_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0200D0F4.h"
 #include "struct_defs/struct_020127E8.h"
diff --git a/src/overlay017/ov17_0224A0FC.c b/src/overlay017/ov17_0224A0FC.c
index 0d06329916..4d5bb7e3fe 100644
--- a/src/overlay017/ov17_0224A0FC.c
+++ b/src/overlay017/ov17_0224A0FC.c
@@ -12,7 +12,7 @@
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay022/struct_ov22_0225B1BC_decl.h"
 
 #include "struct_defs/struct_0200D0F4.h"
diff --git a/src/overlay017/ov17_02250744.c b/src/overlay017/ov17_02250744.c
index 796cfb8058..33209b5350 100644
--- a/src/overlay017/ov17_02250744.c
+++ b/src/overlay017/ov17_02250744.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_02007C7C_decl.h"
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0200D0F4.h"
 #include "struct_defs/struct_02095C48.h"
diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c
index f4ac1678a5..9c9cc3700d 100644
--- a/src/overlay019/ov19_021DA92C.c
+++ b/src/overlay019/ov19_021DA92C.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 
 #include "struct_defs/struct_02008A90.h"
diff --git a/src/overlay019/ov19_021DCF88.c b/src/overlay019/ov19_021DCF88.c
index d360447f8c..752fd4bbd3 100644
--- a/src/overlay019/ov19_021DCF88.c
+++ b/src/overlay019/ov19_021DCF88.c
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DCF88_decl.h"
 
diff --git a/src/overlay019/ov19_021DEC04.c b/src/overlay019/ov19_021DEC04.c
index f65bc976e5..c3a482a55a 100644
--- a/src/overlay019/ov19_021DEC04.c
+++ b/src/overlay019/ov19_021DEC04.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/box_pokemon.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DEC04_decl.h"
diff --git a/src/overlay020/ov20_021D0D80.c b/src/overlay020/ov20_021D0D80.c
index d415b9f9f4..7c1ece450a 100644
--- a/src/overlay020/ov20_021D0D80.c
+++ b/src/overlay020/ov20_021D0D80.c
@@ -4,7 +4,7 @@
 #include "data_021BF67C.h"
 
 #include "struct_decls/struct_020067E8_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "struct_decls/struct_0209747C_decl.h"
 #include "struct_decls/struct_020998EC_decl.h"
diff --git a/src/overlay020/ov20_021D2EA4.c b/src/overlay020/ov20_021D2EA4.c
index 8fb5fce992..10ae927794 100644
--- a/src/overlay020/ov20_021D2EA4.c
+++ b/src/overlay020/ov20_021D2EA4.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_020149F0_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_020998EC_decl.h"
 #include "overlay020/struct_ov20_021D16E8_decl.h"
 #include "overlay020/struct_ov20_021D2128_decl.h"
diff --git a/src/overlay020/ov20_021D3864.c b/src/overlay020/ov20_021D3864.c
index eace32ca4e..325db652ab 100644
--- a/src/overlay020/ov20_021D3864.c
+++ b/src/overlay020/ov20_021D3864.c
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_020998EC_decl.h"
 #include "overlay020/struct_ov20_021D16E8_decl.h"
 #include "overlay020/struct_ov20_021D2128_decl.h"
diff --git a/src/overlay020/ov20_021D3A54.c b/src/overlay020/ov20_021D3A54.c
index 41c5844bcc..65c0b16622 100644
--- a/src/overlay020/ov20_021D3A54.c
+++ b/src/overlay020/ov20_021D3A54.c
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_020998EC_decl.h"
 #include "overlay020/struct_ov20_021D16E8_decl.h"
 #include "overlay020/struct_ov20_021D2128_decl.h"
diff --git a/src/overlay020/ov20_021D40E8.c b/src/overlay020/ov20_021D40E8.c
index 6daf2893f4..eaca41a905 100644
--- a/src/overlay020/ov20_021D40E8.c
+++ b/src/overlay020/ov20_021D40E8.c
@@ -5,7 +5,7 @@
 
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_020998EC_decl.h"
 #include "overlay020/struct_ov20_021D16E8_decl.h"
 #include "overlay020/struct_ov20_021D2128_decl.h"
diff --git a/src/overlay020/ov20_021D4728.c b/src/overlay020/ov20_021D4728.c
index 96e432021d..a2fb0ab74a 100644
--- a/src/overlay020/ov20_021D4728.c
+++ b/src/overlay020/ov20_021D4728.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_020998EC_decl.h"
 #include "overlay020/struct_ov20_021D16E8_decl.h"
 #include "overlay020/struct_ov20_021D2128_decl.h"
diff --git a/src/overlay020/ov20_021D5044.c b/src/overlay020/ov20_021D5044.c
index c9649fa07d..eb3f71500c 100644
--- a/src/overlay020/ov20_021D5044.c
+++ b/src/overlay020/ov20_021D5044.c
@@ -1,7 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "strbuf.h"
 #include "overlay020/ov20_021D5044.h"
diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c
index 07f555c241..8834cdc187 100644
--- a/src/overlay021/ov21_021D0D80.c
+++ b/src/overlay021/ov21_021D0D80.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0209ACBC_decl.h"
 #include "overlay021/struct_ov21_021D3FE0_decl.h"
 #include "overlay021/struct_ov21_021D423C_decl.h"
diff --git a/src/overlay021/ov21_021D3208.c b/src/overlay021/ov21_021D3208.c
index cfc6571fce..5affd72206 100644
--- a/src/overlay021/ov21_021D3208.c
+++ b/src/overlay021/ov21_021D3208.c
@@ -3,7 +3,7 @@
 
 #include "data_021BF67C.h"
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02026324_decl.h"
 
 #include "overlay021/struct_ov21_021D3208.h"
diff --git a/src/overlay021/ov21_021D4C0C.c b/src/overlay021/ov21_021D4C0C.c
index 4566044902..0f2cf13816 100644
--- a/src/overlay021/ov21_021D4C0C.c
+++ b/src/overlay021/ov21_021D4C0C.c
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_02012744_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_020127E8.h"
 #include "struct_defs/struct_0205AA50.h"
diff --git a/src/overlay021/ov21_021D5600.c b/src/overlay021/ov21_021D5600.c
index 0c12bcfa0f..bc2bd17884 100644
--- a/src/overlay021/ov21_021D5600.c
+++ b/src/overlay021/ov21_021D5600.c
@@ -4,7 +4,7 @@
 #include "inlines.h"
 
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "unk_0200AC5C.h"
 #include "unk_0200B29C.h"
diff --git a/src/overlay021/ov21_021D5AEC.c b/src/overlay021/ov21_021D5AEC.c
index cd0946e7a9..47afa1672b 100644
--- a/src/overlay021/ov21_021D5AEC.c
+++ b/src/overlay021/ov21_021D5AEC.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
diff --git a/src/overlay021/ov21_021D85B0.c b/src/overlay021/ov21_021D85B0.c
index 6520d5d201..6074bc3161 100644
--- a/src/overlay021/ov21_021D85B0.c
+++ b/src/overlay021/ov21_021D85B0.c
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_02007C7C_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "overlay019/struct_ov19_021DA864.h"
diff --git a/src/overlay021/ov21_021DE668.c b/src/overlay021/ov21_021DE668.c
index 9ed7837cee..978d0ac1f0 100644
--- a/src/overlay021/ov21_021DE668.c
+++ b/src/overlay021/ov21_021DE668.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021D4C0C_decl.h"
 
diff --git a/src/overlay021/ov21_021E0C68.c b/src/overlay021/ov21_021E0C68.c
index 1d9dcb2b8f..926a4f16a7 100644
--- a/src/overlay021/ov21_021E0C68.c
+++ b/src/overlay021/ov21_021E0C68.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
diff --git a/src/overlay021/ov21_021E6014.c b/src/overlay021/ov21_021E6014.c
index 00e289e3de..7b62b071e7 100644
--- a/src/overlay021/ov21_021E6014.c
+++ b/src/overlay021/ov21_021E6014.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "overlay019/struct_ov19_021DA864.h"
diff --git a/src/overlay021/ov21_021E737C.c b/src/overlay021/ov21_021E737C.c
index c8e74f3009..be737053be 100644
--- a/src/overlay021/ov21_021E737C.c
+++ b/src/overlay021/ov21_021E737C.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_02015214_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "overlay019/struct_ov19_021DA864.h"
diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c
index aaa5e7d354..cea51f0c6f 100644
--- a/src/overlay021/ov21_021E8D48.c
+++ b/src/overlay021/ov21_021E8D48.c
@@ -12,7 +12,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 #include "overlay021/struct_ov21_021D4C0C_decl.h"
 
diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c
index 5b11c6c600..e6f6f1a14d 100644
--- a/src/overlay022/ov22_02255D44.c
+++ b/src/overlay022/ov22_02255D44.c
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02015920_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02029C68_decl.h"
 #include "struct_decls/struct_02029C88_decl.h"
diff --git a/src/overlay022/ov22_02259C58.c b/src/overlay022/ov22_02259C58.c
index a09259cf82..82e662eef4 100644
--- a/src/overlay022/ov22_02259C58.c
+++ b/src/overlay022/ov22_02259C58.c
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02012744_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_020127E8.h"
 #include "struct_defs/union_02022594_020225E0.h"
diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c
index 521aa65fb5..42832d7903 100644
--- a/src/overlay022/ov22_0225A428.c
+++ b/src/overlay022/ov22_0225A428.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_020279FC.h"
 #include "struct_defs/struct_0205AA50.h"
diff --git a/src/overlay022/ov22_0225B660.c b/src/overlay022/ov22_0225B660.c
index 381e2cf1b7..1c40305274 100644
--- a/src/overlay022/ov22_0225B660.c
+++ b/src/overlay022/ov22_0225B660.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02029C68_decl.h"
 #include "struct_decls/struct_02029C88_decl.h"
 #include "struct_defs/pokemon.h"
diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c
index cb15efd90b..8f81054bd8 100644
--- a/src/overlay023/ov23_0223E140.c
+++ b/src/overlay023/ov23_0223E140.c
@@ -12,7 +12,7 @@
 #include "struct_decls/struct_020203AC_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202855C_decl.h"
 #include "struct_decls/struct_020298B0_decl.h"
diff --git a/src/overlay023/ov23_022416A8.c b/src/overlay023/ov23_022416A8.c
index a81ef20f5c..f8f1f7e76e 100644
--- a/src/overlay023/ov23_022416A8.c
+++ b/src/overlay023/ov23_022416A8.c
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_020298B0_decl.h"
 
 #include "struct_defs/struct_0203CDB0.h"
diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c
index 1cec3f6b5b..602be16eba 100644
--- a/src/overlay023/ov23_02241F74.c
+++ b/src/overlay023/ov23_02241F74.c
@@ -5,7 +5,7 @@
 
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02029894_decl.h"
 #include "struct_decls/struct_020298B0_decl.h"
diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c
index e0202346fc..b764c71d1c 100644
--- a/src/overlay023/ov23_0224340C.c
+++ b/src/overlay023/ov23_0224340C.c
@@ -11,7 +11,7 @@
 #include "struct_decls/struct_020203AC_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202855C_decl.h"
 #include "struct_decls/struct_020298B0_decl.h"
diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c
index aef08306f0..ef5e3393d8 100644
--- a/src/overlay023/ov23_02248F1C.c
+++ b/src/overlay023/ov23_02248F1C.c
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0205E884_decl.h"
 #include "overlay023/struct_ov23_0224942C_decl.h"
 
diff --git a/src/overlay023/ov23_0224A1D0.c b/src/overlay023/ov23_0224A1D0.c
index 5bfa66984b..2ff22b4ac8 100644
--- a/src/overlay023/ov23_0224A1D0.c
+++ b/src/overlay023/ov23_0224A1D0.c
@@ -3,7 +3,7 @@
 #include <nnsys/g3d/glbstate.h>
 
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202855C_decl.h"
 #include "struct_decls/struct_020507E4_decl.h"
diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c
index a46e27ce09..fb9ccc308b 100644
--- a/src/overlay023/ov23_0224B05C.c
+++ b/src/overlay023/ov23_0224B05C.c
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202855C_decl.h"
 #include "struct_decls/struct_02029894_decl.h"
diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c
index 2c31567015..0967867b6d 100644
--- a/src/overlay023/ov23_0224F294.c
+++ b/src/overlay023/ov23_0224F294.c
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_020298B0_decl.h"
 #include "struct_decls/struct_0207D3C0_decl.h"
diff --git a/src/overlay023/ov23_02253598.c b/src/overlay023/ov23_02253598.c
index 207b038a77..10d72a2a26 100644
--- a/src/overlay023/ov23_02253598.c
+++ b/src/overlay023/ov23_02253598.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202855C_decl.h"
 #include "struct_decls/struct_020298B0_decl.h"
diff --git a/src/overlay023/ov23_02253D40.c b/src/overlay023/ov23_02253D40.c
index b519e81d28..f2d952a73a 100644
--- a/src/overlay023/ov23_02253D40.c
+++ b/src/overlay023/ov23_02253D40.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "overlay023/struct_ov23_02253E2C_decl.h"
 
diff --git a/src/overlay023/ov23_022542CC.c b/src/overlay023/ov23_022542CC.c
index a687dcdf83..77ee032c16 100644
--- a/src/overlay023/ov23_022542CC.c
+++ b/src/overlay023/ov23_022542CC.c
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_020298B0_decl.h"
 #include "overlay023/struct_ov23_022542D8_decl.h"
 #include "overlay023/struct_ov23_02254594_decl.h"
diff --git a/src/overlay043/ov43_02256544.c b/src/overlay043/ov43_02256544.c
index 5b51ab683d..19d1675b13 100644
--- a/src/overlay043/ov43_02256544.c
+++ b/src/overlay043/ov43_02256544.c
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay025/struct_ov25_02255224_decl.h"
 #include "overlay025/struct_ov25_022555E8_decl.h"
 #include "overlay025/struct_ov25_022558C4_decl.h"
diff --git a/src/overlay048/ov48_0225650C.c b/src/overlay048/ov48_0225650C.c
index 693e8487c4..3414e6f454 100644
--- a/src/overlay048/ov48_0225650C.c
+++ b/src/overlay048/ov48_0225650C.c
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay025/struct_ov25_02255224_decl.h"
 #include "overlay025/struct_ov25_022555E8_decl.h"
 #include "overlay025/struct_ov25_022558C4_decl.h"
diff --git a/src/overlay052/ov52_02256694.c b/src/overlay052/ov52_02256694.c
index 281fee11a3..677b5b388c 100644
--- a/src/overlay052/ov52_02256694.c
+++ b/src/overlay052/ov52_02256694.c
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay025/struct_ov25_02255224_decl.h"
 #include "overlay025/struct_ov25_022555E8_decl.h"
 #include "overlay025/struct_ov25_022558C4_decl.h"
diff --git a/src/overlay054/ov54_0225642C.c b/src/overlay054/ov54_0225642C.c
index 9175bc85f4..aeed17a208 100644
--- a/src/overlay054/ov54_0225642C.c
+++ b/src/overlay054/ov54_0225642C.c
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay025/struct_ov25_02255224_decl.h"
 #include "overlay025/struct_ov25_022555E8_decl.h"
 #include "overlay025/struct_ov25_022558C4_decl.h"
diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c
index fa0753025f..9c4e7464cf 100644
--- a/src/overlay056/ov56_022561C0.c
+++ b/src/overlay056/ov56_022561C0.c
@@ -11,7 +11,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02027F8C_decl.h"
 #include "struct_decls/struct_0205B43C_decl.h"
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index 2e901ac0de..f9aab67f38 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02095EAC_decl.h"
 
diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c
index a903e51443..ed0f9362be 100644
--- a/src/overlay059/ov59_021D0D80.c
+++ b/src/overlay059/ov59_021D0D80.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_020961E8_decl.h"
 
diff --git a/src/overlay061/ov61_0222AE60.c b/src/overlay061/ov61_0222AE60.c
index c1cd54f0ca..6e3f04cee9 100644
--- a/src/overlay061/ov61_0222AE60.c
+++ b/src/overlay061/ov61_0222AE60.c
@@ -1,7 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02029C68_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
diff --git a/src/overlay061/ov61_0222B008.c b/src/overlay061/ov61_0222B008.c
index e3b02b2692..10156e88e5 100644
--- a/src/overlay061/ov61_0222B008.c
+++ b/src/overlay061/ov61_0222B008.c
@@ -4,7 +4,7 @@
 
 #include "data_021BF67C.h"
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E5C_decl.h"
 #include "struct_decls/struct_02029C68_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
diff --git a/src/overlay061/ov61_0222BF44.c b/src/overlay061/ov61_0222BF44.c
index 9c4fe64d8f..2f70428ede 100644
--- a/src/overlay061/ov61_0222BF44.c
+++ b/src/overlay061/ov61_0222BF44.c
@@ -13,7 +13,7 @@
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025CCC_decl.h"
 #include "struct_decls/struct_0202B370_decl.h"
 
diff --git a/src/overlay062/ov62_022300D8.c b/src/overlay062/ov62_022300D8.c
index c8a26a22ad..445b2b7f09 100644
--- a/src/overlay062/ov62_022300D8.c
+++ b/src/overlay062/ov62_022300D8.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0200D0F4.h"
 #include "struct_defs/struct_020127E8.h"
diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c
index 1269c35ef9..038d6073b2 100644
--- a/src/overlay062/ov62_02231690.c
+++ b/src/overlay062/ov62_02231690.c
@@ -13,7 +13,7 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202783C_decl.h"
 #include "struct_decls/struct_0202CD88_decl.h"
 #include "struct_decls/struct_0202F298_decl.h"
diff --git a/src/overlay062/ov62_02234A10.c b/src/overlay062/ov62_02234A10.c
index bf05f94d6a..3b955a3d34 100644
--- a/src/overlay062/ov62_02234A10.c
+++ b/src/overlay062/ov62_02234A10.c
@@ -3,7 +3,7 @@
 
 #include "overlay062/ov62_const_funcptr_tables.h"
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0208C06C.h"
diff --git a/src/overlay062/ov62_02235E64.c b/src/overlay062/ov62_02235E64.c
index 398705ec6c..72d9d64282 100644
--- a/src/overlay062/ov62_02235E64.c
+++ b/src/overlay062/ov62_02235E64.c
@@ -3,7 +3,7 @@
 
 #include "overlay062/ov62_const_funcptr_tables.h"
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 
 #include "struct_defs/union_02022594_020225E0.h"
diff --git a/src/overlay062/ov62_02237D24.c b/src/overlay062/ov62_02237D24.c
index 186ca70075..b5737cf7eb 100644
--- a/src/overlay062/ov62_02237D24.c
+++ b/src/overlay062/ov62_02237D24.c
@@ -4,7 +4,7 @@
 #include "overlay062/ov62_const_funcptr_tables.h"
 
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "struct_decls/struct_02026324_decl.h"
 #include "struct_decls/struct_02029C68_decl.h"
diff --git a/src/overlay062/ov62_02239D60.c b/src/overlay062/ov62_02239D60.c
index fb1d0c0e50..882113674c 100644
--- a/src/overlay062/ov62_02239D60.c
+++ b/src/overlay062/ov62_02239D60.c
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "struct_decls/struct_02075874_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
diff --git a/src/overlay062/ov62_0223CAEC.c b/src/overlay062/ov62_0223CAEC.c
index 0247596f6c..31e21b2710 100644
--- a/src/overlay062/ov62_0223CAEC.c
+++ b/src/overlay062/ov62_0223CAEC.c
@@ -5,7 +5,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 
 #include "struct_defs/union_02022594_020225E0.h"
diff --git a/src/overlay062/ov62_0223DFA8.c b/src/overlay062/ov62_0223DFA8.c
index 07335d8e26..de98314149 100644
--- a/src/overlay062/ov62_0223DFA8.c
+++ b/src/overlay062/ov62_0223DFA8.c
@@ -5,7 +5,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "struct_decls/struct_0202F41C_decl.h"
 
diff --git a/src/overlay062/ov62_02241204.c b/src/overlay062/ov62_02241204.c
index 29ce701564..e30e6c358d 100644
--- a/src/overlay062/ov62_02241204.c
+++ b/src/overlay062/ov62_02241204.c
@@ -7,7 +7,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "struct_decls/struct_02026324_decl.h"
 #include "struct_decls/struct_0202F41C_decl.h"
diff --git a/src/overlay062/ov62_02246B00.c b/src/overlay062/ov62_02246B00.c
index 2e41d1c5dc..66dc304565 100644
--- a/src/overlay062/ov62_02246B00.c
+++ b/src/overlay062/ov62_02246B00.c
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0200D0F4.h"
 #include "struct_defs/struct_020279FC.h"
diff --git a/src/overlay062/ov62_02247D74.c b/src/overlay062/ov62_02247D74.c
index 560db1526a..db8189e510 100644
--- a/src/overlay062/ov62_02247D74.c
+++ b/src/overlay062/ov62_02247D74.c
@@ -4,7 +4,7 @@
 #include "overlay062/ov62_const_funcptr_tables.h"
 
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/union_02022594_020225E0.h"
 #include "struct_defs/struct_02030A80.h"
diff --git a/src/overlay062/ov62_02248408.c b/src/overlay062/ov62_02248408.c
index a5d1022938..573f318bc1 100644
--- a/src/overlay062/ov62_02248408.c
+++ b/src/overlay062/ov62_02248408.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 #include "struct_defs/struct_0202F264.h"
diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c
index 9bd5994024..c483460f83 100644
--- a/src/overlay064/ov64_0222DCE0.c
+++ b/src/overlay064/ov64_0222DCE0.c
@@ -19,7 +19,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202B370_decl.h"
 #include "struct_decls/struct_0203068C_decl.h"
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index 32feb7a84c..c140530d10 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -13,7 +13,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02012B20_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02026324_decl.h"
 #include "struct_decls/struct_0202B370_decl.h"
diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c
index 855944bce5..a42a379c99 100644
--- a/src/overlay065/ov65_0223648C.c
+++ b/src/overlay065/ov65_0223648C.c
@@ -13,7 +13,7 @@
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202B628_decl.h"
 #include "overlay063/struct_ov63_0222BE18_decl.h"
diff --git a/src/overlay066/ov66_0222DDF0.c b/src/overlay066/ov66_0222DDF0.c
index b018268045..ce40d10d13 100644
--- a/src/overlay066/ov66_0222DDF0.c
+++ b/src/overlay066/ov66_0222DDF0.c
@@ -9,7 +9,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02014FB0_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02026324_decl.h"
 #include "struct_decls/struct_0202B628_decl.h"
diff --git a/src/overlay066/ov66_0223177C.c b/src/overlay066/ov66_0223177C.c
index 56dc106144..ec841a2dd8 100644
--- a/src/overlay066/ov66_0223177C.c
+++ b/src/overlay066/ov66_0223177C.c
@@ -5,7 +5,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 
 #include "overlay066/struct_ov66_02231428.h"
diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c
index 441155740a..331ede5d88 100644
--- a/src/overlay067/ov67_0225C700.c
+++ b/src/overlay067/ov67_0225C700.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202CD88_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay066/struct_ov66_0222E71C_decl.h"
diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c
index 500335d20e..5a1e594327 100644
--- a/src/overlay068/ov68_0225C700.c
+++ b/src/overlay068/ov68_0225C700.c
@@ -15,7 +15,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02030EC4_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c
index 7b8005e090..214824c921 100644
--- a/src/overlay069/ov69_0225C700.c
+++ b/src/overlay069/ov69_0225C700.c
@@ -15,7 +15,7 @@
 #include "struct_decls/struct_020203AC_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202C878_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c
index 1f15516ba1..be0170d153 100644
--- a/src/overlay070/ov70_0225D9A4.c
+++ b/src/overlay070/ov70_0225D9A4.c
@@ -18,7 +18,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
diff --git a/src/overlay070/ov70_022630A4.c b/src/overlay070/ov70_022630A4.c
index a574e1b7a5..ac3d01c3de 100644
--- a/src/overlay070/ov70_022630A4.c
+++ b/src/overlay070/ov70_022630A4.c
@@ -6,7 +6,7 @@
 
 #include "data_021BF67C.h"
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay066/struct_ov66_0222DFF8_decl.h"
 #include "overlay066/struct_ov66_0222E71C_decl.h"
 #include "overlay070/struct_ov70_0225C894_decl.h"
diff --git a/src/overlay070/ov70_02265F38.c b/src/overlay070/ov70_02265F38.c
index 7fedd6f756..9d153b137c 100644
--- a/src/overlay070/ov70_02265F38.c
+++ b/src/overlay070/ov70_02265F38.c
@@ -6,7 +6,7 @@
 
 #include "data_021BF67C.h"
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay066/struct_ov66_0222DFF8_decl.h"
 #include "overlay070/struct_ov70_0225CA20_decl.h"
 #include "overlay070/struct_ov70_0225CC54_decl.h"
diff --git a/src/overlay070/ov70_02266E9C.c b/src/overlay070/ov70_02266E9C.c
index 7a35ed6d92..828a696430 100644
--- a/src/overlay070/ov70_02266E9C.c
+++ b/src/overlay070/ov70_02266E9C.c
@@ -4,7 +4,7 @@
 #include <string.h>
 #include <dwc.h>
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay066/struct_ov66_0222DFF8_decl.h"
 #include "overlay066/struct_ov66_0222E71C_decl.h"
 #include "overlay070/struct_ov70_0225CA20_decl.h"
diff --git a/src/overlay070/ov70_0226CC74.c b/src/overlay070/ov70_0226CC74.c
index eb06971612..b356ec67e2 100644
--- a/src/overlay070/ov70_0226CC74.c
+++ b/src/overlay070/ov70_0226CC74.c
@@ -1,7 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay066/struct_ov66_0222DFF8_decl.h"
 #include "overlay070/struct_ov70_0225CA20_decl.h"
 #include "overlay070/struct_ov70_0225CC54_decl.h"
diff --git a/src/overlay071/ov71_0223C69C.c b/src/overlay071/ov71_0223C69C.c
index 1fb84bd00a..941f338c6e 100644
--- a/src/overlay071/ov71_0223C69C.c
+++ b/src/overlay071/ov71_0223C69C.c
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02072014.h"
diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c
index 5e658f2100..fa53ca394d 100644
--- a/src/overlay072/ov72_0223D7A0.c
+++ b/src/overlay072/ov72_0223D7A0.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_02015920_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202CD88_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay072/struct_ov72_0223DB98_decl.h"
diff --git a/src/overlay073/ov73_021D0D80.c b/src/overlay073/ov73_021D0D80.c
index 1c1c1a20e5..29335bd4f5 100644
--- a/src/overlay073/ov73_021D0D80.c
+++ b/src/overlay073/ov73_021D0D80.c
@@ -11,7 +11,7 @@
 #include "struct_decls/struct_02015920_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202783C_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
diff --git a/src/overlay073/ov73_021D3250.c b/src/overlay073/ov73_021D3250.c
index 1cb4718669..5b7cef9951 100644
--- a/src/overlay073/ov73_021D3250.c
+++ b/src/overlay073/ov73_021D3250.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_020067E8_decl.h"
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0208BE5C.h"
diff --git a/src/overlay074/ov74_021D0D80.c b/src/overlay074/ov74_021D0D80.c
index 01dd3018e1..f2bbe27c3f 100644
--- a/src/overlay074/ov74_021D0D80.c
+++ b/src/overlay074/ov74_021D0D80.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0200D0F4.h"
 #include "struct_defs/struct_020279FC.h"
diff --git a/src/overlay075/ov75_021D0D80.c b/src/overlay075/ov75_021D0D80.c
index b3de8b82eb..657dcad0cf 100644
--- a/src/overlay075/ov75_021D0D80.c
+++ b/src/overlay075/ov75_021D0D80.c
@@ -14,7 +14,7 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0200D0F4.h"
 #include "struct_defs/struct_0205AA50.h"
diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c
index abce9635e6..fcb9982d65 100644
--- a/src/overlay076/ov76_0223B870.c
+++ b/src/overlay076/ov76_0223B870.c
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 
 #include "overlay076/const_ov76_0223EF3C.h"
diff --git a/src/overlay077/ov77_021D0D80.c b/src/overlay077/ov77_021D0D80.c
index 290bbc5e83..61ee08c63d 100644
--- a/src/overlay077/ov77_021D0D80.c
+++ b/src/overlay077/ov77_021D0D80.c
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020203AC_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "overlay077/const_ov77_021D742C.h"
 
diff --git a/src/overlay078/ov78_021D0D80.c b/src/overlay078/ov78_021D0D80.c
index 0570cb5393..aac00e7545 100644
--- a/src/overlay078/ov78_021D0D80.c
+++ b/src/overlay078/ov78_021D0D80.c
@@ -20,7 +20,7 @@
 #include "struct_decls/struct_020203AC_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_02008A90.h"
 #include "struct_defs/struct_0200C738.h"
diff --git a/src/overlay079/ov79_021D183C.c b/src/overlay079/ov79_021D183C.c
index 7a53d29e8c..74f74c15b5 100644
--- a/src/overlay079/ov79_021D183C.c
+++ b/src/overlay079/ov79_021D183C.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_0200112C_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0203D9B8.h"
 #include "struct_defs/struct_020989DC.h"
diff --git a/src/overlay079/ov79_021D2268.c b/src/overlay079/ov79_021D2268.c
index 84821b1f9b..cb1ed8b90b 100644
--- a/src/overlay079/ov79_021D2268.c
+++ b/src/overlay079/ov79_021D2268.c
@@ -12,7 +12,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0200D0F4.h"
 #include "struct_defs/struct_020158A8.h"
diff --git a/src/overlay080/ov80_021D1458.c b/src/overlay080/ov80_021D1458.c
index 74a70ce402..cdc1181c95 100644
--- a/src/overlay080/ov80_021D1458.c
+++ b/src/overlay080/ov80_021D1458.c
@@ -5,7 +5,7 @@
 
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02039EBC_decl.h"
 
 #include "struct_defs/union_02022594_020225E0.h"
diff --git a/src/overlay081/ov81_021D1610.c b/src/overlay081/ov81_021D1610.c
index 274d43e8a4..f9c1cdb443 100644
--- a/src/overlay081/ov81_021D1610.c
+++ b/src/overlay081/ov81_021D1610.c
@@ -1,7 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 
 #include "struct_defs/struct_0202BC58.h"
diff --git a/src/overlay083/ov83_0223D6A8.c b/src/overlay083/ov83_0223D6A8.c
index 113b554d49..090f31a35b 100644
--- a/src/overlay083/ov83_0223D6A8.c
+++ b/src/overlay083/ov83_0223D6A8.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay083/struct_ov83_0223D4CC_decl.h"
 
 #include "struct_defs/struct_02015958.h"
diff --git a/src/overlay084/ov84_0223B5A0.c b/src/overlay084/ov84_0223B5A0.c
index 7fe6688b4f..b5f2e33ce2 100644
--- a/src/overlay084/ov84_0223B5A0.c
+++ b/src/overlay084/ov84_0223B5A0.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_020067E8_decl.h"
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "overlay084/const_ov84_02241130.h"
 
diff --git a/src/overlay084/ov84_0223F040.c b/src/overlay084/ov84_0223F040.c
index 8c0bbeaa91..fa8ca08517 100644
--- a/src/overlay084/ov84_0223F040.c
+++ b/src/overlay084/ov84_0223F040.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0201D738.h"
 #include "struct_defs/struct_0205AA50.h"
diff --git a/src/overlay085/ov85_02241440.c b/src/overlay085/ov85_02241440.c
index d64876ccc1..4e28df37d5 100644
--- a/src/overlay085/ov85_02241440.c
+++ b/src/overlay085/ov85_02241440.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_0200C440_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020203AC_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_berry_data_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c
index 81728d1e2a..ef99e02a45 100644
--- a/src/overlay086/ov86_0223B140.c
+++ b/src/overlay086/ov86_0223B140.c
@@ -14,7 +14,7 @@
 #include "struct_decls/struct_020203AC_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_defs/pokemon.h"
 
diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c
index f0326c0441..df34e2c25d 100644
--- a/src/overlay087/ov87_021D106C.c
+++ b/src/overlay087/ov87_021D106C.c
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 #include "overlay087/struct_ov87_021D0D80_decl.h"
 
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index b1d22d3a84..d19f69feb8 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202B370_decl.h"
 #include "struct_decls/struct_0202B628_decl.h"
diff --git a/src/overlay088/ov88_0223E9C4.c b/src/overlay088/ov88_0223E9C4.c
index decb5c436e..a1633d33f7 100644
--- a/src/overlay088/ov88_0223E9C4.c
+++ b/src/overlay088/ov88_0223E9C4.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_02013A04_t.h"
 #include "struct_defs/struct_020279FC.h"
diff --git a/src/overlay090/ov90_021D0D80.c b/src/overlay090/ov90_021D0D80.c
index 0628593e79..8dc96d21b5 100644
--- a/src/overlay090/ov90_021D0D80.c
+++ b/src/overlay090/ov90_021D0D80.c
@@ -12,7 +12,7 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202D750_decl.h"
 #include "struct_decls/struct_0202D764_decl.h"
 #include "struct_decls/struct_0203068C_decl.h"
diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c
index 9f233c71d9..1164a8026b 100644
--- a/src/overlay091/ov91_021D0D80.c
+++ b/src/overlay091/ov91_021D0D80.c
@@ -13,7 +13,7 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "constdata/const_020F410C.h"
 
diff --git a/src/overlay092/ov92_021D0D80.c b/src/overlay092/ov92_021D0D80.c
index d006ec80e5..000455a553 100644
--- a/src/overlay092/ov92_021D0D80.c
+++ b/src/overlay092/ov92_021D0D80.c
@@ -12,7 +12,7 @@
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020203AC_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202C878_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c
index ec00d67b4e..0c3a3c262a 100644
--- a/src/overlay094/ov94_0223C610.c
+++ b/src/overlay094/ov94_0223C610.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c
index f5ad715124..475000711e 100644
--- a/src/overlay094/ov94_0223D0C4.c
+++ b/src/overlay094/ov94_0223D0C4.c
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 #include "struct_defs/box_pokemon.h"
 
diff --git a/src/overlay094/ov94_0223DC04.c b/src/overlay094/ov94_0223DC04.c
index 52bf2e03c9..a6f23ba780 100644
--- a/src/overlay094/ov94_0223DC04.c
+++ b/src/overlay094/ov94_0223DC04.c
@@ -6,7 +6,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 
 #include "struct_defs/struct_0205AA50.h"
diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c
index 076f2ba559..45dedc76e0 100644
--- a/src/overlay094/ov94_0223E46C.c
+++ b/src/overlay094/ov94_0223E46C.c
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "overlay094/const_ov94_02245FD4.h"
 
diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c
index 3e29798469..feefeb1fab 100644
--- a/src/overlay094/ov94_0223FB48.c
+++ b/src/overlay094/ov94_0223FB48.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 #include "struct_defs/box_pokemon.h"
 #include "struct_decls/struct_020797DC_decl.h"
diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c
index 5925cd4e5b..4904fa634e 100644
--- a/src/overlay094/ov94_022414B8.c
+++ b/src/overlay094/ov94_022414B8.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02026324_decl.h"
 #include "struct_defs/pokemon.h"
 #include "struct_defs/box_pokemon.h"
diff --git a/src/overlay094/ov94_02244950.c b/src/overlay094/ov94_02244950.c
index a84261ffe7..bd4ce7dc38 100644
--- a/src/overlay094/ov94_02244950.c
+++ b/src/overlay094/ov94_02244950.c
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay094/struct_ov94_0223FD4C.h"
diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c
index 8b62c68db6..a12d9883c6 100644
--- a/src/overlay095/ov95_02246C20.c
+++ b/src/overlay095/ov95_02246C20.c
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/box_pokemon.h"
 #include "overlay095/struct_ov95_02247004_decl.h"
 #include "overlay095/struct_ov95_022472C4_decl.h"
diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c
index 71ad58836e..553f73f5b3 100644
--- a/src/overlay095/ov95_02247B6C.c
+++ b/src/overlay095/ov95_02247B6C.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/box_pokemon.h"
 #include "overlay095/struct_ov95_02247628_decl.h"
 #include "overlay095/struct_ov95_0224773C_decl.h"
diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c
index 559ecc52e9..6f89ae1be0 100644
--- a/src/overlay095/ov95_0224B3D8.c
+++ b/src/overlay095/ov95_0224B3D8.c
@@ -11,7 +11,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/box_pokemon.h"
 #include "overlay095/struct_ov95_02247628_decl.h"
 #include "overlay095/struct_ov95_0224773C_decl.h"
diff --git a/src/overlay096/ov96_0223BCE0.c b/src/overlay096/ov96_0223BCE0.c
index c41ba03a50..92c5fd9d14 100644
--- a/src/overlay096/ov96_0223BCE0.c
+++ b/src/overlay096/ov96_0223BCE0.c
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay096/struct_ov96_0223BF40_decl.h"
 
 #include "struct_defs/struct_02049A68.h"
diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c
index 10aef5c541..c572af45e2 100644
--- a/src/overlay097/ov97_0222AE60.c
+++ b/src/overlay097/ov97_0222AE60.c
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202442C_decl.h"
 #include "struct_decls/struct_02025E5C_decl.h"
 #include "struct_decls/struct_02025E6C_decl.h"
diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c
index 67528347bd..1edc146480 100644
--- a/src/overlay097/ov97_0222C174.c
+++ b/src/overlay097/ov97_0222C174.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202442C_decl.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02026324_decl.h"
diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c
index 77a70ef6fe..0b467764a5 100644
--- a/src/overlay097/ov97_0222D30C.c
+++ b/src/overlay097/ov97_0222D30C.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202442C_decl.h"
 #include "struct_decls/struct_02025CCC_decl.h"
 #include "struct_defs/pokemon.h"
diff --git a/src/overlay097/ov97_02230410.c b/src/overlay097/ov97_02230410.c
index ef2eb9f6e2..214d7b3d4d 100644
--- a/src/overlay097/ov97_02230410.c
+++ b/src/overlay097/ov97_02230410.c
@@ -15,7 +15,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202442C_decl.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c
index 619f9a3a55..acbf7ba13e 100644
--- a/src/overlay097/ov97_02233B18.c
+++ b/src/overlay097/ov97_02233B18.c
@@ -13,7 +13,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02024440_decl.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c
index a2a02f5859..314bbe839c 100644
--- a/src/overlay097/ov97_02237694.c
+++ b/src/overlay097/ov97_02237694.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c
index 0bc123d4b9..bfc0cf6caf 100644
--- a/src/overlay098/ov98_022471C8.c
+++ b/src/overlay098/ov98_022471C8.c
@@ -14,7 +14,7 @@
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_020149F0_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025CCC_decl.h"
 #include "struct_decls/struct_0202B370_decl.h"
 
diff --git a/src/overlay098/ov98_022499C8.c b/src/overlay098/ov98_022499C8.c
index ed28970ef7..379a574fc7 100644
--- a/src/overlay098/ov98_022499C8.c
+++ b/src/overlay098/ov98_022499C8.c
@@ -2,7 +2,7 @@
 #include <string.h>
 #include <dwc.h>
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "heap.h"
 #include "error_handling.h"
diff --git a/src/overlay099/ov99_021D1A54.c b/src/overlay099/ov99_021D1A54.c
index ccf8d931c4..04f822fb98 100644
--- a/src/overlay099/ov99_021D1A54.c
+++ b/src/overlay099/ov99_021D1A54.c
@@ -4,7 +4,7 @@
 #include "data_021BF67C.h"
 
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0200D0F4.h"
 #include "overlay099/struct_ov99_021D2CB0.h"
diff --git a/src/overlay099/ov99_021D3E78.c b/src/overlay099/ov99_021D3E78.c
index 2e3216e779..07707a189a 100644
--- a/src/overlay099/ov99_021D3E78.c
+++ b/src/overlay099/ov99_021D3E78.c
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay099/struct_ov99_021D3E78_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
diff --git a/src/overlay100/ov100_021D46C8.c b/src/overlay100/ov100_021D46C8.c
index d4f6d22a7a..c7b9b5489b 100644
--- a/src/overlay100/ov100_021D46C8.c
+++ b/src/overlay100/ov100_021D46C8.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_020985E4.h"
 #include "overlay100/struct_ov100_021D46C8.h"
diff --git a/src/overlay102/ov102_021D0D80.c b/src/overlay102/ov102_021D0D80.c
index b3a3d11708..d5ea2c399c 100644
--- a/src/overlay102/ov102_021D0D80.c
+++ b/src/overlay102/ov102_021D0D80.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c
index 69f150afab..c8adf79e70 100644
--- a/src/overlay104/ov104_0222DCE0.c
+++ b/src/overlay104/ov104_0222DCE0.c
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202C878_decl.h"
 #include "struct_defs/pokemon.h"
diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c
index a734c8e119..77b0e55629 100644
--- a/src/overlay104/ov104_0222FBE4.c
+++ b/src/overlay104/ov104_0222FBE4.c
@@ -13,7 +13,7 @@
 #include "struct_decls/struct_02014014_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202440C_decl.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202B370_decl.h"
diff --git a/src/overlay104/ov104_02231F74.c b/src/overlay104/ov104_02231F74.c
index a219ee600a..109520c969 100644
--- a/src/overlay104/ov104_02231F74.c
+++ b/src/overlay104/ov104_02231F74.c
@@ -13,7 +13,7 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 #include "overlay063/struct_ov63_0222BEC0_decl.h"
 #include "overlay104/struct_ov104_0222E930_decl.h"
diff --git a/src/overlay104/ov104_022332B4.c b/src/overlay104/ov104_022332B4.c
index 46cc934749..265d9c3a45 100644
--- a/src/overlay104/ov104_022332B4.c
+++ b/src/overlay104/ov104_022332B4.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 #include "overlay104/struct_ov104_0222E930_decl.h"
 
diff --git a/src/overlay104/ov104_022358E8.c b/src/overlay104/ov104_022358E8.c
index 31b25ffd87..a752cb9a65 100644
--- a/src/overlay104/ov104_022358E8.c
+++ b/src/overlay104/ov104_022358E8.c
@@ -1,7 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 #include "struct_decls/struct_party_decl.h"
 #include "overlay104/struct_ov104_0222E930_decl.h"
diff --git a/src/overlay104/ov104_022361B4.c b/src/overlay104/ov104_022361B4.c
index 35af889061..3faf3dee91 100644
--- a/src/overlay104/ov104_022361B4.c
+++ b/src/overlay104/ov104_022361B4.c
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_020302DC_decl.h"
 #include "struct_decls/struct_0203041C_decl.h"
diff --git a/src/overlay104/ov104_02237378.c b/src/overlay104/ov104_02237378.c
index 0b0e855797..ec255ca648 100644
--- a/src/overlay104/ov104_02237378.c
+++ b/src/overlay104/ov104_02237378.c
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02014014_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_defs/pokemon.h"
 #include "struct_decls/struct_party_decl.h"
diff --git a/src/overlay104/ov104_0223A7F4.c b/src/overlay104/ov104_0223A7F4.c
index f4c9522ab8..3acc3a54b7 100644
--- a/src/overlay104/ov104_0223A7F4.c
+++ b/src/overlay104/ov104_0223A7F4.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_defs/pokemon.h"
 
diff --git a/src/overlay104/ov104_0223B6F4.c b/src/overlay104/ov104_0223B6F4.c
index ac6982c191..ce4832d613 100644
--- a/src/overlay104/ov104_0223B6F4.c
+++ b/src/overlay104/ov104_0223B6F4.c
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0203068C_decl.h"
 #include "struct_defs/pokemon.h"
diff --git a/src/overlay104/ov104_0223BCBC.c b/src/overlay104/ov104_0223BCBC.c
index 3564dc9803..2074755298 100644
--- a/src/overlay104/ov104_0223BCBC.c
+++ b/src/overlay104/ov104_0223BCBC.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_defs/pokemon.h"
 #include "struct_decls/struct_party_decl.h"
diff --git a/src/overlay104/ov104_0223DC7C.c b/src/overlay104/ov104_0223DC7C.c
index 3afc520dd5..4e3534c048 100644
--- a/src/overlay104/ov104_0223DC7C.c
+++ b/src/overlay104/ov104_0223DC7C.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_02012CE0_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0200D0F4.h"
 #include "struct_defs/struct_020127E8.h"
diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c
index 1cf72d08f1..48b57f89d1 100644
--- a/src/overlay105/ov105_02241AE0.c
+++ b/src/overlay105/ov105_02241AE0.c
@@ -13,7 +13,7 @@
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_defs/pokemon.h"
 #include "struct_defs/box_pokemon.h"
diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c
index 9265a24461..744449aaf0 100644
--- a/src/overlay106/ov106_02241AE0.c
+++ b/src/overlay106/ov106_02241AE0.c
@@ -12,7 +12,7 @@
 #include "struct_decls/struct_0200C440_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_defs/pokemon.h"
 #include "struct_decls/struct_party_decl.h"
diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c
index db2a1dca60..6ee43b42d6 100644
--- a/src/overlay107/ov107_02241AE0.c
+++ b/src/overlay107/ov107_02241AE0.c
@@ -13,7 +13,7 @@
 #include "struct_decls/struct_0200C440_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_020302DC_decl.h"
 #include "struct_decls/struct_0203041C_decl.h"
diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c
index 70961fb548..7f0c7c285e 100644
--- a/src/overlay107/ov107_02245EB0.c
+++ b/src/overlay107/ov107_02245EB0.c
@@ -13,7 +13,7 @@
 #include "struct_decls/struct_0200C440_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_020302DC_decl.h"
 #include "struct_decls/struct_0203041C_decl.h"
diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c
index c30e81d9c2..565c15380a 100644
--- a/src/overlay108/ov108_02241AE0.c
+++ b/src/overlay108/ov108_02241AE0.c
@@ -11,7 +11,7 @@
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_020304A0_decl.h"
 #include "struct_decls/struct_020305B8_decl.h"
diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c
index d30b743f59..fe2d3d484c 100644
--- a/src/overlay109/ov109_021D0D80.c
+++ b/src/overlay109/ov109_021D0D80.c
@@ -13,7 +13,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020203AC_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_defs/pokemon.h"
 #include "struct_decls/struct_party_decl.h"
diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c
index 8884e7b728..0064ccfb03 100644
--- a/src/overlay109/ov109_021D3D50.c
+++ b/src/overlay109/ov109_021D3D50.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
diff --git a/src/overlay110/ov110_021D0D80.c b/src/overlay110/ov110_021D0D80.c
index 323671b01b..1f68906738 100644
--- a/src/overlay110/ov110_021D0D80.c
+++ b/src/overlay110/ov110_021D0D80.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202D750_decl.h"
 #include "struct_decls/struct_0203068C_decl.h"
 #include "struct_decls/struct_020308A0_decl.h"
diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c
index de2729d406..a6488d8040 100644
--- a/src/overlay111/ov111_021D0D80.c
+++ b/src/overlay111/ov111_021D0D80.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_0200C440_decl.h"
 #include "struct_decls/struct_02015920_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay111/struct_ov111_021D0F7C_decl.h"
 #include "overlay111/struct_ov111_021D33F4_decl.h"
diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c
index 28d7a0645f..3f1a4ea266 100644
--- a/src/overlay112/ov112_0225C700.c
+++ b/src/overlay112/ov112_0225C700.c
@@ -11,7 +11,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay066/struct_ov66_0222DFF8_decl.h"
 #include "overlay066/struct_ov66_0223177C_decl.h"
 
diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c
index 708ff499e6..519a0db9ee 100644
--- a/src/overlay113/ov113_0225C700.c
+++ b/src/overlay113/ov113_0225C700.c
@@ -17,7 +17,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020203AC_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 #include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
diff --git a/src/overlay113/ov113_02260620.c b/src/overlay113/ov113_02260620.c
index 48e95084db..522c44d1ff 100644
--- a/src/overlay113/ov113_02260620.c
+++ b/src/overlay113/ov113_02260620.c
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "overlay066/struct_ov66_0222DFF8_decl.h"
 #include "overlay066/struct_ov66_0222E71C_decl.h"
diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c
index 49a26e7ffa..c73ec65962 100644
--- a/src/overlay114/ov114_0225C700.c
+++ b/src/overlay114/ov114_0225C700.c
@@ -16,7 +16,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202B370_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c
index a6537f9674..a328cd51e2 100644
--- a/src/overlay115/ov115_02260CEC.c
+++ b/src/overlay115/ov115_02260CEC.c
@@ -15,7 +15,7 @@
 #include "struct_decls/struct_020203AC_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "overlay114/struct_ov114_0225CAD4_decl.h"
 
 #include "struct_defs/struct_0200C738.h"
diff --git a/src/overlay116/ov116_02261870.c b/src/overlay116/ov116_02261870.c
index 19be8f6475..3f7c8ee60e 100644
--- a/src/overlay116/ov116_02261870.c
+++ b/src/overlay116/ov116_02261870.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 
 #include "struct_defs/struct_0200D0F4.h"
diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c
index 55659fd1cc..053704596e 100644
--- a/src/overlay117/ov117_02260668.c
+++ b/src/overlay117/ov117_02260668.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020203AC_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 
 #include "struct_defs/struct_020170F4.h"
diff --git a/src/overlay117/ov117_02263AF0.c b/src/overlay117/ov117_02263AF0.c
index b646de45ac..97c2403384 100644
--- a/src/overlay117/ov117_02263AF0.c
+++ b/src/overlay117/ov117_02263AF0.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_02012744_decl.h"
 #include "struct_decls/struct_02012CE0_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0200D0F4.h"
 #include "struct_defs/struct_020127E8.h"
diff --git a/src/overlay118/ov118_021D0D80.c b/src/overlay118/ov118_021D0D80.c
index 79540eb507..44b42dd82e 100644
--- a/src/overlay118/ov118_021D0D80.c
+++ b/src/overlay118/ov118_021D0D80.c
@@ -5,7 +5,7 @@
 
 #include "struct_decls/struct_02014014_decl.h"
 #include "struct_decls/struct_020203AC_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 
 #include "struct_defs/struct_0207F248.h"
diff --git a/src/overlay119/ov119_021D0D80.c b/src/overlay119/ov119_021D0D80.c
index 823abeacc4..9835638a11 100644
--- a/src/overlay119/ov119_021D0D80.c
+++ b/src/overlay119/ov119_021D0D80.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_02014014_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020203AC_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 #include "struct_defs/box_pokemon.h"
 
diff --git a/src/unk_02002B7C.c b/src/unk_02002B7C.c
index 3135d13a0f..4b1be69d49 100644
--- a/src/unk_02002B7C.c
+++ b/src/unk_02002B7C.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_02023350_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_02002328.h"
 #include "struct_defs/struct_02002D18.h"
diff --git a/src/unk_0200AC5C.c b/src/unk_0200AC5C.c
index 8a9e987c40..2450bc99e8 100644
--- a/src/unk_0200AC5C.c
+++ b/src/unk_0200AC5C.c
@@ -4,7 +4,7 @@
 #include "inlines.h"
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "narc.h"
 #include "unk_0200AC5C.h"
diff --git a/src/unk_0200B29C.c b/src/unk_0200B29C.c
index 9e18142123..8cbe100180 100644
--- a/src/unk_0200B29C.c
+++ b/src/unk_0200B29C.c
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "unk_0200AC5C.h"
 #include "unk_0200B29C.h"
diff --git a/src/unk_0200B358.c b/src/unk_0200B358.c
index 2d37de88b3..66e583c06e 100644
--- a/src/unk_0200B358.c
+++ b/src/unk_0200B358.c
@@ -6,7 +6,7 @@
 #include "constants/pokemon.h"
 
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202B4A0_decl.h"
 #include "struct_defs/box_pokemon.h"
diff --git a/src/unk_02013A04.c b/src/unk_02013A04.c
index 75a28a04fb..5616d83b4a 100644
--- a/src/unk_02013A04.c
+++ b/src/unk_02013A04.c
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_02013A04_t.h"
 
diff --git a/src/unk_020149F0.c b/src/unk_020149F0.c
index 68bb2a813b..66033f7f24 100644
--- a/src/unk_020149F0.c
+++ b/src/unk_020149F0.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_020149F0_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0205AA50.h"
 
diff --git a/src/unk_02014A84.c b/src/unk_02014A84.c
index c8117fa951..b379cb6b3b 100644
--- a/src/unk_02014A84.c
+++ b/src/unk_02014A84.c
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_02014A84.h"
 
diff --git a/src/unk_02014D38.c b/src/unk_02014D38.c
index 603ab9b8db..ad1604ed60 100644
--- a/src/unk_02014D38.c
+++ b/src/unk_02014D38.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 #include "unk_02006E3C.h"
diff --git a/src/unk_020158A8.c b/src/unk_020158A8.c
index c3fc0a7250..2f9ff8c086 100644
--- a/src/unk_020158A8.c
+++ b/src/unk_020158A8.c
@@ -1,7 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_020158A8.h"
 
diff --git a/src/unk_0201D670.c b/src/unk_0201D670.c
index 4a88144275..02987b9320 100644
--- a/src/unk_0201D670.c
+++ b/src/unk_0201D670.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "functypes/funcptr_0201CE28.h"
 #include "struct_defs/struct_0201D670.h"
diff --git a/src/unk_02025E68.c b/src/unk_02025E68.c
index 7d5e828c76..3df6d16925 100644
--- a/src/unk_02025E68.c
+++ b/src/unk_02025E68.c
@@ -1,7 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_02025E6C.h"
 
diff --git a/src/unk_0202602C.c b/src/unk_0202602C.c
index c6da3f6265..422cafcfde 100644
--- a/src/unk_0202602C.c
+++ b/src/unk_0202602C.c
@@ -1,7 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02026030_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
diff --git a/src/unk_02026150.c b/src/unk_02026150.c
index 309c23a56a..0820cb95ce 100644
--- a/src/unk_02026150.c
+++ b/src/unk_02026150.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02026030_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
diff --git a/src/unk_020277A4.c b/src/unk_020277A4.c
index c9e7578d53..44d48cdc1c 100644
--- a/src/unk_020277A4.c
+++ b/src/unk_020277A4.c
@@ -1,7 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 #include "struct_defs/struct_02014A84.h"
diff --git a/src/unk_020298BC.c b/src/unk_020298BC.c
index 3373487bd5..3af3807f9e 100644
--- a/src/unk_020298BC.c
+++ b/src/unk_020298BC.c
@@ -3,7 +3,7 @@
 
 #include "inlines.h"
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
diff --git a/src/unk_0202ACE0.c b/src/unk_0202ACE0.c
index 5a564787c3..3a82efb972 100644
--- a/src/unk_0202ACE0.c
+++ b/src/unk_0202ACE0.c
@@ -4,7 +4,7 @@
 
 #include "assert.h"
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 #include "struct_defs/struct_0202B370.h"
diff --git a/src/unk_0202B37C.c b/src/unk_0202B37C.c
index 9b8db6c4ee..e5f1982fef 100644
--- a/src/unk_0202B37C.c
+++ b/src/unk_0202B37C.c
@@ -1,7 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 #include "struct_defs/struct_0202B4A0.h"
diff --git a/src/unk_0202DF8C.c b/src/unk_0202DF8C.c
index 880e707769..48edc3347f 100644
--- a/src/unk_0202DF8C.c
+++ b/src/unk_0202DF8C.c
@@ -3,7 +3,7 @@
 
 #include "inlines.h"
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 #include "struct_decls/struct_party_decl.h"
 
diff --git a/src/unk_0202E840.c b/src/unk_0202E840.c
index d9d594e86c..adff24a4a9 100644
--- a/src/unk_0202E840.c
+++ b/src/unk_0202E840.c
@@ -1,7 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202CD88_decl.h"
 #include "struct_decls/struct_0203068C_decl.h"
diff --git a/src/unk_02030A80.c b/src/unk_02030A80.c
index 71e0660f4a..8ac5086b6e 100644
--- a/src/unk_02030A80.c
+++ b/src/unk_02030A80.c
@@ -1,7 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025CCC_decl.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202783C_decl.h"
diff --git a/src/unk_0203909C.c b/src/unk_0203909C.c
index 6f2346c632..28d2e4bdb9 100644
--- a/src/unk_0203909C.c
+++ b/src/unk_0203909C.c
@@ -2,7 +2,7 @@
 #include <string.h>
 #include <dwc.h>
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202B370_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
diff --git a/src/unk_02039814.c b/src/unk_02039814.c
index de28e99ba1..a97c969f96 100644
--- a/src/unk_02039814.c
+++ b/src/unk_02039814.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02099F80.h"
diff --git a/src/unk_02039A64.c b/src/unk_02039A64.c
index a8387880fd..a36cbbb0f4 100644
--- a/src/unk_02039A64.c
+++ b/src/unk_02039A64.c
@@ -5,7 +5,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02099F80.h"
diff --git a/src/unk_0203A9C8.c b/src/unk_0203A9C8.c
index 11d281b716..c453c2bac0 100644
--- a/src/unk_0203A9C8.c
+++ b/src/unk_0203A9C8.c
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02026324_decl.h"
 #include "struct_decls/struct_020507E4_decl.h"
diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c
index 5c0743baa0..074109badf 100644
--- a/src/unk_0203D1B8.c
+++ b/src/unk_0203D1B8.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_020067E8_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202783C_decl.h"
 #include "struct_decls/struct_02029C68_decl.h"
diff --git a/src/unk_0203E880.c b/src/unk_0203E880.c
index 2a80da6c7b..7b9509d303 100644
--- a/src/unk_0203E880.c
+++ b/src/unk_0203E880.c
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02001AF4_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0203E724_decl.h"
 #include "struct_decls/struct_0203EF60_decl.h"
 #include "struct_decls/struct_020507E4_decl.h"
diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c
index b144c859c5..4d91b382a6 100644
--- a/src/unk_0203F6C4.c
+++ b/src/unk_0203F6C4.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02014EC4_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202440C_decl.h"
 #include "struct_decls/struct_02025CCC_decl.h"
 #include "struct_decls/struct_02025E6C_decl.h"
diff --git a/src/unk_02046C7C.c b/src/unk_02046C7C.c
index b3d900e799..8a35ca8c4f 100644
--- a/src/unk_02046C7C.c
+++ b/src/unk_02046C7C.c
@@ -4,7 +4,7 @@
 #include "inlines.h"
 
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0203E724_decl.h"
 #include "struct_defs/pokemon.h"
diff --git a/src/unk_020474B8.c b/src/unk_020474B8.c
index 10c776dbce..fbbc70e072 100644
--- a/src/unk_020474B8.c
+++ b/src/unk_020474B8.c
@@ -5,7 +5,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0203E724_decl.h"
 #include "struct_defs/pokemon.h"
diff --git a/src/unk_02048BD0.c b/src/unk_02048BD0.c
index 7d0ba90b54..97f3740de2 100644
--- a/src/unk_02048BD0.c
+++ b/src/unk_02048BD0.c
@@ -4,7 +4,7 @@
 #include "inlines.h"
 
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202B4A0_decl.h"
 #include "struct_decls/struct_0203E724_decl.h"
diff --git a/src/unk_02048DD8.c b/src/unk_02048DD8.c
index 27d2181b43..980b217dd6 100644
--- a/src/unk_02048DD8.c
+++ b/src/unk_02048DD8.c
@@ -4,7 +4,7 @@
 #include "inlines.h"
 
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202440C_decl.h"
 #include "struct_decls/struct_0202A750_decl.h"
 #include "struct_decls/struct_0202CD88_decl.h"
diff --git a/src/unk_0204AEE8.c b/src/unk_0204AEE8.c
index 1698eabaf5..e298e042dd 100644
--- a/src/unk_0204AEE8.c
+++ b/src/unk_0204AEE8.c
@@ -5,7 +5,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02026324_decl.h"
 #include "struct_defs/pokemon.h"
diff --git a/src/unk_0204B830.c b/src/unk_0204B830.c
index 4e2677b216..841093184c 100644
--- a/src/unk_0204B830.c
+++ b/src/unk_0204B830.c
@@ -4,7 +4,7 @@
 #include "inlines.h"
 
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0203E724_decl.h"
 #include "struct_decls/struct_020507E4_decl.h"
diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c
index b1b500b074..750d729540 100644
--- a/src/unk_02051D8C.c
+++ b/src/unk_02051D8C.c
@@ -6,7 +6,7 @@
 #include "data_021BF67C.h"
 
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02026324_decl.h"
 #include "struct_decls/struct_0202B628_decl.h"
diff --git a/src/unk_020528D0.c b/src/unk_020528D0.c
index 79c36f92b2..919dc00797 100644
--- a/src/unk_020528D0.c
+++ b/src/unk_020528D0.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0203A790_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
 
diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c
index 921738d955..0506b071d3 100644
--- a/src/unk_02052C6C.c
+++ b/src/unk_02052C6C.c
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202CD88_decl.h"
 #include "struct_decls/struct_020507E4_decl.h"
diff --git a/src/unk_020530C8.c b/src/unk_020530C8.c
index 989f6ce80e..6b735e932e 100644
--- a/src/unk_020530C8.c
+++ b/src/unk_020530C8.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_02001AF4_decl.h"
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0203A790_decl.h"
 #include "struct_decls/struct_020507E4_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c
index d2c4d6c4ff..a20511b6f5 100644
--- a/src/unk_0205A0D8.c
+++ b/src/unk_0205A0D8.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_020149F0_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_defs/pokemon.h"
diff --git a/src/unk_0205B33C.c b/src/unk_0205B33C.c
index f8648b92da..f82db163e3 100644
--- a/src/unk_0205B33C.c
+++ b/src/unk_0205B33C.c
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02014EC4_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0205B43C_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
diff --git a/src/unk_0205D8CC.c b/src/unk_0205D8CC.c
index 81159c61ad..9684dabaa5 100644
--- a/src/unk_0205D8CC.c
+++ b/src/unk_0205D8CC.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_020279FC.h"
 #include "struct_defs/struct_0205AA50.h"
diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c
index c934e1d11b..c626c03e37 100644
--- a/src/unk_020683F4.c
+++ b/src/unk_020683F4.c
@@ -3,7 +3,7 @@
 
 #include "data_021BF67C.h"
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_020507E4_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_decls/struct_02061AB4_decl.h"
diff --git a/src/unk_0206CCB0.c b/src/unk_0206CCB0.c
index ec4a6e610b..adf702fbc8 100644
--- a/src/unk_0206CCB0.c
+++ b/src/unk_0206CCB0.c
@@ -5,7 +5,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202440C_decl.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02026324_decl.h"
diff --git a/src/unk_0206F314.c b/src/unk_0206F314.c
index 90e3d1cfa3..2b8006bd39 100644
--- a/src/unk_0206F314.c
+++ b/src/unk_0206F314.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_0202E8C0_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
diff --git a/src/unk_02071CFC.c b/src/unk_02071CFC.c
index f1089107ca..0d491266c9 100644
--- a/src/unk_02071CFC.c
+++ b/src/unk_02071CFC.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0203CDB0_sub2_t.h"
 
diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c
index 4c04229756..ced59d65b3 100644
--- a/src/unk_020722AC.c
+++ b/src/unk_020722AC.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02028430_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_defs/pokemon.h"
diff --git a/src/unk_02073C2C.c b/src/unk_02073C2C.c
index 75ed834050..3b0e429257 100644
--- a/src/unk_02073C2C.c
+++ b/src/unk_02073C2C.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02015F84_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202CC84_decl.h"
 #include "struct_decls/party_pokemon.h"
diff --git a/src/unk_02079170.c b/src/unk_02079170.c
index 24ed690b9a..6cb6e6ff74 100644
--- a/src/unk_02079170.c
+++ b/src/unk_02079170.c
@@ -5,7 +5,7 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
diff --git a/src/unk_020797C8.c b/src/unk_020797C8.c
index 7360e6e188..3aff684bda 100644
--- a/src/unk_020797C8.c
+++ b/src/unk_020797C8.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/box_pokemon.h"
 
diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c
index 5264b7d7d7..02c5e1a986 100644
--- a/src/unk_0207AE68.c
+++ b/src/unk_0207AE68.c
@@ -5,7 +5,7 @@
 
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02026324_decl.h"
 #include "struct_decls/struct_0202CD88_decl.h"
 #include "struct_decls/struct_02056B24_decl.h"
diff --git a/src/unk_0207CB08.c b/src/unk_0207CB08.c
index a7e7a26480..bc08b26cfe 100644
--- a/src/unk_0207CB08.c
+++ b/src/unk_0207CB08.c
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02029D04_decl.h"
 #include "struct_decls/struct_0202CA1C_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c
index 34f74a315c..0f13135cc8 100644
--- a/src/unk_0207E0B8.c
+++ b/src/unk_0207E0B8.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_020067E8_decl.h"
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 #include "struct_decls/struct_itemdata_decl.h"
 
diff --git a/src/unk_020819DC.c b/src/unk_020819DC.c
index 9182e83e47..fcc377ed49 100644
--- a/src/unk_020819DC.c
+++ b/src/unk_020819DC.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 
 #include "struct_defs/struct_0201D738.h"
diff --git a/src/unk_02084B70.c b/src/unk_02084B70.c
index 4bd11bba34..fd2662f983 100644
--- a/src/unk_02084B70.c
+++ b/src/unk_02084B70.c
@@ -3,7 +3,7 @@
 
 #include "data_021BF67C.h"
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 #include "struct_decls/struct_itemdata_decl.h"
 
diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c
index 0ebe80af13..dc6b859210 100644
--- a/src/unk_0208694C.c
+++ b/src/unk_0208694C.c
@@ -13,7 +13,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_020218BC_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 #include "struct_decls/struct_02087A10_decl.h"
 
diff --git a/src/unk_02089604.c b/src/unk_02089604.c
index b0b6f6a9f1..5e3324fb13 100644
--- a/src/unk_02089604.c
+++ b/src/unk_02089604.c
@@ -3,7 +3,7 @@
 
 #include "data_021BF67C.h"
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_02089688.h"
 
diff --git a/src/unk_0208A3F4.c b/src/unk_0208A3F4.c
index 51de0e3586..3f18ac28f1 100644
--- a/src/unk_0208A3F4.c
+++ b/src/unk_0208A3F4.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02012CE0_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0200D0F4.h"
 #include "struct_defs/struct_020127E8.h"
diff --git a/src/unk_0208FCF8.c b/src/unk_0208FCF8.c
index 37bb7b445f..d06b9d70b6 100644
--- a/src/unk_0208FCF8.c
+++ b/src/unk_0208FCF8.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 
 #include "struct_defs/struct_0205AA50.h"
diff --git a/src/unk_02092494.c b/src/unk_02092494.c
index fe2c5dae0d..4f92d537c0 100644
--- a/src/unk_02092494.c
+++ b/src/unk_02092494.c
@@ -1,7 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 
 #include "struct_defs/pokemon.h"
diff --git a/src/unk_02094EDC.c b/src/unk_02094EDC.c
index 97d23a231e..fa0848e2e4 100644
--- a/src/unk_02094EDC.c
+++ b/src/unk_02094EDC.c
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02007768_decl.h"
 #include "struct_decls/struct_02007C7C_decl.h"
 #include "struct_decls/struct_0200B144_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_defs/pokemon.h"
 
 #include "struct_defs/struct_02008A90.h"
diff --git a/src/unk_020998EC.c b/src/unk_020998EC.c
index bb12016429..265e30cb73 100644
--- a/src/unk_020998EC.c
+++ b/src/unk_020998EC.c
@@ -6,7 +6,7 @@
 
 #include "struct_decls/struct_02014D38_decl.h"
 #include "struct_decls/struct_02014EC4_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_02026324_decl.h"
 #include "struct_decls/struct_0209747C_decl.h"
 #include "struct_decls/struct_020998EC_decl.h"
diff --git a/src/unk_02099DFC.c b/src/unk_02099DFC.c
index f4f47dd8e9..cd67528b0e 100644
--- a/src/unk_02099DFC.c
+++ b/src/unk_02099DFC.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_020067E8_decl.h"
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 #include "struct_defs/struct_0203CC84.h"
diff --git a/src/unk_0209A2C4.c b/src/unk_0209A2C4.c
index a7305a0f78..f7510aec08 100644
--- a/src/unk_0209A2C4.c
+++ b/src/unk_0209A2C4.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_020067E8_decl.h"
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 #include "struct_defs/struct_0203CC84.h"
diff --git a/src/unk_0209A74C.c b/src/unk_0209A74C.c
index b08a68462d..acf26ca65e 100644
--- a/src/unk_0209A74C.c
+++ b/src/unk_0209A74C.c
@@ -5,7 +5,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02099F80.h"
diff --git a/src/unk_0209AA74.c b/src/unk_0209AA74.c
index 66dc2f4a1d..408c717cc8 100644
--- a/src/unk_0209AA74.c
+++ b/src/unk_0209AA74.c
@@ -5,7 +5,7 @@
 
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02099F80.h"
diff --git a/src/unk_0209ACF4.c b/src/unk_0209ACF4.c
index ff8e13ab47..add4e95ec4 100644
--- a/src/unk_0209ACF4.c
+++ b/src/unk_0209ACF4.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_0200B144_decl.h"
 #include "struct_decls/struct_0200B358_decl.h"
 #include "struct_decls/struct_020149F0_decl.h"
-#include "struct_decls/struct_02023790_decl.h"
+#include "strbuf.h"
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_decls/struct_0209747C_decl.h"