diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 5ac03f6416..ad2cd98fc1 100644
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -273,7 +273,7 @@ typedef  _TUCHAR     wxUChar;
 #    if defined(__VISUALC__) && (__VISUALC__ < 900)
 #      define wxUSE_WCHAR_T 0 // wchar_t is not available for MSVC++ 1.5
 #    elif defined(__UNIX__)
-#      if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) || (defined(__DARWIN__))
+#      if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) || defined(__DARWIN__)
 #        define wxUSE_WCHAR_T 1
 #      else
 #        define wxUSE_WCHAR_T 0
@@ -296,12 +296,12 @@ typedef  _TUCHAR     wxUChar;
 #    ifdef HAVE_WCSTR_H
 #      include <wcstr.h>
 #    else
-       // VZ: do we really have to include this?
-#      include <stdlib.h>
-
        // include wchar.h to get wcslen() declaration used by wx/buffer.h
 #      if defined(HAVE_WCHAR_H)
 #        include <wchar.h>
+#      elif defined(__FreeBSD__) || defined(__DARWIN__)
+#        include <stdlib.h>
+#        define wxNEED_WCSLEN
 #      endif
 #    endif
 #  endif