diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index fa77f6f22c9..6f5ef910014 100644
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -101,7 +101,7 @@ base\system\smss\smss.exe 1
; Dynamic Link Libraries
dll\3rdparty\freetype\freetype.dll 1
dll\3rdparty\mesa32\mesa32.dll 1
-dll\3rdparty\mesa32\dxtn.dll 1 optional
+dll\3rdparty\dxtn.dll 1 optional
dll\cpl\access\access.cpl 1
dll\cpl\appwiz\appwiz.cpl 1
diff --git a/reactos/dll/3rdparty/mesa32/mesa32.rbuild b/reactos/dll/3rdparty/mesa32/mesa32.rbuild
index b02dbc2a934..38ca3fad3c5 100644
--- a/reactos/dll/3rdparty/mesa32/mesa32.rbuild
+++ b/reactos/dll/3rdparty/mesa32/mesa32.rbuild
@@ -28,250 +28,249 @@
src/shader/slang
src/shader/slang/OSDependent/Linux
src/shader/slang/OGLCompilersDLL
-
-
-
- glapi.c
- glthread.c
-
-
- m_debug_clip.c
- m_debug_norm.c
- m_debug_xform.c
- m_eval.c
- m_matrix.c
- m_translate.c
- m_vector.c
- m_xform.c
-
-
- accum.c
- api_arrayelt.c
- api_loopback.c
- api_noop.c
- api_validate.c
- arrayobj.c
- attrib.c
- blend.c
- bufferobj.c
- buffers.c
- clip.c
- colortab.c
- context.c
- convolve.c
- debug.c
- depth.c
- depthstencil.c
- dispatch.c
- dlist.c
- drawpix.c
- enable.c
- enums.c
- eval.c
- execmem.c
- extensions.c
- fbobject.c
- feedback.c
- fog.c
- framebuffer.c
- get.c
- getstring.c
- hash.c
- hint.c
- histogram.c
- image.c
- imports.c
- light.c
- lines.c
- matrix.c
- mipmap.c
- mm.c
- pixel.c
- points.c
- polygon.c
- queryobj.c
- rastpos.c
- rbadaptors.c
- renderbuffer.c
- texcompress.c
- texcompress_fxt1.c
- texcompress_s3tc.c
- texenvprogram.c
- texformat.c
- teximage.c
- texobj.c
- texrender.c
- texstate.c
- texstore.c
- varray.c
-
-
- arbprogparse.c
- arbprogram.c
- atifragshader.c
- nvfragparse.c
- nvprogram.c
- nvvertparse.c
- prog_debug.c
- prog_execute.c
- prog_instruction.c
- prog_parameter.c
- prog_print.c
- prog_statevars.c
- program.c
- programopt.c
-
- grammar_mesa.c
-
-
-
- s_aaline.c
- s_aatriangle.c
- s_accum.c
- s_alpha.c
- s_atifragshader.c
- s_bitmap.c
- s_blend.c
- s_blit.c
- s_buffers.c
- s_context.c
- s_copypix.c
- s_depth.c
- s_drawpix.c
- s_feedback.c
- s_fog.c
- s_fragprog.c
- s_imaging.c
- s_lines.c
- s_logic.c
- s_masking.c
- s_points.c
- s_readpix.c
- s_span.c
- s_stencil.c
- s_texcombine.c
- s_texfilter.c
- s_texstore.c
- s_triangle.c
- s_zoom.c
-
-
- shaders.c
-
-
- shader_api.c
-
- slang_builtin.c
- slang_codegen.c
- slang_compile.c
- slang_compile_function.c
- slang_compile_operation.c
- slang_compile_struct.c
- slang_compile_variable.c
- slang_emit.c
- slang_ir.c
- slang_label.c
- slang_library_noise.c
- slang_link.c
- slang_log.c
- slang_mem.c
- slang_preprocess.c
- slang_print.c
- slang_simplify.c
- slang_storage.c
- slang_typeinfo.c
- slang_utility.c
- slang_vartable.c
-
-
-
- ss_context.c
- ss_triangle.c
-
-
- state.c
- stencil.c
-
-
- t_context.c
- t_draw.c
- t_pipeline.c
- t_vb_cull.c
- t_vb_fog.c
- t_vb_light.c
- t_vb_normals.c
- t_vb_points.c
- t_vb_program.c
- t_vb_render.c
- t_vb_texgen.c
- t_vb_texmat.c
- t_vb_vertex.c
- t_vertex.c
- t_vertex_generic.c
- t_vp_build.c
- t_vertex_sse.c
-
-
- vbo_context.c
- vbo_exec.c
- vbo_exec_api.c
- vbo_exec_array.c
- vbo_exec_draw.c
- vbo_exec_eval.c
- vbo_rebase.c
- vbo_save.c
- vbo_save_api.c
- vbo_save_draw.c
- vbo_save_loopback.c
- vbo_split.c
- vbo_split_copy.c
- vbo_split_inplace.c
-
-
- vtxfmt.c
-
-
-
- driverfuncs.c
+
+
+ glapi.c
+ glthread.c
+
+
+ m_debug_clip.c
+ m_debug_norm.c
+ m_debug_xform.c
+ m_eval.c
+ m_matrix.c
+ m_translate.c
+ m_vector.c
+ m_xform.c
+
+
+ accum.c
+ api_arrayelt.c
+ api_loopback.c
+ api_noop.c
+ api_validate.c
+ arrayobj.c
+ attrib.c
+ blend.c
+ bufferobj.c
+ buffers.c
+ clip.c
+ colortab.c
+ context.c
+ convolve.c
+ debug.c
+ depth.c
+ depthstencil.c
+ dispatch.c
+ dlist.c
+ drawpix.c
+ enable.c
+ enums.c
+ eval.c
+ execmem.c
+ extensions.c
+ fbobject.c
+ feedback.c
+ fog.c
+ framebuffer.c
+ get.c
+ getstring.c
+ hash.c
+ hint.c
+ histogram.c
+ image.c
+ imports.c
+ light.c
+ lines.c
+ matrix.c
+ mipmap.c
+ mm.c
+ pixel.c
+ points.c
+ polygon.c
+ queryobj.c
+ rastpos.c
+ rbadaptors.c
+ renderbuffer.c
+ texcompress.c
+ texcompress_fxt1.c
+ texcompress_s3tc.c
+ texenvprogram.c
+ texformat.c
+ teximage.c
+ texobj.c
+ texrender.c
+ texstate.c
+ texstore.c
+ varray.c
+
+
+ arbprogparse.c
+ arbprogram.c
+ atifragshader.c
+ nvfragparse.c
+ nvprogram.c
+ nvvertparse.c
+ prog_debug.c
+ prog_execute.c
+ prog_instruction.c
+ prog_parameter.c
+ prog_print.c
+ prog_statevars.c
+ program.c
+ programopt.c
+
+ grammar_mesa.c
+
+
+
+ s_aaline.c
+ s_aatriangle.c
+ s_accum.c
+ s_alpha.c
+ s_atifragshader.c
+ s_bitmap.c
+ s_blend.c
+ s_blit.c
+ s_buffers.c
+ s_context.c
+ s_copypix.c
+ s_depth.c
+ s_drawpix.c
+ s_feedback.c
+ s_fog.c
+ s_fragprog.c
+ s_imaging.c
+ s_lines.c
+ s_logic.c
+ s_masking.c
+ s_points.c
+ s_readpix.c
+ s_span.c
+ s_stencil.c
+ s_texcombine.c
+ s_texfilter.c
+ s_texstore.c
+ s_triangle.c
+ s_zoom.c
+
+
+ shaders.c
+
+
+ shader_api.c
+
+ slang_builtin.c
+ slang_codegen.c
+ slang_compile.c
+ slang_compile_function.c
+ slang_compile_operation.c
+ slang_compile_struct.c
+ slang_compile_variable.c
+ slang_emit.c
+ slang_ir.c
+ slang_label.c
+ slang_library_noise.c
+ slang_link.c
+ slang_log.c
+ slang_mem.c
+ slang_preprocess.c
+ slang_print.c
+ slang_simplify.c
+ slang_storage.c
+ slang_typeinfo.c
+ slang_utility.c
+ slang_vartable.c
+
+
+
+ ss_context.c
+ ss_triangle.c
+
+
+ state.c
+ stencil.c
+
+
+ t_context.c
+ t_draw.c
+ t_pipeline.c
+ t_vb_cull.c
+ t_vb_fog.c
+ t_vb_light.c
+ t_vb_normals.c
+ t_vb_points.c
+ t_vb_program.c
+ t_vb_render.c
+ t_vb_texgen.c
+ t_vb_texmat.c
+ t_vb_vertex.c
+ t_vertex.c
+ t_vertex_generic.c
+ t_vp_build.c
+ t_vertex_sse.c
+
+
+ vbo_context.c
+ vbo_exec.c
+ vbo_exec_api.c
+ vbo_exec_array.c
+ vbo_exec_draw.c
+ vbo_exec_eval.c
+ vbo_rebase.c
+ vbo_save.c
+ vbo_save_api.c
+ vbo_save_draw.c
+ vbo_save_loopback.c
+ vbo_split.c
+ vbo_split_copy.c
+ vbo_split_inplace.c
+
+
+ vtxfmt.c
+
+
+
+ driverfuncs.c
+
+
+
+ wmesa.c
-
-
- wmesa.c
-
-
- icd.c
-
+
+ icd.c
-
-
- x86sse.c
-
- 3dnow.c
- 3dnow_normal.S
- 3dnow_xform1.S
- 3dnow_xform2.S
- 3dnow_xform3.S
- 3dnow_xform4.S
- common_x86.c
- common_x86_asm.S
- glapi_x86.S
- mmx_blend.S
- read_rgba_span_x86.S
- sse_normal.S
- sse_xform1.S
- sse_xform2.S
- sse_xform3.S
- sse_xform4.S
- x86.c
- x86_cliptest.S
- x86_xform2.S
- x86_xform3.S
- x86_xform4.S
- sse.c
+
+
+
+ x86sse.c
-
- x86-64.c
-
-
+ 3dnow.c
+ 3dnow_normal.S
+ 3dnow_xform1.S
+ 3dnow_xform2.S
+ 3dnow_xform3.S
+ 3dnow_xform4.S
+ common_x86.c
+ common_x86_asm.S
+ glapi_x86.S
+ mmx_blend.S
+ read_rgba_span_x86.S
+ sse_normal.S
+ sse_xform1.S
+ sse_xform2.S
+ sse_xform3.S
+ sse_xform4.S
+ x86.c
+ x86_cliptest.S
+ x86_xform2.S
+ x86_xform3.S
+ x86_xform4.S
+ sse.c
+
+
+ x86-64.c
+
+
\ No newline at end of file