diff --git a/include/commdlg.h b/include/commdlg.h
index 1bf5d2fd6ae..69bfabe1027 100644
--- a/include/commdlg.h
+++ b/include/commdlg.h
@@ -579,7 +579,10 @@ BOOL32  WINAPI GetSaveFileName32W(LPOPENFILENAME32W ofn);
 BOOL32 WINAPI PageSetupDlg32A( LPPAGESETUPDLG32A );
 BOOL32 WINAPI PageSetupDlg32W( LPPAGESETUPDLG32W );
 #define PageSetupDlg WINELIB_NAME_AW(PageSetupDlg)
-BOOL16  WINAPI PrintDlg( SEGPTR print);
+BOOL16  WINAPI PrintDlg16( SEGPTR print);
+BOOL32  WINAPI PrintDlg32A( LPPRINTDLG32A printdlg);
+BOOL32  WINAPI PrintDlg32W( LPPRINTDLG32W printdlg);
+#define PrintDlg WINELIB_NAME_AW(PrintDlg)
 HWND16  WINAPI ReplaceText16( SEGPTR find);
 HWND32  WINAPI ReplaceText32A( LPFINDREPLACE32A lpFind);
 HWND32  WINAPI ReplaceText32W( LPFINDREPLACE32W lpFind);
diff --git a/include/windows.h b/include/windows.h
index 9d160d8cd09..43bac90248d 100644
--- a/include/windows.h
+++ b/include/windows.h
@@ -8095,8 +8095,8 @@ INT16       WINAPI GetKeyboardLayoutName16(LPSTR);
 INT32       WINAPI GetKeyboardLayoutName32A(LPSTR);
 INT32       WINAPI GetKeyboardLayoutName32W(LPWSTR);
 #define     GetKeyboardLayoutName WINELIB_NAME_AW(GetKeyboardLayoutName)
-WORD        WINAPI GetKeyState16(INT16);
-WORD        WINAPI GetKeyState32(INT32);
+INT16       WINAPI GetKeyState16(INT16);
+INT16       WINAPI GetKeyState32(INT32);
 #define     GetKeyState WINELIB_NAME(GetKeyState)
 HWND16      WINAPI GetLastActivePopup16(HWND16);
 HWND32      WINAPI GetLastActivePopup32(HWND32);
@@ -8358,6 +8358,7 @@ INT32       WINAPI GetUpdateRgn32(HWND32,HRGN32,BOOL32);
 LONG        WINAPI GetVersion16(void);
 LONG        WINAPI GetVersion32(void);
 #define     GetVersion WINELIB_NAME(GetVersion)
+BOOL32      WINAPI GetExitCodeProcess(HANDLE32,LPDWORD);
 BOOL16      WINAPI GetViewportExtEx16(HDC16,LPSIZE16);
 BOOL32      WINAPI GetViewportExtEx32(HDC32,LPSIZE32);
 #define     GetViewportExtEx WINELIB_NAME(GetViewportExtEx)
@@ -8556,7 +8557,7 @@ BOOL32      WINAPI IsDBCSLeadByte32(BYTE);
 BOOL16      WINAPI IsDialogMessage16(HWND16,LPMSG16);
 BOOL32      WINAPI IsDialogMessage32A(HWND32,LPMSG32);
 BOOL32      WINAPI IsDialogMessage32W(HWND32,LPMSG32);
-#define     IsDialogMessage WINELIB_NAME(IsDialogMessage)
+#define     IsDialogMessage WINELIB_NAME_AW(IsDialogMessage)
 UINT16      WINAPI IsDlgButtonChecked16(HWND16,UINT16);
 UINT32      WINAPI IsDlgButtonChecked32(HWND32,UINT32);
 #define     IsDlgButtonChecked WINELIB_NAME(IsDlgButtonChecked)
diff --git a/windows/input.c b/windows/input.c
index 51478321058..1e5851d59aa 100644
--- a/windows/input.c
+++ b/windows/input.c
@@ -355,7 +355,7 @@ HWND32 WINAPI GetCapture32(void)
 /**********************************************************************
  *           GetKeyState      (USER.106)
  */
-WORD WINAPI GetKeyState16(INT16 vkey)
+INT16 WINAPI GetKeyState16(INT16 vkey)
 {
     return GetKeyState32(vkey);
 }
@@ -367,7 +367,7 @@ WORD WINAPI GetKeyState16(INT16 vkey)
  * keyboard-input message.  This function retrieves the state of the key
  * at the time the input message was generated.  (SDK 3.1 Vol 2. p 390)
  */
-WORD WINAPI GetKeyState32(INT32 vkey)
+INT16 WINAPI GetKeyState32(INT32 vkey)
 {
     INT32 retval;