diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index bbdeb58c3f..a55f0f214c 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,15 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2012-11-28 23:54 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * utils/hbmk2/hbmk2.prg
+    + automatically load headers listed in .hbc file
+      when executing an .hb script
+
+  * contrib/hbodbc/tests/testodbc.prg
+    % #include "sql.ch" no longer needed either when
+      built to an executable or when executed as script
+
 2012-11-28 23:31 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/hbodbc/hbodbc.hbc
     + added experimental headers= line
diff --git a/harbour/contrib/hbodbc/tests/testodbc.prg b/harbour/contrib/hbodbc/tests/testodbc.prg
index dce331e0ec..04ed6cbc07 100644
--- a/harbour/contrib/hbodbc/tests/testodbc.prg
+++ b/harbour/contrib/hbodbc/tests/testodbc.prg
@@ -6,8 +6,6 @@
 
 #include "simpleio.ch"
 
-#include "sql.ch"
-
 PROCEDURE Main()
 
    LOCAL hEnv
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 391a5e3478..f36ee02d27 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -12797,7 +12797,7 @@ STATIC PROCEDURE __hbshell( cFile, ... )
    LOCAL cExt
    LOCAL tmp
    LOCAL l_cHB_INSTALL_PREFIX
-   LOCAL aINCPATH
+   LOCAL aOPTPRG
    LOCAL hHRB
 
    s_cDirBase_hbshell := hb_DirBase()
@@ -12884,14 +12884,19 @@ STATIC PROCEDURE __hbshell( cFile, ... )
             ENDIF
          NEXT
 
-         aINCPATH := {}
+         aOPTPRG := {}
+
          FOR EACH tmp IN hbmk[ _HBMK_aINCPATH ]
-            AAdd( aINCPATH, "-I" + tmp )
+            AAdd( aOPTPRG, "-I" + tmp )
+         NEXT
+
+         FOR EACH tmp IN hbmk[ _HBMK_aCH ]
+            AAdd( aOPTPRG, "-u+" + tmp )
          NEXT
 
          /* We can use this function as this is a GPL licenced application */
          cFile := hb_compileBuf( hbmk_CoreHeaderFiles(), hb_ProgName(), "-n2", "-w", "-es2", "-q0", ;
-                                 hb_ArrayToParams( aINCPATH ), "-D" + _HBMK_SHELL, cFile )
+                                 hb_ArrayToParams( aOPTPRG ), "-D" + _HBMK_SHELL, cFile )
          IF cFile == NIL
             ErrorLevel( 1 )
             EXIT