diff --git a/harbour/include/hbclass.ch b/harbour/include/hbclass.ch
index 40375045de..3b0e32fa6e 100644
--- a/harbour/include/hbclass.ch
+++ b/harbour/include/hbclass.ch
@@ -161,7 +161,7 @@ DECLARE HBClass ;
 #xcommand CLASS <ClassName> [METACLASS <metaClass>] ;
              [ <frm: FROM, INHERIT> <SuperClass1> [,<SuperClassN>] ] ;
              [ <static: STATIC> ] [ FUNCTION <FuncName> ] => ;
-   #define _HB_CLS_FUNCNAME <ClassName> ;;
+   #undef _HB_CLS_FUNCNAME ; #define _HB_CLS_FUNCNAME <ClassName> ;;
    [ #undef _HB_CLS_FUNCNAME ; #define _HB_CLS_FUNCNAME <FuncName> ] ;;
    _HB_CLASS <ClassName> ;;
    <static> function _HB_CLS_FUNCNAME() ;;
@@ -191,7 +191,7 @@ DECLARE HBClass ;
 #xcommand CLASS <ClassName> [METACLASS <metaClass>] ;
              [ <frm: FROM, INHERIT> <SuperClass1> [,<SuperClassN>] ] ;
              [ <static: STATIC> ] [ FUNCTION <FuncName> ] => ;
-   #define _HB_CLS_FUNCNAME <ClassName> ;;
+   #undef _HB_CLS_FUNCNAME ; #define _HB_CLS_FUNCNAME <ClassName> ;;
    [ #undef _HB_CLS_FUNCNAME ; #define _HB_CLS_FUNCNAME <FuncName> ] ;;
    _HB_CLASS <ClassName> ;;
    <static> function _HB_CLS_FUNCNAME() ;;
@@ -226,7 +226,7 @@ DECLARE HBClass ;
 #xcommand CLASS <ClassName> [METACLASS <metaClass>] ;
              [ <frm: FROM, INHERIT> <SuperClass1> [,<SuperClassN>] ] ;
              [ <static: STATIC> ] [ FUNCTION <FuncName> ] => ;
-   #define _HB_CLS_FUNCNAME <ClassName> ;;
+   #undef _HB_CLS_FUNCNAME ; #define _HB_CLS_FUNCNAME <ClassName> ;;
    [ #undef _HB_CLS_FUNCNAME ; #define _HB_CLS_FUNCNAME <FuncName> ] ;;
    _HB_CLASS <ClassName> ;;
    <static> function _HB_CLS_FUNCNAME() ;;
@@ -253,7 +253,7 @@ DECLARE HBClass ;
 #xcommand CLASS <ClassName> [METACLASS <metaClass>] ;
              [ <frm: FROM, INHERIT> <SuperClass1> [,<SuperClassN>] ] ;
              [<static: STATIC>] [ FUNCTION <FuncName> ] => ;
-   #define _HB_CLS_FUNCNAME <ClassName> ;;
+   #undef _HB_CLS_FUNCNAME ; #define _HB_CLS_FUNCNAME <ClassName> ;;
    [ #undef _HB_CLS_FUNCNAME ; #define _HB_CLS_FUNCNAME <FuncName> ] ;;
    _HB_CLASS <ClassName> ;;
    <static> function _HB_CLS_FUNCNAME() ;;