- Made sure that the files that contains the declarations
  of implementated functions are included.
- Corrected mismatching prototypes.
- Cleaned up the include section.

diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h
index c9c22ae..d803cce 100644
--- a/include/msvcrt/string.h
+++ b/include/msvcrt/string.h
@@ -34,7 +34,7 @@
 int         _memicmp(const void*,const void*,MSVCRT(size_t));
 int         _strcmpi(const char*,const char*);
 char*       _strdup(const char*);
-char*       _strerror(int);
+char*       _strerror(const char*);
 int         _stricmp(const char*,const char*);
 int         _stricoll(const char*,const char*);
 char*       _strlwr(char*);
diff --git a/include/wine/winuser16.h b/include/wine/winuser16.h
index c486975..2829c1c 100644
--- a/include/wine/winuser16.h
+++ b/include/wine/winuser16.h
@@ -567,7 +567,6 @@
 HHOOK       WINAPI SetWindowsHookEx16(INT16,HOOKPROC16,HINSTANCE16,HTASK16);
 BOOL16      WINAPI UnhookWindowsHook16(INT16,HOOKPROC16);
 BOOL16      WINAPI UnhookWindowsHookEx16(HHOOK);
-INT16       WINAPI wvsnprintf16(LPSTR,UINT16,LPCSTR,LPCVOID);
 VOID        WINAPI CalcChildScroll16(HWND16,WORD);
 VOID        WINAPI CascadeChildWindows16(HWND16,WORD);
 INT16       WINAPI CloseComm16(INT16);
diff --git a/include/winuser.h b/include/winuser.h
index 1261967..9675580 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -3735,11 +3735,12 @@
 UINT        WINAPI MapVirtualKeyExA(UINT,UINT,HKL);
 UINT        WINAPI MapVirtualKeyExW(UINT,UINT,HKL);
 #define     MapVirtualKeyEx WINELIB_NAME_AW(MapVirtualKeyEx)
-BOOL      WINAPI MapDialogRect(HWND,LPRECT);
-INT       WINAPI MapWindowPoints(HWND,HWND,LPPOINT,UINT);
-BOOL      WINAPI MessageBeep(UINT);
-INT       WINAPI MessageBoxA(HWND,LPCSTR,LPCSTR,UINT);
-INT       WINAPI MessageBoxW(HWND,LPCWSTR,LPCWSTR,UINT);
+BOOL        WINAPI MapDialogRect(HWND,LPRECT);
+INT         WINAPI MapWindowPoints(HWND,HWND,LPPOINT,UINT);
+UINT        WINAPI MenuItemFromPoint(HWND,HMENU,POINT);
+BOOL        WINAPI MessageBeep(UINT);
+INT         WINAPI MessageBoxA(HWND,LPCSTR,LPCSTR,UINT);
+INT         WINAPI MessageBoxW(HWND,LPCWSTR,LPCWSTR,UINT);
 #define     MessageBox WINELIB_NAME_AW(MessageBox)
 INT       WINAPI MessageBoxIndirectA(LPMSGBOXPARAMSA);
 INT       WINAPI MessageBoxIndirectW(LPMSGBOXPARAMSW);