--- shellapi.h.org	Thu Apr 29 13:21:24 1999
+++ shellapi.h	Thu Apr 29 13:29:23 1999
@@ -122,12 +122,14 @@
 #define SE_ERR_NOASSOC                  31
 
 
-DECLARE_HANDLE (HDROP);
+/*DECLARE_HANDLE (HDROP);*/
 
+/* get wchar_t from stddef.h */
+#include <stddef.h>
 
 unsigned int WINAPI DragQueryFileW (HDROP, unsigned int, wchar_t *, unsigned int);
 unsigned int WINAPI DragQueryFileA (HDROP, unsigned int, char *, unsigned int);
-BOOL WINAPI DragQueryPoint (HDROP, POint *);
+BOOL WINAPI DragQueryPoint (HDROP, POINT *);
 void WINAPI DragFinish (HDROP);
 void WINAPI DragAcceptFiles (HWND, BOOL);
 HICON WINAPI DuplicateIcon (HINSTANCE, HICON );
--- Windows32/UnicodeFunctions.h.org	Tue Dec 01 13:42:04 1998
+++ Windows32/UnicodeFunctions.h	Thu Apr 29 13:30:19 1999
@@ -2964,23 +2964,23 @@
 /* ------------------------------------- */
 /* From shellapi.h in old Cygnus headers */
 
-unsigned int WINAPI
+/*unsigned int WINAPI
 DragQueryFileW(HDROP, unsigned int, LPCWSTR, unsigned int);
 
 HICON WINAPI
-ExtractAssociatedIconW (HINSTANCE, LPCWSTR, WORD *);
+ExtractAssociatedIconW (HINSTANCE, LPCWSTR, WORD *);*/
 
 HICON WINAPI
 ExtractIconW (HINSTANCE, const LPCWSTR, unsigned int);
 
-HINSTANCE WINAPI
-FindExecutableW (const LPCWSTR, const LPCWSTR, LPCWSTR);
+/*HINSTANCE WINAPI
+FindExecutableW (const LPCWSTR, const LPCWSTR, LPCWSTR);*/
 
 int WINAPI
 ShellAboutW (HWND, const LPCWSTR, const LPCWSTR, HICON);
 
-HINSTANCE WINAPI
-ShellExecuteW (HWND, const LPCWSTR, const LPCWSTR, LPCWSTR, const LPCWSTR, int);
+/*HINSTANCE WINAPI
+ShellExecuteW (HWND, const LPCWSTR, const LPCWSTR, LPCWSTR, const LPCWSTR, int);*/
 
 /* end of stuff from shellapi.h in old Cygnus headers */
 /* -------------------------------------------------- */
--- Windows32/Functions.h.org	Tue Dec 01 13:42:02 1998
+++ Windows32/Functions.h	Thu Apr 29 13:04:04 1999
@@ -843,11 +843,11 @@
 #define GetServiceDisplayName  GetServiceDisplayNameA
 #define OpenSCManager  OpenSCManagerA
 #define DragQueryFile DragQueryFileA
-#define ExtractAssociatedIcon ExtractAssociatedIconA
+/*#define ExtractAssociatedIcon ExtractAssociatedIconA*/
 #define ExtractIcon ExtractIconA
-#define FindExecutable FindExecutableA
-#define ShellAbout ShellAboutA
-#define ShellExecute ShellExecuteA
+/*#define FindExecutable FindExecutableA
+  #define ShellAbout ShellAboutA
+  #define ShellExecute ShellExecuteA*/
 #define DdeCreateStringHandle DdeCreateStringHandleA
 #define DdeInitialize DdeInitializeA
 #define DdeQueryString DdeQueryStringA