diff --git a/data/moves/effects.asm b/data/moves/effects.asm
index df597f8bc..81bd89f5f 100644
--- a/data/moves/effects.asm
+++ b/data/moves/effects.asm
@@ -1,3 +1,5 @@
+INCLUDE "data/moves/effects_pointers.asm"
+
 MoveEffects: ; used only for BANK(MoveEffects)
 
 NormalHit:
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index 5350f94a8..35de91e85 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -1,3 +1,5 @@
+INCLUDE "data/trainers/party_pointers.asm"
+
 Trainers:
 ; Trainer data structure:
 ; - db "NAME@", TRAINERTYPE_* constant
diff --git a/engine/battle/read_trainer_attributes.asm b/engine/battle/read_trainer_attributes.asm
index 12554ebaf..6db8f4204 100644
--- a/engine/battle/read_trainer_attributes.asm
+++ b/engine/battle/read_trainer_attributes.asm
@@ -62,3 +62,5 @@ GetTrainerAttributes:
 	ld a, [hl]
 	ld [wEnemyTrainerBaseReward], a
 	ret
+
+INCLUDE "data/trainers/attributes.asm"
diff --git a/engine/battle/read_trainer_dvs.asm b/engine/battle/read_trainer_dvs.asm
index 67ea0fe3c..d35c9ea61 100644
--- a/engine/battle/read_trainer_dvs.asm
+++ b/engine/battle/read_trainer_dvs.asm
@@ -17,3 +17,5 @@ GetTrainerDVs:
 
 	pop hl
 	ret
+
+INCLUDE "data/trainers/dvs.asm"
diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm
index 9775e1dcc..0a537b64e 100644
--- a/engine/battle/read_trainer_party.asm
+++ b/engine/battle/read_trainer_party.asm
@@ -387,3 +387,5 @@ Function39990:
 	ld bc, NAME_LENGTH
 	pop de
 	ret
+
+INCLUDE "data/trainers/parties.asm"
diff --git a/engine/items/print_item_description.asm b/engine/items/print_item_description.asm
index b6ab6c957..b0a3a0b33 100644
--- a/engine/items/print_item_description.asm
+++ b/engine/items/print_item_description.asm
@@ -28,3 +28,5 @@ PrintItemDescription:
 	ld d, [hl]
 	pop hl
 	jp PlaceString
+
+INCLUDE "data/items/descriptions.asm"
diff --git a/engine/pokedex/pokedex_2.asm b/engine/pokedex/pokedex_2.asm
index 21aea61b4..8105a080a 100644
--- a/engine/pokedex/pokedex_2.asm
+++ b/engine/pokedex/pokedex_2.asm
@@ -279,3 +279,5 @@ endr
 	ld e, l
 	pop hl
 	ret
+
+INCLUDE "data/pokemon/dex_entry_pointers.asm"
diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm
index e2b0f1af5..4dc74c6d2 100644
--- a/engine/printer/printer.asm
+++ b/engine/printer/printer.asm
@@ -1,5 +1,3 @@
-INCLUDE "engine/printer/printer_serial.asm"
-
 SendScreenToPrinter:
 .loop
 	call JoyTextDelay
diff --git a/main.asm b/main.asm
index fe0c76f99..5872ce6cb 100644
--- a/main.asm
+++ b/main.asm
@@ -117,10 +117,8 @@ INCLUDE "engine/events/prof_oaks_pc.asm"
 INCLUDE "engine/overworld/decorations.asm"
 INCLUDE "engine/pokemon/level_up_happiness.asm"
 INCLUDE "engine/battle/read_trainer_dvs.asm"
-INCLUDE "data/trainers/dvs.asm"
 INCLUDE "engine/battle/returntobattle_useball.asm"
 INCLUDE "engine/battle/consume_held_item.asm"
-INCLUDE "data/moves/effects_pointers.asm"
 INCLUDE "data/moves/effects.asm"
 INCLUDE "engine/events/kurt_selectquantity_interpretjoypad.asm"
 
@@ -162,10 +160,7 @@ SECTION "Enemy Trainers", ROMX
 INCLUDE "engine/battle/ai/items.asm"
 INCLUDE "engine/battle/ai/scoring.asm"
 INCLUDE "engine/battle/read_trainer_attributes.asm"
-INCLUDE "data/trainers/attributes.asm"
 INCLUDE "engine/battle/read_trainer_party.asm"
-INCLUDE "data/trainers/party_pointers.asm"
-INCLUDE "data/trainers/parties.asm"
 
 
 SECTION "Battle Core", ROMX
@@ -186,7 +181,6 @@ SECTION "bank11", ROMX
 INCLUDE "engine/events/fruit_trees.asm"
 INCLUDE "engine/battle/ai/move.asm"
 INCLUDE "engine/pokedex/pokedex_2.asm"
-INCLUDE "data/pokemon/dex_entry_pointers.asm"
 INCLUDE "engine/pokemon/mail.asm"
 
 
@@ -287,6 +281,7 @@ INCLUDE "engine/menus/debug.asm"
 
 SECTION "bank21", ROMX
 
+INCLUDE "engine/printer/printer_serial.asm"
 INCLUDE "engine/printer/printer.asm"
 INCLUDE "gfx/battle_anims.asm"
 INCLUDE "engine/events/halloffame.asm"
@@ -569,7 +564,6 @@ SECTION "Miscellaneous Text", ROMX
 
 INCLUDE "data/items/names.asm"
 INCLUDE "engine/items/print_item_description.asm"
-INCLUDE "data/items/descriptions.asm"
 INCLUDE "data/moves/names.asm"
 INCLUDE "engine/overworld/landmarks.asm"