diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3e167436a4..f372e6870d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,12 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-16 09:07 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
+  * harbour/contrib/gtwvg/wvgcuig.c
+  * harbour/contrib/gtwvg/wvgsink.c
+  * harbour/contrib/gtwvg/wvgwin.c
+    ! Fixes for warnings on all compilers.
+
 2009-03-16 15:35 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * bin/postinst.bat
     ! Typo in bcc / fbclient.
diff --git a/harbour/contrib/gtwvg/wvgcuig.c b/harbour/contrib/gtwvg/wvgcuig.c
index 08ec4fc97d..8fd2b7b4f0 100644
--- a/harbour/contrib/gtwvg/wvgcuig.c
+++ b/harbour/contrib/gtwvg/wvgcuig.c
@@ -168,7 +168,7 @@ HB_FUNC( WVG_SETGOBJSTATE )
 {
    PHB_GTWVT pWVT    = hb_wvt_gtGetWVT();
    int       iHandle = hb_parni( 1 );
-   int       iOState;
+   int       iOState = 0;
 
    if( iHandle && pWVT->gObjs )
    {
@@ -203,7 +203,7 @@ HB_FUNC( WVG_SETGOBJDATA )
 {
    PHB_GTWVT pWVT     = hb_wvt_gtGetWVT();
    int       iHandle  = hb_parni( 1 );
-   BOOL      bSuccess;
+   BOOL      bSuccess = FALSE;
 
    if( iHandle )
    {
@@ -232,7 +232,7 @@ HB_FUNC( WVG_SETGOBJDATA )
                break;
             case GOBJ_OBJDATA_IMAGE:
             {
-               IPicture * iPicture;
+               IPicture * iPicture = NULL;
 
                if( ISNUM( 3 ) )
                {
@@ -1184,7 +1184,7 @@ HB_FUNC( WVG_TEXTBOX )
 {
    PHB_GTWVT pWVT = hb_wvt_gtGetWVT();
    HB_GOBJS *gObj = hb_wvg_ObjectNew( pWVT );
-   int iAlignH;
+   int iAlignH = 0;
 
    gObj->iObjType         = GOBJ_OBJTYPE_TEXTBOX;
 
@@ -1291,7 +1291,7 @@ HB_FUNC( WVG_IMAGE )
 #if ! defined( HB_OS_WIN_CE )
    PHB_GTWVT pWVT = hb_wvt_gtGetWVT();
    int       iSource = hb_parni( 6 );
-   IPicture *iPicture;
+   IPicture *iPicture = NULL;
 
    if( iSource == 0 )
    {
diff --git a/harbour/contrib/gtwvg/wvgsink.c b/harbour/contrib/gtwvg/wvgsink.c
index 25af133aba..c031de14fb 100644
--- a/harbour/contrib/gtwvg/wvgsink.c
+++ b/harbour/contrib/gtwvg/wvgsink.c
@@ -92,7 +92,7 @@
    #include "hbvmint.h"
 #endif
 
-//#include <windows.h>
+#include <windows.h>
 #include <oaidl.h>
 #include "hbapi.h"
 #include "item.api"
diff --git a/harbour/contrib/gtwvg/wvgwin.c b/harbour/contrib/gtwvg/wvgwin.c
index 61df68a90d..3edcb66fa8 100644
--- a/harbour/contrib/gtwvg/wvgwin.c
+++ b/harbour/contrib/gtwvg/wvgwin.c
@@ -93,12 +93,6 @@
 
 /*----------------------------------------------------------------------*/
 
-#define WM_CHOOSEFONT_GETLOGFONT                  (WM_USER + 1)
-#define WM_CHOOSEFONT_SETLOGFONT                  (WM_USER + 101)
-#define WM_CHOOSEFONT_SETFLAGS                    (WM_USER + 102)
-
-/*----------------------------------------------------------------------*/
-
 #define wvg_parwparam( n )  ( ( WPARAM )  ( HB_PTRDIFF ) hb_parnint( n ) )
 #define wvg_parlparam( n )  ( ( LPARAM )  ( HB_PTRDIFF ) hb_parnint( n ) )
 #define wvg_parhandle( n )  ( ( HANDLE )  ( HB_PTRDIFF ) hb_parnint( n ) )
@@ -1993,6 +1987,7 @@ HB_FUNC( WVG_CHOOSEFONT )
 
 HB_FUNC( WVG_CHOOSEFONT_GETLOGFONT )
 {
+#if ! defined( HB_OS_WIN_CE )
    LOGFONT  lf;
    PHB_ITEM aFont;
 
@@ -2003,6 +1998,7 @@ HB_FUNC( WVG_CHOOSEFONT_GETLOGFONT )
    aFont = wvg_logfontTOarray( &lf, FALSE );
 
    hb_itemReturnRelease( aFont );
+#endif
 }
 
 //----------------------------------------------------------------------//