diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f9a1da23ba..3106d79c40 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,17 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-11-13 14:38 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/bin/hb-func.sh
+    * do not include gtwin in harbour.dll for MinGW-CE builds
+      gtwin can work only if additional (non standard) libraries
+      are installed in WinCE/PocketPC so it should not be part
+      of harbour.dll
+
+  * harbour/source/rtl/gtwin/gtwin.c
+    * removed HB_WINCE_USE_POCKET_CONSOLE macro
+      It's not longer necessary when gtwin is not part of harbour.dll
+
 2007-11-13 14:13 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/make_xmingwce.sh
   * harbour/make_xmingw.sh
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index ca963696d3..6c3b0bcb15 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -62,9 +62,16 @@ get_solibname()
 
 mk_hbgetlibs()
 {
+    local libs
+
     if [ -z "$@" ]
     then
-        echo -n "vm pp rtl rdd dbffpt dbfcdx dbfntx hsx hbsix usrrdd ${HB_DB_DRVEXT} macro common lang codepage gtcrs gtsln gtxvt gtxwc gtalleg gtcgi gtstd gtpca gttrm gtwin gtwvt gtgui gtdos gtos2 debug profiler compiler hbpcre"
+        libs=""
+        if [ "$HB_COMPILER" != "cemgw" ]
+        then
+            libs="$libs gtwin"
+        fi
+        echo -n "vm pp rtl rdd dbffpt dbfcdx dbfntx hsx hbsix usrrdd ${HB_DB_DRVEXT} macro common lang codepage gtcrs gtsln gtxvt gtxwc gtalleg gtcgi gtstd gtpca gttrm $libs gtwvt gtgui gtdos gtos2 debug profiler compiler hbpcre"
     else
         echo -n "$@"
     fi
@@ -72,9 +79,16 @@ mk_hbgetlibs()
 
 mk_hbgetlibsctb()
 {
+    local libs
+
     if [ -z "$@" ]
     then
-        echo -n "rddads ct nf tip xhb hbgd hbodbc hbpg hbmysql adordd hbwin32"
+        libs=""
+        if [ "$HB_COMPILER" = "cemgw" ]
+        then
+            libs="$libs gtwin"
+        fi
+        echo -n "$libs rddads ct nf tip xhb hbgd hbodbc hbpg hbmysql adordd hbwin32"
     else
         echo -n "$@"
     fi
@@ -380,7 +394,7 @@ else
     fi
     [ "\${HB_MT}" = "MT" ] && [ -f "\${HB_LIB_INSTALL}/\${pref}\${l}mt\${ext}" ] && l="\${l}mt"
     [ -f "\${HB_LIB_INSTALL}/\${pref}\${l}\${ext}" ] && HARBOUR_LIBS="\${HARBOUR_LIBS} -l\${l}"
-    libs="gtalleg hbodbc debug profiler ${hb_libsc}"
+    libs="gtalleg debug profiler ${hb_libsc}"
 fi
 for l in \${libs}
 do
diff --git a/harbour/source/rtl/gtwin/gtwin.c b/harbour/source/rtl/gtwin/gtwin.c
index 0290c912ce..bbc09db3c7 100644
--- a/harbour/source/rtl/gtwin/gtwin.c
+++ b/harbour/source/rtl/gtwin/gtwin.c
@@ -88,11 +88,6 @@
 #  include "hbapicdp.h"
 #endif
 
-#if !defined( HB_NO_WIN_CONSOLE ) && defined( HB_WINCE ) && \
-    !defined( HB_WINCE_USE_POCKET_CONSOLE )
-#  define HB_NO_WIN_CONSOLE
-#endif
-
 #if !defined( HB_NO_WIN_CONSOLE )
 
 #if !defined( __LCC__ )