--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/win32/OS.d	Thu Mar 05 15:12:35 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/win32/OS.d	Mon Mar 09 14:26:40 2009 +0100
@@ -25,8 +25,6 @@
 
 static import tango.stdc.stdlib;
 static import tango.stdc.string;
-static import tango.text.convert.Utf;
-static import tango.io.Console;
 
 alias tango.sys.win32.UserGdi WINAPI;
 alias org.eclipse.swt.internal.win32.WINAPI DWTWINAPI;
@@ -3603,7 +3601,6 @@
 } // END of OS
 //-----------------------------------------------------------------------------
 import tango.sys.win32.CodePage : CodePage;
-private import tango.text.convert.Utf;
 private import tango.stdc.stringz;
 
 // convert UTF-8 to MBCS
@@ -3616,7 +3613,7 @@
             {
                 CHAR[] result;
                 int i;
-                wchar[] ws = tango.text.convert.Utf.toString16(sc);
+                wchar[] ws = toWCharArray(sc);
                 result.length = OS.WideCharToMultiByte(codepage, 0, ws.ptr, ws.length, null, 0, null, null);
                 i = OS.WideCharToMultiByte(codepage, 0, ws.ptr, ws.length, result.ptr, result.length, null, null);
                 assert(i == result.length);
@@ -3654,7 +3651,7 @@
 public wchar[] StrToWCHARs(char[] sc, bool terminated = false ) {
     wchar[] ret;
     try{
-        ret = tango.text.convert.Utf.toString16(sc);
+        ret = toWCharArray(sc);
     }catch(Exception e){
         // do nothing
         ret = "";
@@ -3691,7 +3688,7 @@
     wchar[] wcs = _mbcszToWs(pString, _length, codepage);
     char[] result;
     try{
-        result = .toString(wcs);
+        result = String_valueOf(wcs);
     }catch(Exception e){
     }
     return result;
@@ -3719,7 +3716,7 @@
 
     char[] result;
     try{
-        result = .toString(wcs);
+        result = String_valueOf(wcs);
     }catch(Exception e){
         // do nothing
     }