diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 4fc9de666..bca220a6d 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2000-04-25  Martin Kotulla  <martin-k@softmaker.de>
+
+	* include/ddeml.h (DdeCreateStringHandle{A,W}): Fix prototype.
+	* include/shlobj.h (IShellLink{A,W}::GetPath): Fix prototype.
+	* include/wingdi.h: Add LPFNDEVMODE and LPFNDEVCAPS callbacks.
+	* include/winuser.h: Add WM_* macros. Add PCOPYDATASTRUCT typedef.
+
 Mon Apr 10 22:58:25 2000  Christopher Faylor <cgf@cygnus.com>
 
 	* include/winbase.h: Change first argument of ENUMRES* types to
diff --git a/winsup/w32api/include/ddeml.h b/winsup/w32api/include/ddeml.h
index 352783e34..3f44c76f3 100644
--- a/winsup/w32api/include/ddeml.h
+++ b/winsup/w32api/include/ddeml.h
@@ -186,8 +186,8 @@ int WINAPI DdeCmpStringHandles(HSZ,HSZ);
 HCONV WINAPI DdeConnect(DWORD,HSZ,HSZ,PCONVCONTEXT);
 HCONVLIST WINAPI DdeConnectList(DWORD,HSZ,HSZ,HCONVLIST,PCONVCONTEXT);
 HDDEDATA WINAPI DdeCreateDataHandle(DWORD,PBYTE,DWORD,DWORD,HSZ,UINT,UINT);
-HSZ WINAPI DdeCreateStringHandleA(DWORD,LPSTR,int);
-HSZ WINAPI DdeCreateStringHandleW(DWORD,LPWSTR,int);
+HSZ WINAPI DdeCreateStringHandleA(DWORD,LPCSTR,int);
+HSZ WINAPI DdeCreateStringHandleW(DWORD,LPCWSTR,int);
 BOOL WINAPI DdeDisconnect(HCONV);
 BOOL WINAPI DdeDisconnectList(HCONVLIST);
 BOOL WINAPI DdeEnableCallback(DWORD,HCONV,UINT);
diff --git a/winsup/w32api/include/shlobj.h b/winsup/w32api/include/shlobj.h
index fc77bb9ba..8789df7e9 100644
--- a/winsup/w32api/include/shlobj.h
+++ b/winsup/w32api/include/shlobj.h
@@ -415,7 +415,7 @@ DECLARE_INTERFACE_(IShellLinkA, IUnknown)
 	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
 	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
 	STDMETHOD_(ULONG,Release)(THIS) PURE;
-    STDMETHOD(GetPath)(THIS_ LPSTR,int,LPWIN32_FIND_DATAA*,DWORD) PURE;
+	STDMETHOD(GetPath)(THIS_ LPSTR,int,WIN32_FIND_DATAA*,DWORD) PURE;
 	STDMETHOD(GetIDList)(THIS_ LPITEMIDLIST*) PURE;
 	STDMETHOD(SetIDList)(THIS_ LPCITEMIDLIST) PURE;
 	STDMETHOD(GetDescription)(THIS_ LPSTR,int) PURE;
@@ -441,7 +441,7 @@ DECLARE_INTERFACE_(IShellLinkW, IUnknown)
 	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
 	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
 	STDMETHOD_(ULONG,Release)(THIS) PURE;
-    STDMETHOD(GetPath)(THIS_ LPSTR,int,LPWIN32_FIND_DATAW*,DWORD) PURE;
+	STDMETHOD(GetPath)(THIS_ LPSTR,int,WIN32_FIND_DATAW*,DWORD) PURE;
 	STDMETHOD(GetIDList)(THIS_ LPITEMIDLIST*) PURE;
 	STDMETHOD(SetIDList)(THIS_ LPCITEMIDLIST) PURE;
 	STDMETHOD(GetDescription)(THIS_ LPWSTR,int) PURE;
diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h
index aeb6cc82a..f155d2329 100644
--- a/winsup/w32api/include/wingdi.h
+++ b/winsup/w32api/include/wingdi.h
@@ -2328,6 +2328,9 @@ typedef int (CALLBACK *ICMENUMPROCA)(LPSTR,LPARAM);
 typedef int (CALLBACK *ICMENUMPROCW)(LPWSTR,LPARAM);
 typedef void (CALLBACK *GOBJENUMPROC)(LPVOID,LPARAM);
 typedef void (CALLBACK *LINEDDAPROC)(int,int,LPARAM);
+typedef UINT (CALLBACK *LPFNDEVMODE)(HWND,HMODULE,LPDEVMODEA,LPSTR,LPSTR,LPDEVMODEA,LPSTR,UINT);
+typedef DWORD (CALLBACK *LPFNDEVCAPS)(LPSTR,LPSTR,UINT,LPSTR,LPDEVMODEA);
+
 
 #define RGB(r,g,b)	((DWORD)(((BYTE)(r)|((WORD)(g)<<8))|(((DWORD)(BYTE)(b))<<16)))
 #define MAKEPOINTS(l) (*((POINTS*)&(l)))
diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index 8c2fe7d41..2d3baabec 100644
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -1060,6 +1060,9 @@ extern "C" {
 #define WM_APP 32768
 #define WM_ACTIVATE 6
 #define WM_ACTIVATEAPP 28
+/* FIXME/CHECK: Are WM_AFX{FIRST,LAST} valid for WINVER < 0x400? */
+#define WM_AFXFIRST 864
+#define WM_AFXLAST 895
 #define WM_ASKCBFORMATNAME 780
 #define WM_CANCELJOURNAL 75
 #define WM_CANCELMODE 31
@@ -1071,6 +1074,7 @@ extern "C" {
 #define WM_CLEAR 771
 #define WM_CLOSE 16
 #define WM_COMMAND 273
+#define WM_COMMNOTIFY 68		/* obsolete */
 #define WM_COMPACTING 65
 #define WM_COMPAREITEM 57
 #define WM_CONTEXTMENU 123
@@ -1111,11 +1115,27 @@ extern "C" {
 #define WM_GETMINMAXINFO 36
 #define WM_GETTEXT 13
 #define WM_GETTEXTLENGTH 14
+/* FIXME/CHECK: Are WM_HANDHEL{FIRST,LAST} valid for WINVER < 0x400? */
+#define WM_HANDHELDFIRST 856
+#define WM_HANDHELDLAST 863
 #define WM_HELP 83
 #define WM_HOTKEY 786
 #define WM_HSCROLL 276
 #define WM_HSCROLLCLIPBOARD 782
 #define WM_ICONERASEBKGND 39
+/* FIXME/CHECK: Are WM_IME_* valid for WINVER < 0x400? */
+#define WM_IME_STARTCOMPOSITION 269
+#define WM_IME_ENDCOMPOSITION 270
+#define WM_IME_COMPOSITION 271
+#define WM_IME_KEYLAST 271
+#define WM_IME_SETCONTEXT 641
+#define WM_IME_NOTIFY 642
+#define WM_IME_CONTROL 643
+#define WM_IME_COMPOSITIONFULL 644
+#define WM_IME_SELECT 645
+#define WM_IME_CHAR 646
+#define WM_IME_KEYDOWN 656
+#define WM_IME_KEYUP 657
 #define WM_INITDIALOG 272
 #define WM_INITMENU 278
 #define WM_INITMENUPOPUP 279
@@ -1906,7 +1926,7 @@ typedef struct tagCOPYDATASTRUCT {
 	DWORD dwData;
 	DWORD cbData;
 	PVOID lpData;
-} COPYDATASTRUCT;
+} COPYDATASTRUCT,*PCOPYDATASTRUCT;
 typedef struct tagCURSORSHAPE {
 	int xHotSpot;
 	int yHotSpot;