diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index c0dbf63459..8b97f59337 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -54,6 +54,7 @@
 #include "wx/intl.h"
 #include "wx/log.h"
 
+#if wxUSE_WCHAR_T
 #define BSWAP_UCS4(str, len) { unsigned _c; for (_c=0; _c<len; _c++) str[_c]=wxUINT32_SWAP_ALWAYS(str[_c]); }
 #define BSWAP_UTF16(str, len) { unsigned _c; for (_c=0; _c<len; _c++) str[_c]=wxUINT16_SWAP_ALWAYS(str[_c]); }
 
@@ -95,8 +96,6 @@ WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;
 // implementation
 // ============================================================================
 
-#if wxUSE_WCHAR_T
-
 #ifdef WC_UTF16
 
 static size_t encode_utf16(wxUint32 input, wchar_t *output)
@@ -970,6 +969,7 @@ public:
 // ----------------------------------------------------------------------------
 
 WXDLLEXPORT_DATA(wxMBConv) wxConvLibc, wxConvFile;
+WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;
 
 #endif // wxUSE_WCHAR_T