diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f9f091c10f..7033afb596 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,23 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-08-07 11:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbqt/qtcore/hbqt.h
+  * contrib/hbqt/utils/hbqtgen.prg
+    ! Added HB_EXTERN_* around non-C++ declarations.
+
+  * contrib/hbqt/qtcore/hbqt.h
+  * contrib/hbqt/qtcore/hbqt_destruct.cpp
+    % Made one function and a structure static.
+
+  * contrib/hbqt/qtgui/g/hbqtgui.h
+  * contrib/hbqt/qtwebkit/g/hbqtwebkit.h
+  * contrib/hbqt/qtcore/g/hbqtcore.h
+  * contrib/hbqt/qtnetwork/g/hbqtnetwork.h
+  * contrib/hbqt/qscintilla/g/hbqscintilla.h
+  * contrib/hbqt/qtdesigner/g/hbqtdesigner.h
+    * Regenerated.
+
 2010-08-06 18:46 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   + contrib/hbide/resources/exit3.png
   + contrib/hbide/resources/gotoline3.png
diff --git a/harbour/contrib/hbqt/qscintilla/g/hbqscintilla.h b/harbour/contrib/hbqt/qscintilla/g/hbqscintilla.h
index 474cd7ac58..53c9901ea1 100644
--- a/harbour/contrib/hbqt/qscintilla/g/hbqscintilla.h
+++ b/harbour/contrib/hbqt/qscintilla/g/hbqscintilla.h
@@ -13,6 +13,8 @@
 
 #include "hbqt.h"
 
+HB_EXTERN_BEGIN
+
 extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_HBQsciScintilla );
 extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QsciAbstractAPIs );
 extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QsciAPIs );
@@ -39,6 +41,8 @@ extern HB_EXPORT void * hbqt_gcAllocate_QsciScintilla( void * pObj, bool bNew );
 extern HB_EXPORT void * hbqt_gcAllocate_QsciStyle( void * pObj, bool bNew );
 extern HB_EXPORT void * hbqt_gcAllocate_QsciStyledText( void * pObj, bool bNew );
 
+HB_EXTERN_END
+
 #define hbqt_par_HBQsciScintilla( n )                           ( ( HBQsciScintilla                             * ) hbqt_gcpointer( n ) )
 #define hbqt_par_QsciAbstractAPIs( n )                          ( ( QsciAbstractAPIs                            * ) hbqt_gcpointer( n ) )
 #define hbqt_par_QsciAPIs( n )                                  ( ( QsciAPIs                                    * ) hbqt_gcpointer( n ) )
diff --git a/harbour/contrib/hbqt/qtcore/g/hbqtcore.h b/harbour/contrib/hbqt/qtcore/g/hbqtcore.h
index 34b6939337..e000000335 100644
--- a/harbour/contrib/hbqt/qtcore/g/hbqtcore.h
+++ b/harbour/contrib/hbqt/qtcore/g/hbqtcore.h
@@ -13,6 +13,8 @@
 
 #include "hbqt.h"
 
+HB_EXTERN_BEGIN
+
 extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_HBEvents );
 extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_HBSlots );
 extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QAbstractItemModel );
@@ -117,6 +119,8 @@ extern HB_EXPORT void * hbqt_gcAllocate_QTranslator( void * pObj, bool bNew );
 extern HB_EXPORT void * hbqt_gcAllocate_QUrl( void * pObj, bool bNew );
 extern HB_EXPORT void * hbqt_gcAllocate_QVariant( void * pObj, bool bNew );
 
+HB_EXTERN_END
+
 #define hbqt_par_HBEvents( n )                                  ( ( HBEvents                                    * ) hbqt_gcpointer( n ) )
 #define hbqt_par_HBSlots( n )                                   ( ( HBSlots                                     * ) hbqt_gcpointer( n ) )
 #define hbqt_par_QAbstractItemModel( n )                        ( ( QAbstractItemModel                          * ) hbqt_gcpointer( n ) )
diff --git a/harbour/contrib/hbqt/qtcore/hbqt.h b/harbour/contrib/hbqt/qtcore/hbqt.h
index 92c2c8870f..0c86f13be5 100644
--- a/harbour/contrib/hbqt/qtcore/hbqt.h
+++ b/harbour/contrib/hbqt/qtcore/hbqt.h
@@ -82,13 +82,15 @@ typedef struct
    int type;
 } HBQT_GC_T;
 
