diff --git a/reactos/lib/ddraw/ddraw.xml b/reactos/lib/ddraw/ddraw.xml
index 43f7672b6a2..75df1e8e624 100644
--- a/reactos/lib/ddraw/ddraw.xml
+++ b/reactos/lib/ddraw/ddraw.xml
@@ -18,28 +18,28 @@
 	<file>regsvr.c</file>
 
 	<directory name="hal">
-		<file>ddraw.c</file>
-		<file>surface.c</file>
+		<file>ddraw_hal.c</file>
+		<file>surface_hal.c</file>
 	</directory>
 
 	<directory name="main">
-		<file>ddraw.c</file>
-		<file>surface.c</file>
-		<file>clipper.c</file>
-		<file>color.c</file>
-		<file>gamma.c</file>
-		<file>palette.c</file>
-		<file>videoport.c</file>
-		<file>kernel.c</file>
+		<file>ddraw_main.c</file>
+		<file>surface_main.c</file>
+		<file>clipper_main.c</file>
+		<file>color_main.c</file>
+		<file>gamma_main.c</file>
+		<file>palette_main.c</file>
+		<file>videoport_main.c</file>
+		<file>kernel_main.c</file>
 	</directory>
 
 	<directory name="soft">
-		<file>ddraw.c</file>
-		<file>surface.c</file>
+		<file>ddraw_hel.c</file>
+		<file>surface_hel.c</file>
 	</directory>
 
 	<directory name="thunks">
-		<file>ddraw.c</file>
-		<file>surface.c</file>
+		<file>ddraw_thunk.c</file>
+		<file>surface_thunk.c</file>
 	</directory>
 </module>
diff --git a/reactos/lib/ddraw/hal/ddraw.c b/reactos/lib/ddraw/hal/ddraw_hal.c
similarity index 99%
rename from reactos/lib/ddraw/hal/ddraw.c
rename to reactos/lib/ddraw/hal/ddraw_hal.c
index d1ac6e58bc0..8b769e8ed00 100644
--- a/reactos/lib/ddraw/hal/ddraw.c
+++ b/reactos/lib/ddraw/hal/ddraw_hal.c
@@ -481,8 +481,7 @@ HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD
   {
 	  return DDERR_NODRIVERSUPPORT;
   } 
-  */
-
+  */  
   DX_STUB;
   /* return mode.ddRVal */
 }
diff --git a/reactos/lib/ddraw/hal/surface.c b/reactos/lib/ddraw/hal/surface_hal.c
similarity index 100%
rename from reactos/lib/ddraw/hal/surface.c
rename to reactos/lib/ddraw/hal/surface_hal.c
diff --git a/reactos/lib/ddraw/main/clipper.c b/reactos/lib/ddraw/main/clipper_main.c
similarity index 100%
rename from reactos/lib/ddraw/main/clipper.c
rename to reactos/lib/ddraw/main/clipper_main.c
diff --git a/reactos/lib/ddraw/main/color.c b/reactos/lib/ddraw/main/color_main.c
similarity index 100%
rename from reactos/lib/ddraw/main/color.c
rename to reactos/lib/ddraw/main/color_main.c
diff --git a/reactos/lib/ddraw/main/ddraw.c b/reactos/lib/ddraw/main/ddraw_main.c
similarity index 100%
rename from reactos/lib/ddraw/main/ddraw.c
rename to reactos/lib/ddraw/main/ddraw_main.c
diff --git a/reactos/lib/ddraw/main/gamma.c b/reactos/lib/ddraw/main/gamma_main.c
similarity index 100%
rename from reactos/lib/ddraw/main/gamma.c
rename to reactos/lib/ddraw/main/gamma_main.c
diff --git a/reactos/lib/ddraw/main/kernel.c b/reactos/lib/ddraw/main/kernel_main.c
similarity index 100%
rename from reactos/lib/ddraw/main/kernel.c
rename to reactos/lib/ddraw/main/kernel_main.c
diff --git a/reactos/lib/ddraw/main/palette.c b/reactos/lib/ddraw/main/palette_main.c
similarity index 100%
rename from reactos/lib/ddraw/main/palette.c
rename to reactos/lib/ddraw/main/palette_main.c
diff --git a/reactos/lib/ddraw/main/surface.c b/reactos/lib/ddraw/main/surface_main.c
similarity index 100%
rename from reactos/lib/ddraw/main/surface.c
rename to reactos/lib/ddraw/main/surface_main.c
diff --git a/reactos/lib/ddraw/main/videoport.c b/reactos/lib/ddraw/main/videoport_main.c
similarity index 100%
rename from reactos/lib/ddraw/main/videoport.c
rename to reactos/lib/ddraw/main/videoport_main.c
diff --git a/reactos/lib/ddraw/soft/ddraw.c b/reactos/lib/ddraw/soft/ddraw_hel.c
similarity index 100%
rename from reactos/lib/ddraw/soft/ddraw.c
rename to reactos/lib/ddraw/soft/ddraw_hel.c
diff --git a/reactos/lib/ddraw/soft/surface.c b/reactos/lib/ddraw/soft/surface_hel.c
similarity index 100%
rename from reactos/lib/ddraw/soft/surface.c
rename to reactos/lib/ddraw/soft/surface_hel.c
diff --git a/reactos/lib/ddraw/thunks/ddraw.c b/reactos/lib/ddraw/thunks/ddraw_thunk.c
similarity index 100%
rename from reactos/lib/ddraw/thunks/ddraw.c
rename to reactos/lib/ddraw/thunks/ddraw_thunk.c
diff --git a/reactos/lib/ddraw/thunks/surface.c b/reactos/lib/ddraw/thunks/surface_thunk.c
similarity index 100%
rename from reactos/lib/ddraw/thunks/surface.c
rename to reactos/lib/ddraw/thunks/surface_thunk.c