diff --git a/src/gallium/aux/Makefile b/src/gallium/auxiliary/Makefile
similarity index 100%
rename from src/gallium/aux/Makefile
rename to src/gallium/auxiliary/Makefile
diff --git a/src/gallium/aux/cso_cache/cso_cache.c b/src/gallium/auxiliary/cso_cache/cso_cache.c
similarity index 100%
rename from src/gallium/aux/cso_cache/cso_cache.c
rename to src/gallium/auxiliary/cso_cache/cso_cache.c
diff --git a/src/gallium/aux/cso_cache/cso_cache.h b/src/gallium/auxiliary/cso_cache/cso_cache.h
similarity index 100%
rename from src/gallium/aux/cso_cache/cso_cache.h
rename to src/gallium/auxiliary/cso_cache/cso_cache.h
diff --git a/src/gallium/aux/cso_cache/cso_hash.c b/src/gallium/auxiliary/cso_cache/cso_hash.c
similarity index 100%
rename from src/gallium/aux/cso_cache/cso_hash.c
rename to src/gallium/auxiliary/cso_cache/cso_hash.c
diff --git a/src/gallium/aux/cso_cache/cso_hash.h b/src/gallium/auxiliary/cso_cache/cso_hash.h
similarity index 100%
rename from src/gallium/aux/cso_cache/cso_hash.h
rename to src/gallium/auxiliary/cso_cache/cso_hash.h
diff --git a/src/gallium/aux/draw/Makefile b/src/gallium/auxiliary/draw/Makefile
similarity index 100%
rename from src/gallium/aux/draw/Makefile
rename to src/gallium/auxiliary/draw/Makefile
diff --git a/src/gallium/aux/draw/draw_clip.c b/src/gallium/auxiliary/draw/draw_clip.c
similarity index 100%
rename from src/gallium/aux/draw/draw_clip.c
rename to src/gallium/auxiliary/draw/draw_clip.c
diff --git a/src/gallium/aux/draw/draw_context.c b/src/gallium/auxiliary/draw/draw_context.c
similarity index 100%
rename from src/gallium/aux/draw/draw_context.c
rename to src/gallium/auxiliary/draw/draw_context.c
diff --git a/src/gallium/aux/draw/draw_context.h b/src/gallium/auxiliary/draw/draw_context.h
similarity index 100%
rename from src/gallium/aux/draw/draw_context.h
rename to src/gallium/auxiliary/draw/draw_context.h
diff --git a/src/gallium/aux/draw/draw_cull.c b/src/gallium/auxiliary/draw/draw_cull.c
similarity index 100%
rename from src/gallium/aux/draw/draw_cull.c
rename to src/gallium/auxiliary/draw/draw_cull.c
diff --git a/src/gallium/aux/draw/draw_debug.c b/src/gallium/auxiliary/draw/draw_debug.c
similarity index 100%
rename from src/gallium/aux/draw/draw_debug.c
rename to src/gallium/auxiliary/draw/draw_debug.c
diff --git a/src/gallium/aux/draw/draw_flatshade.c b/src/gallium/auxiliary/draw/draw_flatshade.c
similarity index 100%
rename from src/gallium/aux/draw/draw_flatshade.c
rename to src/gallium/auxiliary/draw/draw_flatshade.c
diff --git a/src/gallium/aux/draw/draw_offset.c b/src/gallium/auxiliary/draw/draw_offset.c
similarity index 100%
rename from src/gallium/aux/draw/draw_offset.c
rename to src/gallium/auxiliary/draw/draw_offset.c
diff --git a/src/gallium/aux/draw/draw_prim.c b/src/gallium/auxiliary/draw/draw_prim.c
similarity index 100%
rename from src/gallium/aux/draw/draw_prim.c
rename to src/gallium/auxiliary/draw/draw_prim.c
diff --git a/src/gallium/aux/draw/draw_private.h b/src/gallium/auxiliary/draw/draw_private.h
similarity index 100%
rename from src/gallium/aux/draw/draw_private.h
rename to src/gallium/auxiliary/draw/draw_private.h
diff --git a/src/gallium/aux/draw/draw_stipple.c b/src/gallium/auxiliary/draw/draw_stipple.c
similarity index 100%
rename from src/gallium/aux/draw/draw_stipple.c
rename to src/gallium/auxiliary/draw/draw_stipple.c
diff --git a/src/gallium/aux/draw/draw_twoside.c b/src/gallium/auxiliary/draw/draw_twoside.c
similarity index 100%
rename from src/gallium/aux/draw/draw_twoside.c
rename to src/gallium/auxiliary/draw/draw_twoside.c
diff --git a/src/gallium/aux/draw/draw_unfilled.c b/src/gallium/auxiliary/draw/draw_unfilled.c
similarity index 100%
rename from src/gallium/aux/draw/draw_unfilled.c
rename to src/gallium/auxiliary/draw/draw_unfilled.c
diff --git a/src/gallium/aux/draw/draw_validate.c b/src/gallium/auxiliary/draw/draw_validate.c
similarity index 100%
rename from src/gallium/aux/draw/draw_validate.c
rename to src/gallium/auxiliary/draw/draw_validate.c
diff --git a/src/gallium/aux/draw/draw_vbuf.c b/src/gallium/auxiliary/draw/draw_vbuf.c
similarity index 100%
rename from src/gallium/aux/draw/draw_vbuf.c
rename to src/gallium/auxiliary/draw/draw_vbuf.c
diff --git a/src/gallium/aux/draw/draw_vbuf.h b/src/gallium/auxiliary/draw/draw_vbuf.h
similarity index 100%
rename from src/gallium/aux/draw/draw_vbuf.h
rename to src/gallium/auxiliary/draw/draw_vbuf.h
diff --git a/src/gallium/aux/draw/draw_vertex.c b/src/gallium/auxiliary/draw/draw_vertex.c
similarity index 100%
rename from src/gallium/aux/draw/draw_vertex.c
rename to src/gallium/auxiliary/draw/draw_vertex.c
diff --git a/src/gallium/aux/draw/draw_vertex.h b/src/gallium/auxiliary/draw/draw_vertex.h
similarity index 100%
rename from src/gallium/aux/draw/draw_vertex.h
rename to src/gallium/auxiliary/draw/draw_vertex.h
diff --git a/src/gallium/aux/draw/draw_vertex_cache.c b/src/gallium/auxiliary/draw/draw_vertex_cache.c
similarity index 100%
rename from src/gallium/aux/draw/draw_vertex_cache.c
rename to src/gallium/auxiliary/draw/draw_vertex_cache.c
diff --git a/src/gallium/aux/draw/draw_vertex_fetch.c b/src/gallium/auxiliary/draw/draw_vertex_fetch.c
similarity index 100%
rename from src/gallium/aux/draw/draw_vertex_fetch.c
rename to src/gallium/auxiliary/draw/draw_vertex_fetch.c
diff --git a/src/gallium/aux/draw/draw_vertex_shader.c b/src/gallium/auxiliary/draw/draw_vertex_shader.c
similarity index 100%
rename from src/gallium/aux/draw/draw_vertex_shader.c
rename to src/gallium/auxiliary/draw/draw_vertex_shader.c
diff --git a/src/gallium/aux/draw/draw_vf.c b/src/gallium/auxiliary/draw/draw_vf.c
similarity index 100%
rename from src/gallium/aux/draw/draw_vf.c
rename to src/gallium/auxiliary/draw/draw_vf.c
diff --git a/src/gallium/aux/draw/draw_vf.h b/src/gallium/auxiliary/draw/draw_vf.h
similarity index 100%
rename from src/gallium/aux/draw/draw_vf.h
rename to src/gallium/auxiliary/draw/draw_vf.h
diff --git a/src/gallium/aux/draw/draw_vf_generic.c b/src/gallium/auxiliary/draw/draw_vf_generic.c
similarity index 100%
rename from src/gallium/aux/draw/draw_vf_generic.c
rename to src/gallium/auxiliary/draw/draw_vf_generic.c
diff --git a/src/gallium/aux/draw/draw_vf_sse.c b/src/gallium/auxiliary/draw/draw_vf_sse.c
similarity index 100%
rename from src/gallium/aux/draw/draw_vf_sse.c
rename to src/gallium/auxiliary/draw/draw_vf_sse.c
diff --git a/src/gallium/aux/draw/draw_wide_prims.c b/src/gallium/auxiliary/draw/draw_wide_prims.c
similarity index 100%
rename from src/gallium/aux/draw/draw_wide_prims.c
rename to src/gallium/auxiliary/draw/draw_wide_prims.c
diff --git a/src/gallium/aux/llvm/Makefile b/src/gallium/auxiliary/llvm/Makefile
similarity index 100%
rename from src/gallium/aux/llvm/Makefile
rename to src/gallium/auxiliary/llvm/Makefile
diff --git a/src/gallium/aux/llvm/gallivm.cpp b/src/gallium/auxiliary/llvm/gallivm.cpp
similarity index 100%
rename from src/gallium/aux/llvm/gallivm.cpp
rename to src/gallium/auxiliary/llvm/gallivm.cpp
diff --git a/src/gallium/aux/llvm/gallivm.h b/src/gallium/auxiliary/llvm/gallivm.h
similarity index 100%
rename from src/gallium/aux/llvm/gallivm.h
rename to src/gallium/auxiliary/llvm/gallivm.h
diff --git a/src/gallium/aux/llvm/gallivm_builtins.cpp b/src/gallium/auxiliary/llvm/gallivm_builtins.cpp
similarity index 100%
rename from src/gallium/aux/llvm/gallivm_builtins.cpp
rename to src/gallium/auxiliary/llvm/gallivm_builtins.cpp
diff --git a/src/gallium/aux/llvm/gallivm_cpu.cpp b/src/gallium/auxiliary/llvm/gallivm_cpu.cpp
similarity index 100%
rename from src/gallium/aux/llvm/gallivm_cpu.cpp
rename to src/gallium/auxiliary/llvm/gallivm_cpu.cpp
diff --git a/src/gallium/aux/llvm/gallivm_p.h b/src/gallium/auxiliary/llvm/gallivm_p.h
similarity index 100%
rename from src/gallium/aux/llvm/gallivm_p.h
rename to src/gallium/auxiliary/llvm/gallivm_p.h
diff --git a/src/gallium/aux/llvm/instructions.cpp b/src/gallium/auxiliary/llvm/instructions.cpp
similarity index 100%
rename from src/gallium/aux/llvm/instructions.cpp
rename to src/gallium/auxiliary/llvm/instructions.cpp
diff --git a/src/gallium/aux/llvm/instructions.h b/src/gallium/auxiliary/llvm/instructions.h
similarity index 100%
rename from src/gallium/aux/llvm/instructions.h
rename to src/gallium/auxiliary/llvm/instructions.h
diff --git a/src/gallium/aux/llvm/instructionssoa.cpp b/src/gallium/auxiliary/llvm/instructionssoa.cpp
similarity index 100%
rename from src/gallium/aux/llvm/instructionssoa.cpp
rename to src/gallium/auxiliary/llvm/instructionssoa.cpp
diff --git a/src/gallium/aux/llvm/instructionssoa.h b/src/gallium/auxiliary/llvm/instructionssoa.h
similarity index 100%
rename from src/gallium/aux/llvm/instructionssoa.h
rename to src/gallium/auxiliary/llvm/instructionssoa.h
diff --git a/src/gallium/aux/llvm/llvm_builtins.c b/src/gallium/auxiliary/llvm/llvm_builtins.c
similarity index 100%
rename from src/gallium/aux/llvm/llvm_builtins.c
rename to src/gallium/auxiliary/llvm/llvm_builtins.c
diff --git a/src/gallium/aux/llvm/loweringpass.cpp b/src/gallium/auxiliary/llvm/loweringpass.cpp
similarity index 100%
rename from src/gallium/aux/llvm/loweringpass.cpp
rename to src/gallium/auxiliary/llvm/loweringpass.cpp
diff --git a/src/gallium/aux/llvm/loweringpass.h b/src/gallium/auxiliary/llvm/loweringpass.h
similarity index 100%
rename from src/gallium/aux/llvm/loweringpass.h
rename to src/gallium/auxiliary/llvm/loweringpass.h
diff --git a/src/gallium/aux/llvm/storage.cpp b/src/gallium/auxiliary/llvm/storage.cpp
similarity index 100%
rename from src/gallium/aux/llvm/storage.cpp
rename to src/gallium/auxiliary/llvm/storage.cpp
diff --git a/src/gallium/aux/llvm/storage.h b/src/gallium/auxiliary/llvm/storage.h
similarity index 100%
rename from src/gallium/aux/llvm/storage.h
rename to src/gallium/auxiliary/llvm/storage.h
diff --git a/src/gallium/aux/llvm/storagesoa.cpp b/src/gallium/auxiliary/llvm/storagesoa.cpp
similarity index 100%
rename from src/gallium/aux/llvm/storagesoa.cpp
rename to src/gallium/auxiliary/llvm/storagesoa.cpp
diff --git a/src/gallium/aux/llvm/storagesoa.h b/src/gallium/auxiliary/llvm/storagesoa.h
similarity index 100%
rename from src/gallium/aux/llvm/storagesoa.h
rename to src/gallium/auxiliary/llvm/storagesoa.h
diff --git a/src/gallium/aux/llvm/tgsitollvm.cpp b/src/gallium/auxiliary/llvm/tgsitollvm.cpp
similarity index 100%
rename from src/gallium/aux/llvm/tgsitollvm.cpp
rename to src/gallium/auxiliary/llvm/tgsitollvm.cpp
diff --git a/src/gallium/aux/llvm/tgsitollvm.h b/src/gallium/auxiliary/llvm/tgsitollvm.h
similarity index 100%
rename from src/gallium/aux/llvm/tgsitollvm.h
rename to src/gallium/auxiliary/llvm/tgsitollvm.h
diff --git a/src/gallium/aux/pipebuffer/Makefile b/src/gallium/auxiliary/pipebuffer/Makefile
similarity index 100%
rename from src/gallium/aux/pipebuffer/Makefile
rename to src/gallium/auxiliary/pipebuffer/Makefile
diff --git a/src/gallium/aux/pipebuffer/linked_list.h b/src/gallium/auxiliary/pipebuffer/linked_list.h
similarity index 100%
rename from src/gallium/aux/pipebuffer/linked_list.h
rename to src/gallium/auxiliary/pipebuffer/linked_list.h
diff --git a/src/gallium/aux/pipebuffer/pb_buffer.h b/src/gallium/auxiliary/pipebuffer/pb_buffer.h
similarity index 100%
rename from src/gallium/aux/pipebuffer/pb_buffer.h
rename to src/gallium/auxiliary/pipebuffer/pb_buffer.h
diff --git a/src/gallium/aux/pipebuffer/pb_buffer_fenced.c b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
similarity index 100%
rename from src/gallium/aux/pipebuffer/pb_buffer_fenced.c
rename to src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
diff --git a/src/gallium/aux/pipebuffer/pb_buffer_fenced.h b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.h
similarity index 100%
rename from src/gallium/aux/pipebuffer/pb_buffer_fenced.h
rename to src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.h
diff --git a/src/gallium/aux/pipebuffer/pb_buffer_malloc.c b/src/gallium/auxiliary/pipebuffer/pb_buffer_malloc.c
similarity index 100%
rename from src/gallium/aux/pipebuffer/pb_buffer_malloc.c
rename to src/gallium/auxiliary/pipebuffer/pb_buffer_malloc.c
diff --git a/src/gallium/aux/pipebuffer/pb_bufmgr.h b/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h
similarity index 100%
rename from src/gallium/aux/pipebuffer/pb_bufmgr.h
rename to src/gallium/auxiliary/pipebuffer/pb_bufmgr.h
diff --git a/src/gallium/aux/pipebuffer/pb_bufmgr_fenced.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c
similarity index 100%
rename from src/gallium/aux/pipebuffer/pb_bufmgr_fenced.c
rename to src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c
diff --git a/src/gallium/aux/pipebuffer/pb_bufmgr_mm.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
similarity index 100%
rename from src/gallium/aux/pipebuffer/pb_bufmgr_mm.c
rename to src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
diff --git a/src/gallium/aux/pipebuffer/pb_bufmgr_pool.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c
similarity index 100%
rename from src/gallium/aux/pipebuffer/pb_bufmgr_pool.c
rename to src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c
diff --git a/src/gallium/aux/pipebuffer/pb_winsys.c b/src/gallium/auxiliary/pipebuffer/pb_winsys.c
similarity index 100%
rename from src/gallium/aux/pipebuffer/pb_winsys.c
rename to src/gallium/auxiliary/pipebuffer/pb_winsys.c
diff --git a/src/gallium/aux/tgsi/Makefile b/src/gallium/auxiliary/tgsi/Makefile
similarity index 100%
rename from src/gallium/aux/tgsi/Makefile
rename to src/gallium/auxiliary/tgsi/Makefile
diff --git a/src/gallium/aux/tgsi/exec/Makefile b/src/gallium/auxiliary/tgsi/exec/Makefile
similarity index 100%
rename from src/gallium/aux/tgsi/exec/Makefile
rename to src/gallium/auxiliary/tgsi/exec/Makefile
diff --git a/src/gallium/aux/tgsi/exec/tgsi_exec.c b/src/gallium/auxiliary/tgsi/exec/tgsi_exec.c
similarity index 100%
rename from src/gallium/aux/tgsi/exec/tgsi_exec.c
rename to src/gallium/auxiliary/tgsi/exec/tgsi_exec.c
diff --git a/src/gallium/aux/tgsi/exec/tgsi_exec.h b/src/gallium/auxiliary/tgsi/exec/tgsi_exec.h
similarity index 100%
rename from src/gallium/aux/tgsi/exec/tgsi_exec.h
rename to src/gallium/auxiliary/tgsi/exec/tgsi_exec.h
diff --git a/src/gallium/aux/tgsi/exec/tgsi_sse2.c b/src/gallium/auxiliary/tgsi/exec/tgsi_sse2.c
similarity index 100%
rename from src/gallium/aux/tgsi/exec/tgsi_sse2.c
rename to src/gallium/auxiliary/tgsi/exec/tgsi_sse2.c
diff --git a/src/gallium/aux/tgsi/exec/tgsi_sse2.h b/src/gallium/auxiliary/tgsi/exec/tgsi_sse2.h
similarity index 100%
rename from src/gallium/aux/tgsi/exec/tgsi_sse2.h
rename to src/gallium/auxiliary/tgsi/exec/tgsi_sse2.h
diff --git a/src/gallium/aux/tgsi/util/tgsi_build.c b/src/gallium/auxiliary/tgsi/util/tgsi_build.c
similarity index 100%
rename from src/gallium/aux/tgsi/util/tgsi_build.c
rename to src/gallium/auxiliary/tgsi/util/tgsi_build.c
diff --git a/src/gallium/aux/tgsi/util/tgsi_build.h b/src/gallium/auxiliary/tgsi/util/tgsi_build.h
similarity index 100%
rename from src/gallium/aux/tgsi/util/tgsi_build.h
rename to src/gallium/auxiliary/tgsi/util/tgsi_build.h
diff --git a/src/gallium/aux/tgsi/util/tgsi_dump.c b/src/gallium/auxiliary/tgsi/util/tgsi_dump.c
similarity index 100%
rename from src/gallium/aux/tgsi/util/tgsi_dump.c
rename to src/gallium/auxiliary/tgsi/util/tgsi_dump.c
diff --git a/src/gallium/aux/tgsi/util/tgsi_dump.h b/src/gallium/auxiliary/tgsi/util/tgsi_dump.h
similarity index 100%
rename from src/gallium/aux/tgsi/util/tgsi_dump.h
rename to src/gallium/auxiliary/tgsi/util/tgsi_dump.h
diff --git a/src/gallium/aux/tgsi/util/tgsi_parse.c b/src/gallium/auxiliary/tgsi/util/tgsi_parse.c
similarity index 100%
rename from src/gallium/aux/tgsi/util/tgsi_parse.c
rename to src/gallium/auxiliary/tgsi/util/tgsi_parse.c
diff --git a/src/gallium/aux/tgsi/util/tgsi_parse.h b/src/gallium/auxiliary/tgsi/util/tgsi_parse.h
similarity index 100%
rename from src/gallium/aux/tgsi/util/tgsi_parse.h
rename to src/gallium/auxiliary/tgsi/util/tgsi_parse.h
diff --git a/src/gallium/aux/tgsi/util/tgsi_transform.c b/src/gallium/auxiliary/tgsi/util/tgsi_transform.c
similarity index 100%
rename from src/gallium/aux/tgsi/util/tgsi_transform.c
rename to src/gallium/auxiliary/tgsi/util/tgsi_transform.c
diff --git a/src/gallium/aux/tgsi/util/tgsi_transform.h b/src/gallium/auxiliary/tgsi/util/tgsi_transform.h
similarity index 100%
rename from src/gallium/aux/tgsi/util/tgsi_transform.h
rename to src/gallium/auxiliary/tgsi/util/tgsi_transform.h
diff --git a/src/gallium/aux/tgsi/util/tgsi_util.c b/src/gallium/auxiliary/tgsi/util/tgsi_util.c
similarity index 100%
rename from src/gallium/aux/tgsi/util/tgsi_util.c
rename to src/gallium/auxiliary/tgsi/util/tgsi_util.c
diff --git a/src/gallium/aux/tgsi/util/tgsi_util.h b/src/gallium/auxiliary/tgsi/util/tgsi_util.h
similarity index 100%
rename from src/gallium/aux/tgsi/util/tgsi_util.h
rename to src/gallium/auxiliary/tgsi/util/tgsi_util.h
diff --git a/src/gallium/aux/util/p_debug.c b/src/gallium/auxiliary/util/p_debug.c
similarity index 100%
rename from src/gallium/aux/util/p_debug.c
rename to src/gallium/auxiliary/util/p_debug.c
diff --git a/src/gallium/aux/util/p_tile.c b/src/gallium/auxiliary/util/p_tile.c
similarity index 100%
rename from src/gallium/aux/util/p_tile.c
rename to src/gallium/auxiliary/util/p_tile.c
diff --git a/src/gallium/aux/util/p_tile.h b/src/gallium/auxiliary/util/p_tile.h
similarity index 100%
rename from src/gallium/aux/util/p_tile.h
rename to src/gallium/auxiliary/util/p_tile.h
diff --git a/src/gallium/aux/util/p_util.c b/src/gallium/auxiliary/util/p_util.c
similarity index 100%
rename from src/gallium/aux/util/p_util.c
rename to src/gallium/auxiliary/util/p_util.c