diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 04b6533bc5..25c10458ce 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,16 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-01-24 23:12 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbcomp.h
+  * harbour/src/compiler/cmdcheck.c
+  * harbour/src/compiler/hbmain.c
+  * harbour/src/compiler/hbusage.c
+    - removed some old unused declarations and code
+
+  * harbour/src/main/harbour.1
+    * updated
+
 2011-01-23 19:10 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   - harbour/contrib/hbunix/guids.c
   + harbour/contrib/hbunix/uidgid.c
diff --git a/harbour/include/hbcomp.h b/harbour/include/hbcomp.h
index da69e4e64a..0ecce9e0c9 100644
--- a/harbour/include/hbcomp.h
+++ b/harbour/include/hbcomp.h
@@ -330,10 +330,6 @@ extern void hb_compStripFuncLines( PFUNCTION pFunc );
 /* output related functions defined in gen*.c */
 extern void hb_compGenCCode( HB_COMP_DECL, PHB_FNAME );      /* generates the C language output */
 extern void hb_compGenPortObj( HB_COMP_DECL, PHB_FNAME );    /* generates the portable objects */
-extern void hb_compGenILCode( HB_COMP_DECL, PHB_FNAME );     /* generates the .NET IL language output */
-extern void hb_compGenJava( HB_COMP_DECL, PHB_FNAME );       /* generates the Java language output */
-extern void hb_compGenObj32( HB_COMP_DECL, PHB_FNAME );      /* generates OBJ 32 bits */
-extern void hb_compGenCObj( HB_COMP_DECL, PHB_FNAME );       /* generates platform dependant object module */
 
 extern void hb_compGenBufPortObj( HB_COMP_DECL, HB_BYTE ** pBufPtr, HB_SIZE * pnSize ); /* generates the portable objects to memory buffer */
 
diff --git a/harbour/src/compiler/cmdcheck.c b/harbour/src/compiler/cmdcheck.c
index 2322116788..bfbedb24fd 100644
--- a/harbour/src/compiler/cmdcheck.c
+++ b/harbour/src/compiler/cmdcheck.c
@@ -290,13 +290,6 @@ static void hb_compChkEnvironVar( HB_COMP_DECL, const char *szSwitch )
                      }
                      break;
 
-#ifdef HB_GEN_OBJ32
-                  case 'w':
-                  case 'W':
-                     HB_COMP_PARAM->iLanguage = HB_LANG_OBJ32;
-                     break;
-#endif
-
                   default:
                      hb_compGenError( HB_COMP_PARAM, hb_comp_szErrors, 'F', HB_COMP_ERR_UNSUPPORTED_LANG, NULL, NULL );
                      break;
diff --git a/harbour/src/compiler/hbmain.c b/harbour/src/compiler/hbmain.c
index 6d4db708c2..86ef9ebd86 100644
--- a/harbour/src/compiler/hbmain.c
+++ b/harbour/src/compiler/hbmain.c
@@ -3761,12 +3761,6 @@ static void hb_compGenOutput( HB_COMP_DECL, int iLanguage )
          hb_compGenCCode( HB_COMP_PARAM, HB_COMP_PARAM->pFileName );
          break;
 
-#ifdef HB_GEN_OBJ32
-      case HB_LANG_OBJ32:
-         hb_compGenObj32( HB_COMP_PARAM, HB_COMP_PARAM->pFileName );
-         break;
-#endif
-
       case HB_LANG_PORT_OBJ:
          hb_compGenPortObj( HB_COMP_PARAM, HB_COMP_PARAM->pFileName );
          break;
@@ -3949,11 +3943,6 @@ static void hb_compGenIncluded( HB_COMP_DECL )
             case HB_LANG_C:
                FileName.szExtension = ".c";
                break;
-#ifdef HB_GEN_OBJ32
-            case HB_LANG_OBJ32:
-               FileName.szExtension = ".obj";
-               break;
-#endif
             case HB_LANG_PORT_OBJ:
             case HB_LANG_PORT_OBJ_BUF:
                FileName.szExtension = ".hrb";
diff --git a/harbour/src/compiler/hbusage.c b/harbour/src/compiler/hbusage.c
index fb6dac2513..5bc43cea8b 100644
--- a/harbour/src/compiler/hbusage.c
+++ b/harbour/src/compiler/hbusage.c
@@ -73,9 +73,6 @@ void hb_compPrintUsage( HB_COMP_DECL, const char * szSelf )
            "\n          %cgc[<type>]      output type: C source (.c) (default)",
            "\n                           <type>: 0=compact (default) 1=normal 2=verbose",
            "\n                                   3=generate real C code",
-#ifdef HB_GEN_OBJ32
-           "\n          %cgw              output type: Windows/DOS OBJ32 (.obj)",
-#endif
            "\n          %cgh              output type: Harbour Portable Object (.hrb)",
            "\n          %cgd[.<destext>]  generate dependencies list into (.d) file",
            "\n          %cge[<mode>]      error output <mode>: 0=Clipper (default)",
diff --git a/harbour/src/main/harbour.1 b/harbour/src/main/harbour.1
index 76d1259b87..c94ecb6b5f 100644
--- a/harbour/src/main/harbour.1
+++ b/harbour/src/main/harbour.1
@@ -30,14 +30,16 @@ output type: C source (.c) (default)
 <type>: 0=compact (default) 1=normal 2=verbose
 .IP
 3=generate real C code instead of PCODE
-.IP "\fB-go\fP" 10
-output type: Platform dependant object module
 .IP "\fB-gh\fP" 10
 output type: Harbour Portable Object (.hrb)
 .IP "\fB-gd[.<destext>]\fP" 10
 generate dependencies list into (.d) file
+.IP "\fB-ge[<mode>]\fP" 10
+error output <mode>: 0=Clipper (default) 1=IDE friendly
 .IP "\fB-i<path>\fP" 10
 #include file search path
+.IP "\fB-i[-|+]\fP" 10
+disable/enable support for INCLUDE envvar
 .IP "\fB-j[<file>]\fP" 10
 generate i18n gettex file (.pot)
 .IP "\fB-k\fP" 10
@@ -52,6 +54,8 @@ no implicit starting procedure (default)
 <type>: 0=no implicit starting procedure
 .IP
 1=no starting procedure at all
+.IP
+2=add starting procedure if necessary
 .IP "\fB-o<path>\fP" 10
 object file drive and/or path
 .IP "\fB-p[<path>]\fP" 10