diff --git a/winsup/lsaauth/ChangeLog b/winsup/lsaauth/ChangeLog
index 3dbc2b873..bbb763a1e 100644
--- a/winsup/lsaauth/ChangeLog
+++ b/winsup/lsaauth/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-10  Corinna Vinschen  <corinna@vinschen.de>
+
+	* Makefile.in: Don't override CC.
+	* cyglsa.c: Don't include wchar.h.  Declare wcscpy and wcslen instead.
+	* cyglsa64.dll: Rebuild.
+
 2011-03-31  Corinna Vinschen  <corinna@vinschen.de>
 
 	* Makefile.in (LIBS): Remove advapi32.dll.
diff --git a/winsup/lsaauth/Makefile.in b/winsup/lsaauth/Makefile.in
index 82b58363c..948c08b34 100644
--- a/winsup/lsaauth/Makefile.in
+++ b/winsup/lsaauth/Makefile.in
@@ -29,8 +29,6 @@ INSTALL_DATA    := @INSTALL_DATA@
 CC              := @CC@
 CC_FOR_TARGET   := $(CC)
 
-override CC	:= @NO_CYGWIN@ $(firstword ${CC})
-
 CFLAGS          := @CFLAGS@
 
 include $(srcdir)/../Makefile.common
diff --git a/winsup/lsaauth/cyglsa.c b/winsup/lsaauth/cyglsa.c
index 0e7a05797..e64d0e11f 100644
--- a/winsup/lsaauth/cyglsa.c
+++ b/winsup/lsaauth/cyglsa.c
@@ -11,7 +11,6 @@ Cygwin license.  Please consult the file "CYGWIN_LICENSE" for details. */
 
 #define WINVER 0x0600
 #include <ntstatus.h>
-#include <wchar.h>
 #include <windows.h>
 #include <wininet.h>
 #include <lmcons.h>
@@ -49,6 +48,11 @@ ULONG NTAPI RtlLengthSid (PSID);
 PULONG NTAPI RtlSubAuthoritySid (PSID, ULONG);
 PUCHAR NTAPI RtlSubAuthorityCountSid (PSID);
 BOOLEAN NTAPI RtlValidSid (PSID);
+/* These standard POSIX functions are implemented in NTDLL and exported.
+   There's just no header to define them and using wchar.h from mingw
+   or Cygwin seems wrong somehow. */
+wchar_t *__cdecl wcscpy (wchar_t *, const wchar_t *);
+size_t __cdecl wcslen (const wchar_t *);
 
 #ifndef RtlInitEmptyUnicodeString
 __inline VOID NTAPI
diff --git a/winsup/lsaauth/cyglsa64.dll b/winsup/lsaauth/cyglsa64.dll
index 18acaf8c7..14f1f6cff 100644
Binary files a/winsup/lsaauth/cyglsa64.dll and b/winsup/lsaauth/cyglsa64.dll differ