diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 880644989e2..ca7114a6f2f 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -73,6 +73,7 @@ EXTRADLLNAMES = \
 	avifile \
 	commdlg \
 	compobj \
+	ddeml \
 	dplay \
 	gdi \
 	keyboard \
@@ -284,7 +285,7 @@ libttydrv.@LIBEXT@: ttydrv/libttydrv.@LIBEXT@
 liburlmon.@LIBEXT@: urlmon/liburlmon.@LIBEXT@
 	$(RM) $@ && $(LN_S) urlmon/liburlmon.@LIBEXT@ $@
 
-libuser32.@LIBEXT@ libuser.@LIBEXT@ libkeyboard.@LIBEXT@: user/libuser32.@LIBEXT@
+libuser32.@LIBEXT@ libuser.@LIBEXT@ libkeyboard.@LIBEXT@ libddeml.@LIBEXT@: user/libuser32.@LIBEXT@
 	$(RM) $@ && $(LN_S) user/libuser32.@LIBEXT@ $@
 
 libversion.@LIBEXT@ libver.@LIBEXT@: version/libversion.@LIBEXT@
diff --git a/dlls/user/Makefile.in b/dlls/user/Makefile.in
index ef8deab16d7..e175648f918 100644
--- a/dlls/user/Makefile.in
+++ b/dlls/user/Makefile.in
@@ -4,11 +4,12 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = user32
 SOVERSION = 1.0
-ALTNAMES  = user keyboard
+ALTNAMES  = user keyboard ddeml
 
-SPEC_SRCS = user32.spec user.spec keyboard.spec
+SPEC_SRCS = user32.spec user.spec keyboard.spec ddeml.spec
 
 C_SRCS = \
+	ddeml.c \
 	user_main.c \
 	thunk.c
 
diff --git a/misc/ddeml.c b/dlls/user/ddeml.c
similarity index 100%
rename from misc/ddeml.c
rename to dlls/user/ddeml.c
diff --git a/if1632/ddeml.spec b/dlls/user/ddeml.spec
similarity index 100%
rename from if1632/ddeml.spec
rename to dlls/user/ddeml.spec
diff --git a/if1632/.cvsignore b/if1632/.cvsignore
index 61e66110c66..9eecb0b8ce4 100644
--- a/if1632/.cvsignore
+++ b/if1632/.cvsignore
@@ -1,11 +1,9 @@
 Makefile
 call16.s
 comm.spec.c
-ddeml.spec.c
 dispdib.spec.c
 kernel.spec.c
 ole2conv.spec.c
-ole2nls.spec.c
 ole2prox.spec.c
 ole2thk.spec.c
 system.spec.c
diff --git a/if1632/Makefile.in b/if1632/Makefile.in
index e9118838e97..066b115fbb9 100644
--- a/if1632/Makefile.in
+++ b/if1632/Makefile.in
@@ -7,7 +7,6 @@ MODULE    = if1632
 
 SPEC_SRCS = \
 	comm.spec \
-	ddeml.spec \
 	dispdib.spec \
 	kernel.spec \
 	ole2conv.spec \
diff --git a/if1632/ole2nls.spec b/if1632/ole2nls.spec
deleted file mode 100644
index e6ccf9ad593..00000000000
--- a/if1632/ole2nls.spec
+++ /dev/null
@@ -1,15 +0,0 @@
-name	ole2nls
-type	win16
-
-1 pascal GetUserDefaultLCID()      GetUserDefaultLCID
-2 pascal GetSystemDefaultLCID()    GetSystemDefaultLCID
-3 pascal GetUserDefaultLangID()    GetUserDefaultLangID
-4 pascal GetSystemDefaultLangID()  GetSystemDefaultLangID
-5 pascal GetLocaleInfoA(long long ptr word) GetLocaleInfo16
-6 stub LCMAPSTRINGA
-7 pascal16 GetStringTypeA(long long str word ptr) GetStringType16
-8 pascal16 CompareStringA(long long str word str word) CompareString16
-9 pascal16 RegisterNLSInfoChanged(ptr) RegisterNLSInfoChanged16
-#10 stub WEP
-11 stub LIBMAIN
-12 stub NOTIFYWINDOWPROC
diff --git a/misc/Makefile.in b/misc/Makefile.in
index c53b14b4c6b..70e8835fc0c 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -11,7 +11,6 @@ C_SRCS = \
 	cdrom.c \
 	comm.c \
 	cpu.c \
-	ddeml.c \
 	debugstr.c \
 	error.c \
 	lstr.c \