diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 30a5cbfef3..9f43c3aee9 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,17 @@
+19990608-13:00 EDT David G. Holm <dholm@jsd-llc.com>
+  * source/rtl/files.c
+    - Changed "#if" for "#include <mingw32/share.h>" from "#if defined(
+      __GCC__) && !defined(__DJGPP__)" to just "#if defined(__CYGNUS__)"
+  * source/rtl/set.c
+    - Moved "#include <sys/stat.h>" outside "#if defined(__GCC__) ||
+      defined(__DJGPP__)" block, so that it is included for all compilers.
+  * source/rtl/strcmp.c
+    Added braces to "if( lLenFirst != lLenSecond ) /* Both empty ? */"
+    block to avoid an implicit else warning for the else clause for the
+    "if( hb_set.HB_SET_EXACT || bForceExact )" block.
+  * source/rtl/natmsg/msghu.c
+    Removed extra "/*" from inside "TODO:" comment block.
+
 19990608-20:00 Alexander Kresin
  Implemented: #command, #xcommand, #translate, #xtranslate .
  Some functions rewritten for a better functionality and readability.
@@ -13,7 +27,6 @@
    - source/hbpp/exam2.ch
 
 Tue Jun 08 09:22:40 1999  Gonzalo A. Diethelm  <Gonzalo.Diethelm@jda.cl>
-
         * source/rtl/set.c (open_handle):
         Misplaced parenthesis when callin open() caused S_IWRITE to never
         be seen by open().
@@ -43,7 +56,6 @@ Mon Jun 07 20:42:04 1999  Gonzalo A. Diethelm  <Gonzalo.Diethelm@jda.cl>
         Made a mistake in my previous commit. This one works.
 
 Mon Jun 07 20:20:32 1999  Gonzalo A. Diethelm  <Gonzalo.Diethelm@jda.cl>
-
         * config/bin.cf:
         * config/c.cf:
         * config/dir.cf:
diff --git a/harbour/source/rtl/files.c b/harbour/source/rtl/files.c
index 570377a1b9..f7185dfb60 100644
--- a/harbour/source/rtl/files.c
+++ b/harbour/source/rtl/files.c
@@ -5,7 +5,7 @@
 #include <extend.h>
 #include <string.h>
 
-#if defined(__GNUC__) && !defined(__DJGPP__)
+#if defined(__CYGNUS__)
   #include <mingw32/share.h>
 #endif
 
diff --git a/harbour/source/rtl/natmsg/msghu.c b/harbour/source/rtl/natmsg/msghu.c
index 8f0a422ccf..9e0ff06769 100644
--- a/harbour/source/rtl/natmsg/msghu.c
+++ b/harbour/source/rtl/natmsg/msghu.c
@@ -6,7 +6,7 @@
 /* Codepage: 852 */
 
 /* TODO: Decide which codepage to use, and how to implement the whole
-/*       codepage issue */
+         codepage issue */
 
 char *hb_monthsname[ 12 ] =
 {
diff --git a/harbour/source/rtl/set.c b/harbour/source/rtl/set.c
index ccf798386f..45544117f6 100644
--- a/harbour/source/rtl/set.c
+++ b/harbour/source/rtl/set.c
@@ -4,14 +4,13 @@
 
 #if defined(__GNUC__) || defined(__DJGPP__)
  #include <unistd.h>
- #include <sys/stat.h>
 #endif
 
 #include <ctype.h>
 #include <extend.h>
 #include <fcntl.h>
 #include <io.h>
-
+#include <sys/stat.h>
 #include <set.h>
 #include <errno.h>
 
diff --git a/harbour/source/rtl/strcmp.c b/harbour/source/rtl/strcmp.c
index 36face2062..302c1af0a3 100644
--- a/harbour/source/rtl/strcmp.c
+++ b/harbour/source/rtl/strcmp.c
@@ -45,10 +45,12 @@ int hb_itemStrCmp( PHB_ITEM pFirst, PHB_ITEM pSecond, BOOL bForceExact )
    else
    {
       if( lLenFirst != lLenSecond )     /* Both empty ?                 */
+      {
          if( hb_set.HB_SET_EXACT || bForceExact )
             iRet = (lLenFirst < lLenSecond) ? -1 : 1;
          else
             iRet = (lLenSecond == 0) ? 0 : -1;
+      }
       else
          iRet = 0;                      /* Both empty => Equal !        */
    }