diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6578ffe1fc..1243475ae2 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,17 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-08-17 01:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbcurl/core.c
+    ! do not include curl/types.h to make it build with 7.21.7 and newer.
+      Thanks to Guy Roussin for the report.
+    % version guarded curl/easy.h and curl/types.h so now they
+      are only used for those very old libcurl versions that
+      require it
+
+  * contrib/hbcuied/hbcuied.hbp
+    * sync with other exe contrib
+
 2011-08-16 15:08 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   - contrib/hbcuied/cu_desgn.prg
   * contrib/hbcuied/cu_main.prg
@@ -50,7 +61,7 @@
   * contrib/hbcuied/hbcuied.hbp
     - Removed: dependancy on GTWVG.
                Now hbCuiEd is portable across any platform.
-               In SVN it has GTWVT dependancy. 
+               In SVN it has GTWVT dependancy.
                Just tweak the hbcuied.hbp according to your platform.
 
     * Changed: a lot of code cleanup and formatting, much more to come.
@@ -69,19 +80,19 @@
   + contrib/hbcuied/hbcuied.hbp
     + Added: initial commit of Harbour's CUI Forms Editor.
 
-      NOTE: It is a work-in-progress and hence is subject 
-            to heavy changes. For now you can just play with 
+      NOTE: It is a work-in-progress and hence is subject
+            to heavy changes. For now you can just play with
             it, though, it does not offer anything singnificant.
             Only building blocks are set in place.
 
-            This code has been pulled out from my application 
-            sources which is a part of much larger reports 
-            object. Hence, it contains some code which 
+            This code has been pulled out from my application
+            sources which is a part of much larger reports
+            object. Hence, it contains some code which
             eventually will be stripped out. Also sources
             need to be formatted heavily per Harbour standards.
 
-            During next several days I will be occupied with 
-            this development. Any suggessions coming in way 
+            During next several days I will be occupied with
+            this development. Any suggessions coming in way
             will highly benefit this tool.
 
 2011-08-12 15:49 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
@@ -91,8 +102,8 @@
   * contrib/hbide/idemain.prg
   * contrib/hbide/idethemes.prg
     + Added: <Edit><Format><Upper Case Harbour Keywords> option.
-      When applied to an editing instance, Harbour keywords are 
-      capitalized. It is a useful utility for old sources where 
+      When applied to an editing instance, Harbour keywords are
+      capitalized. It is a useful utility for old sources where
       we were lazy on readable importance of our sources.
 
 2011-08-12 17:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
diff --git a/harbour/contrib/hbcuied/hbcuied.hbp b/harbour/contrib/hbcuied/hbcuied.hbp
index 6b18ce51a9..06a61a4327 100644
--- a/harbour/contrib/hbcuied/hbcuied.hbp
+++ b/harbour/contrib/hbcuied/hbcuied.hbp
@@ -6,10 +6,10 @@
 -3rd=hbide_title=hbcuied
 -3rd=hbide_output=hbcuied
 
--w3
--es2
 -inc
--gui
+-o${hb_name}
+
+-w3 -es2
 
 -gtwvt
 
@@ -18,10 +18,10 @@ cu_utlty.prg
 cu_achoi.prg
 cu_object.prg
 
--ohbcuied
-
 -icon={allwin}../../package/harb_win.ico
 
 -3rd=hbide_file=hbcuied.ch
 
- 
+# Always build in shared mode for these platforms to minimize
+# binary sizes.
+{_HB_BUILD_&(!(HB_BUILD_DYN='no')&(win|wce|os2))}-shared
diff --git a/harbour/contrib/hbcurl/core.c b/harbour/contrib/hbcurl/core.c
index 00caaa898d..53618ed88c 100644
--- a/harbour/contrib/hbcurl/core.c
+++ b/harbour/contrib/hbcurl/core.c
@@ -53,8 +53,12 @@
  */
 
 #include <curl/curl.h>
-#include <curl/types.h>
-#include <curl/easy.h>
+#if LIBCURL_VERSION_NUM < 0x070A03
+#  include <curl/easy.h>
+#endif
+#if LIBCURL_VERSION_NUM < 0x070C00
+#  include <curl/types.h>
+#endif
 
 #include "hbapi.h"
 #include "hbapiitm.h"