diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in
index 086d3c0c5ab..7febde2db6a 100644
--- a/dlls/mstask/Makefile.in
+++ b/dlls/mstask/Makefile.in
@@ -1,6 +1,8 @@
 MODULE    = mstask.dll
 IMPORTS   = rpcrt4 ole32 oleaut32
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	factory.c \
 	mstask_main.c \
diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h
index dbaf5433b0e..aed4c80cbe9 100644
--- a/dlls/mstask/mstask_private.h
+++ b/dlls/mstask/mstask_private.h
@@ -20,7 +20,6 @@
 #define __MSTASK_PRIVATE_H__
 
 #include "wine/heap.h"
-#include "wine/unicode.h"
 
 extern LONG dll_ref DECLSPEC_HIDDEN;
 
@@ -38,7 +37,7 @@ static inline WCHAR *heap_strdupW(const WCHAR *src)
     WCHAR *dst;
     unsigned len;
     if (!src) return NULL;
-    len = (strlenW(src) + 1) * sizeof(WCHAR);
+    len = (lstrlenW(src) + 1) * sizeof(WCHAR);
     if ((dst = heap_alloc(len))) memcpy(dst, src, len);
     return dst;
 }
diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c
index 6ab92634627..a15e0164b43 100644
--- a/dlls/mstask/task.c
+++ b/dlls/mstask/task.c
@@ -1813,10 +1813,10 @@ static HRESULT WINAPI MSTASK_IPersistFile_GetCurFile(IPersistFile *iface, LPOLES
 
     TRACE("(%p, %p)\n", iface, file_name);
 
-    *file_name = CoTaskMemAlloc((strlenW(This->task_name) + 1) * sizeof(WCHAR));
+    *file_name = CoTaskMemAlloc((lstrlenW(This->task_name) + 1) * sizeof(WCHAR));
     if (!*file_name) return E_OUTOFMEMORY;
 
-    strcpyW(*file_name, This->task_name);
+    lstrcpyW(*file_name, This->task_name);
     return S_OK;
 }
 
@@ -1893,7 +1893,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task)
 
     TRACE("(%s, %p)\n", debugstr_w(name), task);
 
-    if (strchrW(name, '.')) return E_INVALIDARG;
+    if (wcschr(name, '.')) return E_INVALIDARG;
 
     GetWindowsDirectoryW(task_name, MAX_PATH);
     lstrcatW(task_name, tasksW);
diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c
index ebf25d08e80..54ca3609ff4 100644
--- a/dlls/mstask/task_scheduler.c
+++ b/dlls/mstask/task_scheduler.c
@@ -423,7 +423,7 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_Delete(ITaskScheduler *iface, LPCWST
 
     TRACE("%p, %s\n", iface, debugstr_w(name));
 
-    if (strchrW(name, '.')) return E_INVALIDARG;
+    if (wcschr(name, '.')) return E_INVALIDARG;
 
     GetWindowsDirectoryW(task_name, MAX_PATH);
     lstrcatW(task_name, tasksW);
@@ -467,7 +467,7 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_AddWorkItem(ITaskScheduler *iface, L
 
     TRACE("%p, %s, %p\n", iface, debugstr_w(name), item);
 
-    if (strchrW(name, '.')) return E_INVALIDARG;
+    if (wcschr(name, '.')) return E_INVALIDARG;
 
     GetWindowsDirectoryW(task_name, MAX_PATH);
     lstrcatW(task_name, tasksW);