diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ab31bd5e03..6108a1d567 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,43 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-11-27 01:12 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * make_b32.mak
+     ! Removed -l flag from .dll creation to be in sync with the 
+       rest of Harbour.
+
+   * contrib/mtpl_b32.mak
+   * contrib/mtpl_vc.mak
+     ! Synced with core flags (VC mainly).
+
+   * contrib/freeimage/fi_winfu.c
+   * contrib/freeimage/fi_wrp.c
+   * contrib/freeimage/make_b32.bat
+   * contrib/freeimage/make_vc.bat
+   * contrib/firebird/firebird.c
+   * contrib/firebird/make_b32.bat
+   * contrib/firebird/make_vc.bat
+   * contrib/pdflib/make_b32.bat
+   * contrib/pdflib/make_vc.bat
+   * contrib/pdflib/pdfhbdoc.c
+   * contrib/pgsql/postgres.c
+   * contrib/pgsql/make_b32.bat
+   * contrib/pgsql/make_vc.bat
+   * contrib/mysql/mysql.c
+   * contrib/mysql/make_b32.bat
+   * contrib/mysql/make_vc.bat
+     ! Some extra lib-level custom C flags fixed to be 
+       in sync with rest of Harbour. (mainly HB_OS_WIN_32_USED)
+
+   * contrib/hbzlib/make_b32.bat
+   * contrib/hbzlib/make_vc.bat
+     ! hbziparch extra switches removed (all of them). 
+       This made surface a whole lot of warnings.
+       If someone wants to create a .dll from this, 
+       -DZLIB_DLL will need to be added to C_USR.
+       -a8 switch was also removed from the BCC build.
+       If someone know that it's necessary, pls shout.
+
 2007-11-27 00:12 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/bin/pack_src.sh
     * updated for recent file name modifications
diff --git a/harbour/contrib/firebird/firebird.c b/harbour/contrib/firebird/firebird.c
index 170f88e871..8b831f3818 100644
--- a/harbour/contrib/firebird/firebird.c
+++ b/harbour/contrib/firebird/firebird.c
@@ -53,15 +53,15 @@
  */
 
 #define _CLIPDEFS_H
-#if defined(HB_OS_WIN_32_USED)
-   #include <windows.h>
-#endif
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <time.h>
 
+#define HB_OS_WIN_32_USED
+
+#include "hbapi.h"
 #include "extend.api"
 #include "item.api"
 #include "hbapiitm.h"
diff --git a/harbour/contrib/firebird/make_b32.bat b/harbour/contrib/firebird/make_b32.bat
index abc93f83ae..5475298848 100644
--- a/harbour/contrib/firebird/make_b32.bat
+++ b/harbour/contrib/firebird/make_b32.bat
@@ -14,7 +14,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=-I%FIREBIRD_DIR%\include -DHB_OS_WIN_32_USED
+set CFLAGS=-I%FIREBIRD_DIR%\include
 set HB_DLL_NAME=fbclient
 set HB_DLL_DIR=%FIREBIRD_DIR%\bin
 
diff --git a/harbour/contrib/firebird/make_vc.bat b/harbour/contrib/firebird/make_vc.bat
index d454e10bcf..231d53a2d0 100644
--- a/harbour/contrib/firebird/make_vc.bat
+++ b/harbour/contrib/firebird/make_vc.bat
@@ -14,7 +14,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=-I%FIREBIRD_DIR%\include -DHB_OS_WIN_32_USED
+set CFLAGS=-I%FIREBIRD_DIR%\include
 set HB_DLL_NAME=fbclient
 set HB_DLL_DIR=%FIREBIRD_DIR%\bin
 
diff --git a/harbour/contrib/freeimage/fi_winfu.c b/harbour/contrib/freeimage/fi_winfu.c
index cfb2b68d9b..8c24c93929 100644
--- a/harbour/contrib/freeimage/fi_winfu.c
+++ b/harbour/contrib/freeimage/fi_winfu.c
@@ -58,9 +58,8 @@
 
 /* NOTE: we need this to prevent base types redefinition */
 #define _CLIPDEFS_H
