diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 883b528800..bc5d6bfa09 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-04-05 13:31 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * harbour/include/hbclass.ch
+   * harbour/include/common.ch
+     ! Using locally declared __HB_SYMBOL_UNUSED() instead of HB_SYMBOL_UNUSED()
+
+   * harbour/contrib/hgf/os2pm/tform.prg
+     ! Fixed unused symbol.
+
 2007-04-04 15:30 UTC+0200 Lorenzo Fiorini (lorenzo.fiorini/at/gmail.com)
   * harbour/contrib/pgsql/tpostgre.prg
     * removed unused vars
diff --git a/harbour/contrib/hgf/os2pm/tform.prg b/harbour/contrib/hgf/os2pm/tform.prg
index a30f41d982..cada98a762 100644
--- a/harbour/contrib/hgf/os2pm/tform.prg
+++ b/harbour/contrib/hgf/os2pm/tform.prg
@@ -122,6 +122,8 @@ METHOD Command( nNotifyCode, nId, hWndCtl ) CLASS HBForm
 
    local oMenuItem, nAt, oControl
 
+   HB_SYMBOL_UNUSED( hWndCtl )
+
    do case
       case nNotifyCode == CMDSRC_MENU   // Menu command
          if ::Menu != nil
@@ -159,6 +161,8 @@ return nil
 
 METHOD LButtonDown( nKeyFlags, nXPos, nYPos ) CLASS HBForm
 
+   HB_SYMBOL_UNUSED( nKeyFlags )
+
    if ::OnClick != nil
       return __ObjSendMsg( Self, ::OnClick, Self, nXPos, nYPos )
    endif
diff --git a/harbour/include/common.ch b/harbour/include/common.ch
index c8977901c6..05f09414d4 100644
--- a/harbour/include/common.ch
+++ b/harbour/include/common.ch
@@ -81,6 +81,7 @@
 /* To suppress unused variable -w2 warnings. The code snippet will be 
    optimized out by the compiler, so it won't cause any overhead. 
    It can be used in codeblocks, too. */
+/* Please keep it synced with the similar #define in hbclass.ch */
 #define HB_SYMBOL_UNUSED( symbol )  ( symbol := ( symbol ) )
 
 #endif /* HB_COMMON_CH_ */
diff --git a/harbour/include/hbclass.ch b/harbour/include/hbclass.ch
index 3053ff3c70..bb22f80e99 100644
--- a/harbour/include/hbclass.ch
+++ b/harbour/include/hbclass.ch
@@ -134,6 +134,9 @@
    #endif
 #endif
 
+/* Please keep it synced with the similar #define in common.ch */
+#define __HB_SYMBOL_UNUSED( symbol )  ( symbol := ( symbol ) )
+
 /*
  * I have to enable this definition by default untill we will not fix
  * preprocessor. [druzus]
@@ -321,7 +324,7 @@ DECLARE HBClass ;
 
 /* Operator overloading */
 #xcommand OPERATOR <op> [<arg: ARG, ARGS> <Args,...>] [LOCAL <Locals,...>] INLINE <Code,...> [ <export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] => ;
-   s_oClass:AddInline( <(op)>, {|Self [,<Args>] [,<Locals>]| <Code>}, HB_SYMBOL_UNUSED(Self), __HB_CLS_SCOPE( <.export.>, <.protect.>, <.hidde.> ) )
+   s_oClass:AddInline( <(op)>, {|Self [,<Args>] [,<Locals>]| <Code>}, __HB_SYMBOL_UNUSED(Self), __HB_CLS_SCOPE( <.export.>, <.protect.>, <.hidde.> ) )
 
 #xcommand METHOD <MethodName> [ AS <type> ] OPERATOR <op> [ <export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] => ;
    _HB_MEMBER __HB_CLS_ASFUNC(<MethodName>) [ AS <type> ];;
@@ -360,7 +363,7 @@ DECLARE HBClass ;
    s_oClass:AddInline( __HB_CLS_ASSTRING(<MessageName>), <CodeBlock>, __HB_CLS_SCOPE( <.export.>, <.protect.>, <.hidde.> ) + iif( <.ctor.>, HB_OO_CLSTP_CTOR, 0 ) + iif( <.persistent.>, HB_OO_CLSTP_PERSIST, 0 ) )
 
 #xcommand MESSAGE <MessageName> [ AS <type> ] [LOCAL <Locals,...>] INLINE <Code,...> [<ctor: CONSTRUCTOR>] [<export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] [<persistent: PERSISTENT, PROPERTY>] => ;
-   MESSAGE <MessageName> [ AS <type> ] BLOCK {|Self __HB_CLS_ASARGSOPT(<MessageName>) [,<Locals>]| HB_SYMBOL_UNUSED(Self), <Code>} <ctor> <export> <protect> <hidde> <persistent>
+   MESSAGE <MessageName> [ AS <type> ] BLOCK {|Self __HB_CLS_ASARGSOPT(<MessageName>) [,<Locals>]| __HB_SYMBOL_UNUSED(Self), <Code>} <ctor> <export> <protect> <hidde> <persistent>
 
 #xcommand MESSAGE <MessageName> [ AS <type> ] <arg: ARG, ARGS> <Args,...> [LOCAL <Locals,...>] INLINE <Code,...> [<ctor: CONSTRUCTOR>] [<export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] [<persistent: PERSISTENT, PROPERTY>] => ;
    MESSAGE __HB_CLS_ASID(<MessageName>)([<Args>]) [ AS <type> ] [LOCAL <Locals>] INLINE <Code> <ctor> <export> <protect> <hidde> <persistent>
@@ -439,10 +442,10 @@ DECLARE HBClass ;
 
    // Classy compatibility... Added By JF Lefebvre (mafact) 2006/11/07
    #xcommand METHOD <MethodName> [ AS <type> ] INLINE [Local <v>,] <Code,...> [<other>] => ;
-             MESSAGE <MethodName> [ AS <type> ] BLOCK {|Self [,<v>] | HB_SYMBOL_UNUSED(Self), <Code> } [<other>]
+             MESSAGE <MethodName> [ AS <type> ] BLOCK {|Self [,<v>] | __HB_SYMBOL_UNUSED(Self), <Code> } [<other>]
 
    #xcommand METHOD <MethodName>( [<params,...>] ) [ AS <type> ] INLINE [Local <v>,] <Code,...> [<other>] => ;
-             MESSAGE <MethodName> [ AS <type> ] BLOCK {|Self [,<params>] [,<v>] | HB_SYMBOL_UNUSED(Self), <Code> } [<other>]
+             MESSAGE <MethodName> [ AS <type> ] BLOCK {|Self [,<params>] [,<v>] | __HB_SYMBOL_UNUSED(Self), <Code> } [<other>]
 
 
    /* This definitions are not Class(y) compatible - I'm leaving them as is now */