diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 272c6c097a..94aa3f20e1 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,12 @@
+19991004-18:53 GMT+1 Victor Szel <info@szelvesz.hu>
+  + include/reserved.ch
+    + Added for complete Clipper compatibility, the file is a dummy, so it's
+      a TODO to replicate to originial functionality.
+  * include/Makefile
+    * Updated.
+  - source/runner/stdalone/hbrun.prg
+    + Added (now for sure)
+
 Mon Oct 04 12:52:42 1999  Gonzalo A. Diethelm  <Gonzalo.Diethelm@jda.cl>
 
 	* tests/working/Makefile: 
@@ -31,7 +40,7 @@ Mon Oct 04 12:52:42 1999  Gonzalo A. Diethelm  <Gonzalo.Diethelm@jda.cl>
     - Removed (now for sure)
 
 19991004-16:25 GMT+1 Victor Szel <info@szelvesz.hu>
-  * source/runner/stdalone/runner.c -> hbrun.c
+  * source/runner/stdalone/runner.prg -> hbrun.prg
     source/runner/stdalone/Makefile
     runner.b32
     makefile.vc
diff --git a/harbour/include/Makefile b/harbour/include/Makefile
index 938cc531b0..49fb27e646 100644
--- a/harbour/include/Makefile
+++ b/harbour/include/Makefile
@@ -34,21 +34,22 @@ PRG_HEADERS=\
         achoice.ch   \
         assert.ch    \
         box.ch       \
-        classes.ch   \
         color.ch     \
         common.ch    \
         dbedit.ch    \
         dbstruct.ch  \
         directry.ch  \
         error.ch     \
-        external.ch  \
         fileio.ch    \
         getexit.ch   \
         hboo.ch      \
+        hbclass.ch   \
+        hbextern.ch  \
+        hbmemvar.ch  \
         inkey.ch     \
         memoedit.ch  \
-        memvars.ch   \
         rddsys.ch    \
+        reserved.ch  \
         set.ch       \
         setcurs.ch   \
         simpleio.ch  \
diff --git a/harbour/include/reserved.ch b/harbour/include/reserved.ch
new file mode 100644
index 0000000000..0f136cef4e
--- /dev/null
+++ b/harbour/include/reserved.ch
@@ -0,0 +1,41 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ * Header file to help catch reserved keywords
+ *
+ * Copyright 1999 {list of individual authors and e-mail addresses}
+ * www - http://www.harbour-project.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version, with one exception:
+ *
+ * The exception is that if you link the Harbour Runtime Library (HRL)
+ * and/or the Harbour Virtual Machine (HVM) with other files to produce
+ * an executable, this does not by itself cause the resulting executable
+ * to be covered by the GNU General Public License. Your use of that
+ * executable is in no way restricted on account of linking the HRL
+ * and/or HVM code into it.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit
+ * their web site at http://www.gnu.org/).
+ *
+ */
+
+#ifndef _RESERVED_CH
+#define _RESERVED_CH
+
+/* TODO: Fill this file. */
+
+#endif /* _RESERVED_CH */
diff --git a/harbour/source/runner/stdalone/hbrun.prg b/harbour/source/runner/stdalone/hbrun.prg
new file mode 100644
index 0000000000..fa98d223e2
--- /dev/null
+++ b/harbour/source/runner/stdalone/hbrun.prg
@@ -0,0 +1,51 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ * Standalone Harbour Portable Object file runner
+ *
+ * Copyright 1999 Ryszard Glab <rglab@imid.med.pl>
+ * www - http://www.harbour-project.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version, with one exception:
+ *
+ * The exception is that if you link the Harbour Runtime Library (HRL)
+ * and/or the Harbour Virtual Machine (HVM) with other files to produce
+ * an executable, this does not by itself cause the resulting executable
+ * to be covered by the GNU General Public License. Your use of that
+ * executable is in no way restricted on account of linking the HRL
+ * and/or HVM code into it.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit
+ * their web site at http://www.gnu.org/).
+ *
+ */
+
+#include "hbextern.ch"
+
+FUNCTION Main( cHRBFile, cPar1, cPar2, cPar3, cPar4, cPar5, cPar6, cPar7, cPar8, cPar9 )
+   LOCAL xRetVal
+
+   IF Empty( cHRBFile )
+      ?? "Harbour Runner"
+      ? "Copyright 1999, http://www.harbour-project.org"
+      ?
+      ? "Syntax:  hbrun <hrbfile[.hrb]> [parameters]"
+   ELSE
+      xRetVal := __hrbRun( cHRBFile, cPar1, cPar2, cPar3, cPar4, cPar5, cPar6, cPar7, cPar8, cPar9 )
+   ENDIF
+
+   RETURN xRetVal
+