diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index aa4c08e364..03ae4bd706 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,15 @@
+Thu Jun 24 12:25:30 1999  Gonzalo A. Diethelm  <Gonzalo.Diethelm@jda.cl>
+
+	* include/Makefile: 
+	Added the following files: box.h, compat.h, extra.h, super.h,
+	box.ch, color.ch, rdd.api.
+	
+	* source/rtl/Makefile: 
+	Added copyfile.c.
+	
+	* source/rtl/errorsys.prg: 
+	Changed an END to an ENDDO, to avoid Harbour compilation errors.
+
 19990624-13:00 WIB Andi Jahja <andij@aonlippo.co.id>
   * source/rtl/copyfile.c
    - add run time error
diff --git a/harbour/include/Makefile b/harbour/include/Makefile
index 74052b48b1..6a5fe142ae 100644
--- a/harbour/include/Makefile
+++ b/harbour/include/Makefile
@@ -5,11 +5,14 @@
 ROOT = ../
 
 C_HEADERS=\
+	box.h \
+	compat.h \
 	compiler.h \
 	ctoharb.h \
 	dates.h \
 	errorapi.h \
 	extend.h \
+	extra.h \
 	filesys.h \
 	gtapi.h \
 	hberrors.h \
@@ -19,10 +22,13 @@ C_HEADERS=\
 	itemapi.h \
 	pcode.h \
 	set.h \
+	super.h \
 	types.h \
 	version.h \
 
 PRG_HEADERS=\
+	box.ch \
+	color.ch \
 	error.ch \
 	fileio.ch \
 	inkey.ch \
@@ -37,5 +43,6 @@ API_HEADERS=\
 	fm.api \
 	gt.api \
 	item.api \
+	rdd.api \
 
 include $(TOP)$(ROOT)config/header.cf
diff --git a/harbour/source/rtl/Makefile b/harbour/source/rtl/Makefile
index 4a67117420..ef7d7f684c 100644
--- a/harbour/source/rtl/Makefile
+++ b/harbour/source/rtl/Makefile
@@ -9,6 +9,7 @@ C_SOURCES=\
 	classes.c \
 	codebloc.c \
 	console.c \
+	copyfile.c \
 	dates.c \
 	descend.c \
 	dir.c \
diff --git a/harbour/source/rtl/errorsys.prg b/harbour/source/rtl/errorsys.prg
index 5579944501..a745a9d4b0 100644
--- a/harbour/source/rtl/errorsys.prg
+++ b/harbour/source/rtl/errorsys.prg
@@ -21,10 +21,10 @@ static function DefError( oError )
    local cInfo := ""
    local n := 2
 
-   while ! Empty( ProcName( n ) )
+   do while ! Empty( ProcName( n ) )
       cInfo += Chr( 13 ) + Chr( 10 ) + "Called from " + ProcName( n ) + ;
                "(" + AllTrim( Str( ProcLine( n++ ) ) ) + ")"
-   end
+   enddo
 
    QOut( oError:Description + Chr( 13 ) + Chr( 10 ) + cInfo )