diff --git a/src/gallium/auxiliary/draw/Makefile b/src/gallium/auxiliary/draw/Makefile
index 0b0578a1798..62f46c6db1e 100644
--- a/src/gallium/auxiliary/draw/Makefile
+++ b/src/gallium/auxiliary/draw/Makefile
@@ -4,14 +4,21 @@ include $(TOP)/configs/current
 LIBNAME = draw
 
 C_SOURCES = \
-	draw_aaline.c \
-	draw_aapoint.c \
-	draw_clip.c \
-	draw_context.c\
-	draw_cull.c \
-	draw_flatshade.c \
-	draw_offset.c \
-	draw_pstipple.c \
+	draw_context.c \
+	draw_pipe_aaline.c \
+	draw_pipe_aapoint.c \
+	draw_pipe_clip.c \
+	draw_pipe_cull.c \
+	draw_pipe_flatshade.c \
+	draw_pipe_offset.c \
+	draw_pipe_pstipple.c \
+	draw_pipe_stipple.c \
+	draw_pipe_twoside.c \
+	draw_pipe_unfilled.c \
+	draw_pipe_validate.c \
+	draw_pipe_vbuf.c \
+	draw_pipe_wide_line.c \
+	draw_pipe_wide_point.c \
 	draw_pt.c \
 	draw_pt_elts.c \
 	draw_pt_emit.c \
@@ -21,18 +28,11 @@ C_SOURCES = \
 	draw_pt_pipeline.c \
 	draw_pt_post_vs.c \
 	draw_pt_vcache.c \
-	draw_stipple.c \
-	draw_twoside.c \
-	draw_unfilled.c \
-	draw_validate.c \
-	draw_vbuf.c \
 	draw_vertex.c \
 	draw_vs.c \
 	draw_vs_exec.c \
 	draw_vs_llvm.c \
-	draw_vs_sse.c \
-	draw_wide_line.c \
-	draw_wide_point.c
+	draw_vs_sse.c 
 
 
 include ../../Makefile.template
