diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b97d38dc5c..33da06af00 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,27 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-02-24 18:49 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * source/vm/fm.c
+    ! Fixed compilation error in dlmalloc with pocc64.
+
+  * config/win/pocc64.cf
+  * config/win/msvc64.cf
+    * Cleanup.
+
+  * config/win/gcc.cf
+    ! Added gdi32 to system lib list.
+
+  * config/win/mingw.cf
+  * config/win/mingwce.cf
+    * Minor sync with each other.
+    % Two duplicated lines removed from mingwce. I hope these
+      weren't intentional.
+      ---
+      AR = $(CCPREFIX)ar
+      ARFLAGS = $(HB_USER_AFLAGS)
+      ---
+
 2009-02-24 17:19 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * config/win/msvcce.cf
     ! Fixed another cl.exe occurence to be compatible with
@@ -60,7 +81,7 @@
 2009-02-24 13:39 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * config/win/msvc.cf
   * config/win/msvc64.cf
-    ! Fixed to previous.
+    ! Fixes to previous.
 
 2009-02-24 13:27 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * bin/hb-mkdyn.bat
diff --git a/harbour/config/win/gcc.cf b/harbour/config/win/gcc.cf
index 62bdc8bee8..b1f7bee126 100644
--- a/harbour/config/win/gcc.cf
+++ b/harbour/config/win/gcc.cf
@@ -33,7 +33,7 @@ LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
 LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # This library is needed for CharToOemBuff() and OemToCharBuff() support.
-LINKLIBS += -luser32 -lwsock32
+LINKLIBS += -luser32 -lgdi32 -lwsock32
 
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
diff --git a/harbour/config/win/mingw.cf b/harbour/config/win/mingw.cf
index 0b6d2a8a63..ea1e562f87 100644
--- a/harbour/config/win/mingw.cf
+++ b/harbour/config/win/mingw.cf
@@ -126,7 +126,6 @@ ARFLAGS = $(HB_USER_AFLAGS)
 
 RANLIB = $(CCPREFIX)ranlib
 
-
 ifeq ($(SHLVL),) # COMMAND.COM - length of command line is limited
 ifneq ($(OS),Windows_NT)
 AR_RULE = $(create_library)
diff --git a/harbour/config/win/mingwce.cf b/harbour/config/win/mingwce.cf
index d5e69a093c..4b26eb7d22 100644
--- a/harbour/config/win/mingwce.cf
+++ b/harbour/config/win/mingwce.cf
@@ -123,9 +123,6 @@ ARFLAGS = $(HB_USER_AFLAGS)
 
 RANLIB = $(CCPREFIX)ranlib
 
-AR = $(CCPREFIX)ar
-ARFLAGS = $(HB_USER_AFLAGS)
-
 ifeq ($(SHLVL),) # COMMAND.COM - length of command line is limited
 ifneq ($(OS),Windows_NT)
 AR_RULE = $(create_library)
diff --git a/harbour/config/win/msvc64.cf b/harbour/config/win/msvc64.cf
index 2151b86dfc..39ebd52769 100644
--- a/harbour/config/win/msvc64.cf
+++ b/harbour/config/win/msvc64.cf
@@ -2,8 +2,4 @@
 # $Id$
 #
 
-include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
-
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/msvc.cf
-
-include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/win/pocc64.cf b/harbour/config/win/pocc64.cf
index 94efc3018d..a97292c4d1 100644
--- a/harbour/config/win/pocc64.cf
+++ b/harbour/config/win/pocc64.cf
@@ -1,13 +1,7 @@
 #
 # $Id$
 #
-# The Harbour Project
-# GNU MAKE file for Pelles ISO C Compiler
-
-include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
 
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/pocc.cf
 
 CPPFLAGS += /Tamd64-coff
-
-include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/source/vm/fm.c b/harbour/source/vm/fm.c
index 854b5eb9f6..b9080506ff 100644
--- a/harbour/source/vm/fm.c
+++ b/harbour/source/vm/fm.c
@@ -134,6 +134,8 @@
 #     pragma warn -rch
 #  elif defined( HB_OS_WIN_CE ) && defined( __POCC__ )
 #     define ABORT TerminateProcess( GetCurrentProcess(), 0 )
+#  elif defined( __POCC__ ) && !defined( InterlockedCompareExchangePointer )
+#     define InterlockedCompareExchangePointer
 #  elif defined( _MSC_VER ) && !defined( USE_DL_PREFIX )
 #     define USE_DL_PREFIX
 #  endif