diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index 62985fd5c5..6042cbc4a8 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,14 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-03-11 18:43 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * contrib/xhb/dbf2txt.c
+    ! missing header after 2013-03-08 13:32 UTC+0100
+
+  * contrib/hbnf/doc/en/calendar.txt
+  * extras/httpsrv/uhttpd.prg
+    ! casing
+
 2013-03-11 16:26 UTC+0100 Viktor Szakats (vszakats syenar.net)
   * contrib/hbnf/doc/en/*.txt
   * tests/browse.prg
@@ -23,7 +31,7 @@
     + added help and Markdown output for hbrun mode,
       using same options as in hbmk2 mode, run 'hbrun -help'
     + documented how to disable hbrun history
-    + documented script search and and script autodetection details
+    + documented script search and script autodetection details
     + documented opening .dbf files
     + documented how to paste text into shell prompt
     + documented limitation that in script INIT PROCEDUREs,
diff --git a/harbour/contrib/hbnf/doc/en/calendar.txt b/harbour/contrib/hbnf/doc/en/calendar.txt
index 52e21ac630..2cd1a0c2e6 100644
--- a/harbour/contrib/hbnf/doc/en/calendar.txt
+++ b/harbour/contrib/hbnf/doc/en/calendar.txt
@@ -27,7 +27,7 @@
                 to the display, default (.F.).
 
       <lShowHelp> is an optional logical variable. If true, uses
-                  FT_XBOX() to display  a four line help message
+                  ft_XBox() to display  a four line help message
                   if the F1 key is pressed, default (.F.).
 
    $RETURNS$
@@ -51,7 +51,7 @@
       [7]      Numeric Julian day.
       [8]      Current time in time format.
 
-      WARNING: FT_CALENDAR() uses FT_SHADOW() and FT_XBOX()
+      WARNING: ft_Calendar() uses ft_Shadow() and ft_XBox()
                from the Nanforum Toolkit!
 
    $EXAMPLES$
diff --git a/harbour/contrib/xhb/dbf2txt.c b/harbour/contrib/xhb/dbf2txt.c
index efd1bb46be..7b9bfdb442 100644
--- a/harbour/contrib/xhb/dbf2txt.c
+++ b/harbour/contrib/xhb/dbf2txt.c
@@ -56,6 +56,7 @@
 #include "hbapierr.h"
 #include "hbapicdp.h"
 #include "hbapifs.h"
+#include "hbset.h"
 #include "hbvm.h"
 
 /* Escaping delimited strings. Need to be cleaned/optimized/improved */
diff --git a/harbour/extras/httpsrv/uhttpd.prg b/harbour/extras/httpsrv/uhttpd.prg
index 32a3d45453..124a84d21b 100644
--- a/harbour/extras/httpsrv/uhttpd.prg
+++ b/harbour/extras/httpsrv/uhttpd.prg
@@ -98,7 +98,7 @@ REQUEST __HB_EXTERN__
 // adding GD support
 REQUEST GDChart
 REQUEST GDImage
-REQUEST GDImageCHAR
+REQUEST GDImageChar
 #  define APP_GD_SUPPORT "_GD"
 #  stdout "Lib GD support enabled"
 #else
@@ -2810,50 +2810,50 @@ STATIC FUNCTION LoadMimeTypes()
    // TODO: load mime types from file
 
    RETURN { ;
-      "css"  =>  "text/css", ;
-      "htm"  =>  "text/html", ;
-      "html" =>  "text/html", ;
-      "txt"  =>  "text/plain", ;
-      "text" =>  "text/plain", ;
-      "asc"  =>  "text/plain", ;
-      "c"    =>  "text/plain", ;
-      "h"    =>  "text/plain", ;
-      "cpp"  =>  "text/plain", ;
-      "hpp"  =>  "text/plain", ;
-      "log"  =>  "text/plain", ;
-      "rtf"  =>  "text/rtf", ;
-      "xml"  =>  "text/xml", ;
-      "xsl"  =>  "text/xsl", ;
-      "bmp"  =>  "image/bmp", ;
-      "gif"  =>  "image/gif", ;
-      "jpg"  =>  "image/jpeg", ;
-      "jpe"  =>  "image/jpeg", ;
-      "jpeg" =>  "image/jpeg", ;
-      "png"  =>  "image/png", ;
-      "tif"  =>  "image/tiff", ;
-      "tiff" =>  "image/tiff", ;
-      "djv"  =>  "image/vnd.djvu", ;
-      "djvu" =>  "image/vnd.djvu", ;
-      "ico"  =>  "image/x-icon", ;
-      "xls"  =>  "application/excel", ;
-      "doc"  =>  "application/msword", ;
-      "pdf"  =>  "application/pdf", ;
-      "ps"   =>  "application/postscript", ;
-      "eps"  =>  "application/postscript", ;
-      "ppt"  =>  "application/powerpoint", ;
-      "bz2"  =>  "application/x-bzip2", ;
-      "gz"   =>  "application/x-gzip", ;
-      "tgz"  =>  "application/x-gtar", ;
-      "js"   =>  "application/x-javascript", ;
-      "tar"  =>  "application/x-tar", ;
-      "tex"  =>  "application/x-tex", ;
-      "zip"  =>  "application/zip", ;
-      "midi" =>  "audio/midi", ;
-      "mp3"  =>  "audio/mpeg", ;
-      "wav"  =>  "audio/x-wav", ;
-      "qt"   =>  "video/quicktime", ;
-      "mov"  =>  "video/quicktime", ;
-      "avi"  =>  "video/x-msvideo" }
+      "css"  => "text/css", ;
+      "htm"  => "text/html", ;
+      "html" => "text/html", ;
+      "txt"  => "text/plain", ;
+      "text" => "text/plain", ;
+      "asc"  => "text/plain", ;
+      "c"    => "text/plain", ;
+      "h"    => "text/plain", ;
+      "cpp"  => "text/plain", ;
+      "hpp"  => "text/plain", ;
+      "log"  => "text/plain", ;
+      "rtf"  => "text/rtf", ;
+      "xml"  => "text/xml", ;
+      "xsl"  => "text/xsl", ;
+      "bmp"  => "image/bmp", ;
+      "gif"  => "image/gif", ;
+      "jpg"  => "image/jpeg", ;
+      "jpe"  => "image/jpeg", ;
+      "jpeg" => "image/jpeg", ;
+      "png"  => "image/png", ;
+      "tif"  => "image/tiff", ;
+      "tiff" => "image/tiff", ;
+      "djv"  => "image/vnd.djvu", ;
+      "djvu" => "image/vnd.djvu", ;
+      "ico"  => "image/x-icon", ;
+      "xls"  => "application/excel", ;
+      "doc"  => "application/msword", ;
+      "pdf"  => "application/pdf", ;
+      "ps"   => "application/postscript", ;
+      "eps"  => "application/postscript", ;
+      "ppt"  => "application/powerpoint", ;
+      "bz2"  => "application/x-bzip2", ;
+      "gz"   => "application/x-gzip", ;
+      "tgz"  => "application/x-gtar", ;
+      "js"   => "application/x-javascript", ;
+      "tar"  => "application/x-tar", ;
+      "tex"  => "application/x-tex", ;
+      "zip"  => "application/zip", ;
+      "midi" => "audio/midi", ;
+      "mp3"  => "audio/mpeg", ;
+      "wav"  => "audio/x-wav", ;
+      "qt"   => "video/quicktime", ;
+      "mov"  => "video/quicktime", ;
+      "avi"  => "video/x-msvideo" }
 
 STATIC FUNCTION GT_notifier( nEvent, xParams )