diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c
index e15c0ae3bc1..92cd6c0f404 100644
--- a/programs/winhelp/hlpfile.c
+++ b/programs/winhelp/hlpfile.c
@@ -706,7 +706,7 @@ static BYTE *HLPFILE_Uncompress1(BYTE *ptr, BYTE *end, BYTE *newptr)
 	      INT code   = GET_USHORT(ptr, 0);
 	      INT len    = 3 + (code >> 12);
 	      INT offset = code & 0xfff;
-	      hmemcpy16(newptr, newptr - offset - 1, len);
+	      memcpy(newptr, newptr - offset - 1, len);
 	      newptr += len;
 	      ptr    += 2;
 	    }
@@ -738,7 +738,7 @@ static BOOL HLPFILE_Uncompress1_Phrases()
   if (!phrases.hBuffer) return FALSE;
   newbuf = phrases.buf = GlobalLock(phrases.hBuffer);
 
-  hmemcpy16(newbuf, buf + 0x11, 2 * num + 2);
+  memcpy(newbuf, buf + 0x11, 2 * num + 2);
   HLPFILE_Uncompress1(buf + 0x13 + 2 * num, end, newbuf + 2 * num + 2);
 
   for (i = 0; i < num; i++)
@@ -856,7 +856,7 @@ static VOID HLPFILE_Uncompress2(BYTE **pptr, BYTE *end, BYTE *newptr)
 	  phptr = phrases.buf + GET_USHORT(phrases.buf, 2 * index);
 	  phend = phrases.buf + GET_USHORT(phrases.buf, 2 * index + 2);
 
-	  hmemcpy16(newptr, phptr, phend - phptr);
+	  memcpy(newptr, phptr, phend - phptr);
 	  newptr += phend - phptr;
 	  if (space) *newptr++ = ' ';
 
diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c
index e2d54fec5b3..2f2d11df041 100644
--- a/programs/winhelp/macro.c
+++ b/programs/winhelp/macro.c
@@ -286,7 +286,7 @@ VOID MACRO_FileOpen(VOID)
   openfilename.lpTemplateName    = 0;
 
   if (GetOpenFileName(&openfilename))
-    WINHELP_CreateHelpWindow(szPath, 0, "main", FALSE, NULL, NULL, SW_SHOWNORMAL);
+    WINHELP_CreateHelpWindow(szPath, 0, "main", FALSE, 0, NULL, SW_SHOWNORMAL);
 }
 
 VOID MACRO_Find(VOID)
@@ -375,7 +375,7 @@ BOOL MACRO_IsNotMark(LPCSTR str)
 
 VOID MACRO_JumpContents(LPCSTR lpszPath, LPCSTR lpszWindow)
 {
-  WINHELP_CreateHelpWindow(lpszPath, 0, lpszWindow, FALSE, NULL, NULL, SW_NORMAL);
+  WINHELP_CreateHelpWindow(lpszPath, 0, lpszWindow, FALSE, 0, NULL, SW_NORMAL);
 }
 
 VOID MACRO_JumpContext(LPCSTR lpszPath, LPCSTR lpszWindow, LONG context)
@@ -385,7 +385,7 @@ VOID MACRO_JumpContext(LPCSTR lpszPath, LPCSTR lpszWindow, LONG context)
 
 VOID MACRO_JumpHash(LPCSTR lpszPath, LPCSTR lpszWindow, LONG lHash)
 {
-  WINHELP_CreateHelpWindow(lpszPath, lHash, lpszWindow, FALSE, NULL, NULL, SW_NORMAL);
+  WINHELP_CreateHelpWindow(lpszPath, lHash, lpszWindow, FALSE, 0, NULL, SW_NORMAL);
 }
 
 VOID MACRO_JumpHelpOn(VOID)
diff --git a/programs/winhelp/macro.lex.l b/programs/winhelp/macro.lex.l
index e40e159e323..eee33aae161 100644
--- a/programs/winhelp/macro.lex.l
+++ b/programs/winhelp/macro.lex.l
@@ -161,7 +161,7 @@ UpdateWindow|UW		yylval = (YYSTYPE)MACRO_UpdateWindow;		return VOID_FUNCTION_2ST
 #include "winhelp.h"
 static CHAR szTestMacro[256];
 
-static LRESULT MACRO_TestDialogProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT CALLBACK MACRO_TestDialogProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
   if (msg == WM_COMMAND && wParam == IDOK)
     {
diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c
index d083c572840..ef1b220476e 100644
--- a/programs/winhelp/winhelp.c
+++ b/programs/winhelp/winhelp.c
@@ -15,9 +15,9 @@
 #endif
 
 static BOOL    WINHELP_RegisterWinClasses();
-static LRESULT WINHELP_MainWndProc(HWND, UINT, WPARAM, LPARAM);
-static LRESULT WINHELP_TextWndProc(HWND, UINT, WPARAM, LPARAM);
-static LRESULT WINHELP_ButtonBoxWndProc(HWND, UINT, WPARAM, LPARAM);
+static LRESULT CALLBACK WINHELP_MainWndProc(HWND, UINT, WPARAM, LPARAM);
+static LRESULT CALLBACK WINHELP_TextWndProc(HWND, UINT, WPARAM, LPARAM);
+static LRESULT CALLBACK WINHELP_ButtonBoxWndProc(HWND, UINT, WPARAM, LPARAM);
 static VOID    WINHELP_CheckPopup(UINT);
 static BOOL    WINHELP_SplitLines(HWND hWnd, LPSIZE);
 static VOID    WINHELP_InitFonts(HWND hWnd);
@@ -328,7 +328,7 @@ VOID WINHELP_CreateHelpWindow(LPCSTR lpszFile, LONG lHash, LPCSTR lpszWindow,
  *           WINHELP_MainWndProc
  */
 
-static LRESULT WINHELP_MainWndProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT CALLBACK WINHELP_MainWndProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
   WINHELP_WINDOW *win;
   WINHELP_BUTTON *button;
@@ -426,7 +426,7 @@ static LRESULT WINHELP_MainWndProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM l
  *           WINHELP_ButtonBoxWndProc
  */
 
-static LRESULT WINHELP_ButtonBoxWndProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT CALLBACK WINHELP_ButtonBoxWndProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
   WINDOWPOS      *winpos;
   WINHELP_WINDOW *win;
@@ -497,7 +497,7 @@ static LRESULT WINHELP_ButtonBoxWndProc (HWND hWnd, UINT msg, WPARAM wParam, LPA
  *           WINHELP_TextWndProc
  */
 
-static LRESULT WINHELP_TextWndProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT CALLBACK WINHELP_TextWndProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
   WINHELP_WINDOW    *win;
   WINHELP_LINE      *line;
@@ -885,7 +885,7 @@ static BOOL WINHELP_AppendText(WINHELP_LINE ***linep, WINHELP_LINE_PART ***partp
       ptr    += sizeof(WINHELP_LINE_PART);
     }
 
-  hmemcpy16(ptr, text, textlen);
+  memcpy(ptr, text, textlen);
   part->rect.left     = line->rect.right + (*partp ? space->cx : 0);
   part->rect.right    = part->rect.left + textsize->cx;
   line->rect.right    = part->rect.right;