diff --git a/source/cl_math.S b/source/cl_math.S
index 1666700..d28046d 100644
--- a/source/cl_math.S
+++ b/source/cl_math.S
@@ -29,11 +29,10 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "asm_i386.h"
-#include "quakeasm.h"
-
 
 #ifdef USE_INTEL_ASM
+#include "asm_i386.h"
+#include "quakeasm.h"
 
 	.data
 
diff --git a/source/d_copy.S b/source/d_copy.S
index 68e932e..e11b2ef 100644
--- a/source/d_copy.S
+++ b/source/d_copy.S
@@ -29,11 +29,11 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#ifdef USE_INTEL_ASM
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
-
-#ifdef USE_INTEL_ASM
 	.data
 
 LCopyWidth:		.long	0
diff --git a/source/d_draw.S b/source/d_draw.S
index 0792617..6fe35a2 100644
--- a/source/d_draw.S
+++ b/source/d_draw.S
@@ -29,13 +29,13 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#ifdef USE_INTEL_ASM
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
-#ifdef USE_INTEL_ASM
-
 //----------------------------------------------------------------------
 // 8-bpp horizontal span drawing code for polygons, with no transparency.
 //
diff --git a/source/d_draw16.S b/source/d_draw16.S
index 46d575c..82cc00a 100644
--- a/source/d_draw16.S
+++ b/source/d_draw16.S
@@ -30,13 +30,13 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#ifdef USE_INTEL_ASM
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
-#ifdef USE_INTEL_ASM
-
 //----------------------------------------------------------------------
 // 8-bpp horizontal span drawing code for polygons, with no transparency and
 // 16-pixel subdivision.
diff --git a/source/d_parta.S b/source/d_parta.S
index 2ea8d03..d563001 100644
--- a/source/d_parta.S
+++ b/source/d_parta.S
@@ -29,13 +29,13 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#ifdef USE_INTEL_ASM
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "d_ifacea.h"
 #include "asm_draw.h"
 
-#ifdef USE_INTEL_ASM
-
 //----------------------------------------------------------------------
 // 8-bpp particle drawing code.
 //----------------------------------------------------------------------
diff --git a/source/d_polysa.S b/source/d_polysa.S
index 60a17c1..efb073d 100644
--- a/source/d_polysa.S
+++ b/source/d_polysa.S
@@ -29,13 +29,13 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#ifdef USE_INTEL_ASM
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
-#ifdef USE_INTEL_ASM
-
 // !!! if this is changed, it must be changed in d_polyse.c too !!!
 #define DPS_MAXSPANS			MAXHEIGHT+1	
 									// 1 extra for spanpackage that marks end
diff --git a/source/d_scana.S b/source/d_scana.S
index 7487928..aa6c556 100644
--- a/source/d_scana.S
+++ b/source/d_scana.S
@@ -29,13 +29,13 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#ifdef USE_INTEL_ASM
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
-#ifdef USE_INTEL_ASM
-
 	.data
 
 	.text
diff --git a/source/d_spr8.S b/source/d_spr8.S
index 9a38632..b0f4e06 100644
--- a/source/d_spr8.S
+++ b/source/d_spr8.S
@@ -29,12 +29,12 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#ifdef USE_INTEL_ASM
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 
-#ifdef USE_INTEL_ASM
-
 //----------------------------------------------------------------------
 // 8-bpp horizontal span drawing code for polygons, with transparency.
 //----------------------------------------------------------------------
diff --git a/source/d_varsa.S b/source/d_varsa.S
index f6441bc..5bc6b3e 100644
--- a/source/d_varsa.S
+++ b/source/d_varsa.S
@@ -29,13 +29,13 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#ifdef USE_INTEL_ASM
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
-#ifdef USE_INTEL_ASM
-
 	.data
 
 //-------------------------------------------------------
diff --git a/source/math.S b/source/math.S
index 1061131..6642068 100644
--- a/source/math.S
+++ b/source/math.S
@@ -29,11 +29,10 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "asm_i386.h"
-// #include "quakeasm.h"
-
 
 #ifdef USE_INTEL_ASM
+#include "asm_i386.h"
+// #include "quakeasm.h"
 
 	.data
 
