diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e8a92aac3a..001a3d5afa 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-09-04 19:08 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/rdd/dbfntx/dbfntx1.c
+  * harbour/source/rdd/dbfcdx/dbfcdx1.c
+    ! fixed dirty index reading, thx Miguel for bug report
+
+  * harbour/source/compiler/hbmain.c
+    * removed old comment and hack
+
 2008-09-04 15:58 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
    * config/w32/msvc.cf
    * config/w32/msvcce.cf
diff --git a/harbour/source/compiler/hbmain.c b/harbour/source/compiler/hbmain.c
index 4b876b338a..efb03b0abc 100644
--- a/harbour/source/compiler/hbmain.c
+++ b/harbour/source/compiler/hbmain.c
@@ -45,10 +45,6 @@
  *
  */
 
-/* malloc.h has been obsoleted by stdlib.h, which is included via hbcomp.h
-#include <malloc.h> 
-*/
-
 /*
  * Avoid tracing in preprocessor/compiler.
  */
@@ -61,11 +57,6 @@
 #include "hbcomp.h"
 #include "hbhash.h"
 
-#if defined(HB_OS_DOS) && defined(__BORLANDC__)
-   #include <limits.h>
-   extern unsigned _stklen = UINT_MAX;
-#endif
-
 #define HB_COMP_SINGLEFILE    1
 #define HB_COMP_AUTOADDFILE   2
 #define HB_COMP_MEMBUFFER     3
diff --git a/harbour/source/rdd/dbfcdx/dbfcdx1.c b/harbour/source/rdd/dbfcdx/dbfcdx1.c
index 8f004ff8a7..6e1ba17168 100644
--- a/harbour/source/rdd/dbfcdx/dbfcdx1.c
+++ b/harbour/source/rdd/dbfcdx/dbfcdx1.c
@@ -1369,7 +1369,8 @@ static BOOL hb_cdxIndexUnLockRead( LPCDXINDEX pIndex )
 
    hb_cdxIndexPoolFree( pIndex, CDX_PAGECACHESIZE );
 
-   if ( pIndex->pArea->fShared && pIndex->fShared )
+   if ( pIndex->pArea->fShared && pIndex->fShared &&
+        !HB_DIRTYREAD( pIndex->pArea ) )
    {
 #ifdef HB_CDX_DBGCODE
       if ( pIndex->WrLck || ! pIndex->RdLck )
diff --git a/harbour/source/rdd/dbfntx/dbfntx1.c b/harbour/source/rdd/dbfntx/dbfntx1.c
index dafcb63110..c02bc328d9 100644
--- a/harbour/source/rdd/dbfntx/dbfntx1.c
+++ b/harbour/source/rdd/dbfntx/dbfntx1.c
@@ -2089,7 +2089,8 @@ static BOOL hb_ntxIndexUnLockRead( LPNTXINDEX pIndex )
    if( pIndex->lockRead < 0 )
       hb_errInternal( 9106, "hb_ntxIndexUnLockRead: bad count of locks.", NULL, NULL );
 
-   if( pIndex->lockRead || pIndex->lockWrite || !pIndex->fShared )
+   if( pIndex->lockRead || pIndex->lockWrite || !pIndex->fShared ||
+       HB_DIRTYREAD( pIndex->pArea ) )
    {
       fOK = TRUE;
    }