-#if defined(HB_OS_WIN_32_USED)
-   #include <windows.h>
-#endif
+
+#define HB_OS_WIN_32_USED
 
 #include "hbapi.h"
 #include "hbapiitm.h"
diff --git a/harbour/contrib/freeimage/fi_wrp.c b/harbour/contrib/freeimage/fi_wrp.c
index b1bc8f6e14..aaf66bfc05 100644
--- a/harbour/contrib/freeimage/fi_wrp.c
+++ b/harbour/contrib/freeimage/fi_wrp.c
@@ -53,6 +53,8 @@
 /* NOTE: we need this to prevent base types redefinition */
 #define _CLIPDEFS_H
 
+#define HB_OS_WIN_32_USED
+
 #include "hbapi.h"
 #include "hbapiitm.h"
 #include "hbstack.h"
diff --git a/harbour/contrib/freeimage/make_b32.bat b/harbour/contrib/freeimage/make_b32.bat
index eea94ff9bb..894398f825 100644
--- a/harbour/contrib/freeimage/make_b32.bat
+++ b/harbour/contrib/freeimage/make_b32.bat
@@ -15,7 +15,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=-I%FREEIMAGE_DIR%\source -DHB_OS_WIN_32_USED
+set CFLAGS=-I%FREEIMAGE_DIR%\source
 set HB_DLL_NAME=FreeImage
 set HB_DLL_DIR=%FREEIMAGE_DIR%\Dist
 
diff --git a/harbour/contrib/freeimage/make_vc.bat b/harbour/contrib/freeimage/make_vc.bat
index f3d45c16b1..05b5d249f7 100644
--- a/harbour/contrib/freeimage/make_vc.bat
+++ b/harbour/contrib/freeimage/make_vc.bat
@@ -15,7 +15,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=-I%FREEIMAGE_DIR%\source -DHB_OS_WIN_32_USED
+set CFLAGS=-I%FREEIMAGE_DIR%\source
 set HB_DLL_NAME=FreeImage
 set HB_DLL_DIR=%FREEIMAGE_DIR%\Dist
 
diff --git a/harbour/contrib/hbzlib/make_b32.bat b/harbour/contrib/hbzlib/make_b32.bat
index b791c3addc..abda110a5c 100644
--- a/harbour/contrib/hbzlib/make_b32.bat
+++ b/harbour/contrib/hbzlib/make_b32.bat
@@ -3,6 +3,6 @@ rem
 rem $Id$
 rem
 
-set CFLAGS=-Iinclude -DZLIB_DLL;WIN32;ASSERT -vi -Ve -6 -R- -H- -5 -OS -w- -X- -a8 -b -k-
+set CFLAGS=-Iinclude
 
 call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbzlib/make_vc.bat b/harbour/contrib/hbzlib/make_vc.bat
index 72b40b4ae6..39ebf110fd 100644
--- a/harbour/contrib/hbzlib/make_vc.bat
+++ b/harbour/contrib/hbzlib/make_vc.bat
@@ -3,6 +3,6 @@ rem
 rem $Id$
 rem
 
-set CFLAGS=-Iinclude -DZLIB_DLL;WIN32;ASSERT
+set CFLAGS=-Iinclude
 
 call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/mtpl_b32.mak b/harbour/contrib/mtpl_b32.mak
index c7770a65d7..28e8799bff 100644
--- a/harbour/contrib/mtpl_b32.mak
+++ b/harbour/contrib/mtpl_b32.mak
@@ -100,7 +100,7 @@ CFLAGS = -O2 $(CFLAGS)
 !endif
 
 CFLAGS         = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS)
