diff --git a/programs/winemsibuilder/Makefile.in b/programs/winemsibuilder/Makefile.in
index b29f44c84d9..1d7031e4ef1 100644
--- a/programs/winemsibuilder/Makefile.in
+++ b/programs/winemsibuilder/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = winemsibuilder.exe
-APPMODE   = -mconsole -municode
 IMPORTS   = msi ole32
 
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
+
 C_SRCS = main.c
diff --git a/programs/winemsibuilder/main.c b/programs/winemsibuilder/main.c
index ea4607eb2b8..71fd1fdc1c8 100644
--- a/programs/winemsibuilder/main.c
+++ b/programs/winemsibuilder/main.c
@@ -28,7 +28,6 @@
 #include <objbase.h>
 
 #include "wine/debug.h"
-#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(winemsibuilder);
 
@@ -131,7 +130,7 @@ static WCHAR *encode_stream( const WCHAR *in )
     DWORD c, next, count;
     WCHAR *out, *p;
 
-    count = strlenW( in );
+    count = lstrlenW( in );
     if (count > MAX_STREAM_NAME)
         return NULL;