--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/ole/win32/extras.d	Wed Mar 25 08:46:48 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/ole/win32/extras.d	Wed Mar 25 11:18:25 2009 +0100
@@ -8,10 +8,7 @@
 //public import std.c.windows.com;
 //public import std.c.windows.windows;
 import org.eclipse.swt.internal.win32.WINTYPES;
-// private import org.eclipse.swt.internal.ole.win32.comtypes;
-alias WCHAR OLECHAR;
-alias OLECHAR *LPOLESTR;
-alias OLECHAR *LPCOLESTR;
+import org.eclipse.swt.internal.ole.win32.COMTYPES;
 
 enum
 {
@@ -51,7 +48,10 @@
     CLSCTX_SERVER = (CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER),
 }
 
-alias GUID IID;
+version(Tango){
+    static assert(0);
+    alias GUID IID;
+}
 alias GUID CLSID;
 
 extern (C)
@@ -159,6 +159,11 @@
     extern IID IID_IEnumOLEVERB;
 }
 
+version(D_Version2){
+    mixin("alias const(IID) *REFCIID;");
+} else { // D1
+    alias IID *REFCIID;
+}
 extern (Windows) export {
     DWORD   CoBuildVersion();
 
@@ -180,7 +185,7 @@
     void    CoFreeUnusedLibraries();
 
     interface IUnknown {
-        HRESULT QueryInterface(IID* riid, void** pvObject);
+        HRESULT QueryInterface(REFCIID riid, void** pvObject);
         ULONG AddRef();
         ULONG Release();
     }
@@ -203,6 +208,11 @@
 //typedef GUID CLSID;
 //alias CLSID * LPCLSID;
 alias GUID *REFGUID;
+version(D_Version2){
+    mixin("alias const(GUID) *REFCGUID;");
+} else { // D1
+    alias GUID *REFCGUID;
+}
 
 //alias IID *REFIID;