diff --git a/Makefile b/Makefile
index ccfd36357..d458381b2 100644
--- a/Makefile
+++ b/Makefile
@@ -16,12 +16,12 @@ main11.o \
 lib/mobile/main.o \
 home.o \
 audio.o \
-maps_crystal.o \
-engine/events_crystal.o \
-engine/credits_crystal.o \
-data/egg_moves_crystal.o \
-data/evos_attacks_crystal.o \
-data/pokedex/entries_crystal.o \
+maps.o \
+engine/events.o \
+engine/credits.o \
+data/egg_moves.o \
+data/evos_attacks.o \
+data/pokedex/entries.o \
 misc/crystal_misc.o \
 text/common_text.o \
 gfx/pics.o
@@ -32,12 +32,12 @@ main.o \
 lib/mobile/main.o \
 home.o \
 audio.o \
-maps_crystal.o \
-engine/events_crystal.o \
-engine/credits_crystal.o \
-data/egg_moves_crystal.o \
-data/evos_attacks_crystal.o \
-data/pokedex/entries_crystal.o \
+maps.o \
+engine/events.o \
+engine/credits.o \
+data/egg_moves.o \
+data/evos_attacks.o \
+data/pokedex/entries.o \
 misc/crystal_misc.o \
 text/common_text.o \
 gfx/pics.o
@@ -69,6 +69,10 @@ compare: pokecrystal.gbc pokecrystal11.gbc
 %.o: %.asm $$(%_dep)
 	rgbasm -o $@ $<
 
+# This seems to be required because of a filename collision (but not a path collision).
+lib/%.o: lib/%.asm $$(lib/%_dep)
+	rgbasm -o $@ $<
+
 pokecrystal11.gbc: $(crystal11_obj)
 	rgblink -n $*.sym -m $*.map -o $@ $^
 	rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -n 1 -p 0 -r 3 -t PM_CRYSTAL $@
diff --git a/data/egg_moves_crystal.asm b/data/egg_moves_crystal.asm
deleted file mode 100644
index 50fbb1471..000000000
--- a/data/egg_moves_crystal.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-INCLUDE "pokecrystal.asm"
-INCLUDE "data/egg_moves.asm"
diff --git a/data/evos_attacks_crystal.asm b/data/evos_attacks_crystal.asm
deleted file mode 100644
index 22ec9d84c..000000000
--- a/data/evos_attacks_crystal.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-INCLUDE "pokecrystal.asm"
-INCLUDE "data/evos_attacks.asm"
diff --git a/engine/credits_crystal.asm b/engine/credits_crystal.asm
deleted file mode 100644
index 51265434b..000000000
--- a/engine/credits_crystal.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-INCLUDE "pokecrystal.asm"
-INCLUDE "engine/credits.asm"
diff --git a/engine/events_crystal.asm b/engine/events_crystal.asm
deleted file mode 100644
index 56cb7a200..000000000
--- a/engine/events_crystal.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-INCLUDE "pokecrystal.asm"
-INCLUDE "engine/events.asm"
diff --git a/includes.asm b/includes.asm
index 456623d9f..1b3d6bed5 100644
--- a/includes.asm
+++ b/includes.asm
@@ -1,2 +1,3 @@
+INCLUDE "version.asm"
 INCLUDE "contents.asm"
 INCLUDE "constants.asm"
diff --git a/maps_crystal.asm b/maps_crystal.asm
deleted file mode 100644
index 7bb87d329..000000000
--- a/maps_crystal.asm
+++ /dev/null
@@ -1,2 +0,0 @@
-INCLUDE "pokecrystal.asm"
-INCLUDE "maps.asm"
diff --git a/pokecrystal.asm b/version.asm
similarity index 100%
rename from pokecrystal.asm
rename to version.asm