-CLIBFLAGS      = -c $(CFLAGS) $(CLIBFLAGS)
+CLIBFLAGS      = -c -q $(CFLAGS) $(CLIBFLAGS)
 CLIBFLAGSDEBUG = -v $(CLIBFLAGS)
 HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
 LDFLAGS        = $(LDFLAGS)
diff --git a/harbour/contrib/mtpl_vc.mak b/harbour/contrib/mtpl_vc.mak
index 8a5cfe4443..14123e1946 100644
--- a/harbour/contrib/mtpl_vc.mak
+++ b/harbour/contrib/mtpl_vc.mak
@@ -92,7 +92,14 @@ MKLIB  = lib.exe
 
 #**********************************************************
 
-CFLAGS         = -I$(INCLUDE_DIR) -W3 -nologo $(C_USR) $(CFLAGS)
+# C Compiler Flags
+!if $(HB_VISUALC_VER) >= 80
+CFLAGS_VER     = -Ot2b1 -EHs-c- -FD -Gs -D_CRT_SECURE_NO_DEPRECATE
+!else
+CFLAGS_VER     = -Ogt2yb1p -GX- -G6 -YX -FD -Gs
+!endif
+
+CFLAGS         = -I$(INCLUDE_DIR) $(CFLAGS_VER) -W3 -nologo -D__WINDOWS__ -DWIN32 -D__WIN32__ $(C_USR) $(CFLAGS)
 CLIBFLAGS      = -c $(CFLAGS) $(CLIBFLAGS)
 CLIBFLAGSDEBUG = -Zi $(CLIBFLAGS)
 HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
diff --git a/harbour/contrib/mysql/make_b32.bat b/harbour/contrib/mysql/make_b32.bat
index 37591dae86..fe25cc617a 100644
--- a/harbour/contrib/mysql/make_b32.bat
+++ b/harbour/contrib/mysql/make_b32.bat
@@ -14,7 +14,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=-I%MYSQL_DIR%\include -DHB_OS_WIN_32_USED
+set CFLAGS=-I%MYSQL_DIR%\include
 set HB_DLL_NAME=libmySQL
 set HB_DLL_DIR=%MYSQL_DIR%\bin
 
diff --git a/harbour/contrib/mysql/make_vc.bat b/harbour/contrib/mysql/make_vc.bat
index 151e9464f2..5fa15c068d 100644
--- a/harbour/contrib/mysql/make_vc.bat
+++ b/harbour/contrib/mysql/make_vc.bat
@@ -14,7 +14,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=-I%MYSQL_DIR%\include -DHB_OS_WIN_32_USED
+set CFLAGS=-I%MYSQL_DIR%\include
 set HB_DLL_NAME=libmySQL
 set HB_DLL_DIR=%MYSQL_DIR%\bin
 
diff --git a/harbour/contrib/mysql/mysql.c b/harbour/contrib/mysql/mysql.c
index 4616378d98..9cf3065e00 100644
--- a/harbour/contrib/mysql/mysql.c
+++ b/harbour/contrib/mysql/mysql.c
@@ -61,6 +61,9 @@
  *
  */
 
+#ifdef __WIN32__
+   #define HB_OS_WIN_32_USED
+#endif
 
 /* NOTE: we need this to prevent base types redefinition */
 #define _CLIPDEFS_H
diff --git a/harbour/contrib/pdflib/make_b32.bat b/harbour/contrib/pdflib/make_b32.bat
index 1cbf8a92ea..595dad257f 100644
--- a/harbour/contrib/pdflib/make_b32.bat
+++ b/harbour/contrib/pdflib/make_b32.bat
@@ -14,6 +14,6 @@ exit 1
 
 :DIR_OK
 
-set CFLAGS=-I%PDFLIB_DIR%\src\pdflib -DHB_OS_WIN_32_USED
+set CFLAGS=-I%PDFLIB_DIR%\src\pdflib
 
 call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/pdflib/make_vc.bat b/harbour/contrib/pdflib/make_vc.bat
