diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ac71088862..851dfe6e2f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,26 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-23 05:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * examples/hbmsql/hbmsql.hbc
+  * examples/hbmsql/hbmsql.hbp
+  - examples/hbsqlit2/tests/hbsqlit2.hbc
+  + examples/hbsqlit2/hbsqlit2.hbc
+  * examples/hbsqlit2/hbsqlit2.hbp
+  + examples/hbsqlit2/tests/hbmk.hbm
+  - examples/hbapollo/tests/hbapollo.hbc
+  + examples/hbapollo/hbapollo.hbc
+  * examples/hbapollo/hbapollo.hbp
+  + examples/hbapollo/tests/hbmk.hbm
+  - examples/hbwhat/tests/hbwhat.hbc
+  + examples/hbwhat/hbwhat.hbc
+  * examples/hbwhat/hbwhat.hbp
+  + examples/hbwhat/tests/hbmk.hbm
+    * Updated make files, added missing one, synced
+      with latest layout.  Enabled -inc mode in all.
+      Storing output inside arch/comp subtree to allow
+      parellel builds. Moving towards plugin mode.
+
 2009-06-23 04:39 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     * Changed ${hb_self} macro to ${hb_dir}
diff --git a/harbour/examples/hbapollo/hbapollo.hbc b/harbour/examples/hbapollo/hbapollo.hbc
new file mode 100644
index 0000000000..815ac537ab
--- /dev/null
+++ b/harbour/examples/hbapollo/hbapollo.hbc
@@ -0,0 +1,11 @@
+#
+# $Id$
+#
+
+{dos}skip=yes
+
+incpaths=.
+libpaths=lib/${hb_arch}/${hb_comp}
+
+libs=hbapollo
+libs={win}sde61
diff --git a/harbour/examples/hbapollo/hbapollo.hbp b/harbour/examples/hbapollo/hbapollo.hbp
index 790cb0d453..287873b49c 100644
--- a/harbour/examples/hbapollo/hbapollo.hbp
+++ b/harbour/examples/hbapollo/hbapollo.hbp
@@ -3,7 +3,7 @@
 #
 
 -hblib
--ohbapollo
+-olib/${hb_arch}/${hb_comp}/hbapollo
 -inc
 -q0 -w3 -es2 -l
 -i${HB_INC_APOLLO}
diff --git a/harbour/examples/hbapollo/tests/hbapollo.hbc b/harbour/examples/hbapollo/tests/hbapollo.hbc
deleted file mode 100644
index 91d082fa58..0000000000
--- a/harbour/examples/hbapollo/tests/hbapollo.hbc
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# $Id$
-#
-
-libs={!dos}hbapollo
-libs={win}sde61
diff --git a/harbour/examples/hbapollo/tests/hbmk.hbm b/harbour/examples/hbapollo/tests/hbmk.hbm
new file mode 100644
index 0000000000..7a60b00ca4
--- /dev/null
+++ b/harbour/examples/hbapollo/tests/hbmk.hbm
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+../hbapollo.hbc
diff --git a/harbour/examples/hbmsql/hbmsql.hbc b/harbour/examples/hbmsql/hbmsql.hbc
index 6c9056dca7..89558d30b6 100644
--- a/harbour/examples/hbmsql/hbmsql.hbc
+++ b/harbour/examples/hbmsql/hbmsql.hbc
@@ -2,4 +2,7 @@
 # $Id$
 #
 
+incpaths=.
+libpaths=lib/${hb_arch}/${hb_comp}
+
 libs=hbmsql
diff --git a/harbour/examples/hbmsql/hbmsql.hbp b/harbour/examples/hbmsql/hbmsql.hbp
index b0e87ece15..fb9145412d 100644
--- a/harbour/examples/hbmsql/hbmsql.hbp
+++ b/harbour/examples/hbmsql/hbmsql.hbp
@@ -3,8 +3,8 @@
 #
 
 -hblib
