diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a060c1c6aa..73e89e7629 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,30 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-10-24 02:03 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * contrib/hbcairo/hbcairo.hbp
+  * contrib/hbct/hbct.hbp
+  * contrib/hbhpdf/hbhpdf.hbp
+  * contrib/hbmysql/hbmysql.hbp
+  * contrib/hbmzip/hbmzip.hbp
+  * contrib/hbpgsql/hbpgsql.hbp
+  * contrib/hbsqlit3/hbsqlit3.hbp
+  * contrib/hbtip/hbtip.hbm
+  * contrib/hbwin/hbwin.hbp
+  * contrib/hbzebra/hbzebra.hbp
+  * contrib/rddads/rddads.hbp
+  * contrib/xhb/xhb.hbp
+    * do not copy .ch/.hbx files to central Harbour
+      directory. It means that if you need to use
+      these files from now on, you need to use the
+      .hbc files to add these packages to your project:
+      xhbextrn.ch ctextern.ch adsextrn.ch
+      (and more if you need an .hbx file.) INCOMPATIBLE.
+      This is a gradual step to complete this TODO:
+         2012-03-04 20:31 UTC+0100
+      Now all .hbx files are stored locally in package
+      folder.
+
 2012-10-24 01:48 UTC+0200 Viktor Szakats (harbour syenar.net)
   * contrib/hbblat/hbblat.hbp
   * contrib/hbbz2/hbbz2.hbp
diff --git a/harbour/contrib/hbcairo/hbcairo.hbp b/harbour/contrib/hbcairo/hbcairo.hbp
index 7aaf815e35..25c8f8b1f8 100644
--- a/harbour/contrib/hbcairo/hbcairo.hbp
+++ b/harbour/contrib/hbcairo/hbcairo.hbp
@@ -21,7 +21,6 @@
 -iflag={bcc}-a
 
 -instfile=inc:hbcairo.ch
--instfile=inc:hbcairo.hbx
 
 hbcairo.hbx
 
diff --git a/harbour/contrib/hbct/hbct.hbp b/harbour/contrib/hbct/hbct.hbp
index e02aa1122a..cef0983225 100644
--- a/harbour/contrib/hbct/hbct.hbp
+++ b/harbour/contrib/hbct/hbct.hbp
@@ -22,9 +22,7 @@
 -instfile=inc:ctcom.ch
 -instfile=inc:ctdisk.ch
 -instfile=inc:cterror.ch
--instfile=inc:ctextern.ch
 -instfile=inc:ctvideo.ch
--instfile=inc:hbct.hbx
 
 hbct.hbx
 
diff --git a/harbour/contrib/hbhpdf/hbhpdf.hbp b/harbour/contrib/hbhpdf/hbhpdf.hbp
index 35d2be74f9..d28c4d08c9 100644
--- a/harbour/contrib/hbhpdf/hbhpdf.hbp
+++ b/harbour/contrib/hbhpdf/hbhpdf.hbp
@@ -20,7 +20,6 @@
 -depfinish=libharu
 
 -instfile=inc:harupdf.ch
--instfile=inc:hbhpdf.hbx
 
 hbhpdf.hbx
 
diff --git a/harbour/contrib/hbmysql/hbmysql.hbp b/harbour/contrib/hbmysql/hbmysql.hbp
index 421b5e770d..b5d90e4773 100644
--- a/harbour/contrib/hbmysql/hbmysql.hbp
+++ b/harbour/contrib/hbmysql/hbmysql.hbp
@@ -19,7 +19,6 @@
 -depimplibs=mysql:../lib/libmySQL.dll
 
 -instfile=inc:mysql.ch
--instfile=inc:hbmysql.hbx
 
 hbmysql.hbx
 
diff --git a/harbour/contrib/hbmzip/hbmzip.hbp b/harbour/contrib/hbmzip/hbmzip.hbp
index bac0fd3086..78ba24e394 100644
--- a/harbour/contrib/hbmzip/hbmzip.hbp
+++ b/harbour/contrib/hbmzip/hbmzip.hbp
@@ -32,7 +32,6 @@
 -depincpathlocal=zlib:../../src/3rd/zlib
 
 -instfile=inc:hbmzip.ch
