diff --git a/games/riven_hgr/common_defines.inc b/games/riven_hgr/common_defines.inc
index 45efd8fd..0a11110a 100644
--- a/games/riven_hgr/common_defines.inc
+++ b/games/riven_hgr/common_defines.inc
@@ -1,11 +1,3 @@
-LOAD_TITLE      =       0
-LOAD_OUTSIDE	=	1
-LOAD_PROJECTOR	=	2
-LOAD_MAGSTEPS	=	3
-LOAD_MAGLEV	=	4
-LOAD_MOVIE1	=	5
-LOAD_MOVIE2	=	6
-
 div7_table     = $1300
 mod7_table     = $1400
 hposn_high     = $1500
@@ -47,29 +39,3 @@ LOCATION_SPECIAL_Y2=21
 LOCATION_SPECIAL_FUNC=22		; pointer-1 of function to call on click
 
 
-;================================
-; Level definitions
-
-; Outside
-
-RIVEN_MAGLEV1	=	0
-RIVEN_MAGPATH	=	1
-RIVEN_OVERLOOK	=	2
-
-; Projector
-
-RIVEN_PROJECTOR	=	0
-RIVEN_PROJ_DOOR	=	1
-RIVEN_PROJ_STEPS=	2
-RIVEN_WAHRK	=	3
-
-; Magsteps
-
-RIVEN_MAGSTEPS2	=	0
-RIVEN_MAGSTEPS3	=	1
-
-; Maglev
-
-RIVEN_LOOKIN	=	0
-RIVEN_INSEAT	=	1
-RIVEN_READY2GO	=	2
diff --git a/games/riven_hgr/disk39_files/Makefile b/games/riven_hgr/disk39_files/Makefile
index 4fc52205..23336135 100644
--- a/games/riven_hgr/disk39_files/Makefile
+++ b/games/riven_hgr/disk39_files/Makefile
@@ -12,7 +12,7 @@ LEVEL_OUTSIDE:	level_outside.o
 
 level_outside.o:	level_outside.s \
 		../zp.inc ../hardware.inc ../qload.inc \
-		../common_defines.inc \
+		../common_defines.inc disk39_defines.inc \
 		leveldata_outside.inc \
 		graphics_outside/outside_graphics.inc
 	ca65 -o level_outside.o level_outside.s -l level_outside.lst
@@ -24,7 +24,7 @@ LEVEL_PROJECTOR:	level_projector.o
 
 level_projector.o:	level_projector.s \
 		../zp.inc ../hardware.inc ../qload.inc \
-		../common_defines.inc \
+		../common_defines.inc disk39_defines.inc \
 		leveldata_projector.inc \
 		graphics_projector/projector_graphics.inc
 	ca65 -o level_projector.o level_projector.s -l level_projector.lst
@@ -36,7 +36,7 @@ LEVEL_MAGSTEPS:	level_magsteps.o
 
 level_magsteps.o:	level_magsteps.s \
 		../zp.inc ../hardware.inc ../qload.inc \
-		../common_defines.inc \
+		../common_defines.inc disk39_defines.inc \
 		leveldata_magsteps.inc \
 		graphics_magsteps/magsteps_graphics.inc
 	ca65 -o level_magsteps.o level_magsteps.s -l level_magsteps.lst
@@ -48,7 +48,7 @@ LEVEL_MAGLEV:	level_maglev.o
 
 level_maglev.o:	level_maglev.s \
 		../zp.inc ../hardware.inc ../qload.inc \
-		../common_defines.inc \
+		../common_defines.inc disk39_defines.inc \
 		leveldata_maglev.inc \
 		graphics_maglev/maglev_graphics.inc
 	ca65 -o level_maglev.o level_maglev.s -l level_maglev.lst
@@ -60,7 +60,7 @@ MOVIE_MAGLEV_FLIP:	movie_maglev_flip.o
 
 movie_maglev_flip.o:	movie_maglev_flip.s \
 	../zp.inc ../hardware.inc ../qload.inc \
-	../common_defines.inc \
+	../common_defines.inc disk39_defines.inc \
 	movie_maglev_flip/movie_maglev_flip.inc
 	ca65 -o movie_maglev_flip.o movie_maglev_flip.s -l movie_maglev_flip.lst
 
@@ -71,7 +71,7 @@ MOVIE_MAGLEV_RIDE:	movie_maglev_ride.o
 
 movie_maglev_ride.o:	movie_maglev_ride.s \
 	../zp.inc ../hardware.inc ../qload.inc \
-	../common_defines.inc \
+	../common_defines.inc disk39_defines.inc \
 	end_message/end_message.gr.zx02 \
 	movie_maglev_ride/movie_maglev_ride.inc
 	ca65 -o movie_maglev_ride.o movie_maglev_ride.s -l movie_maglev_ride.lst
diff --git a/games/riven_hgr/disk39_files/disk39_defines.inc b/games/riven_hgr/disk39_files/disk39_defines.inc
index 45efd8fd..4f4d2052 100644
--- a/games/riven_hgr/disk39_files/disk39_defines.inc
+++ b/games/riven_hgr/disk39_files/disk39_defines.inc
@@ -6,47 +6,6 @@ LOAD_MAGLEV	=	4
 LOAD_MOVIE1	=	5
 LOAD_MOVIE2	=	6
 
-div7_table     = $1300
-mod7_table     = $1400
-hposn_high     = $1500
-hposn_low      = $1600
-
-
-;=============================
-; common stuff
-
-;===============================================
-; level data structure definitions
-;===============================================
-; 24 bytes each location
-; we put special at end as it's ignored if not set
-
-LOCATION_NORTH_EXIT=0			; new room when heading north
-LOCATION_SOUTH_EXIT=1			; new room when heading south
-LOCATION_EAST_EXIT=2			; new room when heading east
-LOCATION_WEST_EXIT=3			; new room when heading west
-LOCATION_NORTH_EXIT_DIR=4		; direction faced in new room when N
-LOCATION_SOUTH_EXIT_DIR=5		; direction faced in new room when S
-LOCATION_EAST_EXIT_DIR=6		; direction faced in new room when E
-LOCATION_WEST_EXIT_DIR=7		; direction faced in new room when W
-LOCATION_NORTH_BG=8			; pointer to north background image
-LOCATION_SOUTH_BG=10			; pointer to south background image
-LOCATION_EAST_BG=12			; pointer to east background image
-LOCATION_WEST_BG=14			; pointer to west background image
-LOCATION_BGS	= 16			; bitmap saying which backgrounds valid
-	BG_NORTH = 1
-	BG_SOUTH = 2
-	BG_WEST = 4
-	BG_EAST = 8
-LOCATION_SPECIAL_EXIT=17		; if we have something clickable
-					; $FF if not, direction if so
-LOCATION_SPECIAL_X1=18			; collision box for the thing to click
-LOCATION_SPECIAL_X2=19
-LOCATION_SPECIAL_Y1=20
-LOCATION_SPECIAL_Y2=21
-LOCATION_SPECIAL_FUNC=22		; pointer-1 of function to call on click
-
-
 ;================================
 ; Level definitions
 
diff --git a/games/riven_hgr/disk39_files/level_maglev.s b/games/riven_hgr/disk39_files/level_maglev.s
index 1044e26d..0e8b06b9 100644
--- a/games/riven_hgr/disk39_files/level_maglev.s
+++ b/games/riven_hgr/disk39_files/level_maglev.s
@@ -7,6 +7,7 @@
 	.include "../hardware.inc"
 	.include "../common_defines.inc"
 	.include "../qload.inc"
+	.include "disk39_defines.inc"
 
 riven_maglev:
 
diff --git a/games/riven_hgr/disk39_files/level_magsteps.s b/games/riven_hgr/disk39_files/level_magsteps.s
index 56bb18d2..31e85a50 100644
--- a/games/riven_hgr/disk39_files/level_magsteps.s
+++ b/games/riven_hgr/disk39_files/level_magsteps.s
@@ -7,6 +7,7 @@
 	.include "../hardware.inc"
 	.include "../common_defines.inc"
 	.include "../qload.inc"
+	.include "disk39_defines.inc"
 
 riven_magsteps:
 
diff --git a/games/riven_hgr/disk39_files/level_outside.s b/games/riven_hgr/disk39_files/level_outside.s
index a0047018..2c0a318c 100644
--- a/games/riven_hgr/disk39_files/level_outside.s
+++ b/games/riven_hgr/disk39_files/level_outside.s
@@ -7,6 +7,7 @@
 	.include "../hardware.inc"
 	.include "../common_defines.inc"
 	.include "../qload.inc"
+	.include "disk39_defines.inc"
 
 riven_outside:
 
diff --git a/games/riven_hgr/disk39_files/level_projector.s b/games/riven_hgr/disk39_files/level_projector.s
index 6ef971d0..7b7b2d71 100644
--- a/games/riven_hgr/disk39_files/level_projector.s
+++ b/games/riven_hgr/disk39_files/level_projector.s
@@ -7,6 +7,7 @@
 	.include "../hardware.inc"
 	.include "../common_defines.inc"
 	.include "../qload.inc"
+	.include "disk39_defines.inc"
 
 riven_projector:
 
diff --git a/games/riven_hgr/disk39_files/movie_maglev_flip.s b/games/riven_hgr/disk39_files/movie_maglev_flip.s
index a9427545..7c5ac6b2 100644
--- a/games/riven_hgr/disk39_files/movie_maglev_flip.s
+++ b/games/riven_hgr/disk39_files/movie_maglev_flip.s
@@ -6,6 +6,7 @@
 .include "../hardware.inc"
 .include "../common_defines.inc"
 .include "../qload.inc"
+.include "disk39_defines.inc"
 
 overlays	=	$2000