diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index 0abc6020e5..9391b59e6c 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,24 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2012-11-27 21:23 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * harbour/src/vm/cmdarg.c
+    * eliminated unnecessary initialization
+
+  * harbour/src/common/hbfopen.c
+    * added workaround for missing _wopen() in XCC
+
+  * harbour/config/win/xcc.mk
+    * updated RC include paths
+    ; TOFIX: it's still wrong and hbmk2 cannot be compiled
+             and xRC fails opening ../../package/harb_win.rc
+
+  * harbour/contrib/hbwin/hbolesrv.c
+    * do not include <tchar.h>, current code does not use
+      any tchar functions and macros and some older MinGW
+      versions are broken and this files breaks some standard
+      unicode macros like TEXT()
+
 2012-11-27 17:08 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/*/*.hbp
     % use ${hb_name}.hbx to avoid duplicating the project
diff --git a/harbour/config/win/xcc.mk b/harbour/config/win/xcc.mk
index a63c036453..071eafe7ea 100644
--- a/harbour/config/win/xcc.mk
+++ b/harbour/config/win/xcc.mk
@@ -41,7 +41,7 @@ endif
 
 RC := xRC.exe
 RC_OUT := -fo$(subst x,x, )
-RCFLAGS += -I. -I$(HB_HOST_INC)
+RCFLAGS += -I. -I$(TOP) -I$(HB_HOST_INC)
 
 LD := xLink.exe
 LD_OUT := -out:
diff --git a/harbour/contrib/hbwin/hbolesrv.c b/harbour/contrib/hbwin/hbolesrv.c
index 7e2e765343..7172eb6d14 100644
--- a/harbour/contrib/hbwin/hbolesrv.c
+++ b/harbour/contrib/hbwin/hbolesrv.c
@@ -57,7 +57,6 @@
 #include "hbwinuni.h"
 #include "hbwinole.h"
 #include <olectl.h>
-#include <tchar.h>
 
 #define MAX_CLSID_SIZE    64
 #define MAX_CLSNAME_SIZE  256
diff --git a/harbour/src/common/hbfopen.c b/harbour/src/common/hbfopen.c
index d60c6060a4..740dded877 100644
--- a/harbour/src/common/hbfopen.c
+++ b/harbour/src/common/hbfopen.c
@@ -74,3 +74,17 @@ FILE * hb_fopen( const char * path, const char * mode )
 
    return file;
 }
+
+#if defined( __XCC__ )
+#inlcude "hb_io.h"
+int __cdecl _wopen( const wchar_t * path, int flags, int mode )
+{
+   char * pszPath = hb_osStrU16Decode( path );
+   int iResult;
+
+   iResult = _open( pszPath, flags, mode );
+   hb_xfree( pszPath );
+
+   return iResult;
+}
+#endif
diff --git a/harbour/src/vm/cmdarg.c b/harbour/src/vm/cmdarg.c
index 1722bda8f1..cc71cf69ff 100644
--- a/harbour/src/vm/cmdarg.c
+++ b/harbour/src/vm/cmdarg.c
@@ -113,7 +113,6 @@ void hb_winmainArgVBuild( void )
 
    lpCmdLine = GetCommandLine();
    lpArgV = NULL;
-   lpDst = NULL;
    nSize = 0;
    iArgC = -1;