diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a374e22c36..27f6530a28 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-07-02 11:21 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   * include/hbdefs.h
+     ! Fixed DLL creation for MSVC (and maybe compilers, too).
+       Thanks to Marek Paliwoda for the hint.
+
+   * contrib/hbtpathy/tpos2.c
+     ! Blind attempt to fix OS/2 compile error.
+
 2008-07-02 10:52 UTC+0100 Miguel Angel Marchuet <miguelangel@marchuet.net>
    * contrib/hbziparch/hbziparc.c
      * corrected library name in comments.
diff --git a/harbour/contrib/hbtpathy/tpos2.c b/harbour/contrib/hbtpathy/tpos2.c
index 954bb42506..5e028cbf36 100644
--- a/harbour/contrib/hbtpathy/tpos2.c
+++ b/harbour/contrib/hbtpathy/tpos2.c
@@ -60,6 +60,7 @@
 #define INCL_BASE
 #define INCL_DOS
 #define INCL_DOSERROR
+#define INCL_DOSDEVICES
 #define INCL_DOSDEVIOCTL
 #include <os2.h>
 
diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h
index da2cb12d53..7bcca4b09f 100644
--- a/harbour/include/hbdefs.h
+++ b/harbour/include/hbdefs.h
@@ -1174,7 +1174,7 @@ typedef PHB_FUNC HB_FUNC_PTR;
    #elif defined( ASANLM ) || defined( ASANT )
       #define HB_EXPORT
 
-   #elif defined( WIN32 )
+   #elif defined( HB_OS_WIN_32 )
       #define HB_EXPORT _declspec( dllexport )
 
    #else