-
--ohbmsql
+-olib/${hb_arch}/${hb_comp}/hbmsql
+-inc
 
 msql.c
 tmsql.prg
diff --git a/harbour/examples/hbsqlit2/hbsqlit2.hbc b/harbour/examples/hbsqlit2/hbsqlit2.hbc
new file mode 100644
index 0000000000..e86c2e73c6
--- /dev/null
+++ b/harbour/examples/hbsqlit2/hbsqlit2.hbc
@@ -0,0 +1,9 @@
+#
+# $Id$
+#
+
+incpaths=.
+libpaths=lib/${hb_arch}/${hb_comp}
+
+libs=hbsqlit2
+libs=sqlite2
diff --git a/harbour/examples/hbsqlit2/hbsqlit2.hbp b/harbour/examples/hbsqlit2/hbsqlit2.hbp
index d80faf1f81..0ee7a74455 100644
--- a/harbour/examples/hbsqlit2/hbsqlit2.hbp
+++ b/harbour/examples/hbsqlit2/hbsqlit2.hbp
@@ -3,7 +3,7 @@
 #
 
 -hblib
--ohbsqlit2
+-olib/${hb_arch}/${hb_comp}/hbsqlit2
 -inc
 -q0 -w3 -es2 -l
 -i${HB_INC_SQLITE2}
diff --git a/harbour/examples/hbsqlit2/tests/hbmk.hbm b/harbour/examples/hbsqlit2/tests/hbmk.hbm
new file mode 100644
index 0000000000..5e58db745c
--- /dev/null
+++ b/harbour/examples/hbsqlit2/tests/hbmk.hbm
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+../hbsqlit2.hbc
diff --git a/harbour/examples/hbsqlit2/tests/hbsqlit2.hbc b/harbour/examples/hbsqlit2/tests/hbsqlit2.hbc
deleted file mode 100644
index d81c98a9a3..0000000000
--- a/harbour/examples/hbsqlit2/tests/hbsqlit2.hbc
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# $Id$
-#
-
-libs=hbsqlit2 sqlite2
diff --git a/harbour/examples/hbwhat/hbwhat.hbc b/harbour/examples/hbwhat/hbwhat.hbc
new file mode 100644
index 0000000000..647fa5403e
--- /dev/null
+++ b/harbour/examples/hbwhat/hbwhat.hbc
@@ -0,0 +1,11 @@
+#
+# $Id$
+#
+
+{!win}skip=yes
+
+incpaths=.
+libpaths=lib/${hb_arch}/${hb_comp}
+
+libs=hbwhat
+libs=xhb.hbc
diff --git a/harbour/examples/hbwhat/hbwhat.hbp b/harbour/examples/hbwhat/hbwhat.hbp
index 554112bf2a..abe2c9d0eb 100644
--- a/harbour/examples/hbwhat/hbwhat.hbp
+++ b/harbour/examples/hbwhat/hbwhat.hbp
@@ -3,7 +3,7 @@
 #
 
 -hblib
--ohbwhat
+-olib/${hb_arch}/${hb_comp}/hbwhat
 -inc
 -q0 -w3 -es2 -l
 -i../../contrib/xhb
diff --git a/harbour/examples/hbwhat/tests/hbmk.hbm b/harbour/examples/hbwhat/tests/hbmk.hbm
new file mode 100644
index 0000000000..1816e49e15
--- /dev/null
+++ b/harbour/examples/hbwhat/tests/hbmk.hbm
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+../hbwhat.hbc
diff --git a/harbour/examples/hbwhat/tests/hbwhat.hbc b/harbour/examples/hbwhat/tests/hbwhat.hbc
deleted file mode 100644
index d2029b6e42..0000000000
--- a/harbour/examples/hbwhat/tests/hbwhat.hbc
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# $Id$
-#
-
-{win}libs=hbwhat gtwvg xhb
-gui=yes