diff --git a/Makefile b/Makefile
index eb4086367..b8016535f 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ PYTHON := python
 TEXTFILES := $(shell find ./ -type f -name '*.asm' | grep -v globals.asm)
 TEXTQUEUE :=
 
-OBJS := pokecrystal.o
+OBJS := wram.o main.o
 
 PNGS   := $(shell find gfx/ -type f -name '*.png')
 LZS    := $(shell find gfx/ -type f -name '*.lz')
diff --git a/pokecrystal.asm b/includes.asm
similarity index 54%
rename from pokecrystal.asm
rename to includes.asm
index 495b02178..ce581fd02 100644
--- a/pokecrystal.asm
+++ b/includes.asm
@@ -1,5 +1,2 @@
 INCLUDE "globals.asm"
-
 INCLUDE "constants.asm"
-INCLUDE "wram.asm"
-INCLUDE "main.asm"
diff --git a/main.asm b/main.asm
index 582a3393d..b572b4f5e 100644
--- a/main.asm
+++ b/main.asm
@@ -1,3 +1,6 @@
+INCLUDE "includes.asm"
+
+
 SECTION "bank0",ROM0
 
 INCLUDE "rst.asm"
diff --git a/wram.asm b/wram.asm
index 3796969fb..2054d2ff0 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1,3 +1,6 @@
+INCLUDE "includes.asm"
+
+
 SECTION "tiles0",VRAM[$8000],BANK[0]
 VTiles0:
 SECTION "tiles1",VRAM[$8800],BANK[0]