diff --git a/include/quakeasm.h b/include/quakeasm.h
index ab7f412..3833c96 100644
--- a/include/quakeasm.h
+++ b/include/quakeasm.h
@@ -247,13 +247,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	.extern pz
 	.extern spr8entryvec_table
 
-	.extern C(snd_scaletable)
-	.extern C(paintbuffer)
-	.extern C(snd_linear_count)
-	.extern C(snd_p)
-	.extern C(snd_vol)
-	.extern C(snd_out)
 	.extern C(vright)
 	.extern C(vup)
 	.extern C(vpn)
-	.extern C(BOPS_Error)
diff --git a/source/math.S b/source/math.S
index 87064f4..e8e66b9 100644
--- a/source/math.S
+++ b/source/math.S
@@ -29,7 +29,7 @@
 // x86 assembly-language math routines.
 
 #include "asm_i386.h"
-#include "quakeasm.h"
+// #include "quakeasm.h"
 
 
 #if id386
@@ -42,6 +42,8 @@ Ljmptab:	.long	Lcase0, Lcase1, Lcase2, Lcase3
 
 	.text
 
+	.extern C(BOPS_Error)
+
 
 #define EMINS	4+4
 #define EMAXS	4+8
diff --git a/source/snd_mixa.S b/source/snd_mixa.S
index 7104d70..23caf5c 100644
--- a/source/snd_mixa.S
+++ b/source/snd_mixa.S
@@ -29,12 +29,19 @@
 // x86 assembly-language sound code
 
 #include "asm_i386.h"
-#include "quakeasm.h"
+// #include "quakeasm.h"
 
 #if	id386
 
 	.text
 
+	.extern C(snd_scaletable)
+	.extern C(paintbuffer)
+	.extern C(snd_linear_count)
+	.extern C(snd_p)
+	.extern C(snd_vol)
+	.extern C(snd_out)
+
 //----------------------------------------------------------------------
 // 8-bit sound-mixing code
 //----------------------------------------------------------------------
diff --git a/source/sys_x86.S b/source/sys_x86.S
index 6de31c2..9a2d908 100644
--- a/source/sys_x86.S
+++ b/source/sys_x86.S
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // x86 assembly-language Win-dependent routines.
 
 #include "asm_i386.h"
-#include "quakeasm.h"
+// #include "quakeasm.h"
 
 //@@@ should be id386-dependent, and have an equivalent C path
 
diff --git a/source/worlda.S b/source/worlda.S
index 3dfae63..a6e77b8 100644
--- a/source/worlda.S
+++ b/source/worlda.S
@@ -29,7 +29,7 @@
 // x86 assembly-language server testing stuff
 
 #include "asm_i386.h"
-#include "quakeasm.h"
+//#include "quakeasm.h"
 //include "d_ifacea.h"
 
 #if id386