diff --git a/src/gallium/auxiliary/draw/SConscript b/src/gallium/auxiliary/draw/SConscript
index 388d7879dd6..5fa35d30056 100644
--- a/src/gallium/auxiliary/draw/SConscript
+++ b/src/gallium/auxiliary/draw/SConscript
@@ -3,14 +3,22 @@ Import('*')
 draw = env.ConvenienceLibrary(
 	target = 'draw',
 	source = [
-		'draw_aaline.c',
-		'draw_aapoint.c',
-		'draw_clip.c',
 		'draw_context.c',
-		'draw_cull.c',
-		'draw_flatshade.c',
-		'draw_offset.c',
-		'draw_pstipple.c',
+		'draw_pipe_aaline.c',
+		'draw_pipe_aapoint.c',
+		'draw_pipe_clip.c',
+		'draw_pipe_cull.c',
+		'draw_pipe_flatshade.c',
+		'draw_pipe_offset.c',
+		'draw_pipe_pstipple.c',
+		'draw_pipe_stipple.c',
+		'draw_pipe_twoside.c',
+		'draw_pipe_unfilled.c',
+		'draw_pipe_validate.c',
+		'draw_pipe_vbuf.c',
+		'draw_pipe_vertex.c',
+		'draw_pipe_wide_line.c',
+		'draw_pipe_wide_point.c',
 		'draw_pt.c',
 		'draw_pt_elts.c',
 		'draw_pt_emit.c',
@@ -20,18 +28,10 @@ draw = env.ConvenienceLibrary(
 		'draw_pt_pipeline.c',
 		'draw_pt_post_vs.c',
 		'draw_pt_vcache.c',
-		'draw_stipple.c',
-		'draw_twoside.c',
-		'draw_unfilled.c',
-		'draw_validate.c',
-		'draw_vbuf.c',
-		'draw_vertex.c',
 		'draw_vs.c',
 		'draw_vs_exec.c',
 		'draw_vs_llvm.c',
 		'draw_vs_sse.c',
-		'draw_wide_line.c',
-		'draw_wide_point.c',
 	])
 
 auxiliaries.insert(0, draw)
diff --git a/src/gallium/auxiliary/draw/draw_aaline.c b/src/gallium/auxiliary/draw/draw_pipe_aaline.c
similarity index 100%
rename from src/gallium/auxiliary/draw/draw_aaline.c
rename to src/gallium/auxiliary/draw/draw_pipe_aaline.c
diff --git a/src/gallium/auxiliary/draw/draw_aapoint.c b/src/gallium/auxiliary/draw/draw_pipe_aapoint.c
similarity index 100%
rename from src/gallium/auxiliary/draw/draw_aapoint.c
rename to src/gallium/auxiliary/draw/draw_pipe_aapoint.c
diff --git a/src/gallium/auxiliary/draw/draw_clip.c b/src/gallium/auxiliary/draw/draw_pipe_clip.c
similarity index 100%
rename from src/gallium/auxiliary/draw/draw_clip.c
rename to src/gallium/auxiliary/draw/draw_pipe_clip.c
diff --git a/src/gallium/auxiliary/draw/draw_cull.c b/src/gallium/auxiliary/draw/draw_pipe_cull.c
similarity index 100%
rename from src/gallium/auxiliary/draw/draw_cull.c
rename to src/gallium/auxiliary/draw/draw_pipe_cull.c
diff --git a/src/gallium/auxiliary/draw/draw_flatshade.c b/src/gallium/auxiliary/draw/draw_pipe_flatshade.c
similarity index 100%
rename from src/gallium/auxiliary/draw/draw_flatshade.c
rename to src/gallium/auxiliary/draw/draw_pipe_flatshade.c
diff --git a/src/gallium/auxiliary/draw/draw_offset.c b/src/gallium/auxiliary/draw/draw_pipe_offset.c
similarity index 100%
rename from src/gallium/auxiliary/draw/draw_offset.c
rename to src/gallium/auxiliary/draw/draw_pipe_offset.c
diff --git a/src/gallium/auxiliary/draw/draw_pstipple.c b/src/gallium/auxiliary/draw/draw_pipe_pstipple.c
similarity index 100%
rename from src/gallium/auxiliary/draw/draw_pstipple.c
rename to src/gallium/auxiliary/draw/draw_pipe_pstipple.c
diff --git a/src/gallium/auxiliary/draw/draw_stipple.c b/src/gallium/auxiliary/draw/draw_pipe_stipple.c
similarity index 100%
rename from src/gallium/auxiliary/draw/draw_stipple.c
rename to src/gallium/auxiliary/draw/draw_pipe_stipple.c
diff --git a/src/gallium/auxiliary/draw/draw_twoside.c b/src/gallium/auxiliary/draw/draw_pipe_twoside.c
similarity index 100%
rename from src/gallium/auxiliary/draw/draw_twoside.c
rename to src/gallium/auxiliary/draw/draw_pipe_twoside.c
diff --git a/src/gallium/auxiliary/draw/draw_unfilled.c b/src/gallium/auxiliary/draw/draw_pipe_unfilled.c
similarity index 100%
rename from src/gallium/auxiliary/draw/draw_unfilled.c
rename to src/gallium/auxiliary/draw/draw_pipe_unfilled.c
diff --git a/src/gallium/auxiliary/draw/draw_validate.c b/src/gallium/auxiliary/draw/draw_pipe_validate.c
similarity index 100%
rename from src/gallium/auxiliary/draw/draw_validate.c
rename to src/gallium/auxiliary/draw/draw_pipe_validate.c
diff --git a/src/gallium/auxiliary/draw/draw_vbuf.c b/src/gallium/auxiliary/draw/draw_pipe_vbuf.c
similarity index 100%
rename from src/gallium/auxiliary/draw/draw_vbuf.c
rename to src/gallium/auxiliary/draw/draw_pipe_vbuf.c
diff --git a/src/gallium/auxiliary/draw/draw_wide_line.c b/src/gallium/auxiliary/draw/draw_pipe_wide_line.c
similarity index 100%
rename from src/gallium/auxiliary/draw/draw_wide_line.c
rename to src/gallium/auxiliary/draw/draw_pipe_wide_line.c
diff --git a/src/gallium/auxiliary/draw/draw_wide_point.c b/src/gallium/auxiliary/draw/draw_pipe_wide_point.c
similarity index 100%
rename from src/gallium/auxiliary/draw/draw_wide_point.c
rename to src/gallium/auxiliary/draw/draw_pipe_wide_point.c
diff --git a/src/gallium/auxiliary/draw/draw_wide_prims.c b/src/gallium/auxiliary/draw/draw_pipe_wide_prims.c
similarity index 100%
rename from src/gallium/auxiliary/draw/draw_wide_prims.c
rename to src/gallium/auxiliary/draw/draw_pipe_wide_prims.c