diff --git a/source/r_aclipa.S b/source/r_aclipa.S
index a3d0b81..61ef398 100644
--- a/source/r_aclipa.S
+++ b/source/r_aclipa.S
@@ -30,13 +30,13 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#ifdef USE_INTEL_ASM
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
-#ifdef USE_INTEL_ASM
-
 	.data
 Ltemp0:	.long	0
 Ltemp1:	.long	0
diff --git a/source/r_aliasa.S b/source/r_aliasa.S
index 0570525..3602f13 100644
--- a/source/r_aliasa.S
+++ b/source/r_aliasa.S
@@ -29,13 +29,13 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#ifdef USE_INTEL_ASM
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
-#ifdef USE_INTEL_ASM
-
 	.data
 
 Lfloat_1:	.single	1.0
diff --git a/source/r_drawa.S b/source/r_drawa.S
index c2e7832..5aa0afe 100644
--- a/source/r_drawa.S
+++ b/source/r_drawa.S
@@ -29,13 +29,13 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#ifdef USE_INTEL_ASM
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
-#ifdef USE_INTEL_ASM
-
 // !!! if these are changed, they must be changed in r_draw.c too !!!
 #define FULLY_CLIPPED_CACHED	0x80000000
 #define FRAMECOUNT_MASK			0x7FFFFFFF
diff --git a/source/r_edgea.S b/source/r_edgea.S
index 4e799e2..661dbb6 100644
--- a/source/r_edgea.S
+++ b/source/r_edgea.S
@@ -29,12 +29,12 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#ifdef USE_INTEL_ASM
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 
-#ifdef USE_INTEL_ASM
-
 	.data
 Ltemp:					.long	0
 float_1_div_0100000h:	.long	0x35800000	// 1.0/(float)0x100000
diff --git a/source/r_varsa.S b/source/r_varsa.S
index 0a253b8..368b4cf 100644
--- a/source/r_varsa.S
+++ b/source/r_varsa.S
@@ -29,13 +29,13 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#ifdef USE_INTEL_ASM
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
-#ifdef USE_INTEL_ASM
-
 	.data
 
 //-------------------------------------------------------
diff --git a/source/snd_mixa.S b/source/snd_mixa.S
index 3879d40..cf4978b 100644
--- a/source/snd_mixa.S
+++ b/source/snd_mixa.S
@@ -29,10 +29,10 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "asm_i386.h"
-// #include "quakeasm.h"
 
 #ifdef USE_INTEL_ASM
+#include "asm_i386.h"
+// #include "quakeasm.h"
 
 	.text
 
diff --git a/source/surf16.S b/source/surf16.S
index dec8993..2ee4181 100644
--- a/source/surf16.S
+++ b/source/surf16.S
@@ -29,12 +29,12 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#ifdef USE_INTEL_ASM
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 
-#ifdef USE_INTEL_ASM
-
 //----------------------------------------------------------------------
 // Surface block drawer
 //----------------------------------------------------------------------
diff --git a/source/surf8.S b/source/surf8.S
index 50a59c0..68cb271 100644
--- a/source/surf8.S
+++ b/source/surf8.S
@@ -30,12 +30,11 @@
 # include "config.h"
 #endif
 
+#ifdef USE_INTEL_ASM
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 
-#ifdef USE_INTEL_ASM
-
 	.data
 
 sb_v:		.long	0
diff --git a/source/sys_x86.S b/source/sys_x86.S
index b34494a..94d04a6 100644
--- a/source/sys_x86.S
+++ b/source/sys_x86.S
@@ -29,10 +29,9 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "asm_i386.h"
-
 
 #ifdef USE_INTEL_ASM
+#include "asm_i386.h"
 	.data
 
 	.align	4
diff --git a/source/worlda.S b/source/worlda.S
index cb06d48..6b17021 100644
--- a/source/worlda.S
+++ b/source/worlda.S
@@ -29,12 +29,12 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#ifdef USE_INTEL_ASM
 #include "asm_i386.h"
 //#include "quakeasm.h"
 //include "d_ifacea.h"
 
-#ifdef USE_INTEL_ASM
-
 	.data
 
 Ltemp:	.long	0