diff --git a/programs/winhlp32/Makefile.in b/programs/winhlp32/Makefile.in
index 40ce8a1f119..78e0e5a257b 100644
--- a/programs/winhlp32/Makefile.in
+++ b/programs/winhlp32/Makefile.in
@@ -1,8 +1,9 @@
 MODULE    = winhlp32.exe
-APPMODE   = -mwindows
 IMPORTS   = user32 gdi32
 DELAYIMPORTS = shell32 comctl32 comdlg32
 
+EXTRADLLFLAGS = -mwindows -mno-cygwin
+
 C_SRCS = \
 	callback.c \
 	hlpfile.c \
diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l
index eab7a795af0..08067a4548f 100644
--- a/programs/winhlp32/macro.lex.l
+++ b/programs/winhlp32/macro.lex.l
@@ -23,7 +23,6 @@
 %option noinput nounput never-interactive 8bit
 %x quote
 %{
-#include "config.h"
 #include <assert.h>
 #include <stdarg.h>
 
diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c
index 7ce5d4a0a8f..a98a76003ba 100644
--- a/programs/winhlp32/winhelp.c
+++ b/programs/winhlp32/winhelp.c
@@ -275,10 +275,10 @@ HLPFILE_WINDOWINFO*     WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name)
         strcpy(mwi.name, "main");
         if (hlpfile && hlpfile->lpszTitle[0])
         {
-            char        tmp[128];
+            char tmp[40];
             LoadStringA(Globals.hInstance, STID_WINE_HELP, tmp, sizeof(tmp));
-            snprintf(mwi.caption, sizeof(mwi.caption), "%s %s - %s",
-                     hlpfile->lpszTitle, tmp, hlpfile->lpszPath);
+            _snprintf(mwi.caption, sizeof(mwi.caption), "%s %s - %s",
+                      hlpfile->lpszTitle, tmp, hlpfile->lpszPath);
         }
         else
             LoadStringA(Globals.hInstance, STID_WINE_HELP, mwi.caption, sizeof(mwi.caption));