diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 864863e0ce..4da30a61db 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-03-04 13:08 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * examples/gtwvw/wvwcheck.c
+  * examples/gtwvw/wvwedit.c
+  * examples/gtwvw/hbgtwvw.h
+    ! Added not terribly elegant (local) fix to missing 'hb_hInstance'
+      link time errors. Not tested besides successful lib build.
+
 2010-03-04 11:06 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbcompdf.h
   * harbour/src/vm/macro.c
diff --git a/harbour/examples/gtwvw/hbgtwvw.h b/harbour/examples/gtwvw/hbgtwvw.h
index 89aeb4bd64..08516680c9 100644
--- a/harbour/examples/gtwvw/hbgtwvw.h
+++ b/harbour/examples/gtwvw/hbgtwvw.h
@@ -625,8 +625,6 @@ typedef struct wvw_data
    #define HB_PARHANDLE( n )        ( ( LONG ) hb_parnl( n ) )
    #define HB_STOREHANDLE( h, n )   hb_stornl( ( LONG ) ( h ), n )
 HB_EXTERN_BEGIN
-extern HANDLE  hb_hInstance;
-extern HANDLE  hb_hPrevInstance;
 
 /* Get functions for internal Data */
 extern BOOL hb_gt_wvw_GetMainCoordMode( void );
diff --git a/harbour/examples/gtwvw/wvwcheck.c b/harbour/examples/gtwvw/wvwcheck.c
index d5bea6d8ec..cfbe898a5f 100644
--- a/harbour/examples/gtwvw/wvwcheck.c
+++ b/harbour/examples/gtwvw/wvwcheck.c
@@ -463,6 +463,7 @@ HB_FUNC( WVW_CXSTATUSFONT )
 
 HB_FUNC( WVW_PGCREATE)
 {
+   HANDLE hInstance = NULL;
    UINT usWinNum = WVW_WHICH_WINDOW;
    WIN_DATA * pWindowData = hb_gt_wvw_GetWindowsData( usWinNum );
    HWND hWndParent = pWindowData->hWnd;
@@ -523,6 +524,8 @@ HB_FUNC( WVW_PGCREATE)
       iStyle = iStyle | PBS_SMOOTH;
    }
 
+   hb_winmainArgGet( &hInstance, NULL, NULL );
+
    hWndPG = CreateWindowEx(
        0L,
        PROGRESS_CLASS,
@@ -534,7 +537,7 @@ HB_FUNC( WVW_PGCREATE)
        iBottom-iTop+1,
        hWndParent,
        (HMENU) uiPGid,
-       (HINSTANCE) hb_hInstance,
+       (HINSTANCE) hInstance,
        (LPVOID) NULL
    );
 
diff --git a/harbour/examples/gtwvw/wvwedit.c b/harbour/examples/gtwvw/wvwedit.c
index eac658454c..a60e309ec2 100644
--- a/harbour/examples/gtwvw/wvwedit.c
+++ b/harbour/examples/gtwvw/wvwedit.c
@@ -121,6 +121,7 @@
 
 HB_FUNC( WVW_EBCREATE)
 {
+   HANDLE hInstance = NULL;
    UINT usWinNum = WVW_WHICH_WINDOW;
    WIN_DATA * pWindowData = hb_gt_wvw_GetWindowsData( usWinNum );
    HWND hWndParent = pWindowData->hWnd;
@@ -203,6 +204,8 @@ HB_FUNC( WVW_EBCREATE)
 
    }
 
+   hb_winmainArgGet( &hInstance, NULL, NULL );
+
    hWndEB = CreateWindowEx(
        0L,
        "EDIT",
@@ -214,7 +217,7 @@ HB_FUNC( WVW_EBCREATE)
        iBottom-iTop+1,
        hWndParent,
        (HMENU) uiEBid,
-       (HINSTANCE) hb_hInstance,
+       (HINSTANCE) hInstance,
        (LPVOID) NULL
    );
 
@@ -722,6 +725,7 @@ HB_FUNC( WVW_EBSETSEL )
 
 HB_FUNC( WVW_STCREATE )
 {
+   HANDLE hInstance = NULL;
    UINT usWinNum = WVW_WHICH_WINDOW;
    WIN_DATA * pWindowData = hb_gt_wvw_GetWindowsData( usWinNum );
    WVW_DATA * pData =  hb_getWvwData( ) ;
@@ -799,6 +803,8 @@ HB_FUNC( WVW_STCREATE )
      uiCBid++;
    }
 
+   hb_winmainArgGet( &hInstance, NULL, NULL );
+
    hWndCB = CreateWindowEx(
        ulExStyle,
        "STATIC",
@@ -810,7 +816,7 @@ HB_FUNC( WVW_STCREATE )
        iBottom-iTop+1,
        hWndParent,
        (HMENU) uiCBid,
-       (HINSTANCE) hb_hInstance,
+       (HINSTANCE) hInstance,
        (LPVOID) NULL
    );