diff --git a/reactos/lib/ddraw/ddraw.xml b/reactos/lib/ddraw/ddraw.xml
index 6663f16bdb2..cf2277e6173 100644
--- a/reactos/lib/ddraw/ddraw.xml
+++ b/reactos/lib/ddraw/ddraw.xml
@@ -1,4 +1,4 @@
-<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll">
+<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings="true">
 	<importlibrary definition="ddraw.def" />
 	<include base="ddraw">.</include>	
 	<define name="UNICODE" />
@@ -6,8 +6,6 @@
 	<define name="WINVER">0x0600</define>
 	<define name="_WIN32_WINNT">0x0501</define>
            
-
-
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>gdi32</library>
@@ -27,6 +25,10 @@
 	<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>
 	</directory>
 
 	<directory name="soft">
diff --git a/reactos/lib/ddraw/main.c b/reactos/lib/ddraw/main.c
index 00865e17919..323877c3c70 100644
--- a/reactos/lib/ddraw/main.c
+++ b/reactos/lib/ddraw/main.c
@@ -23,7 +23,7 @@ HRESULT WINAPI Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface,
 
 	ZeroMemory(This,sizeof(IDirectDrawImpl));
 
-	This->lpVtbl = &DirectDraw_VTable;
+	This->lpVtbl = &DirectDraw_Vtable;
 	This->DirectDrawGlobal.dwRefCnt = 1;
 	*pIface = (LPDIRECTDRAW)This;
 
diff --git a/reactos/lib/ddraw/main/ddraw.c b/reactos/lib/ddraw/main/ddraw.c
index 0649be77876..6bd83c6e05b 100644
--- a/reactos/lib/ddraw/main/ddraw.c
+++ b/reactos/lib/ddraw/main/ddraw.c
@@ -140,7 +140,7 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDE
 	if (That == NULL) 
 		return E_OUTOFMEMORY;
 
-	That->lpVtbl = &DDrawSurface_VTable;
+	That->lpVtbl = &DirectDrawSurface_Vtable;
 	That->ref = 1;
 	*ppSurf = (LPDIRECTDRAWSURFACE7)That;
 
@@ -380,7 +380,7 @@ HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b
    	DX_STUB;
 }
 
-IDirectDraw7Vtbl DirectDraw_VTable =
+IDirectDraw7Vtbl DirectDraw_Vtable =
 {
     Main_DirectDraw_QueryInterface,
     Main_DirectDraw_AddRef,
diff --git a/reactos/lib/ddraw/main/surface.c b/reactos/lib/ddraw/main/surface.c
index 339101c8977..37ef677f1c4 100644
--- a/reactos/lib/ddraw/main/surface.c
+++ b/reactos/lib/ddraw/main/surface.c
@@ -421,7 +421,7 @@ HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE7 iface
     DX_STUB;
 }
 
-IDirectDrawSurface7Vtbl DDrawSurface_VTable =
+IDirectDrawSurface7Vtbl DirectDrawSurface_Vtable =
 {
     Main_DDrawSurface_QueryInterface,
     Main_DDrawSurface_AddRef,
diff --git a/reactos/lib/ddraw/rosdraw.h b/reactos/lib/ddraw/rosdraw.h
index deb79a4f490..8c84881408d 100644
--- a/reactos/lib/ddraw/rosdraw.h
+++ b/reactos/lib/ddraw/rosdraw.h
@@ -11,10 +11,6 @@
 #include <ddk/d3dhal.h>
 #include <ddrawgdi.h>
 
-
-
-
-
 /******** Main Object ********/
 
 typedef struct 
@@ -67,8 +63,12 @@ typedef struct
 
 /*********** VTables ************/
 
-extern IDirectDraw7Vtbl DirectDraw_VTable;
-extern IDirectDrawSurface7Vtbl DDrawSurface_VTable;
+extern IDirectDraw7Vtbl				DirectDraw_Vtable;
+extern IDirectDrawSurface7Vtbl		DirectDrawSurface_Vtable;
+extern IDirectDrawPaletteVtbl		DirectDrawPalette_Vtable;
+extern IDirectDrawClipperVtbl		DirectDrawClipper_Vtable;
+extern IDirectDrawColorControlVtbl	DirectDrawColorControl_Vtable;
+extern IDirectDrawGammaControlVtbl	DirectDrawGammaControl_Vtable;
 
 /********* Prototypes **********/