diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 81a9a55594..7c8cb85438 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-12 23:47 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbthread.h
+    * added workaround for different CRITICAL_SECTION definitions in
+      some compiler header files
+
+  * harbour/source/vm/fm.c
+  * harbour/source/hbzlib/ChangeLog
+  * harbour/source/hbzlib/zutil.c
+    * use #pragma warning to pacify OpenWatcom warnings
+
 2009-08-12 18:26 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/contrib/hbwin/olecore.c
     ! fixed memory leak in PutParams()
diff --git a/harbour/include/hbthread.h b/harbour/include/hbthread.h
index 7cbae39bc8..1a56a4b8e4 100644
--- a/harbour/include/hbthread.h
+++ b/harbour/include/hbthread.h
@@ -194,7 +194,12 @@ HB_EXTERN_BEGIN
 #  define HB_THREAD_RAWEND             return 0;
 
 #  define HB_THREAD_SELF()          GetCurrentThreadId()
-#  define HB_CRITICAL_INITVAL       { 0, 0, 0, 0, 0, 0 }
+
+#  if defined( __GNUC__ )
+#     define HB_CRITICAL_INITVAL    {  }
+#  else
+#     define HB_CRITICAL_INITVAL    { 0 }
+#  endif
 
 #  define HB_CRITICAL_INIT(v)       InitializeCriticalSection( &(v) )
 #  define HB_CRITICAL_DESTROY(v)    DeleteCriticalSection( &(v) )
diff --git a/harbour/source/hbzlib/ChangeLog b/harbour/source/hbzlib/ChangeLog
index 70f04fd91c..a696556c48 100644
--- a/harbour/source/hbzlib/ChangeLog
+++ b/harbour/source/hbzlib/ChangeLog
@@ -18,6 +18,10 @@
  *
  */
 
+2009-08-12 23:47 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/hbzlib/zutil.c
+    * use #pragma warning to pacify OpenWatcom warnings
+
 2009-07-16 15:20 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/hbzlib/trees.c
     * cleaned casting
diff --git a/harbour/source/hbzlib/zutil.c b/harbour/source/hbzlib/zutil.c
index b1aa60ec21..6fc2cd3f8b 100644
--- a/harbour/source/hbzlib/zutil.c
+++ b/harbour/source/hbzlib/zutil.c
@@ -29,6 +29,10 @@ const char * ZEXPORT zlibVersion( void )
     return ZLIB_VERSION;
 }
 
+#if defined( __WATCOMC__ )
+#  pragma warning 369 9
+#endif
+
 uLong ZEXPORT zlibCompileFlags( void )
 {
     uLong flags;
diff --git a/harbour/source/vm/fm.c b/harbour/source/vm/fm.c
index 5917b1ed9e..84d8d28d78 100644
--- a/harbour/source/vm/fm.c
+++ b/harbour/source/vm/fm.c
@@ -162,9 +162,18 @@
 #     define ABORT TerminateProcess( GetCurrentProcess(), 0 )
 #  elif defined( __POCC__ ) && !defined( InterlockedCompareExchangePointer )
 #     define InterlockedCompareExchangePointer
-#  elif ( defined( _MSC_VER ) || defined( __WATCOMC__ ) ) && \
-        !defined( USE_DL_PREFIX ) && !defined( HB_FM_DLMT_ALLOC )
-#     define USE_DL_PREFIX
+#  elif defined( __WATCOMC__ )
+#     pragma warning 13 9
+#     pragma warning 367 9
+#     pragma warning 368 9
+#     pragma warning 887 9
+#     if !defined( USE_DL_PREFIX ) && !defined( HB_FM_DLMT_ALLOC )
+#        define USE_DL_PREFIX
+#     endif
+#  elif defined( _MSC_VER )
+#     if !defined( USE_DL_PREFIX ) && !defined( HB_FM_DLMT_ALLOC )
+#        define USE_DL_PREFIX
+#     endif
 #  endif
 #  include "dlmalloc.c"
 #  if defined( __BORLANDC__ )
@@ -174,6 +183,11 @@
 #     pragma warn +ngu
 #     pragma warn +prc
 #     pragma warn +rch
+#  elif defined( __WATCOMC__ )
+#     pragma warning 13 2
+#     pragma warning 367 2
+#     pragma warning 368 2
+#     pragma warning 887 2
 #  endif
 #  if defined( HB_FM_DLMT_ALLOC )
 #     define malloc( n )         mspace_malloc( hb_mspace(), ( n ) )
@@ -388,6 +402,10 @@ static void hb_mspace_cleanup( void )
 
 #elif defined( HB_FM_DL_ALLOC ) && defined( USE_DL_PREFIX )
 
+#if defined( __WATCOMC__ )
+#  pragma warning 367 9
+#endif
+
 static void dlmalloc_destroy( void )
 {
    if( ok_magic(gm) )
@@ -405,6 +423,10 @@ static void dlmalloc_destroy( void )
    }
 }
 
+#if defined( __WATCOMC__ )
+#  pragma warning 367 2
+#endif
+
 #endif
 
 void hb_xinit_thread( void )