diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 285691c809..15655ebec3 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,16 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-11-02 15:42 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbstack.h
+    * minor improvement in #include "hbthread.h" condition
+
+  * harbour/external/minizip/ioapi.h
+  * harbour/external/png/Makefile
+  * harbour/src/common/hbffind.c
+  * harbour/src/rtl/hbsocket.c
+    * updated to compile with DMC
+
 2010-11-02 14:35 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * src/rtl/gete.c
     % Deleted very old code to satisfy Borland C++ getenv()
diff --git a/harbour/external/minizip/ioapi.h b/harbour/external/minizip/ioapi.h
index c794f8046d..486eeccd61 100644
--- a/harbour/external/minizip/ioapi.h
+++ b/harbour/external/minizip/ioapi.h
@@ -60,6 +60,7 @@
 #if defined( __BORLANDC__ ) || \
     defined( __WATCOMC__ ) || \
     defined( __MINGW32CE__ ) || \
+    defined( __DMC__ ) || \
     defined( HB_OS_VXWORKS ) || \
     defined( HB_OS_BSD ) || \
     defined( HB_OS_DARWIN ) || \
diff --git a/harbour/external/png/Makefile b/harbour/external/png/Makefile
index 154f2d46f2..1d9e7b9103 100644
--- a/harbour/external/png/Makefile
+++ b/harbour/external/png/Makefile
@@ -50,6 +50,9 @@ ifeq ($(filter $(HB_COMPILER),poccarm xcc),)
          ifeq ($(HB_COMPILER),djgpp)
             HB_CFLAGS += -DPNG_NO_SNPRINTF
          endif
+         ifeq ($(HB_COMPILER),dmc)
+            HB_CFLAGS += -DPNG_NO_SNPRINTF
+         endif
          ifeq ($(HB_COMPILER),watcom)
             HB_CFLAGS += -DPNG_NO_SETJMP
          endif
diff --git a/harbour/include/hbstack.h b/harbour/include/hbstack.h
index 34c43f10a8..177bcbbedb 100644
--- a/harbour/include/hbstack.h
+++ b/harbour/include/hbstack.h
@@ -62,7 +62,7 @@
 
 HB_EXTERN_BEGIN
 
-#if defined( HB_MT_VM )
+#if defined( HB_MT_VM ) && defined( _HB_API_INTERNAL_ )
 #  include "hbthread.h"
 #endif
 
diff --git a/harbour/src/common/hbffind.c b/harbour/src/common/hbffind.c
index fce24bac6a..6a4fbbf2d9 100644
--- a/harbour/src/common/hbffind.c
+++ b/harbour/src/common/hbffind.c
@@ -141,6 +141,18 @@
          ( ( info->dwAttr & info->pFindFileData.dwFileAttributes & _HB_WIN_MASKATTR ) != 0 ) \
       )
 
+   #if defined( __DMC__)
+      #if !defined( FILE_ATTRIBUTE_ENCRYPTED )
+         #define FILE_ATTRIBUTE_ENCRYPTED       0x00004000L
+      #endif
+      #if !defined( FILE_ATTRIBUTE_SPARSE_FILE )
+         #define FILE_ATTRIBUTE_SPARSE_FILE     0x00000200L
+      #endif
+      #if !defined( FILE_ATTRIBUTE_REPARSE_POINT )
+         #define FILE_ATTRIBUTE_REPARSE_POINT   0x00000400L
+      #endif
+   #endif
+
 #elif defined( HB_OS_UNIX )
 
    #include <sys/types.h>
diff --git a/harbour/src/rtl/hbsocket.c b/harbour/src/rtl/hbsocket.c
index 81809be738..58de84e2f3 100644
--- a/harbour/src/rtl/hbsocket.c
+++ b/harbour/src/rtl/hbsocket.c
@@ -3205,7 +3205,7 @@ PHB_ITEM hb_socketGetIFaces( int af, HB_BOOL fNoAliases )
       hb_xfree( buf );
       hb_socketClose( sd );
    }
-#elif defined( HB_OS_WIN )
+#elif defined( HB_OS_WIN ) && !defined( __DMC__ )
    HB_SOCKET sd;
 
    /* TODO: add support for IP6 */