diff --git a/components/images/examples/imagesexample.lpi b/components/images/examples/imagesexample.lpi
index 863fbb3482..5ef46868dc 100644
--- a/components/images/examples/imagesexample.lpi
+++ b/components/images/examples/imagesexample.lpi
@@ -58,7 +58,7 @@
-
+
diff --git a/components/lazreport/samples/editor/calleditorwithpkg.lpi b/components/lazreport/samples/editor/calleditorwithpkg.lpi
index 841a4f4f40..09d0c1ad02 100644
--- a/components/lazreport/samples/editor/calleditorwithpkg.lpi
+++ b/components/lazreport/samples/editor/calleditorwithpkg.lpi
@@ -26,7 +26,7 @@
-
+
@@ -98,7 +98,7 @@
-
+
diff --git a/components/printers/samples/dialogs/selectprinter.lpi b/components/printers/samples/dialogs/selectprinter.lpi
index 9dc99e00da..12bbeee07a 100644
--- a/components/printers/samples/dialogs/selectprinter.lpi
+++ b/components/printers/samples/dialogs/selectprinter.lpi
@@ -22,7 +22,7 @@
-
+
@@ -98,7 +98,7 @@
-
+
diff --git a/examples/autosize/childsizinglayout/childsizinglayout.lpi b/examples/autosize/childsizinglayout/childsizinglayout.lpi
index 541cb9b160..0e352a6bbc 100644
--- a/examples/autosize/childsizinglayout/childsizinglayout.lpi
+++ b/examples/autosize/childsizinglayout/childsizinglayout.lpi
@@ -54,7 +54,7 @@
-
+
diff --git a/examples/cursors/project1.lpi b/examples/cursors/project1.lpi
index b027407362..74a8b00e9c 100644
--- a/examples/cursors/project1.lpi
+++ b/examples/cursors/project1.lpi
@@ -335,7 +335,7 @@
-
+
diff --git a/examples/fontenum/fontenumeration.lpi b/examples/fontenum/fontenumeration.lpi
index c8a14285c4..031f1b6c45 100644
--- a/examples/fontenum/fontenumeration.lpi
+++ b/examples/fontenum/fontenumeration.lpi
@@ -53,7 +53,7 @@
-
+
diff --git a/examples/gridexamples/columneditors/stringgrideditor.lpi b/examples/gridexamples/columneditors/stringgrideditor.lpi
index 64d2247b73..d654a30c08 100644
--- a/examples/gridexamples/columneditors/stringgrideditor.lpi
+++ b/examples/gridexamples/columneditors/stringgrideditor.lpi
@@ -59,7 +59,7 @@
-
+
diff --git a/examples/jpeg/jpegexample.lpi b/examples/jpeg/jpegexample.lpi
index 5571079694..f9f8cfccc5 100644
--- a/examples/jpeg/jpegexample.lpi
+++ b/examples/jpeg/jpegexample.lpi
@@ -68,7 +68,7 @@
-
+
diff --git a/examples/lazintfimage/fadein1.lpi b/examples/lazintfimage/fadein1.lpi
index 785fd56f67..62ad285afb 100644
--- a/examples/lazintfimage/fadein1.lpi
+++ b/examples/lazintfimage/fadein1.lpi
@@ -53,7 +53,7 @@
-
+
diff --git a/examples/listview/listview.lpi b/examples/listview/listview.lpi
index 8c593d50c0..74c58505d7 100644
--- a/examples/listview/listview.lpi
+++ b/examples/listview/listview.lpi
@@ -52,7 +52,7 @@
-
+
diff --git a/examples/multithreading/criticalsectionexample1.lpi b/examples/multithreading/criticalsectionexample1.lpi
index c95c7b8981..4e10acb6f3 100644
--- a/examples/multithreading/criticalsectionexample1.lpi
+++ b/examples/multithreading/criticalsectionexample1.lpi
@@ -49,7 +49,7 @@
-
+
diff --git a/examples/multithreading/multithreadingexample1.lpi b/examples/multithreading/multithreadingexample1.lpi
index 6bd91d7fbd..fc9009b6e4 100644
--- a/examples/multithreading/multithreadingexample1.lpi
+++ b/examples/multithreading/multithreadingexample1.lpi
@@ -48,7 +48,7 @@
-
+
diff --git a/examples/multithreading/singlethreadingexample1.lpi b/examples/multithreading/singlethreadingexample1.lpi
index 639ba5dcba..e86d996e83 100644
--- a/examples/multithreading/singlethreadingexample1.lpi
+++ b/examples/multithreading/singlethreadingexample1.lpi
@@ -49,7 +49,7 @@
-
+
diff --git a/examples/multithreading/waitforexample1.lpi b/examples/multithreading/waitforexample1.lpi
index 272df7dcbb..a40a9dbeac 100644
--- a/examples/multithreading/waitforexample1.lpi
+++ b/examples/multithreading/waitforexample1.lpi
@@ -48,7 +48,7 @@
-
+
diff --git a/examples/notebk.lpi b/examples/notebk.lpi
index 43f8bc9c8e..a69ec12c01 100644
--- a/examples/notebk.lpi
+++ b/examples/notebk.lpi
@@ -60,7 +60,7 @@
-
+
diff --git a/examples/notebooktest.lpi b/examples/notebooktest.lpi
index 00c14578eb..3524551a78 100644
--- a/examples/notebooktest.lpi
+++ b/examples/notebooktest.lpi
@@ -49,7 +49,7 @@
-
+
diff --git a/examples/objectinspector/oiexample.lpi b/examples/objectinspector/oiexample.lpi
index f55ed57992..080196b0ad 100644
--- a/examples/objectinspector/oiexample.lpi
+++ b/examples/objectinspector/oiexample.lpi
@@ -50,10 +50,6 @@
-
-
-
-
diff --git a/examples/openbrowser/testbrowserrmc.lpi b/examples/openbrowser/testbrowserrmc.lpi
index 271e359e33..c963846c7b 100644
--- a/examples/openbrowser/testbrowserrmc.lpi
+++ b/examples/openbrowser/testbrowserrmc.lpi
@@ -46,7 +46,7 @@
-
+
diff --git a/examples/postscript/samplepostscriptcanvas.lpi b/examples/postscript/samplepostscriptcanvas.lpi
index cffdddec12..a7f5a14c0b 100644
--- a/examples/postscript/samplepostscriptcanvas.lpi
+++ b/examples/postscript/samplepostscriptcanvas.lpi
@@ -50,7 +50,7 @@
-
+
diff --git a/examples/taborder.lpi b/examples/taborder.lpi
index 0f5fc76389..0369a70cef 100644
--- a/examples/taborder.lpi
+++ b/examples/taborder.lpi
@@ -49,7 +49,7 @@
-
+
diff --git a/examples/testall.lpi b/examples/testall.lpi
index 5ae80e0d0b..476be30aa9 100644
--- a/examples/testall.lpi
+++ b/examples/testall.lpi
@@ -46,7 +46,7 @@
-
+
diff --git a/examples/trackbar.lpi b/examples/trackbar.lpi
index b35a011fc7..e05a3f7b17 100644
--- a/examples/trackbar.lpi
+++ b/examples/trackbar.lpi
@@ -49,7 +49,7 @@
-
+
diff --git a/examples/trayicon/wndtray.lpi b/examples/trayicon/wndtray.lpi
index b0548f93b7..80f2f3b404 100644
--- a/examples/trayicon/wndtray.lpi
+++ b/examples/trayicon/wndtray.lpi
@@ -53,9 +53,6 @@
-
-
-
diff --git a/examples/turbopower_ipro/tpiproexample.lpi b/examples/turbopower_ipro/tpiproexample.lpi
index 3a6ce4227a..e1bec0c1c3 100644
--- a/examples/turbopower_ipro/tpiproexample.lpi
+++ b/examples/turbopower_ipro/tpiproexample.lpi
@@ -65,7 +65,7 @@
-
+