diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 542db8f7a3..23e4fbc878 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-14 20:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbwin/Makefile
+  - contrib/hbwin/legacyc.c
+  + contrib/hbwin/legacycd.c
+  + contrib/hbwin/legacyco.c
+    * Mimicing old layout to avoid potential symbol collisions
+      with certain 3rd parties.
+
 2009-06-14 19:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
     * Updated.
diff --git a/harbour/contrib/hbwin/Makefile b/harbour/contrib/hbwin/Makefile
index 9416fd8fcc..9013a6ec9b 100644
--- a/harbour/contrib/hbwin/Makefile
+++ b/harbour/contrib/hbwin/Makefile
@@ -21,7 +21,8 @@ C_SOURCES = \
 	olecore.c \
 	oleinit.c \
 	axcore.c \
-	legacyc.c \
+	legacycd.c \
+	legacyco.c \
 	win_dll.c \
 	win_misc.c \
 	win_osc.c \
diff --git a/harbour/contrib/hbwin/legacycd.c b/harbour/contrib/hbwin/legacycd.c
new file mode 100644
index 0000000000..25fd91187d
--- /dev/null
+++ b/harbour/contrib/hbwin/legacycd.c
@@ -0,0 +1,75 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ * Compatibility calls (DLL).
+ *
+ * Copyright 2009 Viktor Szakats (harbour.01 syenar.hu)
+ * www - http://www.harbour-project.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
+ *
+ * As a special exception, the Harbour Project gives permission for
+ * additional uses of the text contained in its release of Harbour.
+ *
+ * The exception is that, if you link the Harbour libraries with other
+ * files to produce an executable, this does not by itself cause the
+ * resulting executable to be covered by the GNU General Public License.
+ * Your use of that executable is in no way restricted on account of
+ * linking the Harbour library code into it.
+ *
+ * This exception does not however invalidate any other reasons why
+ * the executable file might be covered by the GNU General Public License.
+ *
+ * This exception applies only to the code released by the Harbour
+ * Project under the name Harbour.  If you copy code from other
+ * Harbour Project or Free Software Foundation releases into a copy of
+ * Harbour, as the General Public License permits, the exception does
+ * not apply to the code that you add in this way.  To avoid misleading
+ * anyone as to the status of such modified files, you must delete
+ * this exception notice from them.
+ *
+ * If you write modifications of your own for Harbour, it is your choice
+ * whether to permit this exception to apply to your modifications.
+ * If you do not wish that, delete this exception notice.
+ *
+ */
+
+/* This functions are deprecated, kept for compatibility with old
+   3rd party tools. Please update your code to use new API,
+   the old one will be removed in a future revision. [vszakats] */
+
+/* NOTE: Add to this file functions coming from old DLL source only.
+         [vszakats] */
+
+#define HB_OS_WIN_USED
+
+#include "hbapi.h"
+
+/* Please use WAPI_GETLASTERROR(). */
+HB_FUNC( GETLASTERROR )
+{
+   hb_retnl( GetLastError() );
+}
+
+/* Please use WAPI_SETLASTERROR(). */
+HB_FUNC( SETLASTERROR )
+{
+   hb_retnl( GetLastError() );
+   SetLastError( hb_parnl( 1 ) );
+}
diff --git a/harbour/contrib/hbwin/legacyc.c b/harbour/contrib/hbwin/legacyco.c
similarity index 93%
rename from harbour/contrib/hbwin/legacyc.c
rename to harbour/contrib/hbwin/legacyco.c
index 4f30ff8040..ed98aa6d50 100644
--- a/harbour/contrib/hbwin/legacyc.c
+++ b/harbour/contrib/hbwin/legacyco.c
@@ -4,7 +4,7 @@
 
 /*
  * Harbour Project source code:
- * Compatibility calls.
+ * Compatibility calls (OLE).
  *
  * Copyright 2009 Viktor Szakats (harbour.01 syenar.hu)
  * www - http://www.harbour-project.org
@@ -54,6 +54,9 @@
    OLE implementation. Please update your code to use this new API,
    the old one will be removed in a future revision. [vszakats] */
 
+/* NOTE: Add to this file functions coming from old OLE source only.
+         [vszakats] */
+
 #define HB_OS_WIN_USED
 
 #include "hbapi.h"
@@ -114,19 +117,6 @@ HB_FUNC( WIDETOANSI )
    HB_FUNC_EXEC( WIN_WIDETOANSI );
 }
 
-/* Please use WAPI_GETLASTERROR(). */
-HB_FUNC( GETLASTERROR )
-{
-   hb_retnl( GetLastError() );
-}
-
-/* Please use WAPI_SETLASTERROR(). */
-HB_FUNC( SETLASTERROR )
-{
-   hb_retnl( GetLastError() );
-   SetLastError( hb_parnl( 1 ) );
-}
-
 HB_FUNC( MESSAGEBOX )
 {
    LPTSTR lpStr1 = HB_TCHAR_CONVTO( hb_parcx( 2 ) );