diff --git a/src/java/org/apache/poi/hssf/usermodel/examples/Borders.java b/src/examples/src/org/apache/poi/hssf/usermodel/examples/Borders.java
similarity index 100%
rename from src/java/org/apache/poi/hssf/usermodel/examples/Borders.java
rename to src/examples/src/org/apache/poi/hssf/usermodel/examples/Borders.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/examples/CreateCells.java b/src/examples/src/org/apache/poi/hssf/usermodel/examples/CreateCells.java
similarity index 100%
rename from src/java/org/apache/poi/hssf/usermodel/examples/CreateCells.java
rename to src/examples/src/org/apache/poi/hssf/usermodel/examples/CreateCells.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/examples/CreateDateCells.java b/src/examples/src/org/apache/poi/hssf/usermodel/examples/CreateDateCells.java
similarity index 100%
rename from src/java/org/apache/poi/hssf/usermodel/examples/CreateDateCells.java
rename to src/examples/src/org/apache/poi/hssf/usermodel/examples/CreateDateCells.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/examples/NewSheet.java b/src/examples/src/org/apache/poi/hssf/usermodel/examples/NewSheet.java
similarity index 100%
rename from src/java/org/apache/poi/hssf/usermodel/examples/NewSheet.java
rename to src/examples/src/org/apache/poi/hssf/usermodel/examples/NewSheet.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/examples/NewWorkbook.java b/src/examples/src/org/apache/poi/hssf/usermodel/examples/NewWorkbook.java
similarity index 100%
rename from src/java/org/apache/poi/hssf/usermodel/examples/NewWorkbook.java
rename to src/examples/src/org/apache/poi/hssf/usermodel/examples/NewWorkbook.java
diff --git a/tools/targets/compile.xtarget b/tools/targets/compile.xtarget
index 34afaa3cf..040110d8a 100644
--- a/tools/targets/compile.xtarget
+++ b/tools/targets/compile.xtarget
@@ -21,6 +21,12 @@
+
+
+
+
+
+
@@ -80,6 +86,27 @@
+
+
+
+
+
+
+
+
+
+
@@ -123,6 +150,12 @@
+
+
+
+
+
+
diff --git a/tools/targets/init.xtarget b/tools/targets/init.xtarget
index f791f0658..54a74d278 100644
--- a/tools/targets/init.xtarget
+++ b/tools/targets/init.xtarget
@@ -40,6 +40,11 @@
+
+
+
+
+
@@ -58,6 +63,9 @@
+
+
+
diff --git a/tools/targets/preinit.xtarget b/tools/targets/preinit.xtarget
index 27a9ed9fc..4bdfe33f9 100644
--- a/tools/targets/preinit.xtarget
+++ b/tools/targets/preinit.xtarget
@@ -50,6 +50,11 @@
+
+
+
+
+