diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c86d957f6e..455bf037b7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-05-26 11:26 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+   * contrib/hbmsql/make_b32.bat
+   * contrib/hbmsql/make_vc.bat
+   * contrib/hbmsql/msql.c
+     + Now automatically setting _OS_WIN32, no need to
+       use special CFLAGS anymore.
+
 2008-05-26 11:20 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
    - contrib/hbgd/include
    - contrib/hbgd/doc/COPYING
diff --git a/harbour/contrib/hbmsql/make_b32.bat b/harbour/contrib/hbmsql/make_b32.bat
index 94c5513f78..c484512c4c 100644
--- a/harbour/contrib/hbmsql/make_b32.bat
+++ b/harbour/contrib/hbmsql/make_b32.bat
@@ -3,8 +3,4 @@ rem
 rem $Id$
 rem
 
-set CFLAGS=-D_OS_WIN32
-
 call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
-
-set CFLAGS=
diff --git a/harbour/contrib/hbmsql/make_vc.bat b/harbour/contrib/hbmsql/make_vc.bat
index 6783fe5153..4ceb9b9261 100644
--- a/harbour/contrib/hbmsql/make_vc.bat
+++ b/harbour/contrib/hbmsql/make_vc.bat
@@ -3,8 +3,4 @@ rem
 rem $Id$
 rem
 
-set CFLAGS=-D_OS_WIN32
-
 call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
-
-set CFLAGS=
diff --git a/harbour/contrib/hbmsql/msql.c b/harbour/contrib/hbmsql/msql.c
index 766d8981bc..80145549b6 100644
--- a/harbour/contrib/hbmsql/msql.c
+++ b/harbour/contrib/hbmsql/msql.c
@@ -57,6 +57,12 @@
 
 #include "extend.api"
 #include "item.api"
+
+#ifdef HB_OS_WIN_32
+   /* This is needed by msql.h to indicate the platform. */
+   #define _OS_WIN32
+#endif
+
 #include "msql.h"
 
 HB_FUNC(MSQLCONNEC) // int msqlConnect(char *)