diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index da4026b4712..f8edb25d7a6 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -252,7 +252,7 @@ if env['platform'] != 'winddk':
 		])
 		mesa_sources += [
 			'x86/common_x86.c',
-			'x86/x86.c',
+			'x86/x86_xform.c',
 			'x86/3dnow.c',
 			'x86/sse.c',
 			'x86/common_x86_asm.S',
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 92c2183a942..30ee064270e 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -254,7 +254,7 @@ SLANG_SOURCES =	\
 
 ASM_C_SOURCES =	\
 	x86/common_x86.c \
-	x86/x86.c \
+	x86/x86_xform.c \
 	x86/3dnow.c \
 	x86/sse.c \
 	x86/rtasm/x86sse.c \
diff --git a/src/mesa/x86/x86.c b/src/mesa/x86/x86_xform.c
similarity index 100%
rename from src/mesa/x86/x86.c
rename to src/mesa/x86/x86_xform.c