diff --git a/constants.asm b/constants.asm
deleted file mode 100644
index 4e52c9e42..000000000
--- a/constants.asm
+++ /dev/null
@@ -1,51 +0,0 @@
-INCLUDE "charmap.asm"
-
-INCLUDE "macros.asm"
-
-INCLUDE "hram.asm"
-
-INCLUDE "constants/hardware_constants.asm"
-INCLUDE "constants/wram_constants.asm"
-INCLUDE "constants/pokemon_constants.asm"
-INCLUDE "constants/type_constants.asm"
-INCLUDE "constants/move_constants.asm"
-INCLUDE "constants/move_effect_constants.asm"
-INCLUDE "constants/battle_constants.asm"
-INCLUDE "constants/battle_anim_constants.asm"
-INCLUDE "constants/map_constants.asm"
-INCLUDE "constants/map_data_constants.asm"
-INCLUDE "constants/map_setup_constants.asm"
-INCLUDE "constants/landmark_constants.asm"
-INCLUDE "constants/item_constants.asm"
-INCLUDE "constants/item_data_constants.asm"
-INCLUDE "constants/trainer_constants.asm"
-INCLUDE "constants/trainer_data_constants.asm"
-INCLUDE "constants/script_constants.asm"
-INCLUDE "constants/event_flags.asm"
-INCLUDE "constants/engine_flags.asm"
-INCLUDE "constants/music_constants.asm"
-INCLUDE "constants/sfx_constants.asm"
-INCLUDE "constants/phone_constants.asm"
-INCLUDE "constants/credits_constants.asm"
-INCLUDE "constants/gfx_constants.asm"
-INCLUDE "constants/input_constants.asm"
-INCLUDE "constants/pokemon_data_constants.asm"
-INCLUDE "constants/icon_constants.asm"
-INCLUDE "constants/serial_constants.asm"
-INCLUDE "constants/mobile_constants.asm"
-INCLUDE "constants/text_constants.asm"
-INCLUDE "constants/misc_constants.asm"
-INCLUDE "constants/std_constants.asm"
-INCLUDE "constants/deco_constants.asm"
-INCLUDE "constants/radio_constants.asm"
-INCLUDE "constants/npctrade_constants.asm"
-INCLUDE "constants/sprite_constants.asm"
-INCLUDE "constants/sprite_data_constants.asm"
-INCLUDE "constants/sprite_anim_constants.asm"
-INCLUDE "constants/tileset_constants.asm"
-INCLUDE "constants/collision_constants.asm"
-INCLUDE "constants/cgb_constants.asm"
-INCLUDE "constants/battle_tower_constants.asm"
-INCLUDE "constants/cry_constants.asm"
-INCLUDE "constants/audio_constants.asm"
-INCLUDE "constants/printer_constants.asm"
diff --git a/includes.asm b/includes.asm
index a97cda944..2f0a436ea 100644
--- a/includes.asm
+++ b/includes.asm
@@ -1,2 +1,53 @@
 INCLUDE "version.asm"
-INCLUDE "constants.asm"
+
+INCLUDE "charmap.asm"
+
+INCLUDE "macros.asm"
+
+INCLUDE "hram.asm"
+
+INCLUDE "constants/hardware_constants.asm"
+INCLUDE "constants/wram_constants.asm"
+INCLUDE "constants/pokemon_constants.asm"
+INCLUDE "constants/type_constants.asm"
+INCLUDE "constants/move_constants.asm"
+INCLUDE "constants/move_effect_constants.asm"
+INCLUDE "constants/battle_constants.asm"
+INCLUDE "constants/battle_anim_constants.asm"
+INCLUDE "constants/map_constants.asm"
+INCLUDE "constants/map_data_constants.asm"
+INCLUDE "constants/map_setup_constants.asm"
+INCLUDE "constants/landmark_constants.asm"
+INCLUDE "constants/item_constants.asm"
+INCLUDE "constants/item_data_constants.asm"
+INCLUDE "constants/trainer_constants.asm"
+INCLUDE "constants/trainer_data_constants.asm"
+INCLUDE "constants/script_constants.asm"
+INCLUDE "constants/event_flags.asm"
+INCLUDE "constants/engine_flags.asm"
+INCLUDE "constants/music_constants.asm"
+INCLUDE "constants/sfx_constants.asm"
+INCLUDE "constants/phone_constants.asm"
+INCLUDE "constants/credits_constants.asm"
+INCLUDE "constants/gfx_constants.asm"
+INCLUDE "constants/input_constants.asm"
+INCLUDE "constants/pokemon_data_constants.asm"
+INCLUDE "constants/icon_constants.asm"
+INCLUDE "constants/serial_constants.asm"
+INCLUDE "constants/mobile_constants.asm"
+INCLUDE "constants/text_constants.asm"
+INCLUDE "constants/misc_constants.asm"
+INCLUDE "constants/std_constants.asm"
+INCLUDE "constants/deco_constants.asm"
+INCLUDE "constants/radio_constants.asm"
+INCLUDE "constants/npctrade_constants.asm"
+INCLUDE "constants/sprite_constants.asm"
+INCLUDE "constants/sprite_data_constants.asm"
+INCLUDE "constants/sprite_anim_constants.asm"
+INCLUDE "constants/tileset_constants.asm"
+INCLUDE "constants/collision_constants.asm"
+INCLUDE "constants/cgb_constants.asm"
+INCLUDE "constants/battle_tower_constants.asm"
+INCLUDE "constants/cry_constants.asm"
+INCLUDE "constants/audio_constants.asm"
+INCLUDE "constants/printer_constants.asm"