diff --git a/configure b/configure
index c1c7fae880b..10a15845360 100755
--- a/configure
+++ b/configure
@@ -20051,14 +20051,10 @@ esac
 
           ac_config_commands="$ac_config_commands dlls/ddraw/d3ddevice"
 
-          ac_config_commands="$ac_config_commands dlls/ddraw/dclipper"
-
           ac_config_commands="$ac_config_commands dlls/ddraw/ddraw"
 
           ac_config_commands="$ac_config_commands dlls/ddraw/direct3d"
 
-          ac_config_commands="$ac_config_commands dlls/ddraw/dpalette"
-
           ac_config_commands="$ac_config_commands dlls/ddraw/dsurface"
 
           ac_config_commands="$ac_config_commands dlls/gdi/enhmfdrv"
@@ -20887,10 +20883,8 @@ do
   "tools/wmc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/wmc/Makefile" ;;
   "tools/wrc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/wrc/Makefile" ;;
   "dlls/ddraw/d3ddevice" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/d3ddevice" ;;
-  "dlls/ddraw/dclipper" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/dclipper" ;;
   "dlls/ddraw/ddraw" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/ddraw" ;;
   "dlls/ddraw/direct3d" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/direct3d" ;;
-  "dlls/ddraw/dpalette" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/dpalette" ;;
   "dlls/ddraw/dsurface" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/dsurface" ;;
   "dlls/gdi/enhmfdrv" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/enhmfdrv" ;;
   "dlls/gdi/mfdrv" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/mfdrv" ;;
@@ -21684,14 +21678,10 @@ echo "$as_me: executing $ac_dest commands" >&6;}
   case $ac_dest in
     dlls/ddraw/d3ddevice ) test -d "dlls/ddraw/d3ddevice" || ({ echo "$as_me:$LINENO: creating dlls/ddraw/d3ddevice" >&5
 echo "$as_me: creating dlls/ddraw/d3ddevice" >&6;} && mkdir "dlls/ddraw/d3ddevice") ;;
-    dlls/ddraw/dclipper ) test -d "dlls/ddraw/dclipper" || ({ echo "$as_me:$LINENO: creating dlls/ddraw/dclipper" >&5
-echo "$as_me: creating dlls/ddraw/dclipper" >&6;} && mkdir "dlls/ddraw/dclipper") ;;
     dlls/ddraw/ddraw ) test -d "dlls/ddraw/ddraw" || ({ echo "$as_me:$LINENO: creating dlls/ddraw/ddraw" >&5
 echo "$as_me: creating dlls/ddraw/ddraw" >&6;} && mkdir "dlls/ddraw/ddraw") ;;
     dlls/ddraw/direct3d ) test -d "dlls/ddraw/direct3d" || ({ echo "$as_me:$LINENO: creating dlls/ddraw/direct3d" >&5
 echo "$as_me: creating dlls/ddraw/direct3d" >&6;} && mkdir "dlls/ddraw/direct3d") ;;
-    dlls/ddraw/dpalette ) test -d "dlls/ddraw/dpalette" || ({ echo "$as_me:$LINENO: creating dlls/ddraw/dpalette" >&5
-echo "$as_me: creating dlls/ddraw/dpalette" >&6;} && mkdir "dlls/ddraw/dpalette") ;;
     dlls/ddraw/dsurface ) test -d "dlls/ddraw/dsurface" || ({ echo "$as_me:$LINENO: creating dlls/ddraw/dsurface" >&5
 echo "$as_me: creating dlls/ddraw/dsurface" >&6;} && mkdir "dlls/ddraw/dsurface") ;;
     dlls/gdi/enhmfdrv ) test -d "dlls/gdi/enhmfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi/enhmfdrv" >&5
diff --git a/configure.ac b/configure.ac
index 3fd80dfdc38..c92a443972e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1508,10 +1508,8 @@ dnl **** Generate output files ****
 AH_TOP([#define __WINE_CONFIG_H])
 
 WINE_CONFIG_EXTRA_DIR(dlls/ddraw/d3ddevice)
-WINE_CONFIG_EXTRA_DIR(dlls/ddraw/dclipper)
 WINE_CONFIG_EXTRA_DIR(dlls/ddraw/ddraw)
 WINE_CONFIG_EXTRA_DIR(dlls/ddraw/direct3d)
-WINE_CONFIG_EXTRA_DIR(dlls/ddraw/dpalette)
 WINE_CONFIG_EXTRA_DIR(dlls/ddraw/dsurface)
 WINE_CONFIG_EXTRA_DIR(dlls/gdi/enhmfdrv)
 WINE_CONFIG_EXTRA_DIR(dlls/gdi/mfdrv)
diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in
index b54d6b2ce0d..44824e35348 100644
--- a/dlls/ddraw/Makefile.in
+++ b/dlls/ddraw/Makefile.in
@@ -24,14 +24,12 @@ OPENGLFILES = \
 
 C_SRCS = \
 	@OPENGLFILES@ \
-	dclipper/main.c \
+	clipper.c \
 	ddraw_utils.c \
 	ddraw/hal.c \
 	ddraw/main.c \
 	ddraw/thunks.c \
 	ddraw/user.c \
-	dpalette/hal.c \
-	dpalette/main.c \
 	dsurface/dib.c \
 	dsurface/fakezbuffer.c \
 	dsurface/gamma.c \
@@ -41,6 +39,8 @@ C_SRCS = \
 	dsurface/user.c \
 	dsurface/wndproc.c \
 	main.c \
+	palette_hal.c \
+	palette_main.c \
 	regsvr.c
 
 RC_SRCS = version.rc
@@ -49,10 +49,8 @@ SUBDIRS = tests
 
 EXTRASUBDIRS = \
 	d3ddevice \
-	dclipper \
 	ddraw \
 	direct3d \
-	dpalette \
 	dsurface
 
 @MAKE_DLL_RULES@
diff --git a/dlls/ddraw/dclipper/main.c b/dlls/ddraw/clipper.c
similarity index 100%
rename from dlls/ddraw/dclipper/main.c
rename to dlls/ddraw/clipper.c
diff --git a/dlls/ddraw/dpalette/hal.c b/dlls/ddraw/palette_hal.c
similarity index 100%
rename from dlls/ddraw/dpalette/hal.c
rename to dlls/ddraw/palette_hal.c
diff --git a/dlls/ddraw/dpalette/main.c b/dlls/ddraw/palette_main.c
similarity index 100%
rename from dlls/ddraw/dpalette/main.c
rename to dlls/ddraw/palette_main.c