diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 05a1f3b849..059e3e2135 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,15 @@
+Wed Jul 28 11:54:06 1999  Gonzalo A. Diethelm  <Gonzalo.Diethelm@jda.cl>
+
+	* source/rtl/dir.c: 
+	Fixed a typo: #if define(USE_NT) => #if defined(USE_NT).
+	
+	* source/rtl/inkey.c: 
+	Added an include of <mingw32/conio.h> when compiling with gcc.
+
+	* include/Makefile: 
+	* tests/working/Makefile: 
+	Updated list of files.
+	
 19990728-14:30 CET Eddie Runia <eddie@runia.com>
   * source/rtl/dir.c
     #include <errno.h> added
diff --git a/harbour/include/Makefile b/harbour/include/Makefile
index 64810577a9..65a9c587ab 100644
--- a/harbour/include/Makefile
+++ b/harbour/include/Makefile
@@ -21,6 +21,7 @@ C_HEADERS=\
 	hbsetup.h \
 	init.h \
 	initsymb.h \
+	inkey.h \
 	itemapi.h \
 	pcode.h \
 	run_exp.h \
diff --git a/harbour/source/rtl/dir.c b/harbour/source/rtl/dir.c
index 0cd58950a0..c3a5aa746a 100644
--- a/harbour/source/rtl/dir.c
+++ b/harbour/source/rtl/dir.c
@@ -409,7 +409,7 @@ HARBOUR HB_DIRECTORY( void )
          }
 /* some of these are known to work under NT - I picked the letters to use.*/
 /* needs testing on a Novell drive */
-#if define(USE_NT)
+#if defined(USE_NT)
          if (attrib & FA_ENCRYPTED)
             strcat(aatrib,"E");
 //         if (attrib & FA_NORMAL)
diff --git a/harbour/source/rtl/inkey.c b/harbour/source/rtl/inkey.c
index 66709fb48d..e79089e601 100644
--- a/harbour/source/rtl/inkey.c
+++ b/harbour/source/rtl/inkey.c
@@ -44,6 +44,8 @@
   #include <stdlib.h>
 #elif defined(__IBMCPP__)
   #include <conio.h>
+#elif defined(__GNUC__)
+  #include <mingw32/conio.h>
 #endif
 
 #ifdef __WATCOMC__
diff --git a/harbour/tests/working/Makefile b/harbour/tests/working/Makefile
index c5eeb4f617..ea1850689c 100644
--- a/harbour/tests/working/Makefile
+++ b/harbour/tests/working/Makefile
@@ -134,6 +134,8 @@ BAD_PRG_SOURCES=\
 	linecont.prg \
 	spawn.prg \
 	spawn2.prg \
+	statics1.prg \
+	statics2.prg \
 	test10.prg \
 	testid.prg \