-HB_GARBAGE_FUNC( Q_release );
+HB_EXTERN_BEGIN
 
 extern HB_EXPORT void * hbqt_gcpointer( int iParam );
 extern HB_EXPORT const HB_GC_FUNCS * hbqt_gcFuncs( void );
 extern HB_EXPORT void * hbqt_pPtrFromObj( int iParam );
 extern HB_EXPORT void * hbqt_pPtrFromItem( PHB_ITEM pObj );
 
+HB_EXTERN_END
+
 #define hbqt_par_QString( n )                       ( ( QString ) hb_parcx( n ) )
 #define hbqt_par_uchar( n )                         ( ( uchar * ) hb_parcx( n ) )
 #define hbqt_par_QRgb( n )                          ( hb_parnint( n ) )
diff --git a/harbour/contrib/hbqt/qtcore/hbqt_destruct.cpp b/harbour/contrib/hbqt/qtcore/hbqt_destruct.cpp
index 24c8a02d47..6cd5bcca18 100644
--- a/harbour/contrib/hbqt/qtcore/hbqt_destruct.cpp
+++ b/harbour/contrib/hbqt/qtcore/hbqt_destruct.cpp
@@ -62,7 +62,7 @@
 
 /*----------------------------------------------------------------------*/
 
-HB_GARBAGE_FUNC( Q_release )
+static HB_GARBAGE_FUNC( Q_release )
 {
    HBQT_GC_T * p = ( HBQT_GC_T * ) Cargo;
 
@@ -70,7 +70,7 @@ HB_GARBAGE_FUNC( Q_release )
       p->func( p );
 }
 
-const HB_GC_FUNCS QT_gcFuncs =
+static const HB_GC_FUNCS QT_gcFuncs =
 {
    Q_release,
    hb_gcDummyMark
diff --git a/harbour/contrib/hbqt/qtdesigner/g/hbqtdesigner.h b/harbour/contrib/hbqt/qtdesigner/g/hbqtdesigner.h
index ac693ebcaa..00e8e4f9bb 100644
--- a/harbour/contrib/hbqt/qtdesigner/g/hbqtdesigner.h
+++ b/harbour/contrib/hbqt/qtdesigner/g/hbqtdesigner.h
@@ -13,6 +13,8 @@
 
 #include "hbqt.h"
 
+HB_EXTERN_BEGIN
+
 extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QDesignerActionEditorInterface );
 extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QDesignerFormEditorInterface );
 extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QDesignerFormWindowCursorInterface );
@@ -31,6 +33,8 @@ extern HB_EXPORT void * hbqt_gcAllocate_QDesignerObjectInspectorInterface( void
 extern HB_EXPORT void * hbqt_gcAllocate_QDesignerPropertyEditorInterface( void * pObj, bool bNew );
 extern HB_EXPORT void * hbqt_gcAllocate_QDesignerWidgetBoxInterface( void * pObj, bool bNew );
 
+HB_EXTERN_END
+
 #define hbqt_par_QDesignerActionEditorInterface( n )            ( ( QDesignerActionEditorInterface              * ) hbqt_gcpointer( n ) )
 #define hbqt_par_QDesignerFormEditorInterface( n )              ( ( QDesignerFormEditorInterface                * ) hbqt_gcpointer( n ) )
 #define hbqt_par_QDesignerFormWindowCursorInterface( n )        ( ( QDesignerFormWindowCursorInterface          * ) hbqt_gcpointer( n ) )
diff --git a/harbour/contrib/hbqt/qtgui/g/hbqtgui.h b/harbour/contrib/hbqt/qtgui/g/hbqtgui.h
index 6862a82417..58b4baf987 100644
--- a/harbour/contrib/hbqt/qtgui/g/hbqtgui.h
+++ b/harbour/contrib/hbqt/qtgui/g/hbqtgui.h
@@ -13,6 +13,8 @@
 
 #include "hbqt.h"
 
+HB_EXTERN_BEGIN
+
 extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_HBQAbstractItemModel );
 extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_HBQMainWindow );
 extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_HBQPlainTextEdit );
@@ -463,6 +465,8 @@ extern HB_EXPORT void * hbqt_gcAllocate_QWizard( void * pObj, bool bNew );
 extern HB_EXPORT void * hbqt_gcAllocate_QWizardPage( void * pObj, bool bNew );
 extern HB_EXPORT void * hbqt_gcAllocate_QUiLoader( void * pObj, bool bNew );
 
