diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 9aac0d2445..3489cf6485 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,16 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-05-23 11:55 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/Makefile
+    + added hbapidbg.h
+
+  * harbour/source/vm/classes.c
+    - removed one unused debug function
+
+  * harbour/source/vm/debug.c
+    * formatting
+
 2007-05-22 23:20 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/common.mak
     ! fixed typo during copy and past in last modification - changing files
diff --git a/harbour/include/Makefile b/harbour/include/Makefile
index bee3bb3ebe..4509d703e6 100644
--- a/harbour/include/Makefile
+++ b/harbour/include/Makefile
@@ -10,6 +10,7 @@ C_HEADERS=\
 	hbapi.h      \
 	hbapicdp.h   \
 	hbapicls.h   \
+	hbapidbg.h   \
 	hbapierr.h   \
 	hbapifs.h    \
 	hbapigt.h    \
diff --git a/harbour/source/vm/classes.c b/harbour/source/vm/classes.c
index a0f83274f4..790ba6f3db 100644
--- a/harbour/source/vm/classes.c
+++ b/harbour/source/vm/classes.c
@@ -1254,34 +1254,6 @@ HB_EXPORT const char * hb_objGetRealClsName( PHB_ITEM pObject, const char * szNa
    return hb_objGetClsName( pObject );
 }
 
-/*
- * return real function name ignoring aliasing
- */
-const char * hb_clsRealMethodName( void )
-{
-   LONG lOffset = hb_stackBaseProcOffset( 1 );
-   const char * szName = NULL;
-
-   if( lOffset > 0 )
-   {
-      PHB_STACK_STATE pStack = hb_stackItem( lOffset )->item.asSymbol.stackstate;
-
-      if( pStack->uiClass && pStack->uiClass <= s_uiClasses )
-      {
-         PCLASS pClass = &s_pClasses[ pStack->uiClass ];
-
-         if( ( ULONG ) pStack->uiMethod < hb_clsMthNum( pClass ) )
-         {
-            PMETHOD pMethod = pClass->pMethods + pStack->uiMethod;
-
-            if( pMethod->pMessage )
-               szName = pMethod->pMessage->pSymbol->szName;
-         }
-      }
-   }
-   return szName;
-}
-
 #if defined( HB_CLASSY_BLOCK_SCOPE )
 static LONG hb_clsSenderOffset( void )
 {
@@ -4029,7 +4001,6 @@ void hb_clsAssociate( USHORT usClassH )
 
 
 #if 1
-
 /*
  * __CLS_PARAM() and __CLS_PAR00() functions are only for backward binary
  * compatibility. They will be removed in the future so please do not use
@@ -4087,3 +4058,33 @@ BOOL hb_objGetpMethod( PHB_ITEM pObject, PHB_SYMB pMessage )
 }
 
 #endif
+
+#if 0
+/*
+ * return real function name ignoring aliasing
+ */
+const char * hb_clsRealMethodName( void )
+{
+   LONG lOffset = hb_stackBaseProcOffset( 1 );
+   const char * szName = NULL;
+
+   if( lOffset > 0 )
+   {
+      PHB_STACK_STATE pStack = hb_stackItem( lOffset )->item.asSymbol.stackstate;
+
+      if( pStack->uiClass && pStack->uiClass <= s_uiClasses )
+      {
+         PCLASS pClass = &s_pClasses[ pStack->uiClass ];
+
+         if( ( ULONG ) pStack->uiMethod < hb_clsMthNum( pClass ) )
+         {
+            PMETHOD pMethod = pClass->pMethods + pStack->uiMethod;
+
+            if( pMethod->pMessage )
+               szName = pMethod->pMessage->pSymbol->szName;
+         }
+      }
+   }
+   return szName;
+}
+#endif
diff --git a/harbour/source/vm/debug.c b/harbour/source/vm/debug.c
index f3049bb5e5..8cd96b5760 100644
--- a/harbour/source/vm/debug.c
+++ b/harbour/source/vm/debug.c
@@ -255,35 +255,35 @@ HB_FUNC( HB_DBG_VMVARLSET )
 
 HB_FUNC( __VMSTKLCOUNT )
 {
-   HB_FUNC_EXEC(HB_DBG_VMSTKLCOUNT);
+   HB_FUNC_EXEC( HB_DBG_VMSTKLCOUNT );
 }
 
 HB_FUNC( __VMPARLLIST )
 {
-   HB_FUNC_EXEC(HB_DBG_VMPARLLIST);
+   HB_FUNC_EXEC( HB_DBG_VMPARLLIST );
 }
 
 HB_FUNC( __VMSTKLLIST )
 {
-   HB_FUNC_EXEC(HB_DBG_VMSTKLLIST);
+   HB_FUNC_EXEC( HB_DBG_VMSTKLLIST );
 }
 
 HB_FUNC( __VMVARLGET )
 {
-   HB_FUNC_EXEC(HB_DBG_VMVARLGET);
+   HB_FUNC_EXEC( HB_DBG_VMVARLGET );
 }
 
 HB_FUNC( __VMVARLSET )
 {
-   HB_FUNC_EXEC(HB_DBG_VMVARLSET);
+   HB_FUNC_EXEC( HB_DBG_VMVARLSET );
 }
 
 HB_FUNC( __VMSTKGLIST )
 {
-   HB_FUNC_EXEC(HB_DBG_VMSTKGLIST);
+   HB_FUNC_EXEC( HB_DBG_VMSTKGLIST );
 }
 
 HB_FUNC( __VMSTKGCOUNT )
 {
-   HB_FUNC_EXEC(HB_DBG_VMSTKGCOUNT);
+   HB_FUNC_EXEC( HB_DBG_VMSTKGCOUNT );
 }