--instfile=inc:hbmzip.hbx
 
 hbmzip.hbx
 
diff --git a/harbour/contrib/hbpgsql/hbpgsql.hbp b/harbour/contrib/hbpgsql/hbpgsql.hbp
index a04c499814..a7af4e5b3f 100644
--- a/harbour/contrib/hbpgsql/hbpgsql.hbp
+++ b/harbour/contrib/hbpgsql/hbpgsql.hbp
@@ -25,7 +25,6 @@
 -iflag={bcc}-a
 
 -instfile=inc:postgres.ch
--instfile=inc:hbpgsql.hbx
 
 hbpgsql.hbx
 
diff --git a/harbour/contrib/hbsqlit3/hbsqlit3.hbp b/harbour/contrib/hbsqlit3/hbsqlit3.hbp
index 816184193b..d97d2e1d9a 100644
--- a/harbour/contrib/hbsqlit3/hbsqlit3.hbp
+++ b/harbour/contrib/hbsqlit3/hbsqlit3.hbp
@@ -18,7 +18,6 @@
 -depfinish=sqlite3
 
 -instfile=inc:hbsqlit3.ch
--instfile=inc:hbsqlit3.hbx
 
 hbsqlit3.hbx
 
diff --git a/harbour/contrib/hbtip/hbtip.hbm b/harbour/contrib/hbtip/hbtip.hbm
index 336f341897..e7a479195a 100644
--- a/harbour/contrib/hbtip/hbtip.hbm
+++ b/harbour/contrib/hbtip/hbtip.hbm
@@ -12,7 +12,6 @@
 
 -instfile=inc:tip.ch
 -instfile=inc:thtml.ch
--instfile=inc:hbtip.hbx
 
 hbtip.hbx
 
diff --git a/harbour/contrib/hbwin/hbwin.hbp b/harbour/contrib/hbwin/hbwin.hbp
index 86f0d09ad6..34df282eca 100644
--- a/harbour/contrib/hbwin/hbwin.hbp
+++ b/harbour/contrib/hbwin/hbwin.hbp
@@ -25,7 +25,6 @@
 -instfile=contrib:hbwin.h
 -instfile=contrib:hbwinole.h
 -instfile=inc:hbwin.ch
--instfile=inc:hbwin.hbx
 -instfile=contrib:*.def
 
 hbwin.hbx
diff --git a/harbour/contrib/hbzebra/hbzebra.hbp b/harbour/contrib/hbzebra/hbzebra.hbp
index 18e87c8e81..001ae42333 100644
--- a/harbour/contrib/hbzebra/hbzebra.hbp
+++ b/harbour/contrib/hbzebra/hbzebra.hbp
@@ -10,7 +10,6 @@
 -w3 -es2
 
 -instfile=inc:hbzebra.ch
--instfile=inc:hbzebra.hbx
 
 hbzebra.hbx
 
diff --git a/harbour/contrib/rddads/rddads.hbp b/harbour/contrib/rddads/rddads.hbp
index e0ed1df8a5..576975e36f 100644
--- a/harbour/contrib/rddads/rddads.hbp
+++ b/harbour/contrib/rddads/rddads.hbp
@@ -21,8 +21,6 @@
 {x86}-depimplibs=ads:ace32.dll
 
 -instfile=inc:ads.ch
--instfile=inc:adsextrn.ch
--instfile=inc:rddads.hbx
 
 # To avoid a warning in ACE header
 -cflag+=-Wno-unknown-pragmas{allgcc}
diff --git a/harbour/contrib/xhb/xhb.hbp b/harbour/contrib/xhb/xhb.hbp
index b8760a4d65..528f4f8d5f 100644
--- a/harbour/contrib/xhb/xhb.hbp
+++ b/harbour/contrib/xhb/xhb.hbp
@@ -17,8 +17,6 @@
 -instfile=inc:hbcompat.ch
 -instfile=inc:xhb.ch
 -instfile=inc:xhbcls.ch
--instfile=inc:xhbextrn.ch
--instfile=inc:xhb.hbx
 
 # For hbserv.c, maybe more
 -c=gnu90