diff --git a/Makefile b/Makefile
index 30fa875..8bfcaf3 100644
--- a/Makefile
+++ b/Makefile
@@ -1028,37 +1028,37 @@ $(BUILDDIR)/ref_soft/r_sprite.o :     $(REF_SOFT_DIR)/r_sprite.c
 $(BUILDDIR)/ref_soft/r_surf.o :       $(REF_SOFT_DIR)/r_surf.c
 	$(DO_SHLIB_CC)
 
-$(BUILDDIR)/ref_soft/r_aclipa.o :     $(SRC_DIR)/r_aclipa.S
+$(BUILDDIR)/ref_soft/r_aclipa.o :     $(REF_SOFT_DIR)/r_aclipa.S
 	$(DO_SHLIB_AS)
 
-$(BUILDDIR)/ref_soft/r_draw16.o :     $(SRC_DIR)/r_draw16.S
+$(BUILDDIR)/ref_soft/r_draw16.o :     $(REF_SOFT_DIR)/r_draw16.S
 	$(DO_SHLIB_AS)
 
-$(BUILDDIR)/ref_soft/r_drawa.o :      $(SRC_DIR)/r_drawa.S
+$(BUILDDIR)/ref_soft/r_drawa.o :      $(REF_SOFT_DIR)/r_drawa.S
 	$(DO_SHLIB_AS)
 
-$(BUILDDIR)/ref_soft/r_edgea.o :      $(SRC_DIR)/r_edgea.S
+$(BUILDDIR)/ref_soft/r_edgea.o :      $(REF_SOFT_DIR)/r_edgea.S
 	$(DO_SHLIB_AS)
 
-$(BUILDDIR)/ref_soft/r_scana.o :      $(SRC_DIR)/r_scana.S
+$(BUILDDIR)/ref_soft/r_scana.o :      $(REF_SOFT_DIR)/r_scana.S
 	$(DO_SHLIB_AS)
 
-$(BUILDDIR)/ref_soft/r_spr8.o :       $(SRC_DIR)/r_spr8.S
+$(BUILDDIR)/ref_soft/r_spr8.o :       $(REF_SOFT_DIR)/r_spr8.S
 	$(DO_SHLIB_AS)
 
-$(BUILDDIR)/ref_soft/r_surf8.o :      $(SRC_DIR)/r_surf8.S
+$(BUILDDIR)/ref_soft/r_surf8.o :      $(REF_SOFT_DIR)/r_surf8.S
 	$(DO_SHLIB_AS)
 
-$(BUILDDIR)/ref_soft/math.o :         $(SRC_DIR)/math.S
+$(BUILDDIR)/ref_soft/math.o :         $(REF_SOFT_DIR)/math.S
 	$(DO_SHLIB_AS)
 
-$(BUILDDIR)/ref_soft/d_polysa.o :     $(SRC_DIR)/d_polysa.S
+$(BUILDDIR)/ref_soft/d_polysa.o :     $(REF_SOFT_DIR)/d_polysa.S
 	$(DO_SHLIB_AS)
 
-$(BUILDDIR)/ref_soft/r_varsa.o :      $(SRC_DIR)/r_varsa.S
+$(BUILDDIR)/ref_soft/r_varsa.o :      $(REF_SOFT_DIR)/r_varsa.S
 	$(DO_SHLIB_AS)
 
-$(BUILDDIR)/ref_soft/sys_dosa.o :     $(SRC_DIR)/sys_dosa.S
+$(BUILDDIR)/ref_soft/sys_dosa.o :     $(REF_SOFT_DIR)/sys_dosa.S
 	$(DO_SHLIB_AS)
 
 $(BUILDDIR)/ref_soft/q_shared.o :     $(GAME_DIR)/q_shared.c
@@ -1070,7 +1070,7 @@ $(BUILDDIR)/ref_soft/q_sh.o :    $(SRC_DIR)/q_sh.c
 $(BUILDDIR)/ref_soft/glob.o :         $(SRC_DIR)/glob.c
 	$(DO_SHLIB_CC)
 
-$(BUILDDIR)/ref_soft/d_copy.o :       $(SRC_DIR)/d_copy.S
+$(BUILDDIR)/ref_soft/d_copy.o :       $(REF_SOFT_DIR)/d_copy.S
 	$(DO_SHLIB_AS)
 
 $(BUILDDIR)/ref_soft/rw_svgalib.o :   $(SRC_DIR)/rw_svgalib.c
diff --git a/src/d_copy.S b/ref_soft/d_copy.S
similarity index 99%
rename from src/d_copy.S
rename to ref_soft/d_copy.S
index 376bcfe..dbab4b4 100644
--- a/src/d_copy.S
+++ b/ref_soft/d_copy.S
@@ -3,7 +3,7 @@
 // x86 assembly-language screen copying code.
 //
 
-#include "qasm.h"
+#include "../src/qasm.h"
 
 	.data
 
diff --git a/src/d_polysa.S b/ref_soft/d_polysa.S
similarity index 99%
rename from src/d_polysa.S
rename to ref_soft/d_polysa.S
index c3ffdba..78bf00c 100644
--- a/src/d_polysa.S
+++ b/ref_soft/d_polysa.S
@@ -3,7 +3,7 @@
 // x86 assembly-language polygon model drawing code
 //
 
