diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6a08017153..24d3ed5ccc 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,12 @@
+2000-07-31 09:00 UTC+0800 Ron Pinkas <ron@profit-master.com>
+   * source/compiler/simplex.c
+   * source/macro/macro.slx
+     ! Corrected compiler warnings
+
+   * tests/testwarn.prg
+   * utils/hbdoc/ft_funcs.prg
+     * Commented AS USUAL until votes results tabulated
+
 2000-07-31 11:30 UTC-0400 David G. Holm <dholm@jsd-llc.com>
 
    * source/rtl/gtsln/gtsln.c
diff --git a/harbour/source/compiler/simplex.c b/harbour/source/compiler/simplex.c
index a508774c52..d653f73977 100644
--- a/harbour/source/compiler/simplex.c
+++ b/harbour/source/compiler/simplex.c
@@ -63,7 +63,6 @@
 
 /* Pairs. */
 static char sPair[ 2048 ];
-static int  iPairLen;
 static char cTerm;
 static BOOL bExclusive;
 static char * sExclude;
diff --git a/harbour/source/macro/macro.slx b/harbour/source/macro/macro.slx
index 18c14173bc..4999370e8d 100644
--- a/harbour/source/macro/macro.slx
+++ b/harbour/source/macro/macro.slx
@@ -51,7 +51,8 @@
 
 /* code that fills input buffer
  */
-#define YY_INPUT( buf, result, max_size ) result = 0;
+#undef YY_INPUT
+   #define YY_INPUT( buf, result, max_size ) result = 0;
 
 #undef STREAM_EXCEPTION
    #define STREAM_EXCEPTION( sPair, cChar ) \
@@ -59,10 +60,6 @@
            aiReturn[ iReturn++ ] = '\n'; \
            aiReturn[ iReturn++ ] = LITERAL;
 
-static int iTexts = 0;
-static char * aTexts[128];
-static char* sIdOnHold;
-
 long hb_lex_Hex2L( char* sHex );
 
 void * yy_bytes_buffer( char * pBuffer, int iBufSize );
@@ -119,7 +116,8 @@ SELF_CONTAINED_WORDS_ARE {
                          };
 
 /* Key Words. */
-LANGUAGE_KEY_WORDS_ARE { ""
+LANGUAGE_KEY_WORDS_ARE {
+                         LEX_WORD( ""       ) AS_TOKEN( 0         )
                        };
 
 /* Intermediate Words when ambigious. */
@@ -132,8 +130,8 @@ LANGUAGE_KEY_WORDS_ARE { ""
 /* Words. */
 LANGUAGE_WORDS_ARE {
                      LEX_WORD( "IF"        ) AS_TOKEN( _IF_        ),
-                     LEX_WORD( "NIL"       ) AS_TOKEN( NIL         ),
                      LEX_WORD( "IIF"       ) AS_TOKEN( IIF         ),
+                     LEX_WORD( "NIL"       ) AS_TOKEN( NIL         ),
                      LEX_WORD( "SELF"      ) AS_TOKEN( _SELF_      ),
                      LEX_WORD( "QSELF"     ) AS_TOKEN( QSELF       ),
                      LEX_WORD( "FIELD"     ) AS_TOKEN( _FIELD_     ),
@@ -433,8 +431,6 @@ int hb_lex_CustomAction( int x, int iWordLen, int aiHold[], char asHold[][TOKEN_
    sIdentifier = (char*) hb_xgrab( iWordLen + 1 );
    sIdentifier[0] = '\0';
 
-   DEBUG_INFO( printf( "Prepared Text: %i Pointer: %i\n", iTexts, sIdentifier ) );
-
    switch ( x )
    {
       case HB_LIT_ACT :\
diff --git a/harbour/tests/testwarn.prg b/harbour/tests/testwarn.prg
index 4feaf286b6..ba285cba5d 100644
--- a/harbour/tests/testwarn.prg
+++ b/harbour/tests/testwarn.prg
@@ -23,7 +23,7 @@ DECLARE nMyFunc( cVar AS STRING, @nVar AS NUMERIC ) AS NUMERIC
 
 DECLARE cOtherFunc( ) AS STRING
 
-DECLARE cOtherFunc( @cVar as string, optional nVar as numeric, optional other as usual ) AS STRING
+DECLARE cOtherFunc( @cVar as string, optional nVar as numeric, optional other /*as variant*/ ) AS STRING
 
 DECLARE Seconds() AS NUMERIC
 
@@ -32,7 +32,7 @@ DECLARE Int( n AS NUMERIC ) AS NUMERIC
 DECLARE TEST() AS NUMERIC
 
 DECLARE MyClass                              ;
-        nMyFunc( nVal AS NUMERIC) As Num
+        nMyFunc( nVal AS NUMERIC) AS NUMERIC
 
 DECLARE MyClass                              ;
         nMyFunc( nVal AS NUMERIC ) AS NUMERIC ;
diff --git a/harbour/utils/hbdoc/ft_funcs.prg b/harbour/utils/hbdoc/ft_funcs.prg
index a7edb98748..ac889459dc 100644
--- a/harbour/utils/hbdoc/ft_funcs.prg
+++ b/harbour/utils/hbdoc/ft_funcs.prg
@@ -43,9 +43,9 @@ DECLARE  FT_FUSE(CFILE AS STRING,NMODE AS NUMERIC) AS NUMERIC
 DECLARE  ft_FEOF() AS LOGICAL
 DECLARE  FReadLn(  cLine ) AS STRING
 DECLARE  FT_FReadLn() AS STRING
-DECLARE  FT_FGotop()  AS USUAL
-DECLARE  FT_FSKIP(n AS NUMERIC) AS USUAL
-DECLARE  FT_MKDIR( CDIR AS STRING ) AS USUAL
+DECLARE  FT_FGotop()  //AS USUAL
+DECLARE  FT_FSKIP(n AS NUMERIC) //AS USUAL
+DECLARE  FT_MKDIR( CDIR AS STRING ) //AS USUAL
 DECLARE  StrPos( cBuffer AS STRING ) AS NUMERIC
 DECLARE  GetNumberofTableItems( cBuffer AS STRING ) AS NUMERIC
 DECLARE  FREADline( nH AS NUMERIC, @cB AS STRING, nMaxLine AS NUMERIC )