diff --git a/reactos/dll/3rdparty/mesa32/mesa32.rbuild b/reactos/dll/3rdparty/mesa32/mesa32.rbuild
index 3934fb75164..d7d596982fd 100644
--- a/reactos/dll/3rdparty/mesa32/mesa32.rbuild
+++ b/reactos/dll/3rdparty/mesa32/mesa32.rbuild
@@ -1,215 +1,256 @@
-
-
- -Wl,--enable-stdcall-fixup
- ntdll
- kernel32
- msvcrt
- user32
-
-
-
- gdi32
-
-
-
-
-
-
-
-
- include
- src
- src/main
- src/glapi
- src/math
- src/tnl
- src/shader
- src/shader/grammar
- src/shader/slang
- src/shader/slang/OSDependent/Linux
- src/shader/slang/OGLCompilersDLL
- src/main/api_arrayelt.c
- src/main/api_loopback.c
- src/main/api_noop.c
- src/main/api_validate.c
- src/main/accum.c
- src/main/attrib.c
- src/main/blend.c
- src/main/bufferobj.c
- src/main/buffers.c
- src/main/clip.c
- src/main/colortab.c
- src/main/context.c
- src/main/convolve.c
- src/main/debug.c
- src/main/depth.c
- src/main/dispatch.c
- src/main/dlist.c
- src/main/drawpix.c
- src/main/enable.c
- src/main/enums.c
- src/main/eval.c
- src/main/execmem.c
- src/main/extensions.c
- src/main/fbobject.c
- src/main/feedback.c
- src/main/fog.c
- src/main/framebuffer.c
- src/main/get.c
- src/main/getstring.c
- src/main/hash.c
- src/main/hint.c
- src/main/histogram.c
- src/main/image.c
- src/main/imports.c
- src/main/light.c
- src/main/lines.c
- src/main/matrix.c
- src/main/mm.c
- src/main/occlude.c
- src/main/pixel.c
- src/main/points.c
- src/main/polygon.c
- src/main/rastpos.c
- src/main/renderbuffer.c
- src/main/state.c
- src/main/stencil.c
- src/main/texcompress.c
- src/main/texcompress_s3tc.c
- src/main/texcompress_fxt1.c
- src/main/texenvprogram.c
- src/main/texformat.c
- src/main/teximage.c
- src/main/texrender.c
- src/main/texobj.c
- src/main/texstate.c
- src/main/texstore.c
- src/main/varray.c
- src/main/vtxfmt.c
- src/glapi/glapi.c
- src/glapi/glthread.c
- src/math/m_debug_clip.c
- src/math/m_debug_norm.c
- src/math/m_debug_xform.c
- src/math/m_eval.c
- src/math/m_matrix.c
- src/math/m_translate.c
- src/math/m_vector.c
- src/math/m_xform.c
- src/array_cache/ac_context.c
- src/array_cache/ac_import.c
- src/tnl/t_array_api.c
- src/tnl/t_array_import.c
- src/tnl/t_context.c
- src/tnl/t_pipeline.c
- src/tnl/t_save_api.c
- src/tnl/t_save_loopback.c
- src/tnl/t_save_playback.c
- src/tnl/t_vb_arbprogram.c
- src/tnl/t_vb_arbprogram_sse.c
- src/tnl/t_vb_program.c
- src/tnl/t_vb_render.c
- src/tnl/t_vb_texgen.c
- src/tnl/t_vb_texmat.c
- src/tnl/t_vb_vertex.c
- src/tnl/t_vb_cull.c
- src/tnl/t_vb_fog.c
- src/tnl/t_vb_light.c
- src/tnl/t_vb_normals.c
- src/tnl/t_vb_points.c
- src/tnl/t_vp_build.c
- src/tnl/t_vertex.c
- src/tnl/t_vertex_sse.c
- src/tnl/t_vertex_generic.c
- src/tnl/t_vtx_api.c
- src/tnl/t_vtx_generic.c
- src/tnl/t_vtx_x86.c
- src/tnl/t_vtx_eval.c
- src/tnl/t_vtx_exec.c
- src/shader/arbfragparse.c
- src/shader/arbprogparse.c
- src/shader/arbprogram.c
- src/shader/arbvertparse.c
- src/shader/atifragshader.c
- src/shader/grammar/grammar_mesa.c
- src/shader/nvfragparse.c
- src/shader/nvprogram.c
- src/shader/nvvertexec.c
- src/shader/nvvertparse.c
- src/shader/program.c
- src/shader/shaderobjects.c
- src/shader/shaderobjects_3dlabs.c
- src/swrast/s_fragprog_to_c.c
- src/swrast/s_aaline.c
- src/swrast/s_aatriangle.c
- src/swrast/s_accum.c
- src/swrast/s_alpha.c
- src/swrast/s_atifragshader.c
- src/swrast/s_bitmap.c
- src/swrast/s_blend.c
- src/swrast/s_buffers.c
- src/swrast/s_copypix.c
- src/swrast/s_context.c
- src/swrast/s_depth.c
- src/swrast/s_drawpix.c
- src/swrast/s_feedback.c
- src/swrast/s_fog.c
- src/swrast/s_imaging.c
- src/swrast/s_lines.c
- src/swrast/s_logic.c
- src/swrast/s_masking.c
- src/swrast/s_nvfragprog.c
- src/swrast/s_pixeltex.c
- src/swrast/s_points.c
- src/swrast/s_readpix.c
- src/swrast/s_span.c
- src/swrast/s_stencil.c
- src/swrast/s_tcc.c
- src/swrast/s_texture.c
- src/swrast/s_texstore.c
- src/swrast/s_triangle.c
- src/swrast/s_zoom.c
- src/swrast_setup/ss_context.c
- src/swrast_setup/ss_triangle.c
- src/x86/common_x86.c
- src/x86/x86.c
- src/x86/3dnow.c
- src/x86/sse.c
- src/x86/rtasm/x86sse.c
- src/sparc/sparc.c
- src/ppc/common_ppc.c
- src/x86-64/x86-64.c
- src/shader/slang/slang_assemble.c
- src/shader/slang/slang_assemble_assignment.c
- src/shader/slang/slang_assemble_conditional.c
- src/shader/slang/slang_assemble_constructor.c
- src/shader/slang/slang_assemble_typeinfo.c
- src/shader/slang/slang_compile.c
- src/shader/slang/slang_execute.c
- src/shader/slang/slang_preprocess.c
- src/shader/slang/slang_storage.c
- src/shader/slang/slang_utility.c
- src/x86/common_x86_asm.S
- src/x86/x86_xform2.S
- src/x86/x86_xform3.S
- src/x86/x86_xform4.S
- src/x86/x86_cliptest.S
- src/x86/mmx_blend.S
- src/x86/3dnow_xform1.S
- src/x86/3dnow_xform2.S
- src/x86/3dnow_xform3.S
- src/x86/3dnow_xform4.S
- src/x86/3dnow_normal.S
- src/x86/sse_xform1.S
- src/x86/sse_xform2.S
- src/x86/sse_xform3.S
- src/x86/sse_xform4.S
- src/x86/sse_normal.S
- src/x86/read_rgba_span_x86.S
- src/tnl/t_vtx_x86_gcc.S
- src/x86/glapi_x86.S
- src/drivers/common/driverfuncs.c
- src/drivers/windows/gdi/wmesa.c
- src/drivers/windows/icd/icd.c
+
+ -Wl,--enable-stdcall-fixup
+ ntdll
+ kernel32
+ msvcrt
+ user32
+
+
+
+ gdi32
+
+
+
+
+
+
+
+
+ include
+ src
+ src/main
+ src/glapi
+ src/math
+ src/tnl
+ src/shader
+ src/shader/grammar
+ src/shader/slang
+ src/shader/slang/OSDependent/Linux
+ src/shader/slang/OGLCompilersDLL
+
+
+ ac_context.c
+ ac_import.c
+
+
+
+ driverfuncs.c
+
+
+
+ wmesa.c
+
+
+ icd.c
+
+
+
+
+ glapi.c
+ glthread.c
+
+
+ api_arrayelt.c
+ api_loopback.c
+ api_noop.c
+ api_validate.c
+ accum.c
+ attrib.c
+ blend.c
+ bufferobj.c
+ buffers.c
+ clip.c
+ colortab.c
+ context.c
+ convolve.c
+ debug.c
+ depth.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
+ mm.c
+ occlude.c
+ pixel.c
+ points.c
+ polygon.c
+ rastpos.c
+ renderbuffer.c
+ state.c
+ stencil.c
+ texcompress.c
+ texcompress_s3tc.c
+ texcompress_fxt1.c
+ texenvprogram.c
+ texformat.c
+ teximage.c
+ texrender.c
+ texobj.c
+ texstate.c
+ texstore.c
+ varray.c
+ vtxfmt.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
+
+
+ common_ppc.c
+
+
+
+ grammar_mesa.c
+
+
+ slang_assemble.c
+ slang_assemble_assignment.c
+ slang_assemble_conditional.c
+ slang_assemble_constructor.c
+ slang_assemble_typeinfo.c
+ slang_compile.c
+ slang_execute.c
+ slang_preprocess.c
+ slang_storage.c
+ slang_utility.c
+
+ arbfragparse.c
+ arbprogparse.c
+ arbprogram.c
+ arbvertparse.c
+ atifragshader.c
+ nvfragparse.c
+ nvprogram.c
+ nvvertexec.c
+ nvvertparse.c
+ program.c
+ shaderobjects.c
+ shaderobjects_3dlabs.c
+
+
+ sparc.c
+
+
+ s_fragprog_to_c.c
+ s_aaline.c
+ s_aatriangle.c
+ s_accum.c
+ s_alpha.c
+ s_atifragshader.c
+ s_bitmap.c
+ s_blend.c
+ s_buffers.c
+ s_copypix.c
+ s_context.c
+ s_depth.c
+ s_drawpix.c
+ s_feedback.c
+ s_fog.c
+ s_imaging.c
+ s_lines.c
+ s_logic.c
+ s_masking.c
+ s_nvfragprog.c
+ s_pixeltex.c
+ s_points.c
+ s_readpix.c
+ s_span.c
+ s_stencil.c
+ s_tcc.c
+ s_texture.c
+ s_texstore.c
+ s_triangle.c
+ s_zoom.c
+
+
+ ss_context.c
+ ss_triangle.c
+
+
+ t_array_api.c
+ t_array_import.c
+ t_context.c
+ t_pipeline.c
+ t_save_api.c
+ t_save_loopback.c
+ t_save_playback.c
+ t_vb_arbprogram.c
+ t_vb_arbprogram_sse.c
+ t_vb_program.c
+ t_vb_render.c
+ t_vb_texgen.c
+ t_vb_texmat.c
+ t_vb_vertex.c
+ t_vb_cull.c
+ t_vb_fog.c
+ t_vb_light.c
+ t_vb_normals.c
+ t_vb_points.c
+ t_vp_build.c
+ t_vertex.c
+ t_vertex_sse.c
+ t_vertex_generic.c
+ t_vtx_api.c
+ t_vtx_generic.c
+ t_vtx_eval.c
+ t_vtx_exec.c
+ t_vtx_x86.c
+ t_vtx_x86_gcc.S
+
+
+
+ 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
+
+
+ x86-64.c
+
+
diff --git a/reactos/dll/directx/dsound/dsound.rbuild b/reactos/dll/directx/dsound/dsound.rbuild
index 6d81120e074..a1105857428 100644
--- a/reactos/dll/directx/dsound/dsound.rbuild
+++ b/reactos/dll/directx/dsound/dsound.rbuild
@@ -29,9 +29,11 @@
propset.c
regsvr.c
sound3d.c
- dxroslayer/dxrosdrv_querydsounddesc.c
- dxroslayer/dxrosdrv_querydsoundiface.c
- dxroslayer/dxroslayer.c
- dxroslayer/getguidfromstring.c
+
+ dxrosdrv_querydsounddesc.c
+ dxrosdrv_querydsoundiface.c
+ dxroslayer.c
+ getguidfromstring.c
+
dsound.spec