diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index cd35715382..1fd980d3af 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,20 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-07-01 21:33 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   * contrib/hbwhat32/_winmmcap.c
+     ! #include <hbapi.h> -> #include "hbapi.h"
+       Harbour headers are not system headers.
+
+   * contrib/gtwvg/gtwvg.c
+     * Commented unused code to avoid warnings.
+
+   * contrib/hbziparch/hbziparc.c
+   * contrib/hbziparch/hbzipnew.cpp
+     ! Fixed BCC 5.8 warning.
+     ! Removed tabs.
+     * Some formatting.
+
 2008-07-01 21:25 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
    * source/vm/extrap.c
      ! Excluded GPF dumping code for Win64 and WinCE.
diff --git a/harbour/contrib/gtwvg/gtwvg.c b/harbour/contrib/gtwvg/gtwvg.c
index 9ba655536c..a58f3c578d 100644
--- a/harbour/contrib/gtwvg/gtwvg.c
+++ b/harbour/contrib/gtwvg/gtwvg.c
@@ -2987,6 +2987,8 @@ static void hb_gt_wvt_Refresh( PHB_GT pGT )
 /*                  Keeping as a prototype for MW GT                      */
 /* ********************************************************************** */
 
+#if 0
+
 static int hb_gt_wvt_wnd_Create( PHB_GT pGT, int iTop, int iLeft, int iBottom, int iRight )
 {
    PHB_GTWVT pWVT;
@@ -3075,6 +3077,8 @@ static int hb_gt_wvt_wnd_Current( PHB_GT pGT )
    return 0;
 }
 
+#endif
+
 /* ********************************************************************** */
 
 static BOOL hb_gt_wvt_SetDispCP( PHB_GT pGT, char * pszTermCDP, char * pszHostCDP, BOOL fBox )
diff --git a/harbour/contrib/hbwhat32/_winmmcap.c b/harbour/contrib/hbwhat32/_winmmcap.c
index 6815268f42..408a07b219 100644
--- a/harbour/contrib/hbwhat32/_winmmcap.c
+++ b/harbour/contrib/hbwhat32/_winmmcap.c
@@ -12,7 +12,8 @@
 #define HB_OS_WIN_32_USED
 #define _WIN32_WINNT   0x0400
 
-#include <hbapi.h>
+#include "hbapi.h"
+
 #include <windows.h>
 #include <vfw.h>
 
diff --git a/harbour/contrib/hbziparch/hbziparc.c b/harbour/contrib/hbziparch/hbziparc.c
index 69bf5cb63d..f44ab7b96c 100644
--- a/harbour/contrib/hbziparch/hbziparc.c
+++ b/harbour/contrib/hbziparch/hbziparc.c
@@ -788,7 +788,7 @@ HB_FUNC( HB_ZIPFILEBYTDSPAN )
          else
             hb_strncpy( szFile, hb_parc( 1 ), sizeof( szFile ) - 1 );
 
-         hb_xfree( pCurDir ) ;	/* by JGS */
+         hb_xfree( pCurDir ); /* by JGS */
          szZipFileName = hb___CheckFile( szFile );
 
          if( hb_arrayLen(s_FileToZip) > 0 )
diff --git a/harbour/contrib/hbziparch/hbzipnew.cpp b/harbour/contrib/hbziparch/hbzipnew.cpp
index c57e261e7c..e39daffa88 100644
--- a/harbour/contrib/hbziparch/hbzipnew.cpp
+++ b/harbour/contrib/hbziparch/hbzipnew.cpp
@@ -1095,7 +1095,7 @@ int hb_UnzipAll(char *szFile,PHB_ITEM pBlock, BOOL bWithPath,char *szPassWord,ch
    bool iReturn = true;
    uLong uiCount = 0;
 //   int iCause = 0;
-   int iMode = true;
+   int iMode;
    CZipArchive szZip;
    BOOL bChange = FALSE;
    SegmCallback span;
@@ -1112,40 +1112,41 @@ int hb_UnzipAll(char *szFile,PHB_ITEM pBlock, BOOL bWithPath,char *szPassWord,ch
       szZip.SetCallback( &spanac );
    }
 
-   if(szPassWord != NULL )
+   if( szPassWord != NULL )
    {
-      szZip.SetPassword(szPassWord);
+      szZip.SetPassword( szPassWord );
    }
 
-   iMode=hb_CheckSpanMode(szFile);
+   iMode = hb_CheckSpanMode( szFile );
 
-     try {
-        if(iMode==0) {
-            szZip.Open(szFile,CZipArchive::zipOpen,0);
-                     }
-        else {
-            if(iMode ==-1) {
-                szZip.SetSegmCallback( &span );
-                szZip.Open(szFile,CZipArchive::zipOpen,0);
-                            }
-             else {
-                if(iMode==-2) {
-                    szZip.Open(szFile,CZipArchive::zipOpen,1);
-                              }
-                else {
-                    iReturn =false;
-                     }
-                  }
-             }
-    }
-    catch (CZipException &e)
-    {
+   try
+   {
+      if( iMode == 0 )
+          szZip.Open( szFile, CZipArchive::zipOpen, 0 );
+      else
+      {
+         if( iMode == -1 )
+         {
+            szZip.SetSegmCallback( &span );
+            szZip.Open( szFile, CZipArchive::zipOpen, 0 );
+         }
+         else
+         {
+            if( iMode == -2 )
+               szZip.Open( szFile, CZipArchive::zipOpen, 1 );
+            else
+               iReturn = false;
+         }
+      }
+   }
+   catch( CZipException &e )
+   {
       HB_SYMBOL_UNUSED( e );
-      // iCause=e.m_iCause       ;
-	}
-
- if(iReturn) {
+      // iCause=e.m_iCause;
+   }
 
+   if( iReturn )
+   {
       if( pbyBuffer )
       {
          if(hb_stricmp(pbyBuffer,".\\")==0 )
@@ -1163,7 +1164,7 @@ int hb_UnzipAll(char *szFile,PHB_ITEM pBlock, BOOL bWithPath,char *szPassWord,ch
 
     for( uiCount = 0; uiCount < (uLong)szZip.GetCount(); uiCount++ )
     {
-		CZipFileHeader fh;
+            CZipFileHeader fh;
             const char *  szFileNameInZip;
             CZipString szTempString;
             PHB_FNAME pOut;
@@ -1238,3 +1239,4 @@ return iReturn;
 #ifdef __cplusplus
 }
 #endif
+\hbzipnew.cpp 1098: 'iMode' is assigned a value that is never used in function hb_UnzipAll(char *,void *,int,char *,char *,void *,void *)