diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 95f0770b3a..ead219e4a2 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-08-04 22:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * examples/httpsrv/uhttpd.prg
+  * examples/hscript/hscript.prg
+    % Using __HB_EXTERN__ instead of header, to request full core.
+
 2010-08-04 22:02 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/hbextern.hbs
     ! Fixed filtering ANNOUNCE self-reference.
@@ -133,8 +138,8 @@
                  'REQUEST __HBEXTERN__<libname>__' command.
             - Names are not necessarily finalized yet. ("extern", ".hbx")
     - Deleted hard-coded exceptions from generator code.
-    ; TODO: Clean core generated headers to behave like before.
-    ; TODO: Adapt hbextern lib to these changes.
+    ; TODO: Clean core generated headers to behave like before. [DONE]
+    ; TODO: Adapt hbextern lib to these changes. [NOT NEEDED]
     ; TODO: Add generated headers to SVN for contrib libs.
     ; TODO: Add stubs which include generated headers to all libs.
     ; TODO: Long term TODO: make it easy to generate such headers
diff --git a/harbour/examples/hscript/hscript.prg b/harbour/examples/hscript/hscript.prg
index e95b4d243f..62555eaa4b 100644
--- a/harbour/examples/hscript/hscript.prg
+++ b/harbour/examples/hscript/hscript.prg
@@ -50,9 +50,10 @@
  *
  */
 
-#include "hbextern.ch"
 #include "cgi.ch"
 
+REQUEST __HB_EXTERN__
+
 #define IF_BUFFER 65535
 
 PROCEDURE Main( cScript )
diff --git a/harbour/examples/httpsrv/uhttpd.prg b/harbour/examples/httpsrv/uhttpd.prg
index cef07ef464..b5a6ceb6d1 100644
--- a/harbour/examples/httpsrv/uhttpd.prg
+++ b/harbour/examples/httpsrv/uhttpd.prg
@@ -91,7 +91,7 @@
 #include "hbmemory.ch"
 #include "hbgtinfo.ch"
 
-#include "hbextern.ch"   // need this to use with HRB
+REQUEST __HB_EXTERN__
 
 #include "hbsocket.ch"