diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 754cc3d5f2..e0743d903e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-02-03 19:08 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbvm.h
+  * harbour/src/vm/hvm.c
+    * covered hb_vmPushState() and hb_vmPopState() functions by
+      HB_LEGACY_LEVEL3 macro. These functions are depreciated,
+      hb_vmRequestReenter()/hb_vmRequestRestore() should be used
+      instead.
+
 2010-02-03 15:01 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/contrib/hbct/video.c
     * pacified DJGPP warning
diff --git a/harbour/include/hbvm.h b/harbour/include/hbvm.h
index 7db322e2c5..df0870191b 100644
--- a/harbour/include/hbvm.h
+++ b/harbour/include/hbvm.h
@@ -163,9 +163,11 @@ extern HB_EXPORT void     hb_vmPushSymbol( PHB_SYMB pSym ); /* pushes a function
 extern HB_EXPORT void     hb_vmPushDynSym( PHB_DYNS pDynSym ); /* pushes a function/method pointer onto the stack */
 extern HB_EXPORT void     hb_vmPushEvalSym( void ); /* pushes a codeblock eval symbol onto the stack */
 extern HB_EXPORT void     hb_vmPushPointer( void * ); /* push an item of HB_IT_POINTER type */
+extern HB_EXPORT void     hb_vmPushItemRef( PHB_ITEM pItem ); /* push item reference */
+#ifdef HB_LEGACY_LEVEL3
 extern HB_EXPORT void     hb_vmPushState( void ); /* push current VM state on stack */
 extern HB_EXPORT void     hb_vmPopState( void ); /* pop current VM state from stack */
-extern HB_EXPORT void     hb_vmPushItemRef( PHB_ITEM pItem ); /* push item reference */
+#endif
 
 extern HB_EXPORT HB_BOOL  hb_vmIsMt( void ); /* return HB_TRUE if HVM is compiled with thread support */
 extern HB_EXPORT void     hb_vmLock( void ); /* lock VM blocking GC execution by other threads */
diff --git a/harbour/src/vm/hvm.c b/harbour/src/vm/hvm.c
index 11f8139879..54782303c8 100644
--- a/harbour/src/vm/hvm.c
+++ b/harbour/src/vm/hvm.c
@@ -6440,6 +6440,7 @@ void hb_vmPush( PHB_ITEM pItem )
    hb_itemCopy( hb_stackAllocItem(), pItem );
 }
 
+#ifdef HB_LEGACY_LEVEL3
 void hb_vmPushState( void )
 {
    HB_STACK_TLS_PRELOAD
@@ -6448,6 +6449,7 @@ void hb_vmPushState( void )
 
    hb_stackPushReturn();
 }
+#endif
 
 void hb_vmPushNil( void )
 {
@@ -7084,6 +7086,7 @@ static void hb_vmSwap( BYTE bCount )
 /* Pop                             */
 /* ------------------------------- */
 
+#ifdef HB_LEGACY_LEVEL3
 void hb_vmPopState( void )
 {
    HB_STACK_TLS_PRELOAD
@@ -7092,6 +7095,7 @@ void hb_vmPopState( void )
 
    hb_stackPopReturn();
 }
+#endif
 
 static HB_BOOL hb_vmPopLogical( void )
 {