index 65fd67e13d..a03307a77e 100644
--- a/harbour/contrib/pdflib/make_vc.bat
+++ b/harbour/contrib/pdflib/make_vc.bat
@@ -14,6 +14,6 @@ exit 1
 
 :DIR_OK
 
-set CFLAGS=-I%PDFLIB_DIR%\src\pdflib -DHB_OS_WIN_32_USED
+set CFLAGS=-I%PDFLIB_DIR%\src\pdflib
 
 call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/pdflib/pdfhbdoc.c b/harbour/contrib/pdflib/pdfhbdoc.c
index 7758acbdc6..69bb2bbe47 100644
--- a/harbour/contrib/pdflib/pdfhbdoc.c
+++ b/harbour/contrib/pdflib/pdfhbdoc.c
@@ -50,6 +50,7 @@
  *
  */
 
+#define HB_OS_WIN_32_USED
 
 #include <hbapi.h>
 #include <hbapiitm.h>
diff --git a/harbour/contrib/pgsql/make_b32.bat b/harbour/contrib/pgsql/make_b32.bat
index 4edc3d91d4..889969ea52 100644
--- a/harbour/contrib/pgsql/make_b32.bat
+++ b/harbour/contrib/pgsql/make_b32.bat
@@ -14,7 +14,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=-I%PGSQL_DIR%\include -DHB_OS_WIN_32_USED
+set CFLAGS=-I%PGSQL_DIR%\include
 rem .exe
 set HB_DLL_NAME=postgres
 set HB_DLL_DIR=%PGSQL_DIR%\bin
diff --git a/harbour/contrib/pgsql/make_vc.bat b/harbour/contrib/pgsql/make_vc.bat
index 91f30a728a..b63cb4cb96 100644
--- a/harbour/contrib/pgsql/make_vc.bat
+++ b/harbour/contrib/pgsql/make_vc.bat
@@ -14,7 +14,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=-I%PGSQL_DIR%\include -DHB_OS_WIN_32_USED
+set CFLAGS=-I%PGSQL_DIR%\include
 rem .exe
 set HB_DLL_NAME=postgres
 set HB_DLL_DIR=%PGSQL_DIR%\bin
diff --git a/harbour/contrib/pgsql/postgres.c b/harbour/contrib/pgsql/postgres.c
index 9fa148241f..32a5240382 100644
--- a/harbour/contrib/pgsql/postgres.c
+++ b/harbour/contrib/pgsql/postgres.c
@@ -50,15 +50,14 @@
  *
  */
 
+#define _CLIPDEFS_H
+
+#define HB_OS_WIN_32_USED
+
 #include "hbapi.h"
 #include "hbapiitm.h"
 #include "libpq-fe.h"
 
-#define _CLIPDEFS_H
-#if defined(HB_OS_WIN_32_USED)
-   #include <windows.h>
-#endif
-
 #define VARHDRSZ              4
 #define BOOLOID               16
 #define INT8OID               20
diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak
index c6000b010c..aedb6b6a9f 100644
--- a/harbour/make_b32.mak
+++ b/harbour/make_b32.mak
@@ -142,7 +142,7 @@ HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w2 -es2 -gc0 -kM $(PRG_USR)
     HBFLAGSCMN = $(HBFLAGSCMN) -dPDF
 !endif
 HARBOURFLAGS   = -n $(HBFLAGSCMN) $(HARBOURFLAGS)
-HARBOURFLAGSDLL= -D__EXPORT__ -n1 -l $(HBFLAGSCMN) $(HARBOURFLAGSDLL)
+HARBOURFLAGSDLL= -D__EXPORT__ -n1 $(HBFLAGSCMN) $(HARBOURFLAGSDLL)
 
 # Linker Flags
 LDFLAGS        = -ap -Tpe -Gn -C -L$(LIB_DIR) -L$(BIN_DIR) $(LDFLAGS)