From dc75ee56046dd9bc28d8fc836dd0e54915aff190 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 30 Nov 2012 16:31:51 +0000
Subject: [PATCH] 2012-11-30 17:30 UTC+0100 Viktor Szakats (harbour syenar.net)
   * extras/hbusb/hbusb.hbc   * extras/hbusb/tests/hbmk.hbm   *
 extras/hbusb/tests/test.prg   * extras/hbvpdf/hbvpdf.hbc   *
 extras/hbvpdf/tests/pdf_demo.prg     + use default headers extras where it
 makes sense

---
 harbour/ChangeLog.txt                    | 8 ++++++++
 harbour/extras/hbusb/hbusb.hbc           | 1 +
 harbour/extras/hbusb/tests/hbmk.hbm      | 2 ++
 harbour/extras/hbusb/tests/test.prg      | 4 ----
 harbour/extras/hbvpdf/hbvpdf.hbc         | 1 +
 harbour/extras/hbvpdf/tests/pdf_demo.prg | 2 --
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index c5fe497c2e..0b2e4c97de 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,14 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2012-11-30 17:30 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * extras/hbusb/hbusb.hbc
+  * extras/hbusb/tests/hbmk.hbm
+  * extras/hbusb/tests/test.prg
+  * extras/hbvpdf/hbvpdf.hbc
+  * extras/hbvpdf/tests/pdf_demo.prg
+    + use default headers extras where it makes sense
+
 2012-11-30 15:36 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/xhb/xhbcls.ch
     ! fixed recent casing typo in 2012-10-03 19:06 UTC+0200
diff --git a/harbour/extras/hbusb/hbusb.hbc b/harbour/extras/hbusb/hbusb.hbc
index ac2681b21a..a2cbf27eda 100644
--- a/harbour/extras/hbusb/hbusb.hbc
+++ b/harbour/extras/hbusb/hbusb.hbc
@@ -3,6 +3,7 @@
 #
 
 incpaths=.
+headers=${hb_name}.ch
 libpaths=lib/${hb_plat}/${hb_comp}
 
 libs=${hb_name}
diff --git a/harbour/extras/hbusb/tests/hbmk.hbm b/harbour/extras/hbusb/tests/hbmk.hbm
index 94c6d5afea..e759882c7f 100644
--- a/harbour/extras/hbusb/tests/hbmk.hbm
+++ b/harbour/extras/hbusb/tests/hbmk.hbm
@@ -5,3 +5,5 @@
 hbusb.hbc
 
 -w3 -es2
+
+-u+simpleio.ch
diff --git a/harbour/extras/hbusb/tests/test.prg b/harbour/extras/hbusb/tests/test.prg
index 28779d50a1..8189a8bf66 100644
--- a/harbour/extras/hbusb/tests/test.prg
+++ b/harbour/extras/hbusb/tests/test.prg
@@ -4,10 +4,6 @@
 
 #require "hbusb"
 
-#include "simpleio.ch"
-
-#include "hbusb.ch"
-
 PROCEDURE Main()
 
    LOCAL nRetVal
diff --git a/harbour/extras/hbvpdf/hbvpdf.hbc b/harbour/extras/hbvpdf/hbvpdf.hbc
index f4d06b7f71..d80e24c0e7 100644
--- a/harbour/extras/hbvpdf/hbvpdf.hbc
+++ b/harbour/extras/hbvpdf/hbvpdf.hbc
@@ -3,6 +3,7 @@
 #
 
 incpaths=.
+headers=${hb_name}.ch
 libpaths=lib/${hb_plat}/${hb_comp}
 
 libs=${hb_name}
diff --git a/harbour/extras/hbvpdf/tests/pdf_demo.prg b/harbour/extras/hbvpdf/tests/pdf_demo.prg
index 8df412fea5..37aee4b83c 100644
--- a/harbour/extras/hbvpdf/tests/pdf_demo.prg
+++ b/harbour/extras/hbvpdf/tests/pdf_demo.prg
@@ -4,8 +4,6 @@
 
 #require "hbvpdf"
 
-#include "hbvpdf.ch"
-
 PROCEDURE Main()
 
    LOCAL aReport