+HB_EXTERN_END
+
 #define hbqt_par_HBQAbstractItemModel( n )                      ( ( HBQAbstractItemModel                        * ) hbqt_gcpointer( n ) )
 #define hbqt_par_HBQMainWindow( n )                             ( ( HBQMainWindow                               * ) hbqt_gcpointer( n ) )
 #define hbqt_par_HBQPlainTextEdit( n )                          ( ( HBQPlainTextEdit                            * ) hbqt_gcpointer( n ) )
diff --git a/harbour/contrib/hbqt/qtnetwork/g/hbqtnetwork.h b/harbour/contrib/hbqt/qtnetwork/g/hbqtnetwork.h
index 1c8ca3f2e5..a682947330 100644
--- a/harbour/contrib/hbqt/qtnetwork/g/hbqtnetwork.h
+++ b/harbour/contrib/hbqt/qtnetwork/g/hbqtnetwork.h
@@ -13,6 +13,8 @@
 
 #include "hbqt.h"
 
+HB_EXTERN_BEGIN
+
 extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QFtp );
 extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QHttp );
 extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QHttpHeader );
@@ -27,6 +29,8 @@ extern HB_EXPORT void * hbqt_gcAllocate_QHttpRequestHeader( void * pObj, bool bN
 extern HB_EXPORT void * hbqt_gcAllocate_QHttpResponseHeader( void * pObj, bool bNew );
 extern HB_EXPORT void * hbqt_gcAllocate_QNetworkRequest( void * pObj, bool bNew );
 
+HB_EXTERN_END
+
 #define hbqt_par_QFtp( n )                                      ( ( QFtp                                        * ) hbqt_gcpointer( n ) )
 #define hbqt_par_QHttp( n )                                     ( ( QHttp                                       * ) hbqt_gcpointer( n ) )
 #define hbqt_par_QHttpHeader( n )                               ( ( QHttpHeader                                 * ) hbqt_gcpointer( n ) )
diff --git a/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit.h b/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit.h
index d0719d3335..a2ae8a9e6d 100644
--- a/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit.h
+++ b/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit.h
@@ -13,6 +13,8 @@
 
 #include "hbqt.h"
 
+HB_EXTERN_BEGIN
+
 extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebFrame );
 extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebHistory );
 extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebHistoryInterface );
@@ -35,6 +37,8 @@ extern HB_EXPORT void * hbqt_gcAllocate_QWebSecurityOrigin( void * pObj, bool bN
 extern HB_EXPORT void * hbqt_gcAllocate_QWebSettings( void * pObj, bool bNew );
 extern HB_EXPORT void * hbqt_gcAllocate_QWebView( void * pObj, bool bNew );
 
+HB_EXTERN_END
+
 #define hbqt_par_QWebFrame( n )                                 ( ( QWebFrame                                   * ) hbqt_gcpointer( n ) )
 #define hbqt_par_QWebHistory( n )                               ( ( QWebHistory                                 * ) hbqt_gcpointer( n ) )
 #define hbqt_par_QWebHistoryInterface( n )                      ( ( QWebHistoryInterface                        * ) hbqt_gcpointer( n ) )
diff --git a/harbour/contrib/hbqt/utils/hbqtgen.prg b/harbour/contrib/hbqt/utils/hbqtgen.prg
index f5a21ae8ac..98a3d361b0 100644
--- a/harbour/contrib/hbqt/utils/hbqtgen.prg
+++ b/harbour/contrib/hbqt/utils/hbqtgen.prg
@@ -1800,6 +1800,8 @@ STATIC FUNCTION Build_HeaderFile( cpp_, cPathOut, cProFile )
    aadd( txt_, "" )
    aadd( txt_, '#include "hbqt.h"' )
    aadd( txt_, "" )
+   aadd( txt_, "HB_EXTERN_BEGIN" )
+   aadd( txt_, "" )
 
    FOR EACH s IN cpp_
       aadd( txt_, "extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_" + s + " );" )
@@ -1813,6 +1815,9 @@ STATIC FUNCTION Build_HeaderFile( cpp_, cPathOut, cProFile )
       aadd( txt_, "" )
    ENDIF
 
+   aadd( txt_, "HB_EXTERN_END" )
+   aadd( txt_, "" )
+
    FOR EACH s IN cpp_
       IF s == "QList" /* TOFIX: Ugly hack */
          tmp := s + "< void * >"