diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 44097c196a..1731756898 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,22 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-29 07:23 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * src/rtl/cdpapi.c
+    * HB_SETCODEPAGE() guarded as HB_LEGACY_LEVEL2 which means
+      it will be removed in next major version.
+      NOTE to users: Use HB_CDPSELECT() or SET( _SET_CODEPAGE ) instead.
+
+  * src/debug/debugger.prg
+    - Deleted __XHARBOUR__ protected parts.
+
+  * contrib/xhb/xhberr.prg
+    - Deleted some __XHARBOUR__ protected parts.
+      Some other remain, most of them dealing with SET()s which
+      are xhb extension.
+      It again shows that emulating extended SETs is quite a PITA,
+      so we should avoid it.
+
 2009-11-29 05:49 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbmisc/spd.c
     ! Fixed commenting in prev commit.
diff --git a/harbour/contrib/xhb/xhberr.prg b/harbour/contrib/xhb/xhberr.prg
index c057289bd6..f177e52a19 100644
--- a/harbour/contrib/xhb/xhberr.prg
+++ b/harbour/contrib/xhb/xhberr.prg
@@ -192,11 +192,7 @@ STATIC FUNCTION xhb_DefError( oError )
    ? cMessage
 
    ?
-#ifdef __XHARBOUR__
-   ? "Error at ...:", oError:ProcName + "(" + LTrim( Str( oError:ProcLine ) ) + ") in Module:", oError:ModuleName
-#else
    ? "Error at ...:", ProcName() + "(" + LTrim( Str( ProcLine() ) ) + ") in Module:", ProcFile()
-#endif
    n := 2
    WHILE ! Empty( ProcName( ++n ) )
       ? "Called from :", ProcName( n ) + ;
@@ -255,14 +251,8 @@ Return cMessage
 STATIC FUNCTION LogError( oerr )
 
      LOCAL cScreen
-#ifdef __XHARBOUR__
-     LOCAL aLogFile    := SET( _SET_ERRORLOG )
-     LOCAL cLogFile    := aLogFile[1]  // error log file name
-     LOCAL lAppendLog  := aLogFile[2]  // .f. = create a new error log (default) .t. = append to a existing one.
-#else
      LOCAL cLogFile    := "error.log"  // error log file name
      LOCAL lAppendLog  := .T.          // .f. = create a new error log (default) .t. = append to a existing one.
-#endif
      LOCAL nStart      := 1
      LOCAL nCellSize
      LOCAL nRange
@@ -380,8 +370,8 @@ STATIC FUNCTION LogError( oerr )
 
         FWriteLine( nHandle, "SET EOL............: " + strvalue( Asc( Set( _SET_EOL ) ) )  )
         FWriteLine( nHandle, "SET EPOCH..........: " + strvalue( Set( _SET_EPOCH )      ) )
+        FWriteLine( nHandle, "SET ERRORLOG.......: " + strvalue( cLogFile ) + "," + strvalue( lAppendLog ) )
 #ifdef __XHARBOUR__
-        FWriteLine( nHandle, "SET ERRORLOG.......: " + if(!Empty(aLogFile), strvalue( aLogFile[1] )+","+strvalue( aLogFile[2] ), "") )
         FWriteLine( nHandle, "SET ERRORLOOP......: " + strvalue( Set( _SET_ERRORLOOP )      ) )
 #endif
         FWriteLine( nHandle, "SET ESCAPE.........: " + strvalue( Set( _SET_ESCAPE ), .T. ) )
@@ -495,11 +485,8 @@ STATIC FUNCTION LogError( oerr )
         FWriteLine( nHandle, " Trace Through:" )
         FWriteLine( nHandle, "----------------" )
 
-#ifdef __XHARBOUR__
-        FWriteLine( nHandle, Padr( oErr:ProcName, 21 ) + " : " + Transform( oErr:ProcLine, "999,999" ) + " in Module: " + oErr:ModuleName )
-#else
         FWriteLine( nHandle, Padr( ProcName(), 21 ) + " : " + Transform( ProcLine(), "999,999" ) + " in Module: " + ProcFile() )
-#endif
+
         nCount := 3
         While !Empty( Procname( ++ nCount ) )
           FWriteLine( nHandle, Padr( Procname( nCount ), 21 ) + ' : ' + Transform( Procline( nCount ), "999,999" ) + " in Module: " + ProcFile( nCount ) )
diff --git a/harbour/src/debug/debugger.prg b/harbour/src/debug/debugger.prg
index fccc959ee3..c3b0ac54c6 100644
--- a/harbour/src/debug/debugger.prg
+++ b/harbour/src/debug/debugger.prg
@@ -191,10 +191,6 @@ CREATE CLASS HBDebugger
    VAR nAppTypeAhead
    VAR nAppLastKey
 
-   VAR bAppInkeyAfter
-   VAR bAppInkeyBefore
-   VAR bAppClassScope
-
    VAR nMaxRow
    VAR nMaxCol
 
@@ -2194,11 +2190,6 @@ METHOD RestoreAppState() CLASS HBDebugger
    Set( _SET_FILECASE, ::nAppFileCase )
    Set( _SET_TYPEAHEAD, ::nAppTypeAhead )
    hb_SetLastKey( ::nAppLastKey )
-#ifdef __XHARBOUR__
-   SetInkeyAfterBlock( ::bAppInkeyAfter )
-   SetInkeyBeforeBlock( ::bAppInkeyBefore )
-   __SetClassScope( ::bAppClassScope )
-#endif
    RETURN NIL
 
 
@@ -2264,11 +2255,6 @@ METHOD SaveAppState() CLASS HBDebugger
    ::nAppFileCase := Set( _SET_FILECASE, 0 )
    ::nAppTypeAhead := Set( _SET_TYPEAHEAD, 16 )
    ::nAppLastKey := LastKey()
-#ifdef __XHARBOUR__
-   ::bAppInkeyAfter := SetInkeyAfterBlock( NIL )
-   ::bAppInkeyBefore := SetInkeyBeforeBlock( NIL )
-   ::bAppClassScope := __SetClassScope( .F. )
-#endif
    RETURN NIL
 
 
diff --git a/harbour/src/rtl/cdpapi.c b/harbour/src/rtl/cdpapi.c
index f01fe7eeca..06ee1a9193 100644
--- a/harbour/src/rtl/cdpapi.c
+++ b/harbour/src/rtl/cdpapi.c
@@ -2195,11 +2195,15 @@ HB_FUNC( __NATSORTVER )
    HB_FUNC_EXEC( HB_CDPINFO );
 }
 
+#ifdef HB_LEGACY_LEVEL2
+
 HB_FUNC( HB_SETCODEPAGE )
 {
    HB_FUNC_EXEC( HB_CDPSELECT );
 }
 
+#endif
+
 /*
  * extended CP PRG functions
  */