diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3936b0513e..17a7800ae8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,16 @@
+2001-02-05 16:15 UTC-0500 David G. Holm <dholm@jsd-llc.com>
+  * source/compiler/harbour.l
+  * source/pp/pragma.c
+    ! Corrected hb_xalloc and hb_xrealloc type overrides for
+      pItem->pCode to be (BYTE *).
+  * tests/Makefile
+    * Only program modules that fail to compile and link are supposed
+      to be listed under BAD_PRG_SOURCES, so I've moved the following
+      to PRG_SOURCES: clasname, lnlenli2, setkeys, testcdx, testdbf,
+      testhtml, testid, testrdd, and teststr.
+  * tests/testid.prg
+    * Documented how to set /dTEST if using the GNU Make System.
+
 2001-02-05 21:05 GMT+1 Maurilio Longo <maurilio.longo@libero.it>
    * source/debug/debugger.prg
      + Added LineNumbers() method
diff --git a/harbour/source/compiler/harbour.l b/harbour/source/compiler/harbour.l
index e43e2a0536..20a674fd45 100644
--- a/harbour/source/compiler/harbour.l
+++ b/harbour/source/compiler/harbour.l
@@ -885,12 +885,12 @@ Separator     {SpaceTab}
 
 	    if( pInline->pCode == NULL )
 	    {
-               pInline->pCode = (unsigned char *) hb_xgrab( ( iSize = strlen( (char*) sBuffer ) ) + 1 );
+               pInline->pCode = (BYTE *) hb_xgrab( ( iSize = strlen( (char*) sBuffer ) ) + 1 );
                strcpy( (char *) pInline->pCode, (char*) sBuffer );
 	    }
 	    else
 	    {
-               pInline->pCode = (unsigned char *) hb_xrealloc( pInline->pCode, pInline->lPCodeSize + ( iSize = strlen( (char*) sBuffer ) ) + 1 );
+               pInline->pCode = (BYTE *) hb_xrealloc( pInline->pCode, pInline->lPCodeSize + ( iSize = strlen( (char*) sBuffer ) ) + 1 );
                strcpy( (char *) (pInline->pCode + pInline->lPCodeSize), (char*) sBuffer );
 	    }
 	    pInline->lPCodeSize += iSize;
diff --git a/harbour/source/pp/pragma.c b/harbour/source/pp/pragma.c
index 6798040d84..ee16e4bf72 100644
--- a/harbour/source/pp/pragma.c
+++ b/harbour/source/pp/pragma.c
@@ -226,12 +226,12 @@ void hb_pp_ParsePragma( char * szLine )
 
          if( pInline->pCode == NULL )
          {
-            pInline->pCode = (unsigned char *) hb_xgrab( ( iSize = strlen( (char*) sBuffer ) ) + 1 );
+            pInline->pCode = (BYTE *) hb_xgrab( ( iSize = strlen( (char*) sBuffer ) ) + 1 );
             strcpy( (char*) pInline->pCode, (char*) sBuffer );
          }
          else
          {
-            pInline->pCode = (unsigned char *) hb_xrealloc( pInline->pCode, pInline->lPCodeSize + ( iSize = strlen( (char*) sBuffer ) ) + 1 );
+            pInline->pCode = (BYTE *) hb_xrealloc( pInline->pCode, pInline->lPCodeSize + ( iSize = strlen( (char*) sBuffer ) ) + 1 );
             strcpy( (char *) (pInline->pCode + pInline->lPCodeSize), (char*) sBuffer );
          }
          pInline->lPCodeSize += iSize;
diff --git a/harbour/tests/Makefile b/harbour/tests/Makefile
index 75b50a8820..61e6c0b071 100644
--- a/harbour/tests/Makefile
+++ b/harbour/tests/Makefile
@@ -43,6 +43,7 @@ PRG_SOURCES=\
 	byref.prg \
 	calling.prg \
 	cdow.prg \
+	clasname.prg \
 	classch.prg \
 	classes.prg \
 	clsdata.prg \
@@ -77,6 +78,7 @@ PRG_SOURCES=\
 	iotest.prg \
 	iotest2.prg \
 	langapi.prg \
+	lnlenli2.prg \
 	longdev.prg \
 	longstr.prg \
 	longstr2.prg \
@@ -103,6 +105,7 @@ PRG_SOURCES=\
 	say.prg \
 	scroll.prg \
 	seconds.prg \
+	setkeys.prg \
 	set_num.prg \
 	set_test.prg \
 	sound.prg \
@@ -114,15 +117,20 @@ PRG_SOURCES=\
 	test_all.prg \
 	testbrdb.prg \
 	testbrw.prg \
+	testcdx.prg \
 	testcgi.prg \
+	testdbf.prg \
 	testdecl.prg \
 	testerro.prg \
 	testfor.prg \
+	testhtml.prg \
+	testid.prg \
 	testinc.prg \
 	testmem.prg \
-	teststr.prg \
 	testpre.prg \
+	testrdd.prg \
 	testread.prg \
+	teststr.prg \
 	testvars.prg \
 	testwarn.prg \
 	tstalias.prg \
@@ -143,7 +151,6 @@ PRG_HEADERS=\
 
 BAD_PRG_SOURCES=\
 	alias.prg \
-	clasname.prg \
 	clasinit.prg \
 	dates4.prg \
 	debugtst.prg \
@@ -156,13 +163,11 @@ BAD_PRG_SOURCES=\
 	keywords.prg \
 	linecont.prg \
 	lnlenli1.prg \
-	lnlenli2.prg \
 	mathtest.prg \
 	objarr.prg \
 	objasign.prg \
 	readfile.prg \
 	rtfclass.prg \
-	setkeys.prg \
 	spawn.prg \
 	spawn2.prg \
 	statics1.prg \
@@ -171,15 +176,10 @@ BAD_PRG_SOURCES=\
 	test.prg \
 	test10.prg \
 	testgt.prg \
-	testid.prg \
 	testhbf.prg \
-	testhtml.prg \
 	testtok.prg \
 	tstprag.prg \
 	vec1.prg \
-	testrdd.prg \
-	testcdx.prg \
-	testdbf.prg \
 
 C_SOURCES=\
 
diff --git a/harbour/tests/testid.prg b/harbour/tests/testid.prg
index b0a7cb89cf..df6ff55344 100644
--- a/harbour/tests/testid.prg
+++ b/harbour/tests/testid.prg
@@ -20,6 +20,7 @@ function Main()
       QOut( "Fine, you have just tested the /d compiler flag" )
    #else
       QOut( "Please change hb32.bat and include /dTEST compiler flag" )
+      QOut( "Or run 'SET PRG_USR=/dTEST' if you are using the GNU Make System" )
    #endif
 
    #ifdef FIRST