diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3c5ae319b8..f4a902ab56 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-01 01:19 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbwince.h
+  * harbour/contrib/hbwin/axcore.c
+    * moved HBTEXT macro definition from axcore.c to hbwince.h
+
+  * harbour/contrib/hbwin/wapi_shellapi.c
+    ! use HBTEXT() macro for literal constants used as second parameter
+      of GetProcAddress(). It fixes WINCE builds where whole API uses
+      only UNICODE strings.
+
 2009-12-01 00:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
     + Added cairo links.
diff --git a/harbour/contrib/hbwin/axcore.c b/harbour/contrib/hbwin/axcore.c
index a5e53afa90..94abcfb770 100644
--- a/harbour/contrib/hbwin/axcore.c
+++ b/harbour/contrib/hbwin/axcore.c
@@ -53,12 +53,6 @@
 
 #include "hbwinole.h"
 
-#if defined( HB_OS_WIN_CE )
-   #define HBTEXT( x ) TEXT( x )
-#else
-   #define HBTEXT( x ) x
-#endif
-
 typedef BOOL      ( CALLBACK * PHB_AX_WININIT )( void );
 typedef HRESULT   ( CALLBACK * PHB_AX_GETCTRL )( HWND, IUnknown** );
 
diff --git a/harbour/contrib/hbwin/wapi_shellapi.c b/harbour/contrib/hbwin/wapi_shellapi.c
index 37170cd39d..aaf4e22788 100644
--- a/harbour/contrib/hbwin/wapi_shellapi.c
+++ b/harbour/contrib/hbwin/wapi_shellapi.c
@@ -105,7 +105,7 @@ HB_FUNC( WAPI_USERISANADMIN )
    if( hLib )
    {
       typedef int ( WINAPI * ISUSERANADMIN )( void );
-      ISUSERANADMIN pIsUserAnAdmin = ( ISUSERANADMIN ) GetProcAddress( hLib, "IsUserAnAdmin" );
+      ISUSERANADMIN pIsUserAnAdmin = ( ISUSERANADMIN ) GetProcAddress( hLib, HBTEXT( "IsUserAnAdmin" ) );
       if( pIsUserAnAdmin )
          bResult = ( pIsUserAnAdmin )();
 
diff --git a/harbour/include/hbwince.h b/harbour/include/hbwince.h
index cf913b4753..3eeff4f701 100644
--- a/harbour/include/hbwince.h
+++ b/harbour/include/hbwince.h
@@ -193,6 +193,12 @@ extern HB_EXPORT void hb_mbtowccpy( wchar_t *dstW, const char *srcA, unsigned lo
 extern HB_EXPORT void hb_mbtowcset( wchar_t *dstW, const char *srcA, unsigned long ulLen );
 extern HB_EXPORT void hb_wctombget( char *dstA, const wchar_t *srcW, unsigned long ulLen );
 
+#if defined( HB_OS_WIN_CE )
+   #define HBTEXT( x ) TEXT( x )
+#else
+   #define HBTEXT( x ) x
+#endif
+
 #if defined( UNICODE )
 
    #define HB_TCHAR_CPTO(d,s,l)        hb_mbtowccpy(d,s,l)