-#include "qasm.h"
+#include "../src/qasm.h"
 #include "d_ifacea.h"
 
 #if	id386
diff --git a/src/math.S b/ref_soft/math.S
similarity index 99%
rename from src/math.S
rename to ref_soft/math.S
index 005a931..c6aaf12 100644
--- a/src/math.S
+++ b/ref_soft/math.S
@@ -3,7 +3,7 @@
 // x86 assembly-language math routines.
 
 #define GLQUAKE	1	// don't include unneeded defs
-#include "qasm.h"
+#include "../src/qasm.h"
 
 
 #if	id386
diff --git a/src/r_aclipa.S b/ref_soft/r_aclipa.S
similarity index 99%
rename from src/r_aclipa.S
rename to ref_soft/r_aclipa.S
index 74eb74b..d4db210 100644
--- a/src/r_aclipa.S
+++ b/ref_soft/r_aclipa.S
@@ -3,7 +3,7 @@
 // x86 assembly-language Alias model transform and project code.
 //
 
-#include "qasm.h"
+#include "../src/qasm.h"
 #include "d_ifacea.h"
 
 #if id386
diff --git a/src/r_draw16.S b/ref_soft/r_draw16.S
similarity index 99%
rename from src/r_draw16.S
rename to ref_soft/r_draw16.S
index 2c77451..d4ee01c 100644
--- a/src/r_draw16.S
+++ b/ref_soft/r_draw16.S
@@ -4,7 +4,7 @@
 // subdivision.
 //
 
-#include "qasm.h"
+#include "../src/qasm.h"
 #include "d_ifacea.h"
 
 #if	id386
diff --git a/src/r_drawa.S b/ref_soft/r_drawa.S
similarity index 99%
rename from src/r_drawa.S
rename to ref_soft/r_drawa.S
index 4406afd..0e81bac 100644
--- a/src/r_drawa.S
+++ b/ref_soft/r_drawa.S
@@ -3,7 +3,7 @@
 // x86 assembly-language edge clipping and emission code
 //
 
-#include "qasm.h"
+#include "../src/qasm.h"
 #include "d_ifacea.h"
 
 #if	id386
diff --git a/src/r_edgea.S b/ref_soft/r_edgea.S
similarity index 99%
rename from src/r_edgea.S
rename to ref_soft/r_edgea.S
index 6b38251..3d896da 100644
--- a/src/r_edgea.S
+++ b/ref_soft/r_edgea.S
@@ -3,7 +3,7 @@
 // x86 assembly-language edge-processing code.
 //
 
-#include "qasm.h"
+#include "../src/qasm.h"
 
 #if	id386
 
diff --git a/src/r_scana.S b/ref_soft/r_scana.S
similarity index 98%
rename from src/r_scana.S
rename to ref_soft/r_scana.S
index f4ce68d..eb09861 100644
--- a/src/r_scana.S
+++ b/ref_soft/r_scana.S
@@ -3,7 +3,7 @@
 // x86 assembly-language turbulent texture mapping code
 //
 
-#include "qasm.h"
+#include "../src/qasm.h"
 #include "d_ifacea.h"
 
 #if id386
diff --git a/src/r_spr8.S b/ref_soft/r_spr8.S
similarity index 99%
rename from src/r_spr8.S
rename to ref_soft/r_spr8.S
index d5fb017..4286931 100644
--- a/src/r_spr8.S
+++ b/ref_soft/r_spr8.S
@@ -3,7 +3,7 @@
 // x86 assembly-language horizontal 8-bpp transparent span-drawing code.
 //
 
-#include "qasm.h"
+#include "../src/qasm.h"
 
 #if id386
 
diff --git a/src/r_surf8.S b/ref_soft/r_surf8.S
similarity index 99%
rename from src/r_surf8.S
rename to ref_soft/r_surf8.S
index 2069cf3..8daa2f0 100644
--- a/src/r_surf8.S
+++ b/ref_soft/r_surf8.S
@@ -3,7 +3,7 @@
 // x86 assembly-language 8 bpp surface block drawing code.
 //
 
-#include "qasm.h"
+#include "../src/qasm.h"
 
 #if	id386
 
diff --git a/src/r_varsa.S b/ref_soft/r_varsa.S
similarity index 99%
rename from src/r_varsa.S
rename to ref_soft/r_varsa.S
index d951e4f..91c20ff 100644
--- a/src/r_varsa.S
+++ b/ref_soft/r_varsa.S
@@ -2,7 +2,7 @@
 // r_varsa.s
 //
 
-#include "qasm.h"
+#include "../src/qasm.h"
 #include "d_ifacea.h"
 
 #if id386
diff --git a/src/sys_dosa.S b/ref_soft/sys_dosa.S
similarity index 97%
rename from src/sys_dosa.S
rename to ref_soft/sys_dosa.S
index 276874e..755463a 100644
--- a/src/sys_dosa.S
+++ b/ref_soft/sys_dosa.S
@@ -2,7 +2,7 @@
 // sys_dosa.s
 // x86 assembly-language DOS-dependent routines.
 
-#include "qasm.h"
+#include "../src/qasm.h"
 
 
 	.data