diff --git a/autotest/Algo/init b/autotest/Algo/init
deleted file mode 100644
index fecad1def..000000000
--- a/autotest/Algo/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Algo_icpp_init_stub
-#define _Algo_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/BiVector/init b/autotest/BiVector/init
deleted file mode 100644
index 935d6c7ab..000000000
--- a/autotest/BiVector/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _BiVector_icpp_init_stub
-#define _BiVector_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/CParser/init b/autotest/CParser/init
deleted file mode 100644
index e04b875c6..000000000
--- a/autotest/CParser/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CParser_icpp_init_stub
-#define _CParser_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/CParserWspc/init b/autotest/CParserWspc/init
deleted file mode 100644
index 0965dd495..000000000
--- a/autotest/CParserWspc/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CParserWspc_icpp_init_stub
-#define _CParserWspc_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/CVariable/init b/autotest/CVariable/init
deleted file mode 100644
index 2f4bb85e3..000000000
--- a/autotest/CVariable/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CVariable_icpp_init_stub
-#define _CVariable_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/CallbackLambda/init b/autotest/CallbackLambda/init
deleted file mode 100644
index bdc09d51f..000000000
--- a/autotest/CallbackLambda/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CallbackLambda_icpp_init_stub
-#define _CallbackLambda_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/CallbackPick/init b/autotest/CallbackPick/init
deleted file mode 100644
index 221d3a69b..000000000
--- a/autotest/CallbackPick/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CallbackPick_icpp_init_stub
-#define _CallbackPick_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/CheckBak/init b/autotest/CheckBak/init
deleted file mode 100644
index 868b9e30c..000000000
--- a/autotest/CheckBak/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _CheckBak_icpp_init_stub
-#define _CheckBak_icpp_init_stub
-#include "Core/init"
-#include "Core/SSL/init"
-#endif
diff --git a/autotest/CheckDownloads/init b/autotest/CheckDownloads/init
deleted file mode 100644
index e63106493..000000000
--- a/autotest/CheckDownloads/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CheckDownloads_icpp_init_stub
-#define _CheckDownloads_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/CoAlgo/init b/autotest/CoAlgo/init
deleted file mode 100644
index 13b985e00..000000000
--- a/autotest/CoAlgo/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _CoAlgo_icpp_init_stub
-#define _CoAlgo_icpp_init_stub
-#include "Core/init"
-#include "Core/SSL/init"
-#endif
diff --git a/autotest/CoPipe2/init b/autotest/CoPipe2/init
deleted file mode 100644
index cb4354fda..000000000
--- a/autotest/CoPipe2/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CoPipe2_icpp_init_stub
-#define _CoPipe2_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/CoSort/init b/autotest/CoSort/init
deleted file mode 100644
index 0344e50d3..000000000
--- a/autotest/CoSort/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CoSort_icpp_init_stub
-#define _CoSort_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/CoWork/init b/autotest/CoWork/init
deleted file mode 100644
index 78d5974f4..000000000
--- a/autotest/CoWork/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CoWork_icpp_init_stub
-#define _CoWork_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/CompareContainer/init b/autotest/CompareContainer/init
deleted file mode 100644
index 99fce0aed..000000000
--- a/autotest/CompareContainer/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CompareContainer_icpp_init_stub
-#define _CompareContainer_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/ConsoleExit/init b/autotest/ConsoleExit/init
deleted file mode 100644
index 180186e10..000000000
--- a/autotest/ConsoleExit/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ConsoleExit_icpp_init_stub
-#define _ConsoleExit_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/Convert/init b/autotest/Convert/init
deleted file mode 100644
index f1027a1ef..000000000
--- a/autotest/Convert/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Convert_icpp_init_stub
-#define _Convert_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/ConvertOverflow/init b/autotest/ConvertOverflow/init
deleted file mode 100644
index 3de67254d..000000000
--- a/autotest/ConvertOverflow/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ConvertOverflow_icpp_init_stub
-#define _ConvertOverflow_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/Core11/init b/autotest/Core11/init
deleted file mode 100644
index d4f925c9b..000000000
--- a/autotest/Core11/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Core11_icpp_init_stub
-#define _Core11_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/CppParser/init b/autotest/CppParser/init
deleted file mode 100644
index caa0521ce..000000000
--- a/autotest/CppParser/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _CppParser_icpp_init_stub
-#define _CppParser_icpp_init_stub
-#include "Core/init"
-#include "CppBase/init"
-#endif
diff --git a/autotest/CreateArgs/init b/autotest/CreateArgs/init
deleted file mode 100644
index bfdb1ca19..000000000
--- a/autotest/CreateArgs/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CreateArgs_icpp_init_stub
-#define _CreateArgs_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/DateTime/init b/autotest/DateTime/init
deleted file mode 100644
index 04b4e1259..000000000
--- a/autotest/DateTime/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _DateTime_icpp_init_stub
-#define _DateTime_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/Decompress/init b/autotest/Decompress/init
deleted file mode 100644
index 81f4be855..000000000
--- a/autotest/Decompress/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _Decompress_icpp_init_stub
-#define _Decompress_icpp_init_stub
-#include "Core/init"
-#include "plugin/zip/init"
-#include "plugin/lzma/init"
-#include "plugin/bz2/init"
-#endif
diff --git a/autotest/EscTest/init b/autotest/EscTest/init
deleted file mode 100644
index 8a36bbcfd..000000000
--- a/autotest/EscTest/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _EscTest_icpp_init_stub
-#define _EscTest_icpp_init_stub
-#include "Core/init"
-#include "Esc/init"
-#endif
diff --git a/autotest/FileExtMIME/init b/autotest/FileExtMIME/init
deleted file mode 100644
index 117faf1a6..000000000
--- a/autotest/FileExtMIME/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _FileExtMIME_icpp_init_stub
-#define _FileExtMIME_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/FileStream/init b/autotest/FileStream/init
deleted file mode 100644
index 52717d07d..000000000
--- a/autotest/FileStream/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _FileStream_icpp_init_stub
-#define _FileStream_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/FilterStream/init b/autotest/FilterStream/init
deleted file mode 100644
index f7c9363a5..000000000
--- a/autotest/FilterStream/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _FilterStream_icpp_init_stub
-#define _FilterStream_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/FixedMap/init b/autotest/FixedMap/init
deleted file mode 100644
index 5696884ef..000000000
--- a/autotest/FixedMap/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _FixedMap_icpp_init_stub
-#define _FixedMap_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/GZCompressFile/init b/autotest/GZCompressFile/init
deleted file mode 100644
index 8d927a9fc..000000000
--- a/autotest/GZCompressFile/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _GZCompressFile_icpp_init_stub
-#define _GZCompressFile_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/Gzip/init b/autotest/Gzip/init
deleted file mode 100644
index 9bb39a483..000000000
--- a/autotest/Gzip/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Gzip_icpp_init_stub
-#define _Gzip_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/Hashes/init b/autotest/Hashes/init
deleted file mode 100644
index babc03719..000000000
--- a/autotest/Hashes/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Hashes_icpp_init_stub
-#define _Hashes_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/Heap/init b/autotest/Heap/init
deleted file mode 100644
index d73c1c295..000000000
--- a/autotest/Heap/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Heap_icpp_init_stub
-#define _Heap_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/HeapMT/init b/autotest/HeapMT/init
deleted file mode 100644
index e9a41f4e5..000000000
--- a/autotest/HeapMT/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _HeapMT_icpp_init_stub
-#define _HeapMT_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/HeapMT2/init b/autotest/HeapMT2/init
deleted file mode 100644
index 44910225b..000000000
--- a/autotest/HeapMT2/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _HeapMT2_icpp_init_stub
-#define _HeapMT2_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/HttpChunked/init b/autotest/HttpChunked/init
deleted file mode 100644
index 8a3cf5340..000000000
--- a/autotest/HttpChunked/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _HttpChunked_icpp_init_stub
-#define _HttpChunked_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/HttpRequest/init b/autotest/HttpRequest/init
deleted file mode 100644
index 4763d4b7f..000000000
--- a/autotest/HttpRequest/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _HttpRequest_icpp_init_stub
-#define _HttpRequest_icpp_init_stub
-#include "Core/init"
-#include "Core\SSL/init"
-#endif
diff --git a/autotest/Image/init b/autotest/Image/init
deleted file mode 100644
index dc39ba5fa..000000000
--- a/autotest/Image/init
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _Image_icpp_init_stub
-#define _Image_icpp_init_stub
-#include "Core/init"
-#include "Draw/init"
-#include "plugin/gif/init"
-#include "plugin/tif/init"
-#include "plugin/png/init"
-#include "plugin/bmp/init"
-#endif
diff --git a/autotest/InArray/init b/autotest/InArray/init
deleted file mode 100644
index 7cdbeecee..000000000
--- a/autotest/InArray/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _InArray_icpp_init_stub
-#define _InArray_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/InFilterStream/init b/autotest/InFilterStream/init
deleted file mode 100644
index fac3c60cf..000000000
--- a/autotest/InFilterStream/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _InFilterStream_icpp_init_stub
-#define _InFilterStream_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/InVector/init b/autotest/InVector/init
deleted file mode 100644
index 642a795a7..000000000
--- a/autotest/InVector/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _InVector_icpp_init_stub
-#define _InVector_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/InetCode/init b/autotest/InetCode/init
deleted file mode 100644
index 328e2ad4a..000000000
--- a/autotest/InetCode/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _InetCode_icpp_init_stub
-#define _InetCode_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/InetMessage/init b/autotest/InetMessage/init
deleted file mode 100644
index b19b41b85..000000000
--- a/autotest/InetMessage/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _InetMessage_icpp_init_stub
-#define _InetMessage_icpp_init_stub
-#include "Core/init"
-#include "Core/POP3/init"
-#include "Core/SMTP/init"
-#endif
diff --git a/autotest/JSON/init b/autotest/JSON/init
deleted file mode 100644
index 95f1c4ee3..000000000
--- a/autotest/JSON/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _JSON_icpp_init_stub
-#define _JSON_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/JsonDATE/init b/autotest/JsonDATE/init
deleted file mode 100644
index c231b7665..000000000
--- a/autotest/JsonDATE/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _JsonDATE_icpp_init_stub
-#define _JsonDATE_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/LambdaCallback/init b/autotest/LambdaCallback/init
deleted file mode 100644
index 2da0240d1..000000000
--- a/autotest/LambdaCallback/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _LambdaCallback_icpp_init_stub
-#define _LambdaCallback_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/LoadIniStream/init b/autotest/LoadIniStream/init
deleted file mode 100644
index d2c3d43eb..000000000
--- a/autotest/LoadIniStream/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _LoadIniStream_icpp_init_stub
-#define _LoadIniStream_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/LocalProcess/init b/autotest/LocalProcess/init
deleted file mode 100644
index a8c86f777..000000000
--- a/autotest/LocalProcess/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _LocalProcess_icpp_init_stub
-#define _LocalProcess_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/Maps/init b/autotest/Maps/init
deleted file mode 100644
index 31de64aff..000000000
--- a/autotest/Maps/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Maps_icpp_init_stub
-#define _Maps_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/MimeHeader/init b/autotest/MimeHeader/init
deleted file mode 100644
index c71720567..000000000
--- a/autotest/MimeHeader/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _MimeHeader_icpp_init_stub
-#define _MimeHeader_icpp_init_stub
-#include "Core/init"
-#include "Core/POP3/init"
-#endif
diff --git a/autotest/NTLAsString/init b/autotest/NTLAsString/init
deleted file mode 100644
index 35c352213..000000000
--- a/autotest/NTLAsString/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _NTLAsString_icpp_init_stub
-#define _NTLAsString_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/NaNINF/init b/autotest/NaNINF/init
deleted file mode 100644
index 9d9727187..000000000
--- a/autotest/NaNINF/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _NaNINF_icpp_init_stub
-#define _NaNINF_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/Nvl/init b/autotest/Nvl/init
deleted file mode 100644
index c7979ced0..000000000
--- a/autotest/Nvl/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Nvl_icpp_init_stub
-#define _Nvl_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/One/init b/autotest/One/init
deleted file mode 100644
index 35d551a3e..000000000
--- a/autotest/One/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _One_icpp_init_stub
-#define _One_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/P7S/init b/autotest/P7S/init
deleted file mode 100644
index 52e7f2efa..000000000
--- a/autotest/P7S/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _P7S_icpp_init_stub
-#define _P7S_icpp_init_stub
-#include "Core/init"
-#include "Core/SSL/init"
-#endif
diff --git a/autotest/PPTest/init b/autotest/PPTest/init
deleted file mode 100644
index 3b2d60dcc..000000000
--- a/autotest/PPTest/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _PPTest_icpp_init_stub
-#define _PPTest_icpp_init_stub
-#include "Core/init"
-#include "CppBase/init"
-#endif
diff --git a/autotest/PcreTest/init b/autotest/PcreTest/init
deleted file mode 100644
index 3194279c9..000000000
--- a/autotest/PcreTest/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _PcreTest_icpp_init_stub
-#define _PcreTest_icpp_init_stub
-#include "Core/init"
-#include "plugin\pcre/init"
-#endif
diff --git a/autotest/PeekPokeSwap/init b/autotest/PeekPokeSwap/init
deleted file mode 100644
index 307bdf727..000000000
--- a/autotest/PeekPokeSwap/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _PeekPokeSwap_icpp_init_stub
-#define _PeekPokeSwap_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/Qtf/init b/autotest/Qtf/init
deleted file mode 100644
index 2c5e2cbd0..000000000
--- a/autotest/Qtf/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _Qtf_icpp_init_stub
-#define _Qtf_icpp_init_stub
-#include "Core/init"
-#include "RichText/init"
-#include "PdfDraw/init"
-#endif
diff --git a/autotest/RWMutex/init b/autotest/RWMutex/init
deleted file mode 100644
index 109ced9c3..000000000
--- a/autotest/RWMutex/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _RWMutex_icpp_init_stub
-#define _RWMutex_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/RangeCoLoop/init b/autotest/RangeCoLoop/init
deleted file mode 100644
index 92c4498c2..000000000
--- a/autotest/RangeCoLoop/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _RangeCoLoop_icpp_init_stub
-#define _RangeCoLoop_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/RangeInsertTest/init b/autotest/RangeInsertTest/init
deleted file mode 100644
index 5f63ada5a..000000000
--- a/autotest/RangeInsertTest/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _RangeInsertTest_icpp_init_stub
-#define _RangeInsertTest_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/RangeSort/init b/autotest/RangeSort/init
deleted file mode 100644
index 685d2331b..000000000
--- a/autotest/RangeSort/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _RangeSort_icpp_init_stub
-#define _RangeSort_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/Ref/init b/autotest/Ref/init
deleted file mode 100644
index dc87f45b2..000000000
--- a/autotest/Ref/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _Ref_icpp_init_stub
-#define _Ref_icpp_init_stub
-#include "Core/init"
-#include "Draw/init"
-#include "Painter/init"
-#endif
diff --git a/autotest/RichTextHtml/init b/autotest/RichTextHtml/init
deleted file mode 100644
index 94b01df2d..000000000
--- a/autotest/RichTextHtml/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _RichTextHtml_icpp_init_stub
-#define _RichTextHtml_icpp_init_stub
-#include "Core/init"
-#include "RichText/init"
-#endif
diff --git a/autotest/STL/init b/autotest/STL/init
deleted file mode 100644
index ae94b3635..000000000
--- a/autotest/STL/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _STL_icpp_init_stub
-#define _STL_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/S_type/init b/autotest/S_type/init
deleted file mode 100644
index 71c49d9b2..000000000
--- a/autotest/S_type/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _S_type_icpp_init_stub
-#define _S_type_icpp_init_stub
-#include "Sql/init"
-#include "plugin/sqlite3/init"
-#endif
diff --git a/autotest/ScalarDate/init b/autotest/ScalarDate/init
deleted file mode 100644
index 23cd3f5b7..000000000
--- a/autotest/ScalarDate/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ScalarDate_icpp_init_stub
-#define _ScalarDate_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/Skip/init b/autotest/Skip/init
deleted file mode 100644
index 085ca446b..000000000
--- a/autotest/Skip/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Skip_icpp_init_stub
-#define _Skip_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/Socket/init b/autotest/Socket/init
deleted file mode 100644
index 21be07a92..000000000
--- a/autotest/Socket/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Socket_icpp_init_stub
-#define _Socket_icpp_init_stub
-#include "Core/init"
-#include "Core/SSL/init"
-#endif
diff --git a/autotest/Sort/init b/autotest/Sort/init
deleted file mode 100644
index 469e7938f..000000000
--- a/autotest/Sort/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Sort_icpp_init_stub
-#define _Sort_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/SortedAMap/init b/autotest/SortedAMap/init
deleted file mode 100644
index 4b1d0902d..000000000
--- a/autotest/SortedAMap/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SortedAMap_icpp_init_stub
-#define _SortedAMap_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/SortedIndex/init b/autotest/SortedIndex/init
deleted file mode 100644
index 133abf445..000000000
--- a/autotest/SortedIndex/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SortedIndex_icpp_init_stub
-#define _SortedIndex_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/SpinLock/init b/autotest/SpinLock/init
deleted file mode 100644
index 51c9bba20..000000000
--- a/autotest/SpinLock/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SpinLock_icpp_init_stub
-#define _SpinLock_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/SplitJoin/init b/autotest/SplitJoin/init
deleted file mode 100644
index 269a315ed..000000000
--- a/autotest/SplitJoin/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SplitJoin_icpp_init_stub
-#define _SplitJoin_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/SplitSqlSet/init b/autotest/SplitSqlSet/init
deleted file mode 100644
index f47d352a2..000000000
--- a/autotest/SplitSqlSet/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _SplitSqlSet_icpp_init_stub
-#define _SplitSqlSet_icpp_init_stub
-#include "Core/init"
-#include "Sql/init"
-#endif
diff --git a/autotest/SqlExp/init b/autotest/SqlExp/init
deleted file mode 100644
index 0a19bac2c..000000000
--- a/autotest/SqlExp/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _SqlExp_icpp_init_stub
-#define _SqlExp_icpp_init_stub
-#include "Core/init"
-#include "Sql/init"
-#endif
diff --git a/autotest/SqlId/init b/autotest/SqlId/init
deleted file mode 100644
index 1d1dfccee..000000000
--- a/autotest/SqlId/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _SqlId_icpp_init_stub
-#define _SqlId_icpp_init_stub
-#include "Core/init"
-#include "Sql/init"
-#endif
diff --git a/autotest/StableSort/init b/autotest/StableSort/init
deleted file mode 100644
index 17461b7fe..000000000
--- a/autotest/StableSort/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _StableSort_icpp_init_stub
-#define _StableSort_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/StrToTime/init b/autotest/StrToTime/init
deleted file mode 100644
index fd5c6252a..000000000
--- a/autotest/StrToTime/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _StrToTime_icpp_init_stub
-#define _StrToTime_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/Stream/init b/autotest/Stream/init
deleted file mode 100644
index d7013bc1b..000000000
--- a/autotest/Stream/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Stream_icpp_init_stub
-#define _Stream_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/Stream64PutGet/init b/autotest/Stream64PutGet/init
deleted file mode 100644
index d6a3a9c8c..000000000
--- a/autotest/Stream64PutGet/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Stream64PutGet_icpp_init_stub
-#define _Stream64PutGet_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/StreamBigIssue/init b/autotest/StreamBigIssue/init
deleted file mode 100644
index 546f5290d..000000000
--- a/autotest/StreamBigIssue/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _StreamBigIssue_icpp_init_stub
-#define _StreamBigIssue_icpp_init_stub
-#include "Core/init"
-#include "Draw/init"
-#endif
diff --git a/autotest/String/init b/autotest/String/init
deleted file mode 100644
index a7eb689bf..000000000
--- a/autotest/String/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _String_icpp_init_stub
-#define _String_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/StringBuffer2GB/init b/autotest/StringBuffer2GB/init
deleted file mode 100644
index bd4fc291b..000000000
--- a/autotest/StringBuffer2GB/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _StringBuffer2GB_icpp_init_stub
-#define _StringBuffer2GB_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/StringCompare/init b/autotest/StringCompare/init
deleted file mode 100644
index 4fc22d92e..000000000
--- a/autotest/StringCompare/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _StringCompare_icpp_init_stub
-#define _StringCompare_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/StringCompare2/init b/autotest/StringCompare2/init
deleted file mode 100644
index e449e118b..000000000
--- a/autotest/StringCompare2/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _StringCompare2_icpp_init_stub
-#define _StringCompare2_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/StringFind/init b/autotest/StringFind/init
deleted file mode 100644
index 042121e6c..000000000
--- a/autotest/StringFind/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _StringFind_icpp_init_stub
-#define _StringFind_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/StringMethods/init b/autotest/StringMethods/init
deleted file mode 100644
index dcca6e163..000000000
--- a/autotest/StringMethods/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _StringMethods_icpp_init_stub
-#define _StringMethods_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/StringStream/init b/autotest/StringStream/init
deleted file mode 100644
index 28b4bb1a3..000000000
--- a/autotest/StringStream/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _StringStream_icpp_init_stub
-#define _StringStream_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/StringTest/init b/autotest/StringTest/init
deleted file mode 100644
index ff6d9b596..000000000
--- a/autotest/StringTest/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _StringTest_icpp_init_stub
-#define _StringTest_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/StringUtil/init b/autotest/StringUtil/init
deleted file mode 100644
index 908d9828b..000000000
--- a/autotest/StringUtil/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _StringUtil_icpp_init_stub
-#define _StringUtil_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/SvoValue/init b/autotest/SvoValue/init
deleted file mode 100644
index a9410fc04..000000000
--- a/autotest/SvoValue/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _SvoValue_icpp_init_stub
-#define _SvoValue_icpp_init_stub
-#include "Core/init"
-#include "Painter/init"
-#endif
diff --git a/autotest/TestBi/init b/autotest/TestBi/init
deleted file mode 100644
index d498c1dcf..000000000
--- a/autotest/TestBi/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _TestBi_icpp_init_stub
-#define _TestBi_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/TestExitThread/init b/autotest/TestExitThread/init
deleted file mode 100644
index c0a072629..000000000
--- a/autotest/TestExitThread/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _TestExitThread_icpp_init_stub
-#define _TestExitThread_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/TestWithDeepCopy/init b/autotest/TestWithDeepCopy/init
deleted file mode 100644
index ef6435003..000000000
--- a/autotest/TestWithDeepCopy/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _TestWithDeepCopy_icpp_init_stub
-#define _TestWithDeepCopy_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/Time/init b/autotest/Time/init
deleted file mode 100644
index 6a85ee4d6..000000000
--- a/autotest/Time/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Time_icpp_init_stub
-#define _Time_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/UrlInfo/init b/autotest/UrlInfo/init
deleted file mode 100644
index d2c98a5c9..000000000
--- a/autotest/UrlInfo/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _UrlInfo_icpp_init_stub
-#define _UrlInfo_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/ValueArrayInsert/init b/autotest/ValueArrayInsert/init
deleted file mode 100644
index cf20aef29..000000000
--- a/autotest/ValueArrayInsert/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ValueArrayInsert_icpp_init_stub
-#define _ValueArrayInsert_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/ValueCompare/init b/autotest/ValueCompare/init
deleted file mode 100644
index d60caeddc..000000000
--- a/autotest/ValueCompare/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ValueCompare_icpp_init_stub
-#define _ValueCompare_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/ValueIsSame/init b/autotest/ValueIsSame/init
deleted file mode 100644
index ba284d34b..000000000
--- a/autotest/ValueIsSame/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ValueIsSame_icpp_init_stub
-#define _ValueIsSame_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/ValuePick/init b/autotest/ValuePick/init
deleted file mode 100644
index d84fa9be0..000000000
--- a/autotest/ValuePick/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ValuePick_icpp_init_stub
-#define _ValuePick_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/ValueRef/init b/autotest/ValueRef/init
deleted file mode 100644
index 640b46377..000000000
--- a/autotest/ValueRef/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ValueRef_icpp_init_stub
-#define _ValueRef_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/ValueTypeError/init b/autotest/ValueTypeError/init
deleted file mode 100644
index 0edfce692..000000000
--- a/autotest/ValueTypeError/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ValueTypeError_icpp_init_stub
-#define _ValueTypeError_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/Witz/init b/autotest/Witz/init
deleted file mode 100644
index bf6d9a350..000000000
--- a/autotest/Witz/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Witz_icpp_init_stub
-#define _Witz_icpp_init_stub
-#include "Core/init"
-#include "Skylark/init"
-#endif
diff --git a/autotest/XmlNode/init b/autotest/XmlNode/init
deleted file mode 100644
index 279707b18..000000000
--- a/autotest/XmlNode/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _XmlNode_icpp_init_stub
-#define _XmlNode_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/XmlStream/init b/autotest/XmlStream/init
deleted file mode 100644
index 1c962d127..000000000
--- a/autotest/XmlStream/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _XmlStream_icpp_init_stub
-#define _XmlStream_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/XmlTag/init b/autotest/XmlTag/init
deleted file mode 100644
index 294c3f05e..000000000
--- a/autotest/XmlTag/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _XmlTag_icpp_init_stub
-#define _XmlTag_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/Xmlize/init b/autotest/Xmlize/init
deleted file mode 100644
index 850ac5622..000000000
--- a/autotest/Xmlize/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Xmlize_icpp_init_stub
-#define _Xmlize_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/ZeroLZ4/init b/autotest/ZeroLZ4/init
deleted file mode 100644
index 1a778c400..000000000
--- a/autotest/ZeroLZ4/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ZeroLZ4_icpp_init_stub
-#define _ZeroLZ4_icpp_init_stub
-#include "Core/init"
-#include "plugin/lz4/init"
-#endif
diff --git a/autotest/Zlib/init b/autotest/Zlib/init
deleted file mode 100644
index a34d4c8a3..000000000
--- a/autotest/Zlib/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Zlib_icpp_init_stub
-#define _Zlib_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/ZstdTest/init b/autotest/ZstdTest/init
deleted file mode 100644
index ecad8e43f..000000000
--- a/autotest/ZstdTest/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ZstdTest_icpp_init_stub
-#define _ZstdTest_icpp_init_stub
-#include "Core/init"
-#include "plugin/zstd/init"
-#endif
diff --git a/autotest/abs/init b/autotest/abs/init
deleted file mode 100644
index 53dc8f54d..000000000
--- a/autotest/abs/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _abs_icpp_init_stub
-#define _abs_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/decode/init b/autotest/decode/init
deleted file mode 100644
index 69174f528..000000000
--- a/autotest/decode/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _decode_icpp_init_stub
-#define _decode_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/fast_memcmp/init b/autotest/fast_memcmp/init
deleted file mode 100644
index 3b231e6dd..000000000
--- a/autotest/fast_memcmp/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _fast_memcmp_icpp_init_stub
-#define _fast_memcmp_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/initializer_list/init b/autotest/initializer_list/init
deleted file mode 100644
index cbcf7defb..000000000
--- a/autotest/initializer_list/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _initializer_list_icpp_init_stub
-#define _initializer_list_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/ize/init b/autotest/ize/init
deleted file mode 100644
index 5e1907cc5..000000000
--- a/autotest/ize/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ize_icpp_init_stub
-#define _ize_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotest/lz4test/init b/autotest/lz4test/init
deleted file mode 100644
index befb124eb..000000000
--- a/autotest/lz4test/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _lz4test_icpp_init_stub
-#define _lz4test_icpp_init_stub
-#include "Core/init"
-#include "plugin/lz4/init"
-#endif
diff --git a/autotst/Long/init b/autotst/Long/init
deleted file mode 100644
index 8cce5be81..000000000
--- a/autotst/Long/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Long_icpp_init_stub
-#define _Long_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/autotst/leaks/init b/autotst/leaks/init
deleted file mode 100644
index fa4277a07..000000000
--- a/autotst/leaks/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _leaks_icpp_init_stub
-#define _leaks_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/AllMaps/init b/benchmarks/AllMaps/init
deleted file mode 100644
index 1a6ada255..000000000
--- a/benchmarks/AllMaps/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _AllMaps_icpp_init_stub
-#define _AllMaps_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/AllocMT/init b/benchmarks/AllocMT/init
deleted file mode 100644
index 949944d19..000000000
--- a/benchmarks/AllocMT/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _AllocMT_icpp_init_stub
-#define _AllocMT_icpp_init_stub
-#include "Core/init"
-#include "CppBase/init"
-#endif
diff --git a/benchmarks/BenchOps/init b/benchmarks/BenchOps/init
deleted file mode 100644
index 53511c89e..000000000
--- a/benchmarks/BenchOps/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _BenchOps_icpp_init_stub
-#define _BenchOps_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/BiVector/init b/benchmarks/BiVector/init
deleted file mode 100644
index 935d6c7ab..000000000
--- a/benchmarks/BiVector/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _BiVector_icpp_init_stub
-#define _BiVector_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/Bloat/init b/benchmarks/Bloat/init
deleted file mode 100644
index 2d0c1cd79..000000000
--- a/benchmarks/Bloat/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Bloat_icpp_init_stub
-#define _Bloat_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/CoSort/init b/benchmarks/CoSort/init
deleted file mode 100644
index 0344e50d3..000000000
--- a/benchmarks/CoSort/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CoSort_icpp_init_stub
-#define _CoSort_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/InVector/init b/benchmarks/InVector/init
deleted file mode 100644
index 642a795a7..000000000
--- a/benchmarks/InVector/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _InVector_icpp_init_stub
-#define _InVector_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/InVectorCache/init b/benchmarks/InVectorCache/init
deleted file mode 100644
index 2f74ccc17..000000000
--- a/benchmarks/InVectorCache/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _InVectorCache_icpp_init_stub
-#define _InVectorCache_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/InVectorIR/init b/benchmarks/InVectorIR/init
deleted file mode 100644
index f81ce09b4..000000000
--- a/benchmarks/InVectorIR/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _InVectorIR_icpp_init_stub
-#define _InVectorIR_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/JSON/init b/benchmarks/JSON/init
deleted file mode 100644
index 95f1c4ee3..000000000
--- a/benchmarks/JSON/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _JSON_icpp_init_stub
-#define _JSON_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/LZ4/init b/benchmarks/LZ4/init
deleted file mode 100644
index b5389d5e8..000000000
--- a/benchmarks/LZ4/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _LZ4_icpp_init_stub
-#define _LZ4_icpp_init_stub
-#include "Core/init"
-#include "plugin/lz4/init"
-#endif
diff --git a/benchmarks/LongSort/init b/benchmarks/LongSort/init
deleted file mode 100644
index 095879d44..000000000
--- a/benchmarks/LongSort/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _LongSort_icpp_init_stub
-#define _LongSort_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/NewDelete/init b/benchmarks/NewDelete/init
deleted file mode 100644
index 678f8489b..000000000
--- a/benchmarks/NewDelete/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _NewDelete_icpp_init_stub
-#define _NewDelete_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/NewDeleteTree/init b/benchmarks/NewDeleteTree/init
deleted file mode 100644
index 781a99bdf..000000000
--- a/benchmarks/NewDeleteTree/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _NewDeleteTree_icpp_init_stub
-#define _NewDeleteTree_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/PainterBench/init b/benchmarks/PainterBench/init
deleted file mode 100644
index 4ad9e5a64..000000000
--- a/benchmarks/PainterBench/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _PainterBench_icpp_init_stub
-#define _PainterBench_icpp_init_stub
-#include "CtrlLib/init"
-#include "GLCtrl/init"
-#include "Painter/init"
-#endif
diff --git a/benchmarks/ParseQTF/init b/benchmarks/ParseQTF/init
deleted file mode 100644
index 69426f3cf..000000000
--- a/benchmarks/ParseQTF/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ParseQTF_icpp_init_stub
-#define _ParseQTF_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/benchmarks/SimpleAlloc/init b/benchmarks/SimpleAlloc/init
deleted file mode 100644
index 05f7d9397..000000000
--- a/benchmarks/SimpleAlloc/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SimpleAlloc_icpp_init_stub
-#define _SimpleAlloc_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/Sort/init b/benchmarks/Sort/init
deleted file mode 100644
index 469e7938f..000000000
--- a/benchmarks/Sort/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Sort_icpp_init_stub
-#define _Sort_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/Sort2/init b/benchmarks/Sort2/init
deleted file mode 100644
index b429a1ff2..000000000
--- a/benchmarks/Sort2/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Sort2_icpp_init_stub
-#define _Sort2_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/SortIndex/init b/benchmarks/SortIndex/init
deleted file mode 100644
index c0eab6712..000000000
--- a/benchmarks/SortIndex/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _SortIndex_icpp_init_stub
-#define _SortIndex_icpp_init_stub
-#include "Core/init"
-#include "Geom/Coords/init"
-#endif
diff --git a/benchmarks/StringFind/init b/benchmarks/StringFind/init
deleted file mode 100644
index 042121e6c..000000000
--- a/benchmarks/StringFind/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _StringFind_icpp_init_stub
-#define _StringFind_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/StringFindOf/init b/benchmarks/StringFindOf/init
deleted file mode 100644
index 0a715ca60..000000000
--- a/benchmarks/StringFindOf/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _StringFindOf_icpp_init_stub
-#define _StringFindOf_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/ValueBench/init b/benchmarks/ValueBench/init
deleted file mode 100644
index d7719538c..000000000
--- a/benchmarks/ValueBench/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ValueBench_icpp_init_stub
-#define _ValueBench_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/Vector/init b/benchmarks/Vector/init
deleted file mode 100644
index afdc93a8d..000000000
--- a/benchmarks/Vector/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Vector_icpp_init_stub
-#define _Vector_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/VectorCapacity/init b/benchmarks/VectorCapacity/init
deleted file mode 100644
index 520ce07e9..000000000
--- a/benchmarks/VectorCapacity/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _VectorCapacity_icpp_init_stub
-#define _VectorCapacity_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/benchSBuffer/init b/benchmarks/benchSBuffer/init
deleted file mode 100644
index 4b7381de9..000000000
--- a/benchmarks/benchSBuffer/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _benchSBuffer_icpp_init_stub
-#define _benchSBuffer_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/chris/init b/benchmarks/chris/init
deleted file mode 100644
index d3e9ca99c..000000000
--- a/benchmarks/chris/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _chris_icpp_init_stub
-#define _chris_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/idmapBench/init b/benchmarks/idmapBench/init
deleted file mode 100644
index 89cc29e03..000000000
--- a/benchmarks/idmapBench/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _idmapBench_icpp_init_stub
-#define _idmapBench_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/longStringBench/init b/benchmarks/longStringBench/init
deleted file mode 100644
index 00670f041..000000000
--- a/benchmarks/longStringBench/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _longStringBench_icpp_init_stub
-#define _longStringBench_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/benchmarks/sizeof/init b/benchmarks/sizeof/init
deleted file mode 100644
index 6f668dabf..000000000
--- a/benchmarks/sizeof/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _sizeof_icpp_init_stub
-#define _sizeof_icpp_init_stub
-#include "Core/init"
-#include "Draw/init"
-#endif
diff --git a/benchmarks/sizeof_gui/init b/benchmarks/sizeof_gui/init
deleted file mode 100644
index 0c01d9cc5..000000000
--- a/benchmarks/sizeof_gui/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _sizeof_gui_icpp_init_stub
-#define _sizeof_gui_icpp_init_stub
-#include "CtrlLib/init"
-#include "RichEdit/init"
-#endif
diff --git a/benchmarks/stdlist/init b/benchmarks/stdlist/init
deleted file mode 100644
index 0d09c8f3b..000000000
--- a/benchmarks/stdlist/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _stdlist_icpp_init_stub
-#define _stdlist_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/examples/AddressBook/init b/examples/AddressBook/init
deleted file mode 100644
index 3f6bf9b8c..000000000
--- a/examples/AddressBook/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _AddressBook_icpp_init_stub
-#define _AddressBook_icpp_init_stub
-#include "CtrlLib/init"
-#include "Report/init"
-#endif
diff --git a/examples/AddressBookWeb/init b/examples/AddressBookWeb/init
deleted file mode 100644
index 34e4fde47..000000000
--- a/examples/AddressBookWeb/init
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _AddressBookWeb_icpp_init_stub
-#define _AddressBookWeb_icpp_init_stub
-#include "Core/init"
-#include "plugin/sqlite3/init"
-#include "Skylark/init"
-#include "Skylark/Iml/init"
-#include "plugin/jpg/init"
-#define BLITZ_INDEX__ Fe80fdb23285fab06c4cc390b66698c48
-#include "Pages.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/examples/AddressBookXML2/init b/examples/AddressBookXML2/init
deleted file mode 100644
index 31dad5190..000000000
--- a/examples/AddressBookXML2/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _AddressBookXML2_icpp_init_stub
-#define _AddressBookXML2_icpp_init_stub
-#include "CtrlLib/init"
-#include "Report/init"
-#endif
diff --git a/examples/AndroidMath/init b/examples/AndroidMath/init
deleted file mode 100644
index 7ad08a6c5..000000000
--- a/examples/AndroidMath/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _AndroidMath_icpp_init_stub
-#define _AndroidMath_icpp_init_stub
-#include "AndroidMathUtility/init"
-#endif
diff --git a/examples/AndroidMathUtility/init b/examples/AndroidMathUtility/init
deleted file mode 100644
index 281701ed8..000000000
--- a/examples/AndroidMathUtility/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _AndroidMathUtility_icpp_init_stub
-#define _AndroidMathUtility_icpp_init_stub
-#endif
diff --git a/examples/BlueBar/init b/examples/BlueBar/init
deleted file mode 100644
index a28413fc0..000000000
--- a/examples/BlueBar/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _BlueBar_icpp_init_stub
-#define _BlueBar_icpp_init_stub
-#include "CtrlLib/init"
-#include "RichEdit/init"
-#include "PdfDraw/init"
-#include "art\BlueBar/init"
-#endif
diff --git a/examples/Bombs/init b/examples/Bombs/init
deleted file mode 100644
index be5279ab3..000000000
--- a/examples/Bombs/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Bombs_icpp_init_stub
-#define _Bombs_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/examples/Box2DExample/init b/examples/Box2DExample/init
deleted file mode 100644
index ee0cad9da..000000000
--- a/examples/Box2DExample/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _Box2DExample_icpp_init_stub
-#define _Box2DExample_icpp_init_stub
-#include "CtrlLib/init"
-#include "plugin\box2d/init"
-#include "Painter/init"
-#endif
diff --git a/examples/BuildInfo/init b/examples/BuildInfo/init
deleted file mode 100644
index f0e92d228..000000000
--- a/examples/BuildInfo/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _BuildInfo_icpp_init_stub
-#define _BuildInfo_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/examples/Clock/init b/examples/Clock/init
deleted file mode 100644
index d87f2c883..000000000
--- a/examples/Clock/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Clock_icpp_init_stub
-#define _Clock_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/examples/CodeMetric/init b/examples/CodeMetric/init
deleted file mode 100644
index a6429cb19..000000000
--- a/examples/CodeMetric/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _CodeMetric_icpp_init_stub
-#define _CodeMetric_icpp_init_stub
-#include "CtrlLib/init"
-#include "CppBase/init"
-#endif
diff --git a/examples/CompDir/init b/examples/CompDir/init
deleted file mode 100644
index 067df14b4..000000000
--- a/examples/CompDir/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CompDir_icpp_init_stub
-#define _CompDir_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/examples/DbfView/init b/examples/DbfView/init
deleted file mode 100644
index a68dfe36c..000000000
--- a/examples/DbfView/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _DbfView_icpp_init_stub
-#define _DbfView_icpp_init_stub
-#include "plugin\dbf/init"
-#include "CtrlLib/init"
-#endif
diff --git a/examples/ExtractLinks/init b/examples/ExtractLinks/init
deleted file mode 100644
index 47a6ae43c..000000000
--- a/examples/ExtractLinks/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ExtractLinks_icpp_init_stub
-#define _ExtractLinks_icpp_init_stub
-#include "Core/init"
-#include "plugin/pcre/init"
-#endif
diff --git a/examples/EyeCare/init b/examples/EyeCare/init
deleted file mode 100644
index 9ae38b9a0..000000000
--- a/examples/EyeCare/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _EyeCare_icpp_init_stub
-#define _EyeCare_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/examples/FnGraph/init b/examples/FnGraph/init
deleted file mode 100644
index 6e0c8d09b..000000000
--- a/examples/FnGraph/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _FnGraph_icpp_init_stub
-#define _FnGraph_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#endif
diff --git a/examples/GeoFun/init b/examples/GeoFun/init
deleted file mode 100644
index 28adf732b..000000000
--- a/examples/GeoFun/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _GeoFun_icpp_init_stub
-#define _GeoFun_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#include "plugin/jpg/init"
-#include "Report/init"
-#endif
diff --git a/examples/GoogleMaps/init b/examples/GoogleMaps/init
deleted file mode 100644
index bf6f341e3..000000000
--- a/examples/GoogleMaps/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _GoogleMaps_icpp_init_stub
-#define _GoogleMaps_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/examples/HomeBudget/init b/examples/HomeBudget/init
deleted file mode 100644
index d1e2a7170..000000000
--- a/examples/HomeBudget/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _HomeBudget_icpp_init_stub
-#define _HomeBudget_icpp_init_stub
-#include "CtrlLib/init"
-#include "plugin\sqlite3/init"
-#include "GridCtrl/init"
-#include "DropGrid/init"
-#endif
diff --git a/examples/ImageView/init b/examples/ImageView/init
deleted file mode 100644
index 59bde9fb5..000000000
--- a/examples/ImageView/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ImageView_icpp_init_stub
-#define _ImageView_icpp_init_stub
-#include "CtrlLib/init"
-#include "plugin\tif/init"
-#include "plugin\jpg/init"
-#include "plugin\gif/init"
-#endif
diff --git a/examples/OleCalc/init b/examples/OleCalc/init
deleted file mode 100644
index 231d043b1..000000000
--- a/examples/OleCalc/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _OleCalc_icpp_init_stub
-#define _OleCalc_icpp_init_stub
-#include "Ole\Ctrl/init"
-#include "CtrlLib/init"
-#include "Esc/init"
-#endif
diff --git a/examples/PainterExamples/init b/examples/PainterExamples/init
deleted file mode 100644
index ea879d215..000000000
--- a/examples/PainterExamples/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _PainterExamples_icpp_init_stub
-#define _PainterExamples_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#endif
diff --git a/examples/Puzzle/init b/examples/Puzzle/init
deleted file mode 100644
index 3732ee53b..000000000
--- a/examples/Puzzle/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Puzzle_icpp_init_stub
-#define _Puzzle_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/examples/SDLExample/init b/examples/SDLExample/init
deleted file mode 100644
index cfa515629..000000000
--- a/examples/SDLExample/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SDLExample_icpp_init_stub
-#define _SDLExample_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/examples/SVGView/init b/examples/SVGView/init
deleted file mode 100644
index 0692af888..000000000
--- a/examples/SVGView/init
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _SVGView_icpp_init_stub
-#define _SVGView_icpp_init_stub
-#include "CtrlLib/init"
-#include "plugin\tif/init"
-#include "plugin\jpg/init"
-#include "plugin\gif/init"
-#include "Painter/init"
-#endif
diff --git a/examples/ScatterCtrl_Demo/init b/examples/ScatterCtrl_Demo/init
deleted file mode 100644
index 12bb2e51c..000000000
--- a/examples/ScatterCtrl_Demo/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ScatterCtrl_Demo_icpp_init_stub
-#define _ScatterCtrl_Demo_icpp_init_stub
-#include "CtrlLib/init"
-#include "Report/init"
-#include "PdfDraw/init"
-#include "ScatterCtrl/init"
-#endif
diff --git a/examples/SkylarkUpload/init b/examples/SkylarkUpload/init
deleted file mode 100644
index 3df2856e9..000000000
--- a/examples/SkylarkUpload/init
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _SkylarkUpload_icpp_init_stub
-#define _SkylarkUpload_icpp_init_stub
-#include "Core/init"
-#include "Skylark/init"
-#define BLITZ_INDEX__ Fb64938f71485ee02b357f1bc5f6229a0
-#include "Handlers.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/examples/UWord/init b/examples/UWord/init
deleted file mode 100644
index 3538d93bf..000000000
--- a/examples/UWord/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _UWord_icpp_init_stub
-#define _UWord_icpp_init_stub
-#include "CtrlLib/init"
-#include "RichEdit/init"
-#include "PdfDraw/init"
-#include "plugin\jpg/init"
-#endif
diff --git a/examples/XmlView/init b/examples/XmlView/init
deleted file mode 100644
index 7dae7d7ac..000000000
--- a/examples/XmlView/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _XmlView_icpp_init_stub
-#define _XmlView_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/examples/httpcli/init b/examples/httpcli/init
deleted file mode 100644
index 97d85e82b..000000000
--- a/examples/httpcli/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _httpcli_icpp_init_stub
-#define _httpcli_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/examples/idmap/init b/examples/idmap/init
deleted file mode 100644
index 2be20282a..000000000
--- a/examples/idmap/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _idmap_icpp_init_stub
-#define _idmap_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/examples/idmapBench/init b/examples/idmapBench/init
deleted file mode 100644
index 89cc29e03..000000000
--- a/examples/idmapBench/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _idmapBench_icpp_init_stub
-#define _idmapBench_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/rainbow/CoreGl/init b/rainbow/CoreGl/init
deleted file mode 100644
index 8c24c5d0c..000000000
--- a/rainbow/CoreGl/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CoreGl_icpp_init_stub
-#define _CoreGl_icpp_init_stub
-#include "Painter/init"
-#endif
diff --git a/rainbow/DevDraw/init b/rainbow/DevDraw/init
deleted file mode 100644
index fee7bc7ba..000000000
--- a/rainbow/DevDraw/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _DevDraw_icpp_init_stub
-#define _DevDraw_icpp_init_stub
-#include "Draw/init"
-#include "Gtk/init"
-#endif
diff --git a/rainbow/DrawDragRect/init b/rainbow/DrawDragRect/init
deleted file mode 100644
index 590b63c7a..000000000
--- a/rainbow/DrawDragRect/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _DrawDragRect_icpp_init_stub
-#define _DrawDragRect_icpp_init_stub
-#include "CtrlLib/init"
-#include "Framebuffer/init"
-#include "WinFb/init"
-#endif
diff --git a/rainbow/Framebuffer/init b/rainbow/Framebuffer/init
deleted file mode 100644
index 1628fe8ac..000000000
--- a/rainbow/Framebuffer/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Framebuffer_icpp_init_stub
-#define _Framebuffer_icpp_init_stub
-#include "Painter/init"
-#include "CtrlLib/init"
-#endif
diff --git a/rainbow/Gtk/init b/rainbow/Gtk/init
deleted file mode 100644
index 4903cc66c..000000000
--- a/rainbow/Gtk/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _Gtk_icpp_init_stub
-#define _Gtk_icpp_init_stub
-#endif
diff --git a/rainbow/GtkMain/init b/rainbow/GtkMain/init
deleted file mode 100644
index 8ed8bdf84..000000000
--- a/rainbow/GtkMain/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _GtkMain_icpp_init_stub
-#define _GtkMain_icpp_init_stub
-#include "CtrlLib/init"
-#include "Gtk/init"
-#include "RichEdit/init"
-#endif
diff --git a/rainbow/LinuxFb/init b/rainbow/LinuxFb/init
deleted file mode 100644
index d303230be..000000000
--- a/rainbow/LinuxFb/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _LinuxFb_icpp_init_stub
-#define _LinuxFb_icpp_init_stub
-#include "Framebuffer/init"
-#endif
diff --git a/rainbow/LinuxGl/init b/rainbow/LinuxGl/init
deleted file mode 100644
index 6e25866b5..000000000
--- a/rainbow/LinuxGl/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _LinuxGl_icpp_init_stub
-#define _LinuxGl_icpp_init_stub
-#include "CoreGl/init"
-#endif
diff --git a/rainbow/Paint/init b/rainbow/Paint/init
deleted file mode 100644
index 372164a7f..000000000
--- a/rainbow/Paint/init
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _Paint_icpp_init_stub
-#define _Paint_icpp_init_stub
-#include "CtrlLib/init"
-#include "RichEdit/init"
-#include "Skeleton/init"
-#include "WinAlt/init"
-#include "WinFb/init"
-#include "LinuxFb/init"
-#include "SDLFb/init"
-#include "WinGl/init"
-#endif
diff --git a/rainbow/PaintGl/init b/rainbow/PaintGl/init
deleted file mode 100644
index 17d72e3aa..000000000
--- a/rainbow/PaintGl/init
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _PaintGl_icpp_init_stub
-#define _PaintGl_icpp_init_stub
-#include "CtrlLib/init"
-#include "Skeleton/init"
-#include "WinAlt/init"
-#include "WinFb/init"
-#include "LinuxFb/init"
-#include "SDLFb/init"
-#include "WinGl/init"
-#endif
diff --git a/rainbow/SDL20/init b/rainbow/SDL20/init
deleted file mode 100644
index 189e5498d..000000000
--- a/rainbow/SDL20/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _SDL20_icpp_init_stub
-#define _SDL20_icpp_init_stub
-#include "Painter/init"
-#include "CtrlLib/init"
-#endif
diff --git a/rainbow/SDL20GL/init b/rainbow/SDL20GL/init
deleted file mode 100644
index 1500d0953..000000000
--- a/rainbow/SDL20GL/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _SDL20GL_icpp_init_stub
-#define _SDL20GL_icpp_init_stub
-#include "Painter/init"
-#include "CtrlLib/init"
-#include "GLDraw/init"
-#endif
diff --git a/rainbow/SDL20Uword/init b/rainbow/SDL20Uword/init
deleted file mode 100644
index 7bb4594a0..000000000
--- a/rainbow/SDL20Uword/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _SDL20Uword_icpp_init_stub
-#define _SDL20Uword_icpp_init_stub
-#include "CtrlLib/init"
-#include "RichEdit/init"
-#include "SDL20GL/init"
-#include "plugin/DroidFonts/init"
-#endif
diff --git a/rainbow/SDLFb/init b/rainbow/SDLFb/init
deleted file mode 100644
index 2c27d20ed..000000000
--- a/rainbow/SDLFb/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SDLFb_icpp_init_stub
-#define _SDLFb_icpp_init_stub
-#include "Framebuffer/init"
-#endif
diff --git a/rainbow/SDLGLDraw/init b/rainbow/SDLGLDraw/init
deleted file mode 100644
index f51081874..000000000
--- a/rainbow/SDLGLDraw/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _SDLGLDraw_icpp_init_stub
-#define _SDLGLDraw_icpp_init_stub
-#include "CtrlLib/init"
-#include "SDL20GL/init"
-#include "plugin/DroidFonts/init"
-#endif
diff --git a/rainbow/Skeleton/init b/rainbow/Skeleton/init
deleted file mode 100644
index c9a3a82a2..000000000
--- a/rainbow/Skeleton/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _Skeleton_icpp_init_stub
-#define _Skeleton_icpp_init_stub
-#endif
diff --git a/rainbow/SysShutdown/init b/rainbow/SysShutdown/init
deleted file mode 100644
index df64259db..000000000
--- a/rainbow/SysShutdown/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _SysShutdown_icpp_init_stub
-#define _SysShutdown_icpp_init_stub
-#include "CtrlLib/init"
-#include "WinFb/init"
-#endif
diff --git a/rainbow/UWord/init b/rainbow/UWord/init
deleted file mode 100644
index 32ac46d1d..000000000
--- a/rainbow/UWord/init
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _UWord_icpp_init_stub
-#define _UWord_icpp_init_stub
-#include "CtrlLib/init"
-#include "RichEdit/init"
-#include "PdfDraw/init"
-#include "plugin\jpg/init"
-#include "SDL20/init"
-#include "Telpp/init"
-#include "Skeleton/init"
-#include "WinAlt/init"
-#include "WinFb/init"
-#include "LinuxFb/init"
-#include "SDLFb/init"
-#include "WinGl/init"
-#endif
diff --git a/rainbow/WinAlt/init b/rainbow/WinAlt/init
deleted file mode 100644
index bcff0135e..000000000
--- a/rainbow/WinAlt/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _WinAlt_icpp_init_stub
-#define _WinAlt_icpp_init_stub
-#endif
diff --git a/rainbow/WinFb/init b/rainbow/WinFb/init
deleted file mode 100644
index 0123400e9..000000000
--- a/rainbow/WinFb/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _WinFb_icpp_init_stub
-#define _WinFb_icpp_init_stub
-#include "Framebuffer/init"
-#endif
diff --git a/rainbow/WinGl/init b/rainbow/WinGl/init
deleted file mode 100644
index ac8d82ea2..000000000
--- a/rainbow/WinGl/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _WinGl_icpp_init_stub
-#define _WinGl_icpp_init_stub
-#include "CoreGl/init"
-#endif
diff --git a/reference/AK/init b/reference/AK/init
deleted file mode 100644
index 753ba5c28..000000000
--- a/reference/AK/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _AK_icpp_init_stub
-#define _AK_icpp_init_stub
-#include "CtrlLib/init"
-#define BLITZ_INDEX__ Fd9b2e96dcfffad7e520d84eddd91da83
-#include "ak.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/reference/AnimatedClip/init b/reference/AnimatedClip/init
deleted file mode 100644
index 9869f1d53..000000000
--- a/reference/AnimatedClip/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _AnimatedClip_icpp_init_stub
-#define _AnimatedClip_icpp_init_stub
-#include "CtrlLib/init"
-#include "plugin\tif/init"
-#include "plugin\gif/init"
-#include "RasterPlayer/init"
-#endif
diff --git a/reference/ArrayCtrl/init b/reference/ArrayCtrl/init
deleted file mode 100644
index 7c8b71446..000000000
--- a/reference/ArrayCtrl/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ArrayCtrl_icpp_init_stub
-#define _ArrayCtrl_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/ArrayCtrlCreateCtrl/init b/reference/ArrayCtrlCreateCtrl/init
deleted file mode 100644
index 168577543..000000000
--- a/reference/ArrayCtrlCreateCtrl/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ArrayCtrlCreateCtrl_icpp_init_stub
-#define _ArrayCtrlCreateCtrl_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/ArrayCtrlDnD/init b/reference/ArrayCtrlDnD/init
deleted file mode 100644
index e575393f1..000000000
--- a/reference/ArrayCtrlDnD/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ArrayCtrlDnD_icpp_init_stub
-#define _ArrayCtrlDnD_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/ArrayCtrlSetCtrl/init b/reference/ArrayCtrlSetCtrl/init
deleted file mode 100644
index c5cb89ef3..000000000
--- a/reference/ArrayCtrlSetCtrl/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ArrayCtrlSetCtrl_icpp_init_stub
-#define _ArrayCtrlSetCtrl_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/ArrayCtrlSpanWideCells/init b/reference/ArrayCtrlSpanWideCells/init
deleted file mode 100644
index 4e685e4ee..000000000
--- a/reference/ArrayCtrlSpanWideCells/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ArrayCtrlSpanWideCells_icpp_init_stub
-#define _ArrayCtrlSpanWideCells_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/ArrayHideShowColumnMenu/init b/reference/ArrayHideShowColumnMenu/init
deleted file mode 100644
index 071b4df27..000000000
--- a/reference/ArrayHideShowColumnMenu/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ArrayHideShowColumnMenu_icpp_init_stub
-#define _ArrayHideShowColumnMenu_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/AttrText/init b/reference/AttrText/init
deleted file mode 100644
index d0a78f773..000000000
--- a/reference/AttrText/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _AttrText_icpp_init_stub
-#define _AttrText_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/BasicAlgo/init b/reference/BasicAlgo/init
deleted file mode 100644
index fb9b21418..000000000
--- a/reference/BasicAlgo/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _BasicAlgo_icpp_init_stub
-#define _BasicAlgo_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/CParser/init b/reference/CParser/init
deleted file mode 100644
index e04b875c6..000000000
--- a/reference/CParser/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CParser_icpp_init_stub
-#define _CParser_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/CaptureScreenDll/init b/reference/CaptureScreenDll/init
deleted file mode 100644
index 336830065..000000000
--- a/reference/CaptureScreenDll/init
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _ScreenShotter_icpp_init_stub
-#define _ScreenShotter_icpp_init_stub
-#include "CtrlLib/init"
-#include "plugin\jpg/init"
-#include "plugin\gif/init"
-#include "plugin\tif/init"
-#include "plugin\pcx/init"
-#endif
diff --git a/reference/Chameleon/init b/reference/Chameleon/init
deleted file mode 100644
index b9614b07c..000000000
--- a/reference/Chameleon/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Chameleon_icpp_init_stub
-#define _Chameleon_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/CoPipe/init b/reference/CoPipe/init
deleted file mode 100644
index 1f217d10b..000000000
--- a/reference/CoPipe/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CoPipe_icpp_init_stub
-#define _CoPipe_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/CoWork/init b/reference/CoWork/init
deleted file mode 100644
index fbf40794e..000000000
--- a/reference/CoWork/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CoWork_icpp_init_stub
-#define _CoWork_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/ColumnList/init b/reference/ColumnList/init
deleted file mode 100644
index d4fdaf598..000000000
--- a/reference/ColumnList/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ColumnList_icpp_init_stub
-#define _ColumnList_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/ColumnListDnD/init b/reference/ColumnListDnD/init
deleted file mode 100644
index 1bb602e48..000000000
--- a/reference/ColumnListDnD/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ColumnListDnD_icpp_init_stub
-#define _ColumnListDnD_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/Compression/init b/reference/Compression/init
deleted file mode 100644
index a76efe9c7..000000000
--- a/reference/Compression/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _Compression_icpp_init_stub
-#define _Compression_icpp_init_stub
-#include "Core/init"
-#include "plugin/lz4/init"
-#include "plugin/zstd/init"
-#endif
diff --git a/reference/ConditionVariable/init b/reference/ConditionVariable/init
deleted file mode 100644
index 76b6e72fe..000000000
--- a/reference/ConditionVariable/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ConditionVariable_icpp_init_stub
-#define _ConditionVariable_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/ConsoleDraw/init b/reference/ConsoleDraw/init
deleted file mode 100644
index fb734c83d..000000000
--- a/reference/ConsoleDraw/init
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _ConsoleDraw_icpp_init_stub
-#define _ConsoleDraw_icpp_init_stub
-#include "Draw/init"
-#include "Painter/init"
-#include "plugin\png/init"
-#include "RichText/init"
-#include "PdfDraw/init"
-#endif
diff --git a/reference/Convert/init b/reference/Convert/init
deleted file mode 100644
index 4e53fc16a..000000000
--- a/reference/Convert/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Convert_icpp_init_stub
-#define _Convert_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/DerivedLayout/init b/reference/DerivedLayout/init
deleted file mode 100644
index 978af7711..000000000
--- a/reference/DerivedLayout/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _DerivedLayout_icpp_init_stub
-#define _DerivedLayout_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/DockingExample1/init b/reference/DockingExample1/init
deleted file mode 100644
index c5bb6251f..000000000
--- a/reference/DockingExample1/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _DockingExample1_icpp_init_stub
-#define _DockingExample1_icpp_init_stub
-#include "CtrlLib/init"
-#include "Docking/init"
-#endif
diff --git a/reference/DockingExample2/init b/reference/DockingExample2/init
deleted file mode 100644
index ec9304669..000000000
--- a/reference/DockingExample2/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _DockingExample2_icpp_init_stub
-#define _DockingExample2_icpp_init_stub
-#include "CtrlLib/init"
-#include "Docking/init"
-#endif
diff --git a/reference/DragAndDrop/init b/reference/DragAndDrop/init
deleted file mode 100644
index a1b6c6d9b..000000000
--- a/reference/DragAndDrop/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _DragAndDrop_icpp_init_stub
-#define _DragAndDrop_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/DragAndDrop1/init b/reference/DragAndDrop1/init
deleted file mode 100644
index 14bef67fa..000000000
--- a/reference/DragAndDrop1/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _DragAndDrop1_icpp_init_stub
-#define _DragAndDrop1_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/DragAndDrop2/init b/reference/DragAndDrop2/init
deleted file mode 100644
index 80f0c3254..000000000
--- a/reference/DragAndDrop2/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _DragAndDrop2_icpp_init_stub
-#define _DragAndDrop2_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/DragAndDropImg/init b/reference/DragAndDropImg/init
deleted file mode 100644
index a0a3cb91e..000000000
--- a/reference/DragAndDropImg/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _DragAndDropImg_icpp_init_stub
-#define _DragAndDropImg_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/Drawing/init b/reference/Drawing/init
deleted file mode 100644
index c86f3adc4..000000000
--- a/reference/Drawing/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Drawing_icpp_init_stub
-#define _Drawing_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/DropFiles/init b/reference/DropFiles/init
deleted file mode 100644
index 2a64e2609..000000000
--- a/reference/DropFiles/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _DropFiles_icpp_init_stub
-#define _DropFiles_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/DropGridExample/init b/reference/DropGridExample/init
deleted file mode 100644
index 0ef26dcce..000000000
--- a/reference/DropGridExample/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _DropGridExample_icpp_init_stub
-#define _DropGridExample_icpp_init_stub
-#include "DropGrid/init"
-#endif
diff --git a/reference/DropTree/init b/reference/DropTree/init
deleted file mode 100644
index c6b8141d7..000000000
--- a/reference/DropTree/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _DropTree_icpp_init_stub
-#define _DropTree_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/Eigen_demo/init b/reference/Eigen_demo/init
deleted file mode 100644
index 199f84469..000000000
--- a/reference/Eigen_demo/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Eigen_demo_icpp_init_stub
-#define _Eigen_demo_icpp_init_stub
-#include "Core/init"
-#include "plugin\Eigen/init"
-#endif
diff --git a/reference/EncodeDecode/init b/reference/EncodeDecode/init
deleted file mode 100644
index fc163fabf..000000000
--- a/reference/EncodeDecode/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _EncodeDecode_icpp_init_stub
-#define _EncodeDecode_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/EscApp/init b/reference/EscApp/init
deleted file mode 100644
index 4e096fac0..000000000
--- a/reference/EscApp/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _EscApp_icpp_init_stub
-#define _EscApp_icpp_init_stub
-#include "Core/init"
-#include "Esc/init"
-#endif
diff --git a/reference/Event/init b/reference/Event/init
deleted file mode 100644
index 94ab60d40..000000000
--- a/reference/Event/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Event_icpp_init_stub
-#define _Event_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/EventPickClone/init b/reference/EventPickClone/init
deleted file mode 100644
index 39b5cc715..000000000
--- a/reference/EventPickClone/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _EventPickClone_icpp_init_stub
-#define _EventPickClone_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/EventProxy/init b/reference/EventProxy/init
deleted file mode 100644
index 146a38a5f..000000000
--- a/reference/EventProxy/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _EventProxy_icpp_init_stub
-#define _EventProxy_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/Events/init b/reference/Events/init
deleted file mode 100644
index 1f51e8f88..000000000
--- a/reference/Events/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Events_icpp_init_stub
-#define _Events_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/FileSelLazyIcon/init b/reference/FileSelLazyIcon/init
deleted file mode 100644
index 639692ba2..000000000
--- a/reference/FileSelLazyIcon/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _FileSelLazyIcon_icpp_init_stub
-#define _FileSelLazyIcon_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/FileSelPreview/init b/reference/FileSelPreview/init
deleted file mode 100644
index 9296d0bdb..000000000
--- a/reference/FileSelPreview/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _FileSelPreview_icpp_init_stub
-#define _FileSelPreview_icpp_init_stub
-#include "CtrlLib/init"
-#include "plugin\jpg/init"
-#include "plugin\gif/init"
-#endif
diff --git a/reference/FilterStream/init b/reference/FilterStream/init
deleted file mode 100644
index f7c9363a5..000000000
--- a/reference/FilterStream/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _FilterStream_icpp_init_stub
-#define _FilterStream_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/Format/init b/reference/Format/init
deleted file mode 100644
index e490cae01..000000000
--- a/reference/Format/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Format_icpp_init_stub
-#define _Format_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/Framebuffer/init b/reference/Framebuffer/init
deleted file mode 100644
index 1628fe8ac..000000000
--- a/reference/Framebuffer/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Framebuffer_icpp_init_stub
-#define _Framebuffer_icpp_init_stub
-#include "Painter/init"
-#include "CtrlLib/init"
-#endif
diff --git a/reference/GLDrawDemo/init b/reference/GLDrawDemo/init
deleted file mode 100644
index 8fd8f5eab..000000000
--- a/reference/GLDrawDemo/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _GLDrawDemo_icpp_init_stub
-#define _GLDrawDemo_icpp_init_stub
-#include "CtrlLib/init"
-#include "GLDraw/init"
-#include "GLCtrl/init"
-#endif
diff --git a/reference/GetLayoutId/init b/reference/GetLayoutId/init
deleted file mode 100644
index 1468929c4..000000000
--- a/reference/GetLayoutId/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _GetLayoutId_icpp_init_stub
-#define _GetLayoutId_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/GridCtrlTest/init b/reference/GridCtrlTest/init
deleted file mode 100644
index a8f910c98..000000000
--- a/reference/GridCtrlTest/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _GridCtrlTest_icpp_init_stub
-#define _GridCtrlTest_icpp_init_stub
-#include "CtrlLib/init"
-#include "GridCtrl/init"
-#endif
diff --git a/reference/GuiLock/init b/reference/GuiLock/init
deleted file mode 100644
index 4d8f059f5..000000000
--- a/reference/GuiLock/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _GuiLock_icpp_init_stub
-#define _GuiLock_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/GuiMT/init b/reference/GuiMT/init
deleted file mode 100644
index 02bb3c191..000000000
--- a/reference/GuiMT/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _GuiMT_icpp_init_stub
-#define _GuiMT_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/GuiWebCrawler/init b/reference/GuiWebCrawler/init
deleted file mode 100644
index bba909b48..000000000
--- a/reference/GuiWebCrawler/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _GuiWebCrawler_icpp_init_stub
-#define _GuiWebCrawler_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/GuiWebDownload/init b/reference/GuiWebDownload/init
deleted file mode 100644
index 46c2f4f1d..000000000
--- a/reference/GuiWebDownload/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _GuiWebDownload_icpp_init_stub
-#define _GuiWebDownload_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/HotKey/init b/reference/HotKey/init
deleted file mode 100644
index 8bb02f07f..000000000
--- a/reference/HotKey/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _HotKey_icpp_init_stub
-#define _HotKey_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/HttpServer/init b/reference/HttpServer/init
deleted file mode 100644
index 62ae9a99f..000000000
--- a/reference/HttpServer/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _HttpServer_icpp_init_stub
-#define _HttpServer_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/Https/init b/reference/Https/init
deleted file mode 100644
index 5a9956f3b..000000000
--- a/reference/Https/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Https_icpp_init_stub
-#define _Https_icpp_init_stub
-#include "Core/init"
-#include "Core/SSL/init"
-#endif
diff --git a/reference/INI/init b/reference/INI/init
deleted file mode 100644
index 2cedd1e6d..000000000
--- a/reference/INI/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _INI_icpp_init_stub
-#define _INI_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/IdCtrls/init b/reference/IdCtrls/init
deleted file mode 100644
index 1cc56c646..000000000
--- a/reference/IdCtrls/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _IdCtrls_icpp_init_stub
-#define _IdCtrls_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/JSON/init b/reference/JSON/init
deleted file mode 100644
index 95f1c4ee3..000000000
--- a/reference/JSON/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _JSON_icpp_init_stub
-#define _JSON_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/Jsonize/init b/reference/Jsonize/init
deleted file mode 100644
index 66c514c49..000000000
--- a/reference/Jsonize/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Jsonize_icpp_init_stub
-#define _Jsonize_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/LRUCache/init b/reference/LRUCache/init
deleted file mode 100644
index b64ce39c2..000000000
--- a/reference/LRUCache/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _LRUCache_icpp_init_stub
-#define _LRUCache_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/Layout/init b/reference/Layout/init
deleted file mode 100644
index baac97a71..000000000
--- a/reference/Layout/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Layout_icpp_init_stub
-#define _Layout_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/Layouts/init b/reference/Layouts/init
deleted file mode 100644
index b2945d3a9..000000000
--- a/reference/Layouts/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Layouts_icpp_init_stub
-#define _Layouts_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/LazyUpdate/init b/reference/LazyUpdate/init
deleted file mode 100644
index a16b356f0..000000000
--- a/reference/LazyUpdate/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _LazyUpdate_icpp_init_stub
-#define _LazyUpdate_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/LinuxFb/init b/reference/LinuxFb/init
deleted file mode 100644
index d303230be..000000000
--- a/reference/LinuxFb/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _LinuxFb_icpp_init_stub
-#define _LinuxFb_icpp_init_stub
-#include "Framebuffer/init"
-#endif
diff --git a/reference/Log/init b/reference/Log/init
deleted file mode 100644
index da3eed7a2..000000000
--- a/reference/Log/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Log_icpp_init_stub
-#define _Log_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/Macro/init b/reference/Macro/init
deleted file mode 100644
index 53657f101..000000000
--- a/reference/Macro/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Macro_icpp_init_stub
-#define _Macro_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/Menu/init b/reference/Menu/init
deleted file mode 100644
index f0b987d19..000000000
--- a/reference/Menu/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Menu_icpp_init_stub
-#define _Menu_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/MenuBarCheck/init b/reference/MenuBarCheck/init
deleted file mode 100644
index 582a9ebcb..000000000
--- a/reference/MenuBarCheck/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _MenuBarCheck_icpp_init_stub
-#define _MenuBarCheck_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/MenuBarValue/init b/reference/MenuBarValue/init
deleted file mode 100644
index 1c857ab05..000000000
--- a/reference/MenuBarValue/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _MenuBarValue_icpp_init_stub
-#define _MenuBarValue_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/MtRpcClient/init b/reference/MtRpcClient/init
deleted file mode 100644
index cac0a13c1..000000000
--- a/reference/MtRpcClient/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _MtRpcClient_icpp_init_stub
-#define _MtRpcClient_icpp_init_stub
-#include "Core/init"
-#include "Core/Rpc/init"
-#endif
diff --git a/reference/MtRpcServer/init b/reference/MtRpcServer/init
deleted file mode 100644
index 59e0eae0a..000000000
--- a/reference/MtRpcServer/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _MtRpcServer_icpp_init_stub
-#define _MtRpcServer_icpp_init_stub
-#include "Core/init"
-#include "Core/Rpc/init"
-#endif
diff --git a/reference/OpenGL/init b/reference/OpenGL/init
deleted file mode 100644
index 94fa3cc11..000000000
--- a/reference/OpenGL/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _OpenGL_icpp_init_stub
-#define _OpenGL_icpp_init_stub
-#include "GLCtrl/init"
-#endif
diff --git a/reference/Paint/init b/reference/Paint/init
deleted file mode 100644
index 53accd05a..000000000
--- a/reference/Paint/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Paint_icpp_init_stub
-#define _Paint_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/Pop3/init b/reference/Pop3/init
deleted file mode 100644
index 7be31d778..000000000
--- a/reference/Pop3/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _Pop3_icpp_init_stub
-#define _Pop3_icpp_init_stub
-#include "Core/init"
-#include "Core/POP3/init"
-#include "Core/SSL/init"
-#endif
diff --git a/reference/PrinterJob/init b/reference/PrinterJob/init
deleted file mode 100644
index 74b677de4..000000000
--- a/reference/PrinterJob/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _PrinterJob_icpp_init_stub
-#define _PrinterJob_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/PromptRedirect/init b/reference/PromptRedirect/init
deleted file mode 100644
index 952553207..000000000
--- a/reference/PromptRedirect/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _PromptRedirect_icpp_init_stub
-#define _PromptRedirect_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/Qtf/init b/reference/Qtf/init
deleted file mode 100644
index ccc8499a0..000000000
--- a/reference/Qtf/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Qtf_icpp_init_stub
-#define _Qtf_icpp_init_stub
-#include "CtrlLib/init"
-#include "RichEdit/init"
-#endif
diff --git a/reference/QtfDrawing/init b/reference/QtfDrawing/init
deleted file mode 100644
index 9af2fb2dc..000000000
--- a/reference/QtfDrawing/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _QtfDrawing_icpp_init_stub
-#define _QtfDrawing_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/RawRichText/init b/reference/RawRichText/init
deleted file mode 100644
index d6d543825..000000000
--- a/reference/RawRichText/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _RawRichText_icpp_init_stub
-#define _RawRichText_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/RectTracker/init b/reference/RectTracker/init
deleted file mode 100644
index c74689e52..000000000
--- a/reference/RectTracker/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _RectTracker_icpp_init_stub
-#define _RectTracker_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/RegExp/init b/reference/RegExp/init
deleted file mode 100644
index bd870c1b4..000000000
--- a/reference/RegExp/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _RegExp_icpp_init_stub
-#define _RegExp_icpp_init_stub
-#include "Core/init"
-#include "plugin\pcre/init"
-#endif
diff --git a/reference/RegExp2/init b/reference/RegExp2/init
deleted file mode 100644
index 6817df7f7..000000000
--- a/reference/RegExp2/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _RegExp2_icpp_init_stub
-#define _RegExp2_icpp_init_stub
-#include "CtrlLib/init"
-#include "plugin/pcre/init"
-#endif
diff --git a/reference/Reports/init b/reference/Reports/init
deleted file mode 100644
index 0b2f837bb..000000000
--- a/reference/Reports/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _Reports_icpp_init_stub
-#define _Reports_icpp_init_stub
-#include "CtrlLib/init"
-#include "Report/init"
-#include "Painter/init"
-#endif
diff --git a/reference/RescaleFilter/init b/reference/RescaleFilter/init
deleted file mode 100644
index 06207088b..000000000
--- a/reference/RescaleFilter/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _RescaleFilter_icpp_init_stub
-#define _RescaleFilter_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#include "plugin/jpg/init"
-#include "plugin/gif/init"
-#endif
diff --git a/reference/RichImlImage/init b/reference/RichImlImage/init
deleted file mode 100644
index cb62fdc79..000000000
--- a/reference/RichImlImage/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _RichImlImage_icpp_init_stub
-#define _RichImlImage_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/RichTextLayoutTracer/init b/reference/RichTextLayoutTracer/init
deleted file mode 100644
index e40ed03ae..000000000
--- a/reference/RichTextLayoutTracer/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _RichTextLayoutTracer_icpp_init_stub
-#define _RichTextLayoutTracer_icpp_init_stub
-#include "CtrlLib/init"
-#include "Report/init"
-#endif
diff --git a/reference/RichTextObject/init b/reference/RichTextObject/init
deleted file mode 100644
index 47da83051..000000000
--- a/reference/RichTextObject/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _RichTextObject_icpp_init_stub
-#define _RichTextObject_icpp_init_stub
-#include "CtrlLib/init"
-#include "RichEdit/init"
-#endif
diff --git a/reference/Rpc/init b/reference/Rpc/init
deleted file mode 100644
index be03c1fd8..000000000
--- a/reference/Rpc/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Rpc_icpp_init_stub
-#define _Rpc_icpp_init_stub
-#include "Core/init"
-#include "Core\Rpc/init"
-#endif
diff --git a/reference/SMTP/init b/reference/SMTP/init
deleted file mode 100644
index 4bfff12f8..000000000
--- a/reference/SMTP/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _SMTP_icpp_init_stub
-#define _SMTP_icpp_init_stub
-#include "Core/init"
-#include "Core/SMTP/init"
-#include "Core/SSL/init"
-#endif
diff --git a/reference/SQL_MSSQL/init b/reference/SQL_MSSQL/init
deleted file mode 100644
index 4c3aa4abd..000000000
--- a/reference/SQL_MSSQL/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SQL_MSSQL_icpp_init_stub
-#define _SQL_MSSQL_icpp_init_stub
-#include "MSSQL/init"
-#endif
diff --git a/reference/SQL_MySql/init b/reference/SQL_MySql/init
deleted file mode 100644
index 8af698776..000000000
--- a/reference/SQL_MySql/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _SQL_MySql_icpp_init_stub
-#define _SQL_MySql_icpp_init_stub
-#include "Core/init"
-#include "MySql/init"
-#endif
diff --git a/reference/SQL_PostgreSql/init b/reference/SQL_PostgreSql/init
deleted file mode 100644
index 15949933d..000000000
--- a/reference/SQL_PostgreSql/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _SQL_PostgreSql_icpp_init_stub
-#define _SQL_PostgreSql_icpp_init_stub
-#include "CtrlLib/init"
-#include "PostgreSQL/init"
-#include "SqlCtrl/init"
-#endif
diff --git a/reference/SQL_Sqlite3/init b/reference/SQL_Sqlite3/init
deleted file mode 100644
index 6a926017c..000000000
--- a/reference/SQL_Sqlite3/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SQL_Sqlite3_icpp_init_stub
-#define _SQL_Sqlite3_icpp_init_stub
-#include "plugin\sqlite3/init"
-#endif
diff --git a/reference/ScatterDraw_Demo/init b/reference/ScatterDraw_Demo/init
deleted file mode 100644
index be63eeda5..000000000
--- a/reference/ScatterDraw_Demo/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ScatterDraw_Demo_icpp_init_stub
-#define _ScatterDraw_Demo_icpp_init_stub
-#include "Core/init"
-#include "ScatterDraw/init"
-#include "plugin\png/init"
-#endif
diff --git a/reference/ScrollBar/init b/reference/ScrollBar/init
deleted file mode 100644
index 96246e16c..000000000
--- a/reference/ScrollBar/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ScrollBar_icpp_init_stub
-#define _ScrollBar_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/SelectFile/init b/reference/SelectFile/init
deleted file mode 100644
index 0928b063c..000000000
--- a/reference/SelectFile/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SelectFile_icpp_init_stub
-#define _SelectFile_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/SetLayout/init b/reference/SetLayout/init
deleted file mode 100644
index c86bb5c88..000000000
--- a/reference/SetLayout/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SetLayout_icpp_init_stub
-#define _SetLayout_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/SetSurface/init b/reference/SetSurface/init
deleted file mode 100644
index 8cbe22371..000000000
--- a/reference/SetSurface/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SetSurface_icpp_init_stub
-#define _SetSurface_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/SignPDF/init b/reference/SignPDF/init
deleted file mode 100644
index ba02e8eca..000000000
--- a/reference/SignPDF/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _SignPDF_icpp_init_stub
-#define _SignPDF_icpp_init_stub
-#include "Core/init"
-#include "PdfDraw/init"
-#include "Core/SSL/init"
-#include "RichText/init"
-#endif
diff --git a/reference/SimpleEditDlgs/init b/reference/SimpleEditDlgs/init
deleted file mode 100644
index a11ab1bb5..000000000
--- a/reference/SimpleEditDlgs/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SimpleEditDlgs_icpp_init_stub
-#define _SimpleEditDlgs_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/Slider/init b/reference/Slider/init
deleted file mode 100644
index 987ff496d..000000000
--- a/reference/Slider/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Slider_icpp_init_stub
-#define _Slider_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/SocketClient/init b/reference/SocketClient/init
deleted file mode 100644
index 94affb992..000000000
--- a/reference/SocketClient/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SocketClient_icpp_init_stub
-#define _SocketClient_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/SocketServer/init b/reference/SocketServer/init
deleted file mode 100644
index 74072ac88..000000000
--- a/reference/SocketServer/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SocketServer_icpp_init_stub
-#define _SocketServer_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/SplitJoinMerge/init b/reference/SplitJoinMerge/init
deleted file mode 100644
index 3b45a7ac9..000000000
--- a/reference/SplitJoinMerge/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SplitJoinMerge_icpp_init_stub
-#define _SplitJoinMerge_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/Splitter/init b/reference/Splitter/init
deleted file mode 100644
index eddac7768..000000000
--- a/reference/Splitter/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Splitter_icpp_init_stub
-#define _Splitter_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/SplitterFrame/init b/reference/SplitterFrame/init
deleted file mode 100644
index afbf3e015..000000000
--- a/reference/SplitterFrame/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SplitterFrame_icpp_init_stub
-#define _SplitterFrame_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/SplitterFrame1/init b/reference/SplitterFrame1/init
deleted file mode 100644
index dfe28f4ef..000000000
--- a/reference/SplitterFrame1/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SplitterFrame1_icpp_init_stub
-#define _SplitterFrame1_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/SqlArray/init b/reference/SqlArray/init
deleted file mode 100644
index 6d48afc53..000000000
--- a/reference/SqlArray/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _SqlArray_icpp_init_stub
-#define _SqlArray_icpp_init_stub
-#include "CtrlLib/init"
-#include "plugin/sqlite3/init"
-#include "SqlCtrl/init"
-#endif
diff --git a/reference/SqlCtrls/init b/reference/SqlCtrls/init
deleted file mode 100644
index 5b9c6c487..000000000
--- a/reference/SqlCtrls/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _SqlCtrls_icpp_init_stub
-#define _SqlCtrls_icpp_init_stub
-#include "CtrlLib/init"
-#include "SqlCtrl/init"
-#include "plugin\sqlite3/init"
-#endif
diff --git a/reference/SqlExp/init b/reference/SqlExp/init
deleted file mode 100644
index f090f4cb3..000000000
--- a/reference/SqlExp/init
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _SqlExp_icpp_init_stub
-#define _SqlExp_icpp_init_stub
-#include "Core/init"
-#include "Sql/init"
-#include "RichText/init"
-#include "CtrlLib/init"
-#include "RichEdit/init"
-#endif
diff --git a/reference/SqlIdOpt/init b/reference/SqlIdOpt/init
deleted file mode 100644
index 740643f57..000000000
--- a/reference/SqlIdOpt/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _SqlIdOpt_icpp_init_stub
-#define _SqlIdOpt_icpp_init_stub
-#include "Core/init"
-#include "Sql/init"
-#endif
diff --git a/reference/SqlS_fn/init b/reference/SqlS_fn/init
deleted file mode 100644
index aa7d555a6..000000000
--- a/reference/SqlS_fn/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _SqlS_fn_icpp_init_stub
-#define _SqlS_fn_icpp_init_stub
-#include "Core/init"
-#include "Sql/init"
-#endif
diff --git a/reference/StatusBar/init b/reference/StatusBar/init
deleted file mode 100644
index 0524f04dd..000000000
--- a/reference/StatusBar/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _StatusBar_icpp_init_stub
-#define _StatusBar_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/StreamGetSzPtr/init b/reference/StreamGetSzPtr/init
deleted file mode 100644
index c3b4a2dbc..000000000
--- a/reference/StreamGetSzPtr/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _StreamGetSzPtr_icpp_init_stub
-#define _StreamGetSzPtr_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/Strings/init b/reference/Strings/init
deleted file mode 100644
index 0edbce307..000000000
--- a/reference/Strings/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Strings_icpp_init_stub
-#define _Strings_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/SuggestCtrl/init b/reference/SuggestCtrl/init
deleted file mode 100644
index bcb64636d..000000000
--- a/reference/SuggestCtrl/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SuggestCtrl_icpp_init_stub
-#define _SuggestCtrl_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/Switch/init b/reference/Switch/init
deleted file mode 100644
index 188d89edf..000000000
--- a/reference/Switch/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Switch_icpp_init_stub
-#define _Switch_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/TabDlg/init b/reference/TabDlg/init
deleted file mode 100644
index 76c8c38b5..000000000
--- a/reference/TabDlg/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _TabDlg_icpp_init_stub
-#define _TabDlg_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/Timing/init b/reference/Timing/init
deleted file mode 100644
index 6ae293a3e..000000000
--- a/reference/Timing/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Timing_icpp_init_stub
-#define _Timing_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/Topic/init b/reference/Topic/init
deleted file mode 100644
index f06342207..000000000
--- a/reference/Topic/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Topic_icpp_init_stub
-#define _Topic_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/TrayIcon/init b/reference/TrayIcon/init
deleted file mode 100644
index bc640b371..000000000
--- a/reference/TrayIcon/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _TrayIcon_icpp_init_stub
-#define _TrayIcon_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/TreeCtrl/init b/reference/TreeCtrl/init
deleted file mode 100644
index 7f39e4b90..000000000
--- a/reference/TreeCtrl/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _TreeCtrl_icpp_init_stub
-#define _TreeCtrl_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/TreeCtrlDnD/init b/reference/TreeCtrlDnD/init
deleted file mode 100644
index a7bab1828..000000000
--- a/reference/TreeCtrlDnD/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _TreeCtrlDnD_icpp_init_stub
-#define _TreeCtrlDnD_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/Tuple/init b/reference/Tuple/init
deleted file mode 100644
index 906e2783e..000000000
--- a/reference/Tuple/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Tuple_icpp_init_stub
-#define _Tuple_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/UWord_FB/init b/reference/UWord_FB/init
deleted file mode 100644
index 4a32d43ea..000000000
--- a/reference/UWord_FB/init
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _UWord_FB_icpp_init_stub
-#define _UWord_FB_icpp_init_stub
-#include "CtrlLib/init"
-#include "RichEdit/init"
-#include "PdfDraw/init"
-#include "plugin\jpg/init"
-#include "WinFb/init"
-#include "LinuxFb/init"
-#endif
diff --git a/reference/UrlInfo/init b/reference/UrlInfo/init
deleted file mode 100644
index d2c98a5c9..000000000
--- a/reference/UrlInfo/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _UrlInfo_icpp_init_stub
-#define _UrlInfo_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/Value/init b/reference/Value/init
deleted file mode 100644
index 8f1cc2e96..000000000
--- a/reference/Value/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Value_icpp_init_stub
-#define _Value_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/ValuePick/init b/reference/ValuePick/init
deleted file mode 100644
index d84fa9be0..000000000
--- a/reference/ValuePick/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ValuePick_icpp_init_stub
-#define _ValuePick_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/ValueRef/init b/reference/ValueRef/init
deleted file mode 100644
index 640b46377..000000000
--- a/reference/ValueRef/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ValueRef_icpp_init_stub
-#define _ValueRef_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/Watermark/init b/reference/Watermark/init
deleted file mode 100644
index 0c5f84de4..000000000
--- a/reference/Watermark/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Watermark_icpp_init_stub
-#define _Watermark_icpp_init_stub
-#include "CtrlLib/init"
-#include "Report/init"
-#endif
diff --git a/reference/WebImage/init b/reference/WebImage/init
deleted file mode 100644
index 3cd801c1d..000000000
--- a/reference/WebImage/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _WebImage_icpp_init_stub
-#define _WebImage_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/WebSocket/init b/reference/WebSocket/init
deleted file mode 100644
index 2538775bb..000000000
--- a/reference/WebSocket/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _WebSocket_icpp_init_stub
-#define _WebSocket_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/WebWord/init b/reference/WebWord/init
deleted file mode 100644
index 3c044298b..000000000
--- a/reference/WebWord/init
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _WebWord_icpp_init_stub
-#define _WebWord_icpp_init_stub
-#include "Core/init"
-#include "RichEdit/init"
-#include "PdfDraw/init"
-#include "Turtle/init"
-#include "plugin/DroidFonts/init"
-#endif
diff --git a/reference/WinFb/init b/reference/WinFb/init
deleted file mode 100644
index 0123400e9..000000000
--- a/reference/WinFb/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _WinFb_icpp_init_stub
-#define _WinFb_icpp_init_stub
-#include "Framebuffer/init"
-#endif
diff --git a/reference/XML/init b/reference/XML/init
deleted file mode 100644
index 75c88dde3..000000000
--- a/reference/XML/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _XML_icpp_init_stub
-#define _XML_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/XmlRpcCall/init b/reference/XmlRpcCall/init
deleted file mode 100644
index 7828920e3..000000000
--- a/reference/XmlRpcCall/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _XmlRpcCall_icpp_init_stub
-#define _XmlRpcCall_icpp_init_stub
-#include "Core/init"
-#include "Core\Rpc/init"
-#endif
diff --git a/reference/XmlRpcClient/init b/reference/XmlRpcClient/init
deleted file mode 100644
index 5ea4c212f..000000000
--- a/reference/XmlRpcClient/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _XmlRpcClient_icpp_init_stub
-#define _XmlRpcClient_icpp_init_stub
-#include "Core/init"
-#include "Core\Rpc/init"
-#endif
diff --git a/reference/XmlRpcServer/init b/reference/XmlRpcServer/init
deleted file mode 100644
index 07fc502e0..000000000
--- a/reference/XmlRpcServer/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _XmlRpcServer_icpp_init_stub
-#define _XmlRpcServer_icpp_init_stub
-#include "Core/init"
-#include "Core\Rpc/init"
-#endif
diff --git a/reference/Xmlize/init b/reference/Xmlize/init
deleted file mode 100644
index 850ac5622..000000000
--- a/reference/Xmlize/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Xmlize_icpp_init_stub
-#define _Xmlize_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/XmlizeCustomValue/init b/reference/XmlizeCustomValue/init
deleted file mode 100644
index 4c60f6639..000000000
--- a/reference/XmlizeCustomValue/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _XmlizeCustomValue_icpp_init_stub
-#define _XmlizeCustomValue_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/Xmlize_std/init b/reference/Xmlize_std/init
deleted file mode 100644
index 846620698..000000000
--- a/reference/Xmlize_std/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Xmlize_std_icpp_init_stub
-#define _Xmlize_std_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/Zip/init b/reference/Zip/init
deleted file mode 100644
index 6fe970ab3..000000000
--- a/reference/Zip/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Zip_icpp_init_stub
-#define _Zip_icpp_init_stub
-#include "Core/init"
-#include "plugin/zip/init"
-#endif
diff --git a/reference/build_info/init b/reference/build_info/init
deleted file mode 100644
index 922306b57..000000000
--- a/reference/build_info/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _build_info_icpp_init_stub
-#define _build_info_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/reference/iml/init b/reference/iml/init
deleted file mode 100644
index a472a668d..000000000
--- a/reference/iml/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _iml_icpp_init_stub
-#define _iml_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/tutorial/Core01/init b/tutorial/Core01/init
deleted file mode 100644
index a9a869aa6..000000000
--- a/tutorial/Core01/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Core01_icpp_init_stub
-#define _Core01_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/tutorial/Core04/init b/tutorial/Core04/init
deleted file mode 100644
index bb0d6e30a..000000000
--- a/tutorial/Core04/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Core04_icpp_init_stub
-#define _Core04_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/tutorial/Core07/init b/tutorial/Core07/init
deleted file mode 100644
index 8437a7ac2..000000000
--- a/tutorial/Core07/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Core07_icpp_init_stub
-#define _Core07_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/tutorial/Core08/init b/tutorial/Core08/init
deleted file mode 100644
index 1bd4ffa75..000000000
--- a/tutorial/Core08/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Core08_icpp_init_stub
-#define _Core08_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/tutorial/Core09/init b/tutorial/Core09/init
deleted file mode 100644
index f6acf8bdd..000000000
--- a/tutorial/Core09/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Core09_icpp_init_stub
-#define _Core09_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/tutorial/Draw03/init b/tutorial/Draw03/init
deleted file mode 100644
index f7c598c14..000000000
--- a/tutorial/Draw03/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Draw03_icpp_init_stub
-#define _Draw03_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/tutorial/Grid01/init b/tutorial/Grid01/init
deleted file mode 100644
index 27793d786..000000000
--- a/tutorial/Grid01/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Grid01_icpp_init_stub
-#define _Grid01_icpp_init_stub
-#include "CtrlLib/init"
-#include "GridCtrl/init"
-#endif
diff --git a/tutorial/Gui07/init b/tutorial/Gui07/init
deleted file mode 100644
index af3bc4d73..000000000
--- a/tutorial/Gui07/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Gui07_icpp_init_stub
-#define _Gui07_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/tutorial/Gui07a/init b/tutorial/Gui07a/init
deleted file mode 100644
index 65cda96a6..000000000
--- a/tutorial/Gui07a/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Gui07a_icpp_init_stub
-#define _Gui07a_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/tutorial/Gui08/init b/tutorial/Gui08/init
deleted file mode 100644
index f444a4e3a..000000000
--- a/tutorial/Gui08/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Gui08_icpp_init_stub
-#define _Gui08_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/tutorial/Gui09/init b/tutorial/Gui09/init
deleted file mode 100644
index a9c21b4af..000000000
--- a/tutorial/Gui09/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Gui09_icpp_init_stub
-#define _Gui09_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/tutorial/Gui10/init b/tutorial/Gui10/init
deleted file mode 100644
index 336de774f..000000000
--- a/tutorial/Gui10/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Gui10_icpp_init_stub
-#define _Gui10_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/tutorial/Gui12/init b/tutorial/Gui12/init
deleted file mode 100644
index f0220ab4a..000000000
--- a/tutorial/Gui12/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Gui12_icpp_init_stub
-#define _Gui12_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/tutorial/Ntl01/init b/tutorial/Ntl01/init
deleted file mode 100644
index 2c5eb4612..000000000
--- a/tutorial/Ntl01/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Ntl01_icpp_init_stub
-#define _Ntl01_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/tutorial/Ntl03/init b/tutorial/Ntl03/init
deleted file mode 100644
index 412108e8e..000000000
--- a/tutorial/Ntl03/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Ntl03_icpp_init_stub
-#define _Ntl03_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/tutorial/Ntl04/init b/tutorial/Ntl04/init
deleted file mode 100644
index 816402c5e..000000000
--- a/tutorial/Ntl04/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Ntl04_icpp_init_stub
-#define _Ntl04_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/tutorial/Ntl05/init b/tutorial/Ntl05/init
deleted file mode 100644
index bdd969e86..000000000
--- a/tutorial/Ntl05/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Ntl05_icpp_init_stub
-#define _Ntl05_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/tutorial/Ntl06/init b/tutorial/Ntl06/init
deleted file mode 100644
index cddeeceba..000000000
--- a/tutorial/Ntl06/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Ntl06_icpp_init_stub
-#define _Ntl06_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/tutorial/Ntl07/init b/tutorial/Ntl07/init
deleted file mode 100644
index 21d19fac5..000000000
--- a/tutorial/Ntl07/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Ntl07_icpp_init_stub
-#define _Ntl07_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/tutorial/Ntl08/init b/tutorial/Ntl08/init
deleted file mode 100644
index 9cbbe9f62..000000000
--- a/tutorial/Ntl08/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Ntl08_icpp_init_stub
-#define _Ntl08_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/tutorial/Ntl09/init b/tutorial/Ntl09/init
deleted file mode 100644
index cfb349c24..000000000
--- a/tutorial/Ntl09/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Ntl09_icpp_init_stub
-#define _Ntl09_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/tutorial/Ntl10/init b/tutorial/Ntl10/init
deleted file mode 100644
index cac4fc406..000000000
--- a/tutorial/Ntl10/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Ntl10_icpp_init_stub
-#define _Ntl10_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/tutorial/Ntl11/init b/tutorial/Ntl11/init
deleted file mode 100644
index 7f9dbb96c..000000000
--- a/tutorial/Ntl11/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Ntl11_icpp_init_stub
-#define _Ntl11_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/tutorial/Ntl12/init b/tutorial/Ntl12/init
deleted file mode 100644
index 2825e52f4..000000000
--- a/tutorial/Ntl12/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Ntl12_icpp_init_stub
-#define _Ntl12_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/tutorial/Ntl13/init b/tutorial/Ntl13/init
deleted file mode 100644
index 2171822d1..000000000
--- a/tutorial/Ntl13/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Ntl13_icpp_init_stub
-#define _Ntl13_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/tutorial/Ntl14/init b/tutorial/Ntl14/init
deleted file mode 100644
index b5bfdbf63..000000000
--- a/tutorial/Ntl14/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Ntl14_icpp_init_stub
-#define _Ntl14_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/tutorial/Ntl15/init b/tutorial/Ntl15/init
deleted file mode 100644
index 04e6937fb..000000000
--- a/tutorial/Ntl15/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Ntl15_icpp_init_stub
-#define _Ntl15_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/tutorial/Ntl16/init b/tutorial/Ntl16/init
deleted file mode 100644
index 916c9589b..000000000
--- a/tutorial/Ntl16/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Ntl16_icpp_init_stub
-#define _Ntl16_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/tutorial/Skylark01/init b/tutorial/Skylark01/init
deleted file mode 100644
index ca84e225f..000000000
--- a/tutorial/Skylark01/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Skylark01_icpp_init_stub
-#define _Skylark01_icpp_init_stub
-#include "Core/init"
-#include "Skylark/init"
-#endif
diff --git a/tutorial/Skylark02/init b/tutorial/Skylark02/init
deleted file mode 100644
index a6c9cd27b..000000000
--- a/tutorial/Skylark02/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Skylark02_icpp_init_stub
-#define _Skylark02_icpp_init_stub
-#include "Core/init"
-#include "Skylark/init"
-#endif
diff --git a/tutorial/Skylark03/init b/tutorial/Skylark03/init
deleted file mode 100644
index 5e149988f..000000000
--- a/tutorial/Skylark03/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Skylark03_icpp_init_stub
-#define _Skylark03_icpp_init_stub
-#include "Core/init"
-#include "Skylark/init"
-#endif
diff --git a/tutorial/Skylark04/init b/tutorial/Skylark04/init
deleted file mode 100644
index 30a474e6e..000000000
--- a/tutorial/Skylark04/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _Skylark04_icpp_init_stub
-#define _Skylark04_icpp_init_stub
-#include "Core/init"
-#include "Skylark/init"
-#include "plugin/jpg/init"
-#include "plugin/png/init"
-#endif
diff --git a/tutorial/Skylark05/init b/tutorial/Skylark05/init
deleted file mode 100644
index 5aa3e4abe..000000000
--- a/tutorial/Skylark05/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Skylark05_icpp_init_stub
-#define _Skylark05_icpp_init_stub
-#include "Core/init"
-#include "Skylark/init"
-#endif
diff --git a/tutorial/Skylark06/init b/tutorial/Skylark06/init
deleted file mode 100644
index 4ddc77565..000000000
--- a/tutorial/Skylark06/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Skylark06_icpp_init_stub
-#define _Skylark06_icpp_init_stub
-#include "Core/init"
-#include "Skylark/init"
-#endif
diff --git a/tutorial/Skylark07/init b/tutorial/Skylark07/init
deleted file mode 100644
index d9a554164..000000000
--- a/tutorial/Skylark07/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Skylark07_icpp_init_stub
-#define _Skylark07_icpp_init_stub
-#include "Core/init"
-#include "Skylark/init"
-#endif
diff --git a/tutorial/Skylark08/init b/tutorial/Skylark08/init
deleted file mode 100644
index 0a895efbb..000000000
--- a/tutorial/Skylark08/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Skylark08_icpp_init_stub
-#define _Skylark08_icpp_init_stub
-#include "Core/init"
-#include "Skylark/init"
-#endif
diff --git a/tutorial/Skylark09/init b/tutorial/Skylark09/init
deleted file mode 100644
index 89e7b5883..000000000
--- a/tutorial/Skylark09/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _Skylark09_icpp_init_stub
-#define _Skylark09_icpp_init_stub
-#include "Core/init"
-#include "Skylark/init"
-#include "plugin/sqlite3/init"
-#endif
diff --git a/tutorial/Skylark10/init b/tutorial/Skylark10/init
deleted file mode 100644
index c124732bc..000000000
--- a/tutorial/Skylark10/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _Skylark10_icpp_init_stub
-#define _Skylark10_icpp_init_stub
-#include "Core/init"
-#include "Skylark/init"
-#include "plugin/sqlite3/init"
-#endif
diff --git a/tutorial/Skylark11/init b/tutorial/Skylark11/init
deleted file mode 100644
index fb5e34c64..000000000
--- a/tutorial/Skylark11/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _Skylark11_icpp_init_stub
-#define _Skylark11_icpp_init_stub
-#include "Core/init"
-#include "Skylark/init"
-#include "plugin/sqlite3/init"
-#endif
diff --git a/tutorial/Skylark12/init b/tutorial/Skylark12/init
deleted file mode 100644
index 5d1a0986c..000000000
--- a/tutorial/Skylark12/init
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _Skylark12_icpp_init_stub
-#define _Skylark12_icpp_init_stub
-#include "Skylark/init"
-#include "plugin/sqlite3/init"
-#define BLITZ_INDEX__ F70b142af5a1a021ab945c31f2df8abbb
-#include "Handlers.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/tutorial/Sql01/init b/tutorial/Sql01/init
deleted file mode 100644
index 5c6abeb90..000000000
--- a/tutorial/Sql01/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Sql01_icpp_init_stub
-#define _Sql01_icpp_init_stub
-#include "Core/init"
-#include "plugin\sqlite3/init"
-#endif
diff --git a/tutorial/Sql02/init b/tutorial/Sql02/init
deleted file mode 100644
index 4d65b675c..000000000
--- a/tutorial/Sql02/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Sql02_icpp_init_stub
-#define _Sql02_icpp_init_stub
-#include "Core/init"
-#include "plugin\sqlite3/init"
-#endif
diff --git a/tutorial/Sql03/init b/tutorial/Sql03/init
deleted file mode 100644
index 61c723009..000000000
--- a/tutorial/Sql03/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Sql03_icpp_init_stub
-#define _Sql03_icpp_init_stub
-#include "Core/init"
-#include "plugin\sqlite3/init"
-#endif
diff --git a/tutorial/Sql04/init b/tutorial/Sql04/init
deleted file mode 100644
index c9f295052..000000000
--- a/tutorial/Sql04/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Sql05_icpp_init_stub
-#define _Sql05_icpp_init_stub
-#include "Core/init"
-#include "plugin\sqlite3/init"
-#endif
diff --git a/tutorial/Sql05/init b/tutorial/Sql05/init
deleted file mode 100644
index 6674705a2..000000000
--- a/tutorial/Sql05/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Sql06_icpp_init_stub
-#define _Sql06_icpp_init_stub
-#include "Core/init"
-#include "plugin\sqlite3/init"
-#endif
diff --git a/tutorial/Sql06/init b/tutorial/Sql06/init
deleted file mode 100644
index 6674705a2..000000000
--- a/tutorial/Sql06/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Sql06_icpp_init_stub
-#define _Sql06_icpp_init_stub
-#include "Core/init"
-#include "plugin\sqlite3/init"
-#endif
diff --git a/uppbox/AutoTest/init b/uppbox/AutoTest/init
deleted file mode 100644
index bb1814807..000000000
--- a/uppbox/AutoTest/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _AutoTest_icpp_init_stub
-#define _AutoTest_icpp_init_stub
-#include "Core/init"
-#include "Core/SMTP/init"
-#include "Core/SSL/init"
-#endif
diff --git a/uppbox/FontMaps/init b/uppbox/FontMaps/init
deleted file mode 100644
index 042cf32e3..000000000
--- a/uppbox/FontMaps/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _FontMaps_icpp_init_stub
-#define _FontMaps_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppbox/MakeInstall3/init b/uppbox/MakeInstall3/init
deleted file mode 100644
index 6cfdbd729..000000000
--- a/uppbox/MakeInstall3/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _MakeInstall4_icpp_init_stub
-#define _MakeInstall4_icpp_init_stub
-#include "plugin\bz2/init"
-#include "Core/init"
-#include "plugin\ftp/init"
-#endif
diff --git a/uppbox/MakeInstall4/init b/uppbox/MakeInstall4/init
deleted file mode 100644
index 6cfdbd729..000000000
--- a/uppbox/MakeInstall4/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _MakeInstall4_icpp_init_stub
-#define _MakeInstall4_icpp_init_stub
-#include "plugin\bz2/init"
-#include "Core/init"
-#include "plugin\ftp/init"
-#endif
diff --git a/uppbox/MakeInstall5/init b/uppbox/MakeInstall5/init
deleted file mode 100644
index 6d85bc992..000000000
--- a/uppbox/MakeInstall5/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _MakeInstall5_icpp_init_stub
-#define _MakeInstall5_icpp_init_stub
-#include "plugin\bz2/init"
-#include "Core/init"
-#include "plugin\ftp/init"
-#endif
diff --git a/uppbox/MakeSpellScd/init b/uppbox/MakeSpellScd/init
deleted file mode 100644
index fd8113dac..000000000
--- a/uppbox/MakeSpellScd/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _MakeSpellScd_icpp_init_stub
-#define _MakeSpellScd_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppbox/Scripts/init b/uppbox/Scripts/init
deleted file mode 100644
index 5c47f295f..000000000
--- a/uppbox/Scripts/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _Scripts_icpp_init_stub
-#define _Scripts_icpp_init_stub
-#endif
diff --git a/uppbox/UppBuilder/init b/uppbox/UppBuilder/init
deleted file mode 100644
index 2a6bf65ca..000000000
--- a/uppbox/UppBuilder/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _UppBuilder_icpp_init_stub
-#define _UppBuilder_icpp_init_stub
-#endif
diff --git a/uppbox/Uvs2/init b/uppbox/Uvs2/init
deleted file mode 100644
index 3641712ce..000000000
--- a/uppbox/Uvs2/init
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _Uvs2_icpp_init_stub
-#define _Uvs2_icpp_init_stub
-#include "Web/init"
-#include "plugin\bz2/init"
-#include "plugin\z/init"
-#include "plugin\ftp/init"
-#include "CtrlLib/init"
-#define BLITZ_INDEX__ FBCE16A4E47C9D5FD092354066DF5ED0C
-#include "Uvs2_init.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppbox/WinInstaller/init b/uppbox/WinInstaller/init
deleted file mode 100644
index 7e0a08749..000000000
--- a/uppbox/WinInstaller/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _WinInstaller_icpp_init_stub
-#define _WinInstaller_icpp_init_stub
-#include "Core/init"
-#include "plugin\bz2/init"
-#endif
diff --git a/uppbox/WinInstaller2/init b/uppbox/WinInstaller2/init
deleted file mode 100644
index 8ffad27ef..000000000
--- a/uppbox/WinInstaller2/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _WinInstaller2_icpp_init_stub
-#define _WinInstaller2_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppbox/lpbuild/init b/uppbox/lpbuild/init
deleted file mode 100644
index 2b37a9126..000000000
--- a/uppbox/lpbuild/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _lpbuild_icpp_init_stub
-#define _lpbuild_icpp_init_stub
-#endif
diff --git a/uppbox/uppweb/init b/uppbox/uppweb/init
deleted file mode 100644
index 69b3f5cfd..000000000
--- a/uppbox/uppweb/init
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _uppweb_icpp_init_stub
-#define _uppweb_icpp_init_stub
-#include "Web/init"
-#include "RichText/init"
-#include "plugin\gif/init"
-#include "CtrlLib/init"
-#include "plugin\png/init"
-#include "ide/init"
-#include "plugin\ftp/init"
-#include "Sql/init"
-#include "Skeleton/init"
-#include "Painter/init"
-#include "Skylark/init"
-#endif
diff --git a/uppdev/AAA/init b/uppdev/AAA/init
deleted file mode 100644
index f9cb5a8fd..000000000
--- a/uppdev/AAA/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _AAA_icpp_init_stub
-#define _AAA_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/AccessKey/init b/uppdev/AccessKey/init
deleted file mode 100644
index a98d445c1..000000000
--- a/uppdev/AccessKey/init
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _AccessKey_icpp_init_stub
-#define _AccessKey_icpp_init_stub
-#include "CtrlLib/init"
-#include "Web/init"
-#include "SubTest/init"
-#define BLITZ_INDEX__ F190185a01d70a422cd7de990bd1c48a1
-#include "testing.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppdev/AggCtrl/init b/uppdev/AggCtrl/init
deleted file mode 100644
index 06de2b1a2..000000000
--- a/uppdev/AggCtrl/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _AggCtrl_icpp_init_stub
-#define _AggCtrl_icpp_init_stub
-#include "CtrlLib/init"
-#include "agg24/init"
-#endif
diff --git a/uppdev/Alloc/init b/uppdev/Alloc/init
deleted file mode 100644
index 4a6cbfae7..000000000
--- a/uppdev/Alloc/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Alloc_icpp_init_stub
-#define _Alloc_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/AlphaImage/init b/uppdev/AlphaImage/init
deleted file mode 100644
index e66ff9ba0..000000000
--- a/uppdev/AlphaImage/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _AlphaImage_icpp_init_stub
-#define _AlphaImage_icpp_init_stub
-#include "CtrlLib/init"
-#include "plugin\zim/init"
-#endif
diff --git a/uppdev/Any/init b/uppdev/Any/init
deleted file mode 100644
index 873bd3831..000000000
--- a/uppdev/Any/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Any_icpp_init_stub
-#define _Any_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/AnyImageDraw/init b/uppdev/AnyImageDraw/init
deleted file mode 100644
index 722ba3f40..000000000
--- a/uppdev/AnyImageDraw/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _AnyImageDraw_icpp_init_stub
-#define _AnyImageDraw_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#endif
diff --git a/uppdev/ArrayCtrl/init b/uppdev/ArrayCtrl/init
deleted file mode 100644
index 7c8b71446..000000000
--- a/uppdev/ArrayCtrl/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ArrayCtrl_icpp_init_stub
-#define _ArrayCtrl_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/ArrayCtrlClipSel/init b/uppdev/ArrayCtrlClipSel/init
deleted file mode 100644
index 51e0b308d..000000000
--- a/uppdev/ArrayCtrlClipSel/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ArrayCtrlClipSel_icpp_init_stub
-#define _ArrayCtrlClipSel_icpp_init_stub
-#include "CtrlLib/init"
-#include "Report/init"
-#endif
diff --git a/uppdev/ArrayCtrlCtrl/init b/uppdev/ArrayCtrlCtrl/init
deleted file mode 100644
index 79059a97c..000000000
--- a/uppdev/ArrayCtrlCtrl/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ArrayCtrlCtrl_icpp_init_stub
-#define _ArrayCtrlCtrl_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/ArrayCtrlEdit/init b/uppdev/ArrayCtrlEdit/init
deleted file mode 100644
index 45631f50a..000000000
--- a/uppdev/ArrayCtrlEdit/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ArrayCtrlEdit_icpp_init_stub
-#define _ArrayCtrlEdit_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/ArrayCtrlMSel/init b/uppdev/ArrayCtrlMSel/init
deleted file mode 100644
index a741c9ac2..000000000
--- a/uppdev/ArrayCtrlMSel/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ArrayCtrlMSel_icpp_init_stub
-#define _ArrayCtrlMSel_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/ArrayCtrlPaint/init b/uppdev/ArrayCtrlPaint/init
deleted file mode 100644
index 07e46befd..000000000
--- a/uppdev/ArrayCtrlPaint/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ArrayCtrlPaint_icpp_init_stub
-#define _ArrayCtrlPaint_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/ArrayCtrlSort/init b/uppdev/ArrayCtrlSort/init
deleted file mode 100644
index 99123bcc6..000000000
--- a/uppdev/ArrayCtrlSort/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ArrayCtrlSort_icpp_init_stub
-#define _ArrayCtrlSort_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/ArrayOne/init b/uppdev/ArrayOne/init
deleted file mode 100644
index bd8dceb52..000000000
--- a/uppdev/ArrayOne/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ArrayOne_icpp_init_stub
-#define _ArrayOne_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/AssistTest/init b/uppdev/AssistTest/init
deleted file mode 100644
index efbcfeb48..000000000
--- a/uppdev/AssistTest/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _AssistTest_icpp_init_stub
-#define _AssistTest_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/Astyle/init b/uppdev/Astyle/init
deleted file mode 100644
index 3efcc49af..000000000
--- a/uppdev/Astyle/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Astyle_icpp_init_stub
-#define _Astyle_icpp_init_stub
-#include "CtrlLib/init"
-#include "plugin\astyle/init"
-#endif
diff --git a/uppdev/BOM/init b/uppdev/BOM/init
deleted file mode 100644
index 71ce3ff17..000000000
--- a/uppdev/BOM/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _BOM_icpp_init_stub
-#define _BOM_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/Bar/init b/uppdev/Bar/init
deleted file mode 100644
index 41d9d4af1..000000000
--- a/uppdev/Bar/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Bar_icpp_init_stub
-#define _Bar_icpp_init_stub
-#include "CtrlLib/init"
-#include "Geom/init"
-#endif
diff --git a/uppdev/BeatPickerTest/init b/uppdev/BeatPickerTest/init
deleted file mode 100644
index a350f4d59..000000000
--- a/uppdev/BeatPickerTest/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _BeatPickerTest_icpp_init_stub
-#define _BeatPickerTest_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/BiCubic/init b/uppdev/BiCubic/init
deleted file mode 100644
index 87731de79..000000000
--- a/uppdev/BiCubic/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _BiCubic_icpp_init_stub
-#define _BiCubic_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#include "plugin/jpg/init"
-#include "plugin/gif/init"
-#endif
diff --git a/uppdev/BigSort/init b/uppdev/BigSort/init
deleted file mode 100644
index 6ac1a9893..000000000
--- a/uppdev/BigSort/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _BigSort_icpp_init_stub
-#define _BigSort_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/BitStream/init b/uppdev/BitStream/init
deleted file mode 100644
index bab5585a3..000000000
--- a/uppdev/BitStream/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _BitStream_icpp_init_stub
-#define _BitStream_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/CMacro/init b/uppdev/CMacro/init
deleted file mode 100644
index 95dc406e5..000000000
--- a/uppdev/CMacro/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CMacro_icpp_init_stub
-#define _CMacro_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/CParserb/init b/uppdev/CParserb/init
deleted file mode 100644
index 5614d77d5..000000000
--- a/uppdev/CParserb/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CParserb_icpp_init_stub
-#define _CParserb_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/CacheGlyphTest/init b/uppdev/CacheGlyphTest/init
deleted file mode 100644
index a5e2f2ce0..000000000
--- a/uppdev/CacheGlyphTest/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _CacheGlyphTest_icpp_init_stub
-#define _CacheGlyphTest_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#endif
diff --git a/uppdev/CacheLock/init b/uppdev/CacheLock/init
deleted file mode 100644
index ab417d534..000000000
--- a/uppdev/CacheLock/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CacheLock_icpp_init_stub
-#define _CacheLock_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/CairoDemo/init b/uppdev/CairoDemo/init
deleted file mode 100644
index d65115c25..000000000
--- a/uppdev/CairoDemo/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _CairoDemo_icpp_init_stub
-#define _CairoDemo_icpp_init_stub
-#include "CtrlLib/init"
-#include "plugin\cairo/init"
-#endif
diff --git a/uppdev/Calgo/init b/uppdev/Calgo/init
deleted file mode 100644
index 23f5adf93..000000000
--- a/uppdev/Calgo/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Calgo_icpp_init_stub
-#define _Calgo_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/CheckDomain/init b/uppdev/CheckDomain/init
deleted file mode 100644
index 309f88595..000000000
--- a/uppdev/CheckDomain/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _CheckDomain_icpp_init_stub
-#define _CheckDomain_icpp_init_stub
-#include "Core/init"
-#include "Web/init"
-#endif
diff --git a/uppdev/Chessboard/init b/uppdev/Chessboard/init
deleted file mode 100644
index a87bcde0c..000000000
--- a/uppdev/Chessboard/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Chessboard_icpp_init_stub
-#define _Chessboard_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/Clock/init b/uppdev/Clock/init
deleted file mode 100644
index d87f2c883..000000000
--- a/uppdev/Clock/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Clock_icpp_init_stub
-#define _Clock_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/CoWork/init b/uppdev/CoWork/init
deleted file mode 100644
index fbf40794e..000000000
--- a/uppdev/CoWork/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CoWork_icpp_init_stub
-#define _CoWork_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/ColumnListDnD/init b/uppdev/ColumnListDnD/init
deleted file mode 100644
index 1bb602e48..000000000
--- a/uppdev/ColumnListDnD/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ColumnListDnD_icpp_init_stub
-#define _ColumnListDnD_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/Compare/init b/uppdev/Compare/init
deleted file mode 100644
index c8e2489fc..000000000
--- a/uppdev/Compare/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Compare_icpp_init_stub
-#define _Compare_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/CompressedSerialize/init b/uppdev/CompressedSerialize/init
deleted file mode 100644
index 0d03a817f..000000000
--- a/uppdev/CompressedSerialize/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _CompressedSerialize_icpp_init_stub
-#define _CompressedSerialize_icpp_init_stub
-#include "Core/init"
-#include "plugin/lz4/init"
-#endif
diff --git a/uppdev/CondVar/init b/uppdev/CondVar/init
deleted file mode 100644
index d118e3d93..000000000
--- a/uppdev/CondVar/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CondVar_icpp_init_stub
-#define _CondVar_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/CoreBenchmark/init b/uppdev/CoreBenchmark/init
deleted file mode 100644
index ff77aef32..000000000
--- a/uppdev/CoreBenchmark/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _CoreBenchmark_icpp_init_stub
-#define _CoreBenchmark_icpp_init_stub
-#include "Core/init"
-#include "CppBase/init"
-#endif
diff --git a/uppdev/CoreTopics/init b/uppdev/CoreTopics/init
deleted file mode 100644
index 3bd517961..000000000
--- a/uppdev/CoreTopics/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _CoreTopics_icpp_init_stub
-#define _CoreTopics_icpp_init_stub
-#endif
diff --git a/uppdev/Cout/init b/uppdev/Cout/init
deleted file mode 100644
index 0d2827ab0..000000000
--- a/uppdev/Cout/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Cout_icpp_init_stub
-#define _Cout_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/CppTest/init b/uppdev/CppTest/init
deleted file mode 100644
index 89a4c07a1..000000000
--- a/uppdev/CppTest/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _CppTest_icpp_init_stub
-#define _CppTest_icpp_init_stub
-#endif
diff --git a/uppdev/CtrlLibTest/init b/uppdev/CtrlLibTest/init
deleted file mode 100644
index 126fc0e61..000000000
--- a/uppdev/CtrlLibTest/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _CtrlLibTest_icpp_init_stub
-#define _CtrlLibTest_icpp_init_stub
-#include "CtrlLib/init"
-#include "CtrlTest2/init"
-#endif
diff --git a/uppdev/CtrlTest2/init b/uppdev/CtrlTest2/init
deleted file mode 100644
index ebd6d4368..000000000
--- a/uppdev/CtrlTest2/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CtrlTest2_icpp_init_stub
-#define _CtrlTest2_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/CzTest/init b/uppdev/CzTest/init
deleted file mode 100644
index 0e87ef365..000000000
--- a/uppdev/CzTest/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _CzTest_icpp_init_stub
-#define _CzTest_icpp_init_stub
-#include "CtrlLib/init"
-#include "Report/init"
-#endif
diff --git a/uppdev/DPI/init b/uppdev/DPI/init
deleted file mode 100644
index 77f53982b..000000000
--- a/uppdev/DPI/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _DPI_icpp_init_stub
-#define _DPI_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/Dec/init b/uppdev/Dec/init
deleted file mode 100644
index 63dd1a0c4..000000000
--- a/uppdev/Dec/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Dec_icpp_init_stub
-#define _Dec_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/Decimal128/init b/uppdev/Decimal128/init
deleted file mode 100644
index dbe0aa1f3..000000000
--- a/uppdev/Decimal128/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Decimal128_icpp_init_stub
-#define _Decimal128_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/Dim/init b/uppdev/Dim/init
deleted file mode 100644
index e511f5456..000000000
--- a/uppdev/Dim/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Dim_icpp_init_stub
-#define _Dim_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/Div64/init b/uppdev/Div64/init
deleted file mode 100644
index 500af6372..000000000
--- a/uppdev/Div64/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Div64_icpp_init_stub
-#define _Div64_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/DocEdit/init b/uppdev/DocEdit/init
deleted file mode 100644
index 128ae103f..000000000
--- a/uppdev/DocEdit/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _DocEdit_icpp_init_stub
-#define _DocEdit_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/DockWindow/init b/uppdev/DockWindow/init
deleted file mode 100644
index 77df3de6c..000000000
--- a/uppdev/DockWindow/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _DockWindow_icpp_init_stub
-#define _DockWindow_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/Docking/init b/uppdev/Docking/init
deleted file mode 100644
index eb3e13183..000000000
--- a/uppdev/Docking/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Docking_icpp_init_stub
-#define _Docking_icpp_init_stub
-#include "CtrlLib/init"
-#include "TabBar/init"
-#endif
diff --git a/uppdev/DockingExample1/init b/uppdev/DockingExample1/init
deleted file mode 100644
index c5bb6251f..000000000
--- a/uppdev/DockingExample1/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _DockingExample1_icpp_init_stub
-#define _DockingExample1_icpp_init_stub
-#include "CtrlLib/init"
-#include "Docking/init"
-#endif
diff --git a/uppdev/DockingExample2/init b/uppdev/DockingExample2/init
deleted file mode 100644
index ec9304669..000000000
--- a/uppdev/DockingExample2/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _DockingExample2_icpp_init_stub
-#define _DockingExample2_icpp_init_stub
-#include "CtrlLib/init"
-#include "Docking/init"
-#endif
diff --git a/uppdev/DrawBench/init b/uppdev/DrawBench/init
deleted file mode 100644
index 010f8a621..000000000
--- a/uppdev/DrawBench/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _DrawBench_icpp_init_stub
-#define _DrawBench_icpp_init_stub
-#include "CtrlLib/init"
-#include "plugin\cairo/init"
-#include "Painter/init"
-#endif
diff --git a/uppdev/DrawOutputTest/init b/uppdev/DrawOutputTest/init
deleted file mode 100644
index 08b3ed857..000000000
--- a/uppdev/DrawOutputTest/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _DrawOutputTest_icpp_init_stub
-#define _DrawOutputTest_icpp_init_stub
-#include "CtrlLib/init"
-#include "Web/init"
-#include "plugin\cairo/init"
-#endif
diff --git a/uppdev/DrawText/init b/uppdev/DrawText/init
deleted file mode 100644
index 4f9ad810a..000000000
--- a/uppdev/DrawText/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _DrawText_icpp_init_stub
-#define _DrawText_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/DrawText697/init b/uppdev/DrawText697/init
deleted file mode 100644
index 1b95890be..000000000
--- a/uppdev/DrawText697/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _DrawText697_icpp_init_stub
-#define _DrawText697_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/DrawingReport/init b/uppdev/DrawingReport/init
deleted file mode 100644
index 68e889369..000000000
--- a/uppdev/DrawingReport/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _DrawingReport_icpp_init_stub
-#define _DrawingReport_icpp_init_stub
-#include "CtrlLib/init"
-#include "Report/init"
-#endif
diff --git a/uppdev/DropListBug/init b/uppdev/DropListBug/init
deleted file mode 100644
index bc8237161..000000000
--- a/uppdev/DropListBug/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _DropListBug_icpp_init_stub
-#define _DropListBug_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/EditString/init b/uppdev/EditString/init
deleted file mode 100644
index 310e74aaa..000000000
--- a/uppdev/EditString/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _EditString_icpp_init_stub
-#define _EditString_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/ExpandFrame/init b/uppdev/ExpandFrame/init
deleted file mode 100644
index 70e7b1503..000000000
--- a/uppdev/ExpandFrame/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _ExpandFrame_icpp_init_stub
-#define _ExpandFrame_icpp_init_stub
-#endif
diff --git a/uppdev/F5crash/init b/uppdev/F5crash/init
deleted file mode 100644
index da6eaf91b..000000000
--- a/uppdev/F5crash/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _F5crash_icpp_init_stub
-#define _F5crash_icpp_init_stub
-#endif
diff --git a/uppdev/FileHexView/init b/uppdev/FileHexView/init
deleted file mode 100644
index 2f8ccc9e9..000000000
--- a/uppdev/FileHexView/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _FileHexView_icpp_init_stub
-#define _FileHexView_icpp_init_stub
-#include "CtrlLib/init"
-#include "HexView/init"
-#endif
diff --git a/uppdev/FileSel/init b/uppdev/FileSel/init
deleted file mode 100644
index 1967588ed..000000000
--- a/uppdev/FileSel/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _FileSel_icpp_init_stub
-#define _FileSel_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/FileView/init b/uppdev/FileView/init
deleted file mode 100644
index cb6d73bcc..000000000
--- a/uppdev/FileView/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _FileView_icpp_init_stub
-#define _FileView_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/FindFile/init b/uppdev/FindFile/init
deleted file mode 100644
index 4804b41d3..000000000
--- a/uppdev/FindFile/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _FindFile_icpp_init_stub
-#define _FindFile_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/FindMissingDrive/init b/uppdev/FindMissingDrive/init
deleted file mode 100644
index 03bf68ced..000000000
--- a/uppdev/FindMissingDrive/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _FindMissingDrive_icpp_init_stub
-#define _FindMissingDrive_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/FixedMap/init b/uppdev/FixedMap/init
deleted file mode 100644
index 5696884ef..000000000
--- a/uppdev/FixedMap/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _FixedMap_icpp_init_stub
-#define _FixedMap_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/Flex/init b/uppdev/Flex/init
deleted file mode 100644
index 733b47486..000000000
--- a/uppdev/Flex/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Flex_icpp_init_stub
-#define _Flex_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/FontDB/init b/uppdev/FontDB/init
deleted file mode 100644
index 8a5b8ea0a..000000000
--- a/uppdev/FontDB/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _FontDB_icpp_init_stub
-#define _FontDB_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#endif
diff --git a/uppdev/FontInfo/init b/uppdev/FontInfo/init
deleted file mode 100644
index 97f0f6817..000000000
--- a/uppdev/FontInfo/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _FontInfo_icpp_init_stub
-#define _FontInfo_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/Fonts/init b/uppdev/Fonts/init
deleted file mode 100644
index 511944fc5..000000000
--- a/uppdev/Fonts/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Fonts_icpp_init_stub
-#define _Fonts_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/FormatUnsafe/init b/uppdev/FormatUnsafe/init
deleted file mode 100644
index 225b8913a..000000000
--- a/uppdev/FormatUnsafe/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _FormatUnsafe_icpp_init_stub
-#define _FormatUnsafe_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/Freetds/init b/uppdev/Freetds/init
deleted file mode 100644
index d34fe5678..000000000
--- a/uppdev/Freetds/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Freetds_icpp_init_stub
-#define _Freetds_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/FwSort/init b/uppdev/FwSort/init
deleted file mode 100644
index d36bbc9da..000000000
--- a/uppdev/FwSort/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _FwSort_icpp_init_stub
-#define _FwSort_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/GCCBug/init b/uppdev/GCCBug/init
deleted file mode 100644
index acfe8b4ab..000000000
--- a/uppdev/GCCBug/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _GCCBug_icpp_init_stub
-#define _GCCBug_icpp_init_stub
-#endif
diff --git a/uppdev/GLControlTest/init b/uppdev/GLControlTest/init
deleted file mode 100644
index e30e48f56..000000000
--- a/uppdev/GLControlTest/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _GLControlTest_icpp_init_stub
-#define _GLControlTest_icpp_init_stub
-#include "CtrlLib/init"
-#include "GLCtrl/init"
-#endif
diff --git a/uppdev/GLCtrl.bak/init b/uppdev/GLCtrl.bak/init
deleted file mode 100644
index 85141d075..000000000
--- a/uppdev/GLCtrl.bak/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _GLCtrl_icpp_init_stub
-#define _GLCtrl_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/GLCtrlBug/init b/uppdev/GLCtrlBug/init
deleted file mode 100644
index 26e2016e2..000000000
--- a/uppdev/GLCtrlBug/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _GLCtrlBug_icpp_init_stub
-#define _GLCtrlBug_icpp_init_stub
-#include "CtrlLib/init"
-#include "GLCtrl/init"
-#endif
diff --git a/uppdev/GTK/init b/uppdev/GTK/init
deleted file mode 100644
index 8e903ed72..000000000
--- a/uppdev/GTK/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _GTK_icpp_init_stub
-#define _GTK_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/GateIssue/init b/uppdev/GateIssue/init
deleted file mode 100644
index e2a5abeaa..000000000
--- a/uppdev/GateIssue/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _GateIssue_icpp_init_stub
-#define _GateIssue_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/GatoFax/init b/uppdev/GatoFax/init
deleted file mode 100644
index 1c150507d..000000000
--- a/uppdev/GatoFax/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _GatoFax_icpp_init_stub
-#define _GatoFax_icpp_init_stub
-#include "CtrlLib/init"
-#include "plugin/tif/init"
-#endif
diff --git a/uppdev/Gen3/init b/uppdev/Gen3/init
deleted file mode 100644
index b859f104e..000000000
--- a/uppdev/Gen3/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Gen3_icpp_init_stub
-#define _Gen3_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/GenShard/init b/uppdev/GenShard/init
deleted file mode 100644
index a9ba16dad..000000000
--- a/uppdev/GenShard/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _GenShard_icpp_init_stub
-#define _GenShard_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#endif
diff --git a/uppdev/GeomTest/init b/uppdev/GeomTest/init
deleted file mode 100644
index 181a76ebd..000000000
--- a/uppdev/GeomTest/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _GeomTest_icpp_init_stub
-#define _GeomTest_icpp_init_stub
-#include "CtrlLib/init"
-#include "Geom/init"
-#include "Geom/Coords/init"
-#include "plugin/jpg/init"
-#endif
diff --git a/uppdev/GetSysTime/init b/uppdev/GetSysTime/init
deleted file mode 100644
index 5228caefd..000000000
--- a/uppdev/GetSysTime/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _GetSysTime_icpp_init_stub
-#define _GetSysTime_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/GlDraw/init b/uppdev/GlDraw/init
deleted file mode 100644
index 11f2b34d6..000000000
--- a/uppdev/GlDraw/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _GlDraw_icpp_init_stub
-#define _GlDraw_icpp_init_stub
-#include "CtrlLib/init"
-#include "GLCtrl/init"
-#include "Painter/init"
-#endif
diff --git a/uppdev/Glyph/init b/uppdev/Glyph/init
deleted file mode 100644
index fe45ee243..000000000
--- a/uppdev/Glyph/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Glyph_icpp_init_stub
-#define _Glyph_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#endif
diff --git a/uppdev/GoogleMap/init b/uppdev/GoogleMap/init
deleted file mode 100644
index 8f5bfa28d..000000000
--- a/uppdev/GoogleMap/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _GoogleMap_icpp_init_stub
-#define _GoogleMap_icpp_init_stub
-#include "CtrlLib/init"
-#include "Web/init"
-#include "plugin\jpg/init"
-#include "Geom\Coords/init"
-#endif
diff --git a/uppdev/GridEx/init b/uppdev/GridEx/init
deleted file mode 100644
index 5a82284ce..000000000
--- a/uppdev/GridEx/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _GridEx_icpp_init_stub
-#define _GridEx_icpp_init_stub
-#include "CtrlLib/init"
-#include "GridCtrl/init"
-#endif
diff --git a/uppdev/GtkApp/init b/uppdev/GtkApp/init
deleted file mode 100644
index 7103091a5..000000000
--- a/uppdev/GtkApp/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _GtkApp_icpp_init_stub
-#define _GtkApp_icpp_init_stub
-#include "Draw/init"
-#include "plugin/png/init"
-#endif
diff --git a/uppdev/GuiMTtest/init b/uppdev/GuiMTtest/init
deleted file mode 100644
index 560e37402..000000000
--- a/uppdev/GuiMTtest/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _GuiMTtest_icpp_init_stub
-#define _GuiMTtest_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/HTTPClient/init b/uppdev/HTTPClient/init
deleted file mode 100644
index 206336fea..000000000
--- a/uppdev/HTTPClient/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _HTTPClient_icpp_init_stub
-#define _HTTPClient_icpp_init_stub
-#include "Core/init"
-#include "Web/init"
-#include "Web/SSL/init"
-#endif
diff --git a/uppdev/HomeDirCp/init b/uppdev/HomeDirCp/init
deleted file mode 100644
index ee198ef53..000000000
--- a/uppdev/HomeDirCp/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _HomeDirCp_icpp_init_stub
-#define _HomeDirCp_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/ImageMT/init b/uppdev/ImageMT/init
deleted file mode 100644
index b465fd34b..000000000
--- a/uppdev/ImageMT/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ImageMT_icpp_init_stub
-#define _ImageMT_icpp_init_stub
-#include "CtrlLib/init"
-#include "plugin\tif/init"
-#endif
diff --git a/uppdev/ImageView/init b/uppdev/ImageView/init
deleted file mode 100644
index 25d3d16b1..000000000
--- a/uppdev/ImageView/init
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _ImageView_icpp_init_stub
-#define _ImageView_icpp_init_stub
-#include "CtrlLib/init"
-#include "plugin\tif/init"
-#include "plugin\jpg/init"
-#include "plugin\gif/init"
-#include "plugin\pcx/init"
-#endif
diff --git a/uppdev/Iml2/init b/uppdev/Iml2/init
deleted file mode 100644
index ab42ef8d6..000000000
--- a/uppdev/Iml2/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Iml2_icpp_init_stub
-#define _Iml2_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/Jasa/init b/uppdev/Jasa/init
deleted file mode 100644
index 9502156e3..000000000
--- a/uppdev/Jasa/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Jasa_icpp_init_stub
-#define _Jasa_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/KanjiFlash/init b/uppdev/KanjiFlash/init
deleted file mode 100644
index 0e78ef70f..000000000
--- a/uppdev/KanjiFlash/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _KanjiFlash_icpp_init_stub
-#define _KanjiFlash_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/Key/init b/uppdev/Key/init
deleted file mode 100644
index 9568610cc..000000000
--- a/uppdev/Key/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Key_icpp_init_stub
-#define _Key_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/Kpoly/init b/uppdev/Kpoly/init
deleted file mode 100644
index e7796c2d4..000000000
--- a/uppdev/Kpoly/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Kpoly_icpp_init_stub
-#define _Kpoly_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/LZF/init b/uppdev/LZF/init
deleted file mode 100644
index a2c8b572b..000000000
--- a/uppdev/LZF/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _LZF_icpp_init_stub
-#define _LZF_icpp_init_stub
-#include "Core/init"
-#include "plugin/lz4/init"
-#include "plugin\lzo/init"
-#endif
diff --git a/uppdev/Lang/init b/uppdev/Lang/init
deleted file mode 100644
index 959c0d8db..000000000
--- a/uppdev/Lang/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Lang_icpp_init_stub
-#define _Lang_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/LangInfo/init b/uppdev/LangInfo/init
deleted file mode 100644
index dfeea389f..000000000
--- a/uppdev/LangInfo/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _LangInfo_icpp_init_stub
-#define _LangInfo_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/Layout/init b/uppdev/Layout/init
deleted file mode 100644
index baac97a71..000000000
--- a/uppdev/Layout/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Layout_icpp_init_stub
-#define _Layout_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/LineClip/init b/uppdev/LineClip/init
deleted file mode 100644
index 5972c17aa..000000000
--- a/uppdev/LineClip/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _LineClip_icpp_init_stub
-#define _LineClip_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#endif
diff --git a/uppdev/LineEdit/init b/uppdev/LineEdit/init
deleted file mode 100644
index ef3f1d804..000000000
--- a/uppdev/LineEdit/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _LineEdit_icpp_init_stub
-#define _LineEdit_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/LineEditTest/init b/uppdev/LineEditTest/init
deleted file mode 100644
index 7d71b1f76..000000000
--- a/uppdev/LineEditTest/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _LineEditTest_icpp_init_stub
-#define _LineEditTest_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/LionSDraw/init b/uppdev/LionSDraw/init
deleted file mode 100644
index 49557ce97..000000000
--- a/uppdev/LionSDraw/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _LionSDraw_icpp_init_stub
-#define _LionSDraw_icpp_init_stub
-#include "CtrlLib/init"
-#include "LionSDraw/init"
-#include "SDraw/init"
-#endif
diff --git a/uppdev/LocalProcess/init b/uppdev/LocalProcess/init
deleted file mode 100644
index a8c86f777..000000000
--- a/uppdev/LocalProcess/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _LocalProcess_icpp_init_stub
-#define _LocalProcess_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/MakeSpellScd/init b/uppdev/MakeSpellScd/init
deleted file mode 100644
index fd8113dac..000000000
--- a/uppdev/MakeSpellScd/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _MakeSpellScd_icpp_init_stub
-#define _MakeSpellScd_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/Malloc.bak/init b/uppdev/Malloc.bak/init
deleted file mode 100644
index 1569f33e1..000000000
--- a/uppdev/Malloc.bak/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Malloc_icpp_init_stub
-#define _Malloc_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/Malloc/init b/uppdev/Malloc/init
deleted file mode 100644
index 1569f33e1..000000000
--- a/uppdev/Malloc/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Malloc_icpp_init_stub
-#define _Malloc_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/Malloc7/init b/uppdev/Malloc7/init
deleted file mode 100644
index 1569f33e1..000000000
--- a/uppdev/Malloc7/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Malloc_icpp_init_stub
-#define _Malloc_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/Menu/init b/uppdev/Menu/init
deleted file mode 100644
index f0b987d19..000000000
--- a/uppdev/Menu/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Menu_icpp_init_stub
-#define _Menu_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/MultiButton/init b/uppdev/MultiButton/init
deleted file mode 100644
index 5166cd3b5..000000000
--- a/uppdev/MultiButton/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _MultiButton_icpp_init_stub
-#define _MultiButton_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/MyEcho_Test/init b/uppdev/MyEcho_Test/init
deleted file mode 100644
index 29a77dc2a..000000000
--- a/uppdev/MyEcho_Test/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _MyEcho_icpp_init_stub
-#define _MyEcho_icpp_init_stub
-#include "CtrlLib/init"
-#include "Core/init"
-#endif
diff --git a/uppdev/MySQLSch/init b/uppdev/MySQLSch/init
deleted file mode 100644
index 81f2468b5..000000000
--- a/uppdev/MySQLSch/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _MySQLSch_icpp_init_stub
-#define _MySQLSch_icpp_init_stub
-#include "Core/init"
-#include "MySql/init"
-#include "CtrlCore/init"
-#endif
diff --git a/uppdev/NanoStrings/init b/uppdev/NanoStrings/init
deleted file mode 100644
index f37ac1698..000000000
--- a/uppdev/NanoStrings/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _NanoStrings_icpp_init_stub
-#define _NanoStrings_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/NewDraw/init b/uppdev/NewDraw/init
deleted file mode 100644
index 3ab315fa8..000000000
--- a/uppdev/NewDraw/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _NewDraw_icpp_init_stub
-#define _NewDraw_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/NewXmlRpc/init b/uppdev/NewXmlRpc/init
deleted file mode 100644
index 3eeb1bdf1..000000000
--- a/uppdev/NewXmlRpc/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _NewXmlRpc_icpp_init_stub
-#define _NewXmlRpc_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/NibblePtr/init b/uppdev/NibblePtr/init
deleted file mode 100644
index d5a3f5add..000000000
--- a/uppdev/NibblePtr/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _NibblePtr_icpp_init_stub
-#define _NibblePtr_icpp_init_stub
-#include "Core/init"
-#include "plugin/lz4/init"
-#endif
diff --git a/uppdev/Ns/init b/uppdev/Ns/init
deleted file mode 100644
index 3913b6a4d..000000000
--- a/uppdev/Ns/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Ns_icpp_init_stub
-#define _Ns_icpp_init_stub
-#include "CtrlLib/init"
-#include "Report/init"
-#endif
diff --git a/uppdev/OffsetBug/init b/uppdev/OffsetBug/init
deleted file mode 100644
index e98839cdb..000000000
--- a/uppdev/OffsetBug/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _OffsetBug_icpp_init_stub
-#define _OffsetBug_icpp_init_stub
-#include "Core/init"
-#include "PdfDraw/init"
-#include "CtrlLib/init"
-#include "Web/init"
-#endif
diff --git a/uppdev/OpenCL/init b/uppdev/OpenCL/init
deleted file mode 100644
index 7179de644..000000000
--- a/uppdev/OpenCL/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _OpenCL_icpp_init_stub
-#define _OpenCL_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/OptionTree/init b/uppdev/OptionTree/init
deleted file mode 100644
index f4e3bab0e..000000000
--- a/uppdev/OptionTree/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _OptionTree_icpp_init_stub
-#define _OptionTree_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/PCX/init b/uppdev/PCX/init
deleted file mode 100644
index f6ba83aa1..000000000
--- a/uppdev/PCX/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _plugin_pcx_icpp_init_stub
-#define _plugin_pcx_icpp_init_stub
-#endif
diff --git a/uppdev/PDF/init b/uppdev/PDF/init
deleted file mode 100644
index c7e285ab6..000000000
--- a/uppdev/PDF/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _PDF_icpp_init_stub
-#define _PDF_icpp_init_stub
-#include "PdfDraw/init"
-#include "Painter/init"
-#include "RichText/init"
-#endif
diff --git a/uppdev/PaintSizeGrip/init b/uppdev/PaintSizeGrip/init
deleted file mode 100644
index 7966b5a0c..000000000
--- a/uppdev/PaintSizeGrip/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _PaintSizeGrip_icpp_init_stub
-#define _PaintSizeGrip_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/PainterBug/init b/uppdev/PainterBug/init
deleted file mode 100644
index d8399075a..000000000
--- a/uppdev/PainterBug/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _PainterBug_icpp_init_stub
-#define _PainterBug_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#endif
diff --git a/uppdev/PainterExamples/init b/uppdev/PainterExamples/init
deleted file mode 100644
index ea879d215..000000000
--- a/uppdev/PainterExamples/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _PainterExamples_icpp_init_stub
-#define _PainterExamples_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#endif
diff --git a/uppdev/PainterImage/init b/uppdev/PainterImage/init
deleted file mode 100644
index f159d2753..000000000
--- a/uppdev/PainterImage/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _PainterImage_icpp_init_stub
-#define _PainterImage_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#endif
diff --git a/uppdev/PainterLine/init b/uppdev/PainterLine/init
deleted file mode 100644
index 4343380f4..000000000
--- a/uppdev/PainterLine/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _PainterLine_icpp_init_stub
-#define _PainterLine_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#endif
diff --git a/uppdev/PainterTest/init b/uppdev/PainterTest/init
deleted file mode 100644
index 23060045f..000000000
--- a/uppdev/PainterTest/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _PainterTest_icpp_init_stub
-#define _PainterTest_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#endif
diff --git a/uppdev/Parser/init b/uppdev/Parser/init
deleted file mode 100644
index b33a1c3ab..000000000
--- a/uppdev/Parser/init
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _Parser_icpp_init_stub
-#define _Parser_icpp_init_stub
-#include "Core/init"
-#include "CtrlLib/init"
-#include "CodeEditor/init"
-#include "Sql/init"
-#include "plugin\pcre/init"
-#endif
diff --git a/uppdev/Parser2/init b/uppdev/Parser2/init
deleted file mode 100644
index 1807c38cb..000000000
--- a/uppdev/Parser2/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _Parser2_icpp_init_stub
-#define _Parser2_icpp_init_stub
-#endif
diff --git a/uppdev/Parser3/init b/uppdev/Parser3/init
deleted file mode 100644
index 6e7dea39c..000000000
--- a/uppdev/Parser3/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Parser3_icpp_init_stub
-#define _Parser3_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/PasteClip/init b/uppdev/PasteClip/init
deleted file mode 100644
index ed2c60e22..000000000
--- a/uppdev/PasteClip/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _PasteClip_icpp_init_stub
-#define _PasteClip_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/PictureCtrl/init b/uppdev/PictureCtrl/init
deleted file mode 100644
index 09a996e25..000000000
--- a/uppdev/PictureCtrl/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _PictureCtrl_icpp_init_stub
-#define _PictureCtrl_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#endif
diff --git a/uppdev/PipeStreamTest/init b/uppdev/PipeStreamTest/init
deleted file mode 100644
index d74e8b0fe..000000000
--- a/uppdev/PipeStreamTest/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _PipeStreamTest_icpp_init_stub
-#define _PipeStreamTest_icpp_init_stub
-#include "Core/init"
-#include "PipeStream/init"
-#endif
diff --git a/uppdev/PopUpCrash/init b/uppdev/PopUpCrash/init
deleted file mode 100644
index fc8503f3d..000000000
--- a/uppdev/PopUpCrash/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Crash_icpp_init_stub
-#define _Crash_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/PrinterInfo/init b/uppdev/PrinterInfo/init
deleted file mode 100644
index 3643ee4ae..000000000
--- a/uppdev/PrinterInfo/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _PrinterInfo_icpp_init_stub
-#define _PrinterInfo_icpp_init_stub
-#include "CtrlLib/init"
-#include "TDraw/init"
-#include "Report/init"
-#endif
diff --git a/uppdev/Prompt/init b/uppdev/Prompt/init
deleted file mode 100644
index 8133772b2..000000000
--- a/uppdev/Prompt/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Prompt_icpp_init_stub
-#define _Prompt_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/Qtf/init b/uppdev/Qtf/init
deleted file mode 100644
index 8d106367e..000000000
--- a/uppdev/Qtf/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Qtf_icpp_init_stub
-#define _Qtf_icpp_init_stub
-#include "CtrlLib/init"
-#include "Report/init"
-#endif
diff --git a/uppdev/QtfAA/init b/uppdev/QtfAA/init
deleted file mode 100644
index 7030719d8..000000000
--- a/uppdev/QtfAA/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _QtfAA_icpp_init_stub
-#define _QtfAA_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#endif
diff --git a/uppdev/QtfDrawing/init b/uppdev/QtfDrawing/init
deleted file mode 100644
index 03d9de178..000000000
--- a/uppdev/QtfDrawing/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _QtfDrawing_icpp_init_stub
-#define _QtfDrawing_icpp_init_stub
-#include "CtrlLib/init"
-#include "plugin\gif/init"
-#endif
diff --git a/uppdev/QtfProblem/init b/uppdev/QtfProblem/init
deleted file mode 100644
index cb2af9167..000000000
--- a/uppdev/QtfProblem/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _QtfProblem_icpp_init_stub
-#define _QtfProblem_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/Queue/init b/uppdev/Queue/init
deleted file mode 100644
index 39f96f154..000000000
--- a/uppdev/Queue/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Queue_icpp_init_stub
-#define _Queue_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/RSS/init b/uppdev/RSS/init
deleted file mode 100644
index 261649610..000000000
--- a/uppdev/RSS/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _RSS_icpp_init_stub
-#define _RSS_icpp_init_stub
-#include "Core/init"
-#include "Web/init"
-#endif
diff --git a/uppdev/Random/init b/uppdev/Random/init
deleted file mode 100644
index 26ff0a8cc..000000000
--- a/uppdev/Random/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Random_icpp_init_stub
-#define _Random_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/RefCount/init b/uppdev/RefCount/init
deleted file mode 100644
index db84ce440..000000000
--- a/uppdev/RefCount/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _RefCount_icpp_init_stub
-#define _RefCount_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/Rep/init b/uppdev/Rep/init
deleted file mode 100644
index 5e5df2d53..000000000
--- a/uppdev/Rep/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _Rep_icpp_init_stub
-#define _Rep_icpp_init_stub
-#include "CtrlLib/init"
-#include "Report/init"
-#include "PdfDraw/init"
-#include "Painter/init"
-#endif
diff --git a/uppdev/ReportWithChineseCharacter/init b/uppdev/ReportWithChineseCharacter/init
deleted file mode 100644
index e42896dd7..000000000
--- a/uppdev/ReportWithChineseCharacter/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ReportWithChineseCharacter_icpp_init_stub
-#define _ReportWithChineseCharacter_icpp_init_stub
-#include "CtrlLib/init"
-#include "Report/init"
-#include "PdfDraw/init"
-#endif
diff --git a/uppdev/Reports/init b/uppdev/Reports/init
deleted file mode 100644
index f4738d3a7..000000000
--- a/uppdev/Reports/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _Reports_icpp_init_stub
-#define _Reports_icpp_init_stub
-#include "CtrlLib/init"
-#include "Report/init"
-#include "PdfDraw/init"
-#endif
diff --git a/uppdev/Rescale/init b/uppdev/Rescale/init
deleted file mode 100644
index f32dd4544..000000000
--- a/uppdev/Rescale/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Rescale_icpp_init_stub
-#define _Rescale_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/RichEditTest/init b/uppdev/RichEditTest/init
deleted file mode 100644
index 5b16dd87a..000000000
--- a/uppdev/RichEditTest/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _RichEditTest_icpp_init_stub
-#define _RichEditTest_icpp_init_stub
-#include "RichEdit/init"
-#include "plugin\jpg/init"
-#include "Painter/init"
-#endif
diff --git a/uppdev/RichHtml/init b/uppdev/RichHtml/init
deleted file mode 100644
index ff7d2a87e..000000000
--- a/uppdev/RichHtml/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _RichHtml_icpp_init_stub
-#define _RichHtml_icpp_init_stub
-#include "Web/init"
-#include "CtrlLib/init"
-#include "RichText/init"
-#endif
diff --git a/uppdev/RichTextLayoutTracer/init b/uppdev/RichTextLayoutTracer/init
deleted file mode 100644
index 15261af79..000000000
--- a/uppdev/RichTextLayoutTracer/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _RichTextLayoutTracer_icpp_init_stub
-#define _RichTextLayoutTracer_icpp_init_stub
-#include "CtrlLib/init"
-#include "Report/init"
-#include "Painter/init"
-#endif
diff --git a/uppdev/RichTextP/init b/uppdev/RichTextP/init
deleted file mode 100644
index 74e325758..000000000
--- a/uppdev/RichTextP/init
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _RichTextP_icpp_init_stub
-#define _RichTextP_icpp_init_stub
-#include "CtrlCore/init"
-#include "plugin\png/init"
-#define BLITZ_INDEX__ F70234807CBDCCBF7C7FC03C2E97EA2EC
-#include "RichImage.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppdev/RwLock/init b/uppdev/RwLock/init
deleted file mode 100644
index 59751dabe..000000000
--- a/uppdev/RwLock/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _RwLock_icpp_init_stub
-#define _RwLock_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/SDL20/init b/uppdev/SDL20/init
deleted file mode 100644
index e8c259ed5..000000000
--- a/uppdev/SDL20/init
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _SDL20_icpp_init_stub
-#define _SDL20_icpp_init_stub
-#include "Core/init"
-#include "Draw/init"
-#include "Painter/init"
-#include "RichText/init"
-#include "plugin/FT_fontsys/init"
-#include "plugin/DroidFonts/init"
-#endif
diff --git a/uppdev/SDrawTest/init b/uppdev/SDrawTest/init
deleted file mode 100644
index 2ade00475..000000000
--- a/uppdev/SDrawTest/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _SDrawTest_icpp_init_stub
-#define _SDrawTest_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#endif
diff --git a/uppdev/SQL_MySql/init b/uppdev/SQL_MySql/init
deleted file mode 100644
index 32cbf64c0..000000000
--- a/uppdev/SQL_MySql/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SQL_MySql_icpp_init_stub
-#define _SQL_MySql_icpp_init_stub
-#include "MySql/init"
-#endif
diff --git a/uppdev/SQL_PostgreSql/init b/uppdev/SQL_PostgreSql/init
deleted file mode 100644
index 15949933d..000000000
--- a/uppdev/SQL_PostgreSql/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _SQL_PostgreSql_icpp_init_stub
-#define _SQL_PostgreSql_icpp_init_stub
-#include "CtrlLib/init"
-#include "PostgreSQL/init"
-#include "SqlCtrl/init"
-#endif
diff --git a/uppdev/SQL_Sqlite3/init b/uppdev/SQL_Sqlite3/init
deleted file mode 100644
index 3cea50e54..000000000
--- a/uppdev/SQL_Sqlite3/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SQL_Sqlite3_icpp_init_stub
-#define _SQL_Sqlite3_icpp_init_stub
-#include "plugin\Sqlite3/init"
-#endif
diff --git a/uppdev/SQL_Sqlite3b/init b/uppdev/SQL_Sqlite3b/init
deleted file mode 100644
index 3cea50e54..000000000
--- a/uppdev/SQL_Sqlite3b/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SQL_Sqlite3_icpp_init_stub
-#define _SQL_Sqlite3_icpp_init_stub
-#include "plugin\Sqlite3/init"
-#endif
diff --git a/uppdev/ScanLine/init b/uppdev/ScanLine/init
deleted file mode 100644
index 99017c57c..000000000
--- a/uppdev/ScanLine/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ScanLine_icpp_init_stub
-#define _ScanLine_icpp_init_stub
-#include "Core/init"
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/ScgiHello/init b/uppdev/ScgiHello/init
deleted file mode 100644
index c6391c920..000000000
--- a/uppdev/ScgiHello/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ScgiHello_icpp_init_stub
-#define _ScgiHello_icpp_init_stub
-#include "Core/init"
-#include "ScgiServer/init"
-#endif
diff --git a/uppdev/ScgiServer/init b/uppdev/ScgiServer/init
deleted file mode 100644
index c76cba3eb..000000000
--- a/uppdev/ScgiServer/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ScgiServer_icpp_init_stub
-#define _ScgiServer_icpp_init_stub
-#include "Web/init"
-#endif
diff --git a/uppdev/ScrollTest/init b/uppdev/ScrollTest/init
deleted file mode 100644
index d2d7abe9d..000000000
--- a/uppdev/ScrollTest/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ScrollTest_icpp_init_stub
-#define _ScrollTest_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/SendMail/init b/uppdev/SendMail/init
deleted file mode 100644
index a803fb3be..000000000
--- a/uppdev/SendMail/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _SendMail_icpp_init_stub
-#define _SendMail_icpp_init_stub
-#include "Core/init"
-#include "Web/init"
-#endif
diff --git a/uppdev/SetSurtface1/init b/uppdev/SetSurtface1/init
deleted file mode 100644
index 2dda26fa8..000000000
--- a/uppdev/SetSurtface1/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _SetSurtface1_icpp_init_stub
-#define _SetSurtface1_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#endif
diff --git a/uppdev/Sharps/init b/uppdev/Sharps/init
deleted file mode 100644
index eebc9fc48..000000000
--- a/uppdev/Sharps/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Sharps_icpp_init_stub
-#define _Sharps_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/ShowQtf/init b/uppdev/ShowQtf/init
deleted file mode 100644
index 7dc9bb7e8..000000000
--- a/uppdev/ShowQtf/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ShowQtf_icpp_init_stub
-#define _ShowQtf_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/Smoothen/init b/uppdev/Smoothen/init
deleted file mode 100644
index bae8de22d..000000000
--- a/uppdev/Smoothen/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Smoothen_icpp_init_stub
-#define _Smoothen_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/SocketServer/init b/uppdev/SocketServer/init
deleted file mode 100644
index 6cefabdd0..000000000
--- a/uppdev/SocketServer/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _SocketServer_icpp_init_stub
-#define _SocketServer_icpp_init_stub
-#include "Core/init"
-#include "Web/init"
-#endif
diff --git a/uppdev/Speller/init b/uppdev/Speller/init
deleted file mode 100644
index 4c5c0dba0..000000000
--- a/uppdev/Speller/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Speller_icpp_init_stub
-#define _Speller_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/SplitString/init b/uppdev/SplitString/init
deleted file mode 100644
index 60794ffdd..000000000
--- a/uppdev/SplitString/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SplitString_icpp_init_stub
-#define _SplitString_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/SplitterBug/init b/uppdev/SplitterBug/init
deleted file mode 100644
index 038dd01b1..000000000
--- a/uppdev/SplitterBug/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SplitterBug_icpp_init_stub
-#define _SplitterBug_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/SqlExp/init b/uppdev/SqlExp/init
deleted file mode 100644
index 344ab5062..000000000
--- a/uppdev/SqlExp/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _SqlExp_icpp_init_stub
-#define _SqlExp_icpp_init_stub
-#include "Core/init"
-#include "Sql/init"
-#include "RichText/init"
-#endif
diff --git a/uppdev/SqlProblem/init b/uppdev/SqlProblem/init
deleted file mode 100644
index 045f4bd41..000000000
--- a/uppdev/SqlProblem/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _SqlProblem_icpp_init_stub
-#define _SqlProblem_icpp_init_stub
-#include "CtrlLib/init"
-#include "Sql/init"
-#include "SqlCtrl/init"
-#include "plugin/sqlite3/init"
-#endif
diff --git a/uppdev/SqliteCommander/init b/uppdev/SqliteCommander/init
deleted file mode 100644
index fd0f1290d..000000000
--- a/uppdev/SqliteCommander/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _SqliteCommander_icpp_init_stub
-#define _SqliteCommander_icpp_init_stub
-#include "CtrlLib/init"
-#include "plugin\sqlite3/init"
-#include "SqlCtrl/init"
-#endif
diff --git a/uppdev/StableSort/init b/uppdev/StableSort/init
deleted file mode 100644
index 17461b7fe..000000000
--- a/uppdev/StableSort/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _StableSort_icpp_init_stub
-#define _StableSort_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/StlHeap/init b/uppdev/StlHeap/init
deleted file mode 100644
index 5a58ab11f..000000000
--- a/uppdev/StlHeap/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _StlHeap_icpp_init_stub
-#define _StlHeap_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/StringComp/init b/uppdev/StringComp/init
deleted file mode 100644
index 901e5bf34..000000000
--- a/uppdev/StringComp/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _StringComp_icpp_init_stub
-#define _StringComp_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/StringStream/init b/uppdev/StringStream/init
deleted file mode 100644
index 28b4bb1a3..000000000
--- a/uppdev/StringStream/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _StringStream_icpp_init_stub
-#define _StringStream_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/Stroke/init b/uppdev/Stroke/init
deleted file mode 100644
index d2be6ee9b..000000000
--- a/uppdev/Stroke/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _Stroke_icpp_init_stub
-#define _Stroke_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#include "Geom/init"
-#endif
diff --git a/uppdev/SvgDraw/init b/uppdev/SvgDraw/init
deleted file mode 100644
index 333d57485..000000000
--- a/uppdev/SvgDraw/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _SvgDraw_icpp_init_stub
-#define _SvgDraw_icpp_init_stub
-#include "Draw/init"
-#include "CtrlLib/init"
-#include "Web/init"
-#endif
diff --git a/uppdev/SvoValue/init b/uppdev/SvoValue/init
deleted file mode 100644
index 3957f4265..000000000
--- a/uppdev/SvoValue/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SvoValue_icpp_init_stub
-#define _SvoValue_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/SyntaxHighlight/init b/uppdev/SyntaxHighlight/init
deleted file mode 100644
index a9f12dc7a..000000000
--- a/uppdev/SyntaxHighlight/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _SyntaxHighlight_icpp_init_stub
-#define _SyntaxHighlight_icpp_init_stub
-#endif
diff --git a/uppdev/TcpSocket/init b/uppdev/TcpSocket/init
deleted file mode 100644
index d415f0137..000000000
--- a/uppdev/TcpSocket/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _TcpSocket_icpp_init_stub
-#define _TcpSocket_icpp_init_stub
-#include "Core/init"
-#include "Web/init"
-#endif
diff --git a/uppdev/Test/init b/uppdev/Test/init
deleted file mode 100644
index 28da4f475..000000000
--- a/uppdev/Test/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Test_icpp_init_stub
-#define _Test_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/TestApp/init b/uppdev/TestApp/init
deleted file mode 100644
index 220a986c1..000000000
--- a/uppdev/TestApp/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _TestApp_icpp_init_stub
-#define _TestApp_icpp_init_stub
-#include "CtrlLib/init"
-#include "GridCtrl/init"
-#endif
diff --git a/uppdev/TestArrayCtrl/init b/uppdev/TestArrayCtrl/init
deleted file mode 100644
index ccfeb4307..000000000
--- a/uppdev/TestArrayCtrl/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _TestArrayCtrl_icpp_init_stub
-#define _TestArrayCtrl_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/TestCppParser/init b/uppdev/TestCppParser/init
deleted file mode 100644
index 15dd72215..000000000
--- a/uppdev/TestCppParser/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _TestCppParser_icpp_init_stub
-#define _TestCppParser_icpp_init_stub
-#include "Core/init"
-#include "CppBase/init"
-#endif
diff --git a/uppdev/TestDraw/init b/uppdev/TestDraw/init
deleted file mode 100644
index c7d6fe532..000000000
--- a/uppdev/TestDraw/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _TestDraw_icpp_init_stub
-#define _TestDraw_icpp_init_stub
-#include "CtrlLib/init"
-#include "Geom/init"
-#endif
diff --git a/uppdev/TestDroplist/init b/uppdev/TestDroplist/init
deleted file mode 100644
index ea219d1ca..000000000
--- a/uppdev/TestDroplist/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _TestDroplist_icpp_init_stub
-#define _TestDroplist_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/TestEditInt/init b/uppdev/TestEditInt/init
deleted file mode 100644
index 46745dc50..000000000
--- a/uppdev/TestEditInt/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _TestEditInt_icpp_init_stub
-#define _TestEditInt_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/TestLag/init b/uppdev/TestLag/init
deleted file mode 100644
index 6c7edb565..000000000
--- a/uppdev/TestLag/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _TestLag_icpp_init_stub
-#define _TestLag_icpp_init_stub
-#include "CtrlLib/init"
-#include "CodeEditor/init"
-#endif
diff --git a/uppdev/TestPainter/init b/uppdev/TestPainter/init
deleted file mode 100644
index cfbd5bf73..000000000
--- a/uppdev/TestPainter/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _TestPainter_icpp_init_stub
-#define _TestPainter_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#endif
diff --git a/uppdev/Testcase/UppTest/init b/uppdev/Testcase/UppTest/init
deleted file mode 100644
index f19bdb773..000000000
--- a/uppdev/Testcase/UppTest/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _UppTest_icpp_init_stub
-#define _UppTest_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/Testcase/UppTestLib/init b/uppdev/Testcase/UppTestLib/init
deleted file mode 100644
index 5b3653b66..000000000
--- a/uppdev/Testcase/UppTestLib/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _UppTestLib_icpp_init_stub
-#define _UppTestLib_icpp_init_stub
-#endif
diff --git a/uppdev/Testcase_002/init b/uppdev/Testcase_002/init
deleted file mode 100644
index bae706f56..000000000
--- a/uppdev/Testcase_002/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Testcase_002_icpp_init_stub
-#define _Testcase_002_icpp_init_stub
-#include "CtrlLib/init"
-#include "Testcase_002/init"
-#endif
diff --git a/uppdev/Testcase_Maximize/init b/uppdev/Testcase_Maximize/init
deleted file mode 100644
index 051f10464..000000000
--- a/uppdev/Testcase_Maximize/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Testcase_Maximize_icpp_init_stub
-#define _Testcase_Maximize_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/TextDiff/init b/uppdev/TextDiff/init
deleted file mode 100644
index ebd91911b..000000000
--- a/uppdev/TextDiff/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _TextDiff_icpp_init_stub
-#define _TextDiff_icpp_init_stub
-#include "CtrlLib/init"
-#include "TextDiffCtrl/init"
-#endif
diff --git a/uppdev/ToolBarAsCtrl/init b/uppdev/ToolBarAsCtrl/init
deleted file mode 100644
index 2197b5cf8..000000000
--- a/uppdev/ToolBarAsCtrl/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ToolBarAsCtrl_icpp_init_stub
-#define _ToolBarAsCtrl_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/ToolWin/init b/uppdev/ToolWin/init
deleted file mode 100644
index f7aa79d84..000000000
--- a/uppdev/ToolWin/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ToolWin_icpp_init_stub
-#define _ToolWin_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/TrayIcon/init b/uppdev/TrayIcon/init
deleted file mode 100644
index bc640b371..000000000
--- a/uppdev/TrayIcon/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _TrayIcon_icpp_init_stub
-#define _TrayIcon_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/TreeCtrl/init b/uppdev/TreeCtrl/init
deleted file mode 100644
index 7f39e4b90..000000000
--- a/uppdev/TreeCtrl/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _TreeCtrl_icpp_init_stub
-#define _TreeCtrl_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/TreeRefresh/init b/uppdev/TreeRefresh/init
deleted file mode 100644
index c47743d8d..000000000
--- a/uppdev/TreeRefresh/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _TreeRefresh_icpp_init_stub
-#define _TreeRefresh_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/TreeTest/init b/uppdev/TreeTest/init
deleted file mode 100644
index 4fb32f45d..000000000
--- a/uppdev/TreeTest/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _TreeTest_icpp_init_stub
-#define _TreeTest_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/TurtleIde/init b/uppdev/TurtleIde/init
deleted file mode 100644
index e258673a2..000000000
--- a/uppdev/TurtleIde/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _TurtleIde_icpp_init_stub
-#define _TurtleIde_icpp_init_stub
-#include "Core/init"
-#include "CursorOverride/init"
-#endif
diff --git a/uppdev/UApplication/init b/uppdev/UApplication/init
deleted file mode 100644
index 870bc3eea..000000000
--- a/uppdev/UApplication/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _UApplication_icpp_init_stub
-#define _UApplication_icpp_init_stub
-#include "CtrlLib/init"
-#include "GridCtrl/init"
-#endif
diff --git a/uppdev/UWord/init b/uppdev/UWord/init
deleted file mode 100644
index 98b957e1b..000000000
--- a/uppdev/UWord/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _UWord_icpp_init_stub
-#define _UWord_icpp_init_stub
-#include "CtrlLib/init"
-#include "RichEdit/init"
-#include "PdfDraw/init"
-#include "art/BlueBar/init"
-#endif
diff --git a/uppdev/UWord1/init b/uppdev/UWord1/init
deleted file mode 100644
index 596869481..000000000
--- a/uppdev/UWord1/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _UWord_icpp_init_stub
-#define _UWord_icpp_init_stub
-#include "CtrlLib/init"
-#include "RichEdit/init"
-#include "PdfDraw/init"
-#include "BlueSkin/init"
-#endif
diff --git a/uppdev/UdpClient/init b/uppdev/UdpClient/init
deleted file mode 100644
index 59777ff1e..000000000
--- a/uppdev/UdpClient/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _UdpClient_icpp_init_stub
-#define _UdpClient_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/UdpServer/init b/uppdev/UdpServer/init
deleted file mode 100644
index aa05421e6..000000000
--- a/uppdev/UdpServer/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _UdpServer_icpp_init_stub
-#define _UdpServer_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/UnZip/init b/uppdev/UnZip/init
deleted file mode 100644
index 09c4c2cbb..000000000
--- a/uppdev/UnZip/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _UnZip_icpp_init_stub
-#define _UnZip_icpp_init_stub
-#include "Core/init"
-#include "plugin/zip/init"
-#endif
diff --git a/uppdev/UniqueFolder/init b/uppdev/UniqueFolder/init
deleted file mode 100644
index fd6a2a3f7..000000000
--- a/uppdev/UniqueFolder/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _UniqueFolder_icpp_init_stub
-#define _UniqueFolder_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/UppTest/init b/uppdev/UppTest/init
deleted file mode 100644
index f19bdb773..000000000
--- a/uppdev/UppTest/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _UppTest_icpp_init_stub
-#define _UppTest_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/UseMallocMT/init b/uppdev/UseMallocMT/init
deleted file mode 100644
index 6b4866328..000000000
--- a/uppdev/UseMallocMT/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _UseMallocMT_icpp_init_stub
-#define _UseMallocMT_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/Utf8/init b/uppdev/Utf8/init
deleted file mode 100644
index 0d7e7f5d5..000000000
--- a/uppdev/Utf8/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Utf8_icpp_init_stub
-#define _Utf8_icpp_init_stub
-#include "Core/init"
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/ValueArray/init b/uppdev/ValueArray/init
deleted file mode 100644
index c0b298392..000000000
--- a/uppdev/ValueArray/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ValueArray_icpp_init_stub
-#define _ValueArray_icpp_init_stub
-#include "Core/init"
-#include "ValueMap/init"
-#endif
diff --git a/uppdev/ValueMap2/init b/uppdev/ValueMap2/init
deleted file mode 100644
index 8942fba5f..000000000
--- a/uppdev/ValueMap2/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ValueMap2_icpp_init_stub
-#define _ValueMap2_icpp_init_stub
-#include "Core/init"
-#include "Sql/init"
-#endif
diff --git a/uppdev/ValueMap3/init b/uppdev/ValueMap3/init
deleted file mode 100644
index c5e67e3ba..000000000
--- a/uppdev/ValueMap3/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ValueMap3_icpp_init_stub
-#define _ValueMap3_icpp_init_stub
-#include "Core/init"
-#include "Sql/init"
-#endif
diff --git a/uppdev/ValuePath/init b/uppdev/ValuePath/init
deleted file mode 100644
index 912084914..000000000
--- a/uppdev/ValuePath/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ValuePath_icpp_init_stub
-#define _ValuePath_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/Vector/init b/uppdev/Vector/init
deleted file mode 100644
index afdc93a8d..000000000
--- a/uppdev/Vector/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Vector_icpp_init_stub
-#define _Vector_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/WebSockets/init b/uppdev/WebSockets/init
deleted file mode 100644
index 68f7cc57d..000000000
--- a/uppdev/WebSockets/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _WebSockets_icpp_init_stub
-#define _WebSockets_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/X11dev/init b/uppdev/X11dev/init
deleted file mode 100644
index e414cedf2..000000000
--- a/uppdev/X11dev/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _X11dev_icpp_init_stub
-#define _X11dev_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/XLS/init b/uppdev/XLS/init
deleted file mode 100644
index 91bcbc0e2..000000000
--- a/uppdev/XLS/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _XLS_icpp_init_stub
-#define _XLS_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/XmlBug/init b/uppdev/XmlBug/init
deleted file mode 100644
index 582bed8a3..000000000
--- a/uppdev/XmlBug/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _XmlBug_icpp_init_stub
-#define _XmlBug_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/XmlNodeFilter/init b/uppdev/XmlNodeFilter/init
deleted file mode 100644
index 0eca3a652..000000000
--- a/uppdev/XmlNodeFilter/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _XmlNodeFilter_icpp_init_stub
-#define _XmlNodeFilter_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/XmlRpcShorted/init b/uppdev/XmlRpcShorted/init
deleted file mode 100644
index 312e4013d..000000000
--- a/uppdev/XmlRpcShorted/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _XmlRpcShorted_icpp_init_stub
-#define _XmlRpcShorted_icpp_init_stub
-#include "Core/init"
-#include "XmlRpc/init"
-#endif
diff --git a/uppdev/XmlRpcTest/init b/uppdev/XmlRpcTest/init
deleted file mode 100644
index c2b3da2de..000000000
--- a/uppdev/XmlRpcTest/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _XmlRpcTest_icpp_init_stub
-#define _XmlRpcTest_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/ZSerialize/init b/uppdev/ZSerialize/init
deleted file mode 100644
index d6ebef1cd..000000000
--- a/uppdev/ZSerialize/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ZSerialize_icpp_init_stub
-#define _ZSerialize_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/agg24/init b/uppdev/agg24/init
deleted file mode 100644
index a85af586e..000000000
--- a/uppdev/agg24/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _agg24_icpp_init_stub
-#define _agg24_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/agg_upp_bind/init b/uppdev/agg_upp_bind/init
deleted file mode 100644
index c82a47c78..000000000
--- a/uppdev/agg_upp_bind/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _agg_upp_bind_icpp_init_stub
-#define _agg_upp_bind_icpp_init_stub
-#include "CtrlLib/init"
-#include "agg24/init"
-#endif
diff --git a/uppdev/aggtest/init b/uppdev/aggtest/init
deleted file mode 100644
index 9371480d8..000000000
--- a/uppdev/aggtest/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _aggtest_icpp_init_stub
-#define _aggtest_icpp_init_stub
-#include "CtrlLib/init"
-#include "AggCtrl/init"
-#endif
diff --git a/uppdev/alpha/beta/init b/uppdev/alpha/beta/init
deleted file mode 100644
index 009b657fe..000000000
--- a/uppdev/alpha/beta/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _alpha_beta_icpp_init_stub
-#define _alpha_beta_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/asmopt/init b/uppdev/asmopt/init
deleted file mode 100644
index 50a4dc316..000000000
--- a/uppdev/asmopt/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _asmopt_icpp_init_stub
-#define _asmopt_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/benchsin/init b/uppdev/benchsin/init
deleted file mode 100644
index 6c9f451ec..000000000
--- a/uppdev/benchsin/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _benchsin_icpp_init_stub
-#define _benchsin_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/bible/init b/uppdev/bible/init
deleted file mode 100644
index a7faf8450..000000000
--- a/uppdev/bible/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _bible_icpp_init_stub
-#define _bible_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/bitcnt/init b/uppdev/bitcnt/init
deleted file mode 100644
index 099544c8d..000000000
--- a/uppdev/bitcnt/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _bitcnt_icpp_init_stub
-#define _bitcnt_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/captures/init b/uppdev/captures/init
deleted file mode 100644
index 6ad4bedab..000000000
--- a/uppdev/captures/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _captures_icpp_init_stub
-#define _captures_icpp_init_stub
-#endif
diff --git a/uppdev/ceditor/init b/uppdev/ceditor/init
deleted file mode 100644
index 0c7d3915c..000000000
--- a/uppdev/ceditor/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ceditor_icpp_init_stub
-#define _ceditor_icpp_init_stub
-#include "CodeEditor/init"
-#endif
diff --git a/uppdev/colorpopup/init b/uppdev/colorpopup/init
deleted file mode 100644
index 85007cdb1..000000000
--- a/uppdev/colorpopup/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _colorpopup_icpp_init_stub
-#define _colorpopup_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/cpp/init b/uppdev/cpp/init
deleted file mode 100644
index a4d3d782e..000000000
--- a/uppdev/cpp/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _cpp_icpp_init_stub
-#define _cpp_icpp_init_stub
-#include "Core/init"
-#include "CppBase/init"
-#endif
diff --git a/uppdev/cpp2/init b/uppdev/cpp2/init
deleted file mode 100644
index 70d84a235..000000000
--- a/uppdev/cpp2/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _cpp2_icpp_init_stub
-#define _cpp2_icpp_init_stub
-#include "Core/init"
-#include "CppBase/init"
-#endif
diff --git a/uppdev/editwithkey/init b/uppdev/editwithkey/init
deleted file mode 100644
index 03e33a9a5..000000000
--- a/uppdev/editwithkey/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _editwithkey_icpp_init_stub
-#define _editwithkey_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/ezcomm/init b/uppdev/ezcomm/init
deleted file mode 100644
index 44f694cb0..000000000
--- a/uppdev/ezcomm/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ezcomm_icpp_init_stub
-#define _ezcomm_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/f602/init b/uppdev/f602/init
deleted file mode 100644
index 5829a8814..000000000
--- a/uppdev/f602/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _f602_icpp_init_stub
-#define _f602_icpp_init_stub
-#include "Core/init"
-#include "Web/init"
-#endif
diff --git a/uppdev/google_upload/init b/uppdev/google_upload/init
deleted file mode 100644
index b44bd5c57..000000000
--- a/uppdev/google_upload/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _google_upload_icpp_init_stub
-#define _google_upload_icpp_init_stub
-#include "Core/init"
-#include "Web/SSL/init"
-#endif
diff --git a/uppdev/guimtbug/init b/uppdev/guimtbug/init
deleted file mode 100644
index 682401cfc..000000000
--- a/uppdev/guimtbug/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _guimtbug_icpp_init_stub
-#define _guimtbug_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/hahaha/init b/uppdev/hahaha/init
deleted file mode 100644
index da3c183fa..000000000
--- a/uppdev/hahaha/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _hahaha_icpp_init_stub
-#define _hahaha_icpp_init_stub
-#endif
diff --git a/uppdev/hash2/init b/uppdev/hash2/init
deleted file mode 100644
index 153fbd2a4..000000000
--- a/uppdev/hash2/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _hash2_icpp_init_stub
-#define _hash2_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/hiddisk/init b/uppdev/hiddisk/init
deleted file mode 100644
index 037683aea..000000000
--- a/uppdev/hiddisk/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _hiddisk_icpp_init_stub
-#define _hiddisk_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/idmapBench/init b/uppdev/idmapBench/init
deleted file mode 100644
index 89cc29e03..000000000
--- a/uppdev/idmapBench/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _idmapBench_icpp_init_stub
-#define _idmapBench_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/j2/init b/uppdev/j2/init
deleted file mode 100644
index 56d48b958..000000000
--- a/uppdev/j2/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _j2_icpp_init_stub
-#define _j2_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppdev/md5/init b/uppdev/md5/init
deleted file mode 100644
index 4b8068cb8..000000000
--- a/uppdev/md5/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _md5_icpp_init_stub
-#define _md5_icpp_init_stub
-#include "Core/init"
-#include "Web/init"
-#include "plugin\zip/init"
-#endif
diff --git a/uppdev/mimetab/init b/uppdev/mimetab/init
deleted file mode 100644
index 3b8a4d313..000000000
--- a/uppdev/mimetab/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _mimetab_icpp_init_stub
-#define _mimetab_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/mt/init b/uppdev/mt/init
deleted file mode 100644
index 35ffb6e33..000000000
--- a/uppdev/mt/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _mt_icpp_init_stub
-#define _mt_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/mtbug/init b/uppdev/mtbug/init
deleted file mode 100644
index beda730c0..000000000
--- a/uppdev/mtbug/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _console_mtbug_icpp_init_stub
-#define _console_mtbug_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/myProblem/init b/uppdev/myProblem/init
deleted file mode 100644
index 719082536..000000000
--- a/uppdev/myProblem/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _myProblem_icpp_init_stub
-#define _myProblem_icpp_init_stub
-#include "CtrlLib/init"
-#include "GLCtrl/init"
-#endif
diff --git a/uppdev/odbctest/init b/uppdev/odbctest/init
deleted file mode 100644
index 78a3537b2..000000000
--- a/uppdev/odbctest/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _odbctest_icpp_init_stub
-#define _odbctest_icpp_init_stub
-#include "Core/init"
-#include "ODBC/init"
-#endif
diff --git a/uppdev/pthread_tls/init b/uppdev/pthread_tls/init
deleted file mode 100644
index 2c8a7ead1..000000000
--- a/uppdev/pthread_tls/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _pthread_tls_icpp_init_stub
-#define _pthread_tls_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/rand/init b/uppdev/rand/init
deleted file mode 100644
index ac15b7900..000000000
--- a/uppdev/rand/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _rand_icpp_init_stub
-#define _rand_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/sqlite3sch/init b/uppdev/sqlite3sch/init
deleted file mode 100644
index b480e0e30..000000000
--- a/uppdev/sqlite3sch/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _sqlite3sch_icpp_init_stub
-#define _sqlite3sch_icpp_init_stub
-#include "Core/init"
-#include "plugin\sqlite3/init"
-#endif
diff --git a/uppdev/svo_memcpy/init b/uppdev/svo_memcpy/init
deleted file mode 100644
index fba9ae275..000000000
--- a/uppdev/svo_memcpy/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _svo_memcpy_icpp_init_stub
-#define _svo_memcpy_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppdev/telupp/init b/uppdev/telupp/init
deleted file mode 100644
index 6ba042ed9..000000000
--- a/uppdev/telupp/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _telupp_icpp_init_stub
-#define _telupp_icpp_init_stub
-#include "Core/init"
-#include "Draw/init"
-#include "RichText/init"
-#include "Painter/init"
-#endif
diff --git a/uppdev/testOnglet/init b/uppdev/testOnglet/init
deleted file mode 100644
index 577539b50..000000000
--- a/uppdev/testOnglet/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _testOnglet_icpp_init_stub
-#define _testOnglet_icpp_init_stub
-#include "CtrlLib/init"
-#include "Docking/init"
-#endif
diff --git a/uppdev/testssl/init b/uppdev/testssl/init
deleted file mode 100644
index 616066e5a..000000000
--- a/uppdev/testssl/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _testssl_icpp_init_stub
-#define _testssl_icpp_init_stub
-#include "Core/init"
-#include "Web\SSL/init"
-#include "Core/SSL/init"
-#endif
diff --git a/uppdev/valgrind/init b/uppdev/valgrind/init
deleted file mode 100644
index 42ff95e19..000000000
--- a/uppdev/valgrind/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _valgrind_icpp_init_stub
-#define _valgrind_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppsrc/AllForI18n/init b/uppsrc/AllForI18n/init
deleted file mode 100644
index 0886a77c2..000000000
--- a/uppsrc/AllForI18n/init
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef _AllForI18n_icpp_init_stub
-#define _AllForI18n_icpp_init_stub
-#include "CtrlLib/init"
-#include "Web/init"
-#include "ide/init"
-#include "PostgreSQL/init"
-#include "RichEdit/init"
-#include "MySql/init"
-#include "Ole/init"
-#include "GridCtrl/init"
-#include "Oracle/init"
-#include "usvn/init"
-#include "SqlCtrl/init"
-#include "plugin/astyle/init"
-#include "plugin/bmp/init"
-#include "plugin/box2d/init"
-#include "plugin/bz2/init"
-#include "plugin/dbf/init"
-#include "plugin/DroidFonts/init"
-#include "plugin/Eigen/init"
-#include "plugin/ftp/init"
-#include "plugin/FT_fontsys/init"
-#include "plugin/gif/init"
-#include "plugin/glew/init"
-#include "plugin/jpg/init"
-#include "plugin/lz4/init"
-#include "plugin/lzma/init"
-#include "plugin/ndisasm/init"
-#include "plugin/pcre/init"
-#include "plugin/pcx/init"
-#include "plugin/png/init"
-#include "plugin/ppm/init"
-#include "plugin/sqlite3/init"
-#include "plugin/tif/init"
-#include "plugin/wincert/init"
-#include "plugin/z/init"
-#include "plugin/zip/init"
-#endif
diff --git a/uppsrc/AnalyzeMap/init b/uppsrc/AnalyzeMap/init
deleted file mode 100644
index b372e638f..000000000
--- a/uppsrc/AnalyzeMap/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _AnalyzeMap_icpp_init_stub
-#define _AnalyzeMap_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppsrc/BuildAll/init b/uppsrc/BuildAll/init
deleted file mode 100644
index 3fba93b08..000000000
--- a/uppsrc/BuildAll/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _BuildAll_icpp_init_stub
-#define _BuildAll_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppsrc/CbGen/init b/uppsrc/CbGen/init
deleted file mode 100644
index 794f15b39..000000000
--- a/uppsrc/CbGen/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CbGen_icpp_init_stub
-#define _CbGen_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppsrc/CodeEditor/init b/uppsrc/CodeEditor/init
deleted file mode 100644
index f7c2812e8..000000000
--- a/uppsrc/CodeEditor/init
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _CodeEditor_icpp_init_stub
-#define _CodeEditor_icpp_init_stub
-#include "CtrlLib/init"
-#include "plugin/pcre/init"
-#define BLITZ_INDEX__ F97a09d04ab17001c0c60ffb6219ac958
-#include "CRegister.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/Core/POP3/init b/uppsrc/Core/POP3/init
deleted file mode 100644
index edcf08949..000000000
--- a/uppsrc/Core/POP3/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Core_POP3_icpp_init_stub
-#define _Core_POP3_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppsrc/Core/Rpc/init b/uppsrc/Core/Rpc/init
deleted file mode 100644
index e96437af8..000000000
--- a/uppsrc/Core/Rpc/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _Core_Rpc_icpp_init_stub
-#define _Core_Rpc_icpp_init_stub
-#endif
diff --git a/uppsrc/Core/SMTP/init b/uppsrc/Core/SMTP/init
deleted file mode 100644
index 60a4951ca..000000000
--- a/uppsrc/Core/SMTP/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Core_SMTP_icpp_init_stub
-#define _Core_SMTP_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppsrc/Core/SSL/init b/uppsrc/Core/SSL/init
deleted file mode 100644
index 1d87a814e..000000000
--- a/uppsrc/Core/SSL/init
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _Core_SSL_icpp_init_stub
-#define _Core_SSL_icpp_init_stub
-#define BLITZ_INDEX__ F2a01c2597c8c635f342bbb222556fa5c
-#include "InitExit.icpp"
-#undef BLITZ_INDEX__
-#define BLITZ_INDEX__ F20fd197ce515f45c6284ecc270cf38ca
-#include "Socket.icpp"
-#undef BLITZ_INDEX__
-#define BLITZ_INDEX__ F2102a4fa3eba4dcfabd989be82ccd052
-#include "P7S.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/Core/init b/uppsrc/Core/init
deleted file mode 100644
index 16c5bbb3f..000000000
--- a/uppsrc/Core/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Core_icpp_init_stub
-#define _Core_icpp_init_stub
-#include "plugin\z/init"
-#endif
diff --git a/uppsrc/CppBase/init b/uppsrc/CppBase/init
deleted file mode 100644
index 19d24e702..000000000
--- a/uppsrc/CppBase/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CppBase_icpp_init_stub
-#define _CppBase_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppsrc/Crash/init b/uppsrc/Crash/init
deleted file mode 100644
index fc8503f3d..000000000
--- a/uppsrc/Crash/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Crash_icpp_init_stub
-#define _Crash_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppsrc/CtrlCore/init b/uppsrc/CtrlCore/init
deleted file mode 100644
index 1dffbde98..000000000
--- a/uppsrc/CtrlCore/init
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _CtrlCore_icpp_init_stub
-#define _CtrlCore_icpp_init_stub
-#include "Draw/init"
-#include "plugin\bmp/init"
-#include "RichText/init"
-#define BLITZ_INDEX__ Fabd53e6bbfc025249fe3b02cd8be7b6c
-#include "CtrlCore.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/CtrlLib/init b/uppsrc/CtrlLib/init
deleted file mode 100644
index 045155554..000000000
--- a/uppsrc/CtrlLib/init
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _CtrlLib_icpp_init_stub
-#define _CtrlLib_icpp_init_stub
-#include "CtrlCore/init"
-#include "PdfDraw/init"
-#define BLITZ_INDEX__ F73a88dfc92373ef6f2379fafa069fdce
-#include "CtrlLib.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/DocTypes/init b/uppsrc/DocTypes/init
deleted file mode 100644
index d8a9a4724..000000000
--- a/uppsrc/DocTypes/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _DocTypes_icpp_init_stub
-#define _DocTypes_icpp_init_stub
-#include "Draw/init"
-#include "RichText/init"
-#include "CtrlLib/init"
-#include "PdfDraw/init"
-#endif
diff --git a/uppsrc/Docedit/init b/uppsrc/Docedit/init
deleted file mode 100644
index 91bf37012..000000000
--- a/uppsrc/Docedit/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Docedit_icpp_init_stub
-#define _Docedit_icpp_init_stub
-#include "docpp/init"
-#include "RichEdit/init"
-#endif
diff --git a/uppsrc/Docking/init b/uppsrc/Docking/init
deleted file mode 100644
index eb3e13183..000000000
--- a/uppsrc/Docking/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Docking_icpp_init_stub
-#define _Docking_icpp_init_stub
-#include "CtrlLib/init"
-#include "TabBar/init"
-#endif
diff --git a/uppsrc/Draw/init b/uppsrc/Draw/init
deleted file mode 100644
index ff7037a12..000000000
--- a/uppsrc/Draw/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Draw_icpp_init_stub
-#define _Draw_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppsrc/DropGrid/init b/uppsrc/DropGrid/init
deleted file mode 100644
index 46ab34167..000000000
--- a/uppsrc/DropGrid/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _DropGrid_icpp_init_stub
-#define _DropGrid_icpp_init_stub
-#include "CtrlLib/init"
-#include "GridCtrl/init"
-#endif
diff --git a/uppsrc/Esc/init b/uppsrc/Esc/init
deleted file mode 100644
index 8a92b5ff2..000000000
--- a/uppsrc/Esc/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Esc_icpp_init_stub
-#define _Esc_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppsrc/GLCtrl/init b/uppsrc/GLCtrl/init
deleted file mode 100644
index 0deddaae8..000000000
--- a/uppsrc/GLCtrl/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _GLCtrl_icpp_init_stub
-#define _GLCtrl_icpp_init_stub
-#include "CtrlCore/init"
-#endif
diff --git a/uppsrc/GLDraw/init b/uppsrc/GLDraw/init
deleted file mode 100644
index 4162bcd9d..000000000
--- a/uppsrc/GLDraw/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _GLDraw_icpp_init_stub
-#define _GLDraw_icpp_init_stub
-#include "Draw/init"
-#include "Painter/init"
-#include "plugin/glew/init"
-#endif
diff --git a/uppsrc/Geom/Coords/init b/uppsrc/Geom/Coords/init
deleted file mode 100644
index 55b066f01..000000000
--- a/uppsrc/Geom/Coords/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Geom_Coords_icpp_init_stub
-#define _Geom_Coords_icpp_init_stub
-#include "Geom/init"
-#endif
diff --git a/uppsrc/Geom/Ctrl/init b/uppsrc/Geom/Ctrl/init
deleted file mode 100644
index 0be8a472b..000000000
--- a/uppsrc/Geom/Ctrl/init
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _Geom_Ctrl_icpp_init_stub
-#define _Geom_Ctrl_icpp_init_stub
-#include "Geom\Draw/init"
-#include "TCtrlLib/init"
-#define BLITZ_INDEX__ F1B1C947DDF9AE825683C36D7A839B905
-#include "GeomCtrl_init.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/Geom/Draw/init b/uppsrc/Geom/Draw/init
deleted file mode 100644
index 3a59e1de6..000000000
--- a/uppsrc/Geom/Draw/init
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _Geom_Draw_icpp_init_stub
-#define _Geom_Draw_icpp_init_stub
-#include "TDraw/init"
-#include "plugin\png/init"
-#include "plugin\gif/init"
-#include "plugin\jpg/init"
-#include "Geom\Coords/init"
-#endif
diff --git a/uppsrc/Geom/init b/uppsrc/Geom/init
deleted file mode 100644
index 85bd1e40a..000000000
--- a/uppsrc/Geom/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Geom_icpp_init_stub
-#define _Geom_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppsrc/GridCtrl/init b/uppsrc/GridCtrl/init
deleted file mode 100644
index f6ea48d9a..000000000
--- a/uppsrc/GridCtrl/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _GridCtrl_icpp_init_stub
-#define _GridCtrl_icpp_init_stub
-#include "CtrlLib/init"
-#include "Sql/init"
-#endif
diff --git a/uppsrc/HexView/init b/uppsrc/HexView/init
deleted file mode 100644
index b6b7121f4..000000000
--- a/uppsrc/HexView/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _HexView_icpp_init_stub
-#define _HexView_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppsrc/IconDes/init b/uppsrc/IconDes/init
deleted file mode 100644
index 30cebb6f7..000000000
--- a/uppsrc/IconDes/init
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _IconDes_icpp_init_stub
-#define _IconDes_icpp_init_stub
-#include "CtrlLib/init"
-#include "plugin\gif/init"
-#include "plugin\jpg/init"
-#include "Painter/init"
-#include "RichEdit/init"
-#endif
diff --git a/uppsrc/MSSQL/init b/uppsrc/MSSQL/init
deleted file mode 100644
index 856cf0821..000000000
--- a/uppsrc/MSSQL/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _MSSQL_icpp_init_stub
-#define _MSSQL_icpp_init_stub
-#include "ODBC/init"
-#endif
diff --git a/uppsrc/MySql/init b/uppsrc/MySql/init
deleted file mode 100644
index 425823b40..000000000
--- a/uppsrc/MySql/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _MySql_icpp_init_stub
-#define _MySql_icpp_init_stub
-#include "Sql/init"
-#include "plugin\z/init"
-#endif
diff --git a/uppsrc/ODBC/init b/uppsrc/ODBC/init
deleted file mode 100644
index 3efad477c..000000000
--- a/uppsrc/ODBC/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ODBC_icpp_init_stub
-#define _ODBC_icpp_init_stub
-#include "Sql/init"
-#endif
diff --git a/uppsrc/Ole/Ctrl/init b/uppsrc/Ole/Ctrl/init
deleted file mode 100644
index c5a762906..000000000
--- a/uppsrc/Ole/Ctrl/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Ole_Ctrl_icpp_init_stub
-#define _Ole_Ctrl_icpp_init_stub
-#include "Ole/init"
-#include "CtrlCore/init"
-#endif
diff --git a/uppsrc/Ole/init b/uppsrc/Ole/init
deleted file mode 100644
index 9f755ffa6..000000000
--- a/uppsrc/Ole/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Ole_icpp_init_stub
-#define _Ole_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppsrc/OleDB/init b/uppsrc/OleDB/init
deleted file mode 100644
index f7c93b797..000000000
--- a/uppsrc/OleDB/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _OleDB_icpp_init_stub
-#define _OleDB_icpp_init_stub
-#include "Ole/init"
-#include "Sql/init"
-#endif
diff --git a/uppsrc/Oracle/init b/uppsrc/Oracle/init
deleted file mode 100644
index 937169f8d..000000000
--- a/uppsrc/Oracle/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _Oracle_icpp_init_stub
-#define _Oracle_icpp_init_stub
-#include "Sql/init"
-#define BLITZ_INDEX__ F1de02542baf464f5c8c49b0a6b37efa4
-#include "Oracle_init.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/PaintGL/init b/uppsrc/PaintGL/init
deleted file mode 100644
index 24c15ecb1..000000000
--- a/uppsrc/PaintGL/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _PaintGL_icpp_init_stub
-#define _PaintGL_icpp_init_stub
-#endif
diff --git a/uppsrc/Painter/init b/uppsrc/Painter/init
deleted file mode 100644
index e1018d421..000000000
--- a/uppsrc/Painter/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _Painter_icpp_init_stub
-#define _Painter_icpp_init_stub
-#include "Draw/init"
-#define BLITZ_INDEX__ Fbc33529cf612fae4cff93d84eae761ba
-#include "PaintPainting.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/PdfDraw/init b/uppsrc/PdfDraw/init
deleted file mode 100644
index 10066a884..000000000
--- a/uppsrc/PdfDraw/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _PdfDraw_icpp_init_stub
-#define _PdfDraw_icpp_init_stub
-#include "Draw/init"
-#define BLITZ_INDEX__ F45b8b8ce27234b3a4db83c8cbd05bbce
-#include "PdfReport.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/PostgreSQL/init b/uppsrc/PostgreSQL/init
deleted file mode 100644
index 7b511f8a9..000000000
--- a/uppsrc/PostgreSQL/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _PostgreSQL_icpp_init_stub
-#define _PostgreSQL_icpp_init_stub
-#include "Sql/init"
-#endif
diff --git a/uppsrc/RasterPlayer/init b/uppsrc/RasterPlayer/init
deleted file mode 100644
index 511269d4f..000000000
--- a/uppsrc/RasterPlayer/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _RasterPlayer_icpp_init_stub
-#define _RasterPlayer_icpp_init_stub
-#include "plugin\gif/init"
-#include "plugin\tif/init"
-#endif
diff --git a/uppsrc/Report/init b/uppsrc/Report/init
deleted file mode 100644
index 1d1da9d00..000000000
--- a/uppsrc/Report/init
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _Report_icpp_init_stub
-#define _Report_icpp_init_stub
-#include "CtrlLib/init"
-#include "RichText/init"
-#define BLITZ_INDEX__ F92e20102c48294de23860475d094c3d4
-#include "ReportI.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/RichEdit/init b/uppsrc/RichEdit/init
deleted file mode 100644
index ff95ed82f..000000000
--- a/uppsrc/RichEdit/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _RichEdit_icpp_init_stub
-#define _RichEdit_icpp_init_stub
-#include "CtrlLib/init"
-#define BLITZ_INDEX__ F577a99570bbb000fda524f1066c896cb
-#include "RichEdit.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/RichText/init b/uppsrc/RichText/init
deleted file mode 100644
index 0dc699a5a..000000000
--- a/uppsrc/RichText/init
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _RichText_icpp_init_stub
-#define _RichText_icpp_init_stub
-#include "plugin\png/init"
-#include "Draw/init"
-#define BLITZ_INDEX__ Fe06c765f424ade6abd0ef0872b0f0559
-#include "RichImage.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/ScatterCtrl/init b/uppsrc/ScatterCtrl/init
deleted file mode 100644
index 71cde834f..000000000
--- a/uppsrc/ScatterCtrl/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ScatterCtrl_icpp_init_stub
-#define _ScatterCtrl_icpp_init_stub
-#include "CtrlLib/init"
-#include "plugin\jpg/init"
-#include "ScatterDraw/init"
-#include "GridCtrl/init"
-#endif
diff --git a/uppsrc/ScatterDraw/init b/uppsrc/ScatterDraw/init
deleted file mode 100644
index 25dd65fcc..000000000
--- a/uppsrc/ScatterDraw/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ScatterDraw_icpp_init_stub
-#define _ScatterDraw_icpp_init_stub
-#include "Painter/init"
-#include "plugin/Eigen/init"
-#endif
diff --git a/uppsrc/Skylark/Iml/init b/uppsrc/Skylark/Iml/init
deleted file mode 100644
index 60122448e..000000000
--- a/uppsrc/Skylark/Iml/init
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _Skylark_Iml_icpp_init_stub
-#define _Skylark_Iml_icpp_init_stub
-#include "Draw/init"
-#include "plugin\png/init"
-#define BLITZ_INDEX__ Fe08bb47a4f2334977b7d8bba44463f3f
-#include "Lib.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/Skylark/init b/uppsrc/Skylark/init
deleted file mode 100644
index d84b82ce3..000000000
--- a/uppsrc/Skylark/init
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _Skylark_icpp_init_stub
-#define _Skylark_icpp_init_stub
-#include "Sql/init"
-#define BLITZ_INDEX__ Ffdceedd0c779faf45203de4d20cc5340
-#include "StdLib.icpp"
-#undef BLITZ_INDEX__
-#define BLITZ_INDEX__ Fe14c3b567600743c08c9ce0e5cca713c
-#include "Static.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/Sql/init b/uppsrc/Sql/init
deleted file mode 100644
index 633fe5def..000000000
--- a/uppsrc/Sql/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Sql_icpp_init_stub
-#define _Sql_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppsrc/SqlCommander/init b/uppsrc/SqlCommander/init
deleted file mode 100644
index c5b11d34d..000000000
--- a/uppsrc/SqlCommander/init
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _SqlCommander_icpp_init_stub
-#define _SqlCommander_icpp_init_stub
-#include "SqlCtrl/init"
-#include "Oracle/init"
-#include "OleDB/init"
-#include "plugin\sqlite3/init"
-#include "PostgreSQL/init"
-#include "MySql/init"
-#endif
diff --git a/uppsrc/SqlCtrl/init b/uppsrc/SqlCtrl/init
deleted file mode 100644
index 6cc638f42..000000000
--- a/uppsrc/SqlCtrl/init
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _SqlCtrl_icpp_init_stub
-#define _SqlCtrl_icpp_init_stub
-#include "Sql/init"
-#include "CtrlLib/init"
-#include "Report/init"
-#include "CodeEditor/init"
-#define BLITZ_INDEX__ Fb6fe57a94b58c245d45f2decc640592c
-#include "SqlCtrl_init.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/TCore/init b/uppsrc/TCore/init
deleted file mode 100644
index 4a9093147..000000000
--- a/uppsrc/TCore/init
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _TCore_icpp_init_stub
-#define _TCore_icpp_init_stub
-#include "Core/init"
-#include "Web/init"
-#include "plugin\dbf/init"
-#define BLITZ_INDEX__ F85818f977ba42f8d2e1d9c6f4e48c385
-#include "TCore_init.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/TCore/service/init b/uppsrc/TCore/service/init
deleted file mode 100644
index 0a43b28c0..000000000
--- a/uppsrc/TCore/service/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _TCore_service_icpp_init_stub
-#define _TCore_service_icpp_init_stub
-#endif
diff --git a/uppsrc/TCtrlLib/Help/init b/uppsrc/TCtrlLib/Help/init
deleted file mode 100644
index ca27f992e..000000000
--- a/uppsrc/TCtrlLib/Help/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _TCtrlLib_Help_icpp_init_stub
-#define _TCtrlLib_Help_icpp_init_stub
-#include "TCtrlLib/init"
-#include "RichText/init"
-#endif
diff --git a/uppsrc/TCtrlLib/init b/uppsrc/TCtrlLib/init
deleted file mode 100644
index 3df0e6592..000000000
--- a/uppsrc/TCtrlLib/init
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _TCtrlLib_icpp_init_stub
-#define _TCtrlLib_icpp_init_stub
-#include "TDraw/init"
-#include "CtrlLib/init"
-#include "RichEdit/init"
-#include "plugin\gif/init"
-#include "PdfDraw/init"
-#include "DocTypes/init"
-#define BLITZ_INDEX__ F129aade12840874565c94814972fbf43
-#include "TCtrlLib_init.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/TDraw/init b/uppsrc/TDraw/init
deleted file mode 100644
index bac878116..000000000
--- a/uppsrc/TDraw/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _TDraw_icpp_init_stub
-#define _TDraw_icpp_init_stub
-#include "Draw/init"
-#include "Geom/init"
-#include "TCore/init"
-#include "PdfDraw/init"
-#endif
diff --git a/uppsrc/TSql/init b/uppsrc/TSql/init
deleted file mode 100644
index d5c1af616..000000000
--- a/uppsrc/TSql/init
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _TSql_icpp_init_stub
-#define _TSql_icpp_init_stub
-#include "Sql/init"
-#include "TCore/init"
-#define BLITZ_INDEX__ Fc7553a79185141de02fd1db792933d93
-#include "TSql_init.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/TabBar/init b/uppsrc/TabBar/init
deleted file mode 100644
index 39035a8d0..000000000
--- a/uppsrc/TabBar/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _TabBar_icpp_init_stub
-#define _TabBar_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppsrc/TextDiffCtrl/init b/uppsrc/TextDiffCtrl/init
deleted file mode 100644
index a955739b0..000000000
--- a/uppsrc/TextDiffCtrl/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _TextDiffCtrl_icpp_init_stub
-#define _TextDiffCtrl_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppsrc/Turtle/init b/uppsrc/Turtle/init
deleted file mode 100644
index 7d79b8f99..000000000
--- a/uppsrc/Turtle/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Turtle_icpp_init_stub
-#define _Turtle_icpp_init_stub
-#include "Painter/init"
-#include "CtrlLib/init"
-#endif
diff --git a/uppsrc/Updater/init b/uppsrc/Updater/init
deleted file mode 100644
index 51d041b1d..000000000
--- a/uppsrc/Updater/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Updater_icpp_init_stub
-#define _Updater_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppsrc/Web/SSL/init b/uppsrc/Web/SSL/init
deleted file mode 100644
index d005fb179..000000000
--- a/uppsrc/Web/SSL/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Web_SSL_icpp_init_stub
-#define _Web_SSL_icpp_init_stub
-#include "Web/init"
-#endif
diff --git a/uppsrc/Web/ctrl/init b/uppsrc/Web/ctrl/init
deleted file mode 100644
index 99123ea7f..000000000
--- a/uppsrc/Web/ctrl/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _Web_ctrl_icpp_init_stub
-#define _Web_ctrl_icpp_init_stub
-#include "Web/init"
-#include "TCtrlLib/init"
-#include "TDraw/init"
-#endif
diff --git a/uppsrc/Web/init b/uppsrc/Web/init
deleted file mode 100644
index da57e4638..000000000
--- a/uppsrc/Web/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _Web_icpp_init_stub
-#define _Web_icpp_init_stub
-#include "Core/init"
-#define BLITZ_INDEX__ F3170ff05da2f89ed29b26b5af54b309d
-#include "Web_init.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/Web/wisapi/init b/uppsrc/Web/wisapi/init
deleted file mode 100644
index 0b201fd01..000000000
--- a/uppsrc/Web/wisapi/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Web_wisapi_icpp_init_stub
-#define _Web_wisapi_icpp_init_stub
-#include "Web/init"
-#include "TCore/init"
-#endif
diff --git a/uppsrc/XmlRpc/init b/uppsrc/XmlRpc/init
deleted file mode 100644
index 365d889c0..000000000
--- a/uppsrc/XmlRpc/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _XmlRpc_icpp_init_stub
-#define _XmlRpc_icpp_init_stub
-#include "Web/init"
-#include "Core/Rpc/init"
-#endif
diff --git a/uppsrc/XmlView/init b/uppsrc/XmlView/init
deleted file mode 100644
index 7dae7d7ac..000000000
--- a/uppsrc/XmlView/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _XmlView_icpp_init_stub
-#define _XmlView_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/uppsrc/art/BlueBar/init b/uppsrc/art/BlueBar/init
deleted file mode 100644
index 9fa8344c2..000000000
--- a/uppsrc/art/BlueBar/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _art_BlueBar_icpp_init_stub
-#define _art_BlueBar_icpp_init_stub
-#endif
diff --git a/uppsrc/docpp/init b/uppsrc/docpp/init
deleted file mode 100644
index 1bc0db7dc..000000000
--- a/uppsrc/docpp/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _docpp_icpp_init_stub
-#define _docpp_icpp_init_stub
-#include "RichEdit/init"
-#endif
diff --git a/uppsrc/ide/Android/init b/uppsrc/ide/Android/init
deleted file mode 100644
index 80f674540..000000000
--- a/uppsrc/ide/Android/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ide_Android_icpp_init_stub
-#define _ide_Android_icpp_init_stub
-#include "ide/Core/init"
-#include "plugin/pcre/init"
-#endif
diff --git a/uppsrc/ide/Browser/init b/uppsrc/ide/Browser/init
deleted file mode 100644
index 1567bcd59..000000000
--- a/uppsrc/ide/Browser/init
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _ide_Browser_icpp_init_stub
-#define _ide_Browser_icpp_init_stub
-#include "CppBase/init"
-#include "ide\Common/init"
-#include "PdfDraw/init"
-#include "RichEdit/init"
-#include "plugin/lz4/init"
-#define BLITZ_INDEX__ Faf5167357a73176b37fced69d194f797
-#include "TopicI.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/ide/Builders/init b/uppsrc/ide/Builders/init
deleted file mode 100644
index 901551a79..000000000
--- a/uppsrc/ide/Builders/init
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _ide_Builders_icpp_init_stub
-#define _ide_Builders_icpp_init_stub
-#include "ide\Core/init"
-#include "ide/Android/init"
-#include "ide/Java/init"
-#define BLITZ_INDEX__ Fab5aa4644e1c1b5af8ed5faf2d4db317
-#include "GccBuilder.icpp"
-#undef BLITZ_INDEX__
-#define BLITZ_INDEX__ F956ea62c6d598d9abe6fd347ece78faf
-#include "MscBuilder.icpp"
-#undef BLITZ_INDEX__
-#define BLITZ_INDEX__ Fecf66fc39eec6a21e32d6c41cad4d431
-#include "JavaBuilder.icpp"
-#undef BLITZ_INDEX__
-#define BLITZ_INDEX__ Fea8152e4f0407437ab942dc131a5c47f
-#include "AndroidBuilder.icpp"
-#undef BLITZ_INDEX__
-#define BLITZ_INDEX__ Fa99182ca8dccb6e49a9bb75dbfd7c33d
-#include "ScriptBuilder.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/ide/Common/init b/uppsrc/ide/Common/init
deleted file mode 100644
index 51b52aeb3..000000000
--- a/uppsrc/ide/Common/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ide_Common_icpp_init_stub
-#define _ide_Common_icpp_init_stub
-#include "ide\Core/init"
-#include "CtrlLib/init"
-#endif
diff --git a/uppsrc/ide/Core/init b/uppsrc/ide/Core/init
deleted file mode 100644
index 281129f29..000000000
--- a/uppsrc/ide/Core/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ide_Core_icpp_init_stub
-#define _ide_Core_icpp_init_stub
-#include "Esc/init"
-#include "plugin/bz2/init"
-#endif
diff --git a/uppsrc/ide/Debuggers/init b/uppsrc/ide/Debuggers/init
deleted file mode 100644
index 027b31cc1..000000000
--- a/uppsrc/ide/Debuggers/init
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _ide_Debuggers_icpp_init_stub
-#define _ide_Debuggers_icpp_init_stub
-#include "ide\Common/init"
-#include "plugin\ndisasm/init"
-#include "HexView/init"
-#define BLITZ_INDEX__ Ff98dcbb6b07843a5d0dee1900fadafd0
-#include "UppSimplifiers.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/ide/Designers/init b/uppsrc/ide/Designers/init
deleted file mode 100644
index a31f873b1..000000000
--- a/uppsrc/ide/Designers/init
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _ide_Designers_icpp_init_stub
-#define _ide_Designers_icpp_init_stub
-#include "HexView/init"
-#define BLITZ_INDEX__ F30af27bc27b2245be0afb8cf140e0a02
-#include "Img.icpp"
-#undef BLITZ_INDEX__
-#define BLITZ_INDEX__ F2b9cc9e34248ca7ce468509d67805881
-#include "Qtf.icpp"
-#undef BLITZ_INDEX__
-#define BLITZ_INDEX__ F231a40d13d2e3c77ea055dcf401dd5dc
-#include "HexView.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/ide/IconDes/init b/uppsrc/ide/IconDes/init
deleted file mode 100644
index a8016b643..000000000
--- a/uppsrc/ide/IconDes/init
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _ide_IconDes_icpp_init_stub
-#define _ide_IconDes_icpp_init_stub
-#include "IconDes/init"
-#include "ide\Common/init"
-#define BLITZ_INDEX__ F345d51d3b37dda2031fc9e0075258061
-#include "IdeDes.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/ide/Java/init b/uppsrc/ide/Java/init
deleted file mode 100644
index d2db221b0..000000000
--- a/uppsrc/ide/Java/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ide_Java_icpp_init_stub
-#define _ide_Java_icpp_init_stub
-#include "ide/Core/init"
-#endif
diff --git a/uppsrc/ide/LayDes/init b/uppsrc/ide/LayDes/init
deleted file mode 100644
index b4233f2eb..000000000
--- a/uppsrc/ide/LayDes/init
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _ide_LayDes_icpp_init_stub
-#define _ide_LayDes_icpp_init_stub
-#include "ide\Common/init"
-#include "RichEdit/init"
-#include "Esc/init"
-#include "IconDes/init"
-#include "CodeEditor/init"
-#endif
diff --git a/uppsrc/ide/SrcUpdater/init b/uppsrc/ide/SrcUpdater/init
deleted file mode 100644
index 388f3e00c..000000000
--- a/uppsrc/ide/SrcUpdater/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ide_SrcUpdater_icpp_init_stub
-#define _ide_SrcUpdater_icpp_init_stub
-#include "CtrlLib/init"
-#include "usvn/init"
-#endif
diff --git a/uppsrc/ide/init b/uppsrc/ide/init
deleted file mode 100644
index dc2d33295..000000000
--- a/uppsrc/ide/init
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _ide_icpp_init_stub
-#define _ide_icpp_init_stub
-#include "ide\Common/init"
-#include "ide\Core/init"
-#include "ide\LayDes/init"
-#include "ide\IconDes/init"
-#include "ide\Builders/init"
-#include "ide\Debuggers/init"
-#include "ide\Browser/init"
-#include "CodeEditor/init"
-#include "CtrlLib/init"
-#include "plugin\bz2/init"
-#include "HexView/init"
-#include "art\BlueBar/init"
-#include "plugin/astyle/init"
-#include "usvn/init"
-#include "TextDiffCtrl/init"
-#include "TabBar/init"
-#include "ide/Designers/init"
-#include "ide/Android/init"
-#include "ide/Java/init"
-#include "ide\SrcUpdater/init"
-#endif
diff --git a/uppsrc/plugin/DroidFonts/init b/uppsrc/plugin/DroidFonts/init
deleted file mode 100644
index 3f842691c..000000000
--- a/uppsrc/plugin/DroidFonts/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _plugin_DroidFonts_icpp_init_stub
-#define _plugin_DroidFonts_icpp_init_stub
-#include "plugin/FT_fontsys/init"
-#define BLITZ_INDEX__ F3e7c51a94c0c592c4447edc4e38a808b
-#include "DroidFonts.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/plugin/Eigen/init b/uppsrc/plugin/Eigen/init
deleted file mode 100644
index 3e1fa6260..000000000
--- a/uppsrc/plugin/Eigen/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _plugin_Eigen_icpp_init_stub
-#define _plugin_Eigen_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppsrc/plugin/FT_fontsys/init b/uppsrc/plugin/FT_fontsys/init
deleted file mode 100644
index 7d7198be1..000000000
--- a/uppsrc/plugin/FT_fontsys/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _plugin_FT_fontsys_icpp_init_stub
-#define _plugin_FT_fontsys_icpp_init_stub
-#include "Draw/init"
-#endif
diff --git a/uppsrc/plugin/astyle/init b/uppsrc/plugin/astyle/init
deleted file mode 100644
index cb0d67960..000000000
--- a/uppsrc/plugin/astyle/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _plugin_astyle_icpp_init_stub
-#define _plugin_astyle_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppsrc/plugin/bmp/init b/uppsrc/plugin/bmp/init
deleted file mode 100644
index dade997d5..000000000
--- a/uppsrc/plugin/bmp/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _plugin_bmp_icpp_init_stub
-#define _plugin_bmp_icpp_init_stub
-#include "Draw/init"
-#define BLITZ_INDEX__ F90a005b27b04effc8403340c7f5c1243
-#include "BmpReg.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/plugin/box2d/init b/uppsrc/plugin/box2d/init
deleted file mode 100644
index 2ea292025..000000000
--- a/uppsrc/plugin/box2d/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _plugin_box2d_icpp_init_stub
-#define _plugin_box2d_icpp_init_stub
-#endif
diff --git a/uppsrc/plugin/bz2/init b/uppsrc/plugin/bz2/init
deleted file mode 100644
index 04b47c2d5..000000000
--- a/uppsrc/plugin/bz2/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _plugin_bz2_icpp_init_stub
-#define _plugin_bz2_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppsrc/plugin/dbf/init b/uppsrc/plugin/dbf/init
deleted file mode 100644
index 7830dc2c8..000000000
--- a/uppsrc/plugin/dbf/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _plugin_dbf_icpp_init_stub
-#define _plugin_dbf_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppsrc/plugin/ftp/init b/uppsrc/plugin/ftp/init
deleted file mode 100644
index 23fa7795a..000000000
--- a/uppsrc/plugin/ftp/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _plugin_ftp_icpp_init_stub
-#define _plugin_ftp_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppsrc/plugin/gif/init b/uppsrc/plugin/gif/init
deleted file mode 100644
index cc099fdd9..000000000
--- a/uppsrc/plugin/gif/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _plugin_gif_icpp_init_stub
-#define _plugin_gif_icpp_init_stub
-#include "Draw/init"
-#define BLITZ_INDEX__ F822a3f6a2543aefad7ddf3febf8ae3a5
-#include "gif.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/plugin/glew/init b/uppsrc/plugin/glew/init
deleted file mode 100644
index c87a2bbb4..000000000
--- a/uppsrc/plugin/glew/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _plugin_glew_icpp_init_stub
-#define _plugin_glew_icpp_init_stub
-#endif
diff --git a/uppsrc/plugin/jpg/init b/uppsrc/plugin/jpg/init
deleted file mode 100644
index 49f64ffa3..000000000
--- a/uppsrc/plugin/jpg/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _plugin_jpg_icpp_init_stub
-#define _plugin_jpg_icpp_init_stub
-#include "Draw/init"
-#define BLITZ_INDEX__ Fefc5791bca702d19b0b783697a123279
-#include "jpgreg.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/plugin/lz4/init b/uppsrc/plugin/lz4/init
deleted file mode 100644
index ca703ac89..000000000
--- a/uppsrc/plugin/lz4/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _plugin_lz4_icpp_init_stub
-#define _plugin_lz4_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppsrc/plugin/lzma/init b/uppsrc/plugin/lzma/init
deleted file mode 100644
index 287c2445a..000000000
--- a/uppsrc/plugin/lzma/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _plugin_lzma_icpp_init_stub
-#define _plugin_lzma_icpp_init_stub
-#endif
diff --git a/uppsrc/plugin/ndisasm/init b/uppsrc/plugin/ndisasm/init
deleted file mode 100644
index 81e720a50..000000000
--- a/uppsrc/plugin/ndisasm/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _plugin_ndisasm_icpp_init_stub
-#define _plugin_ndisasm_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppsrc/plugin/pcre/init b/uppsrc/plugin/pcre/init
deleted file mode 100644
index 48f81a81f..000000000
--- a/uppsrc/plugin/pcre/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _plugin_pcre_icpp_init_stub
-#define _plugin_pcre_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppsrc/plugin/pcx/init b/uppsrc/plugin/pcx/init
deleted file mode 100644
index fdfe0c8d5..000000000
--- a/uppsrc/plugin/pcx/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _plugin_pcx_icpp_init_stub
-#define _plugin_pcx_icpp_init_stub
-#define BLITZ_INDEX__ F7436A22E881D6898946270473975CEA8
-#include "pcxreg.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/plugin/png/init b/uppsrc/plugin/png/init
deleted file mode 100644
index 4074fe6e0..000000000
--- a/uppsrc/plugin/png/init
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _plugin_png_icpp_init_stub
-#define _plugin_png_icpp_init_stub
-#include "Core/init"
-#include "Draw/init"
-#define BLITZ_INDEX__ Fe579e330740ee04de50bc580cf6af8c6
-#include "pngreg.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/plugin/ppm/init b/uppsrc/plugin/ppm/init
deleted file mode 100644
index 1e4043ed8..000000000
--- a/uppsrc/plugin/ppm/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _plugin_ppm_icpp_init_stub
-#define _plugin_ppm_icpp_init_stub
-#define BLITZ_INDEX__ Fdf120578bb798e5c9b5d622a2a6f7bf4
-#include "ppmref.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/plugin/sqlite3/init b/uppsrc/plugin/sqlite3/init
deleted file mode 100644
index 25a5c4d45..000000000
--- a/uppsrc/plugin/sqlite3/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _plugin_sqlite3_icpp_init_stub
-#define _plugin_sqlite3_icpp_init_stub
-#include "Sql/init"
-#endif
diff --git a/uppsrc/plugin/tif/init b/uppsrc/plugin/tif/init
deleted file mode 100644
index 13c4f3ce7..000000000
--- a/uppsrc/plugin/tif/init
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _plugin_tif_icpp_init_stub
-#define _plugin_tif_icpp_init_stub
-#include "plugin\jpg/init"
-#define BLITZ_INDEX__ Fe7bd8071315226912b93a1d9cb51e423
-#include "tifreg.icpp"
-#undef BLITZ_INDEX__
-#endif
diff --git a/uppsrc/plugin/wincert/init b/uppsrc/plugin/wincert/init
deleted file mode 100644
index e09445492..000000000
--- a/uppsrc/plugin/wincert/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _plugin_wincert_icpp_init_stub
-#define _plugin_wincert_icpp_init_stub
-#include "Web/init"
-#endif
diff --git a/uppsrc/plugin/z/init b/uppsrc/plugin/z/init
deleted file mode 100644
index 01193ba8e..000000000
--- a/uppsrc/plugin/z/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _plugin_z_icpp_init_stub
-#define _plugin_z_icpp_init_stub
-#endif
diff --git a/uppsrc/plugin/zip/init b/uppsrc/plugin/zip/init
deleted file mode 100644
index 41d606d28..000000000
--- a/uppsrc/plugin/zip/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _plugin_zip_icpp_init_stub
-#define _plugin_zip_icpp_init_stub
-#endif
diff --git a/uppsrc/plugin/zstd/init b/uppsrc/plugin/zstd/init
deleted file mode 100644
index b2d85c0d1..000000000
--- a/uppsrc/plugin/zstd/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _plugin_zstd_icpp_init_stub
-#define _plugin_zstd_icpp_init_stub
-#endif
diff --git a/uppsrc/umk/init b/uppsrc/umk/init
deleted file mode 100644
index 99792fad1..000000000
--- a/uppsrc/umk/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _umk_icpp_init_stub
-#define _umk_icpp_init_stub
-#include "ide\Builders/init"
-#endif
diff --git a/uppsrc/usvn/init b/uppsrc/usvn/init
deleted file mode 100644
index c1c62b484..000000000
--- a/uppsrc/usvn/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _usvn_icpp_init_stub
-#define _usvn_icpp_init_stub
-#include "TextDiffCtrl/init"
-#endif
diff --git a/uppsrc2/Crypto/init b/uppsrc2/Crypto/init
deleted file mode 100644
index 2c882cb87..000000000
--- a/uppsrc2/Crypto/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Crypto_icpp_init_stub
-#define _Crypto_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppsrc2/TServ/init b/uppsrc2/TServ/init
deleted file mode 100644
index 6b837339f..000000000
--- a/uppsrc2/TServ/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Web_TServ_icpp_init_stub
-#define _Web_TServ_icpp_init_stub
-#include "Web/init"
-#include "plugin\bz2/init"
-#endif
diff --git a/uppsrc2/coff/binobj/init b/uppsrc2/coff/binobj/init
deleted file mode 100644
index efc098801..000000000
--- a/uppsrc2/coff/binobj/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _coff_binobj_icpp_init_stub
-#define _coff_binobj_icpp_init_stub
-#include "coff/init"
-#include "plugin\bz2/init"
-#endif
diff --git a/uppsrc2/coff/init b/uppsrc2/coff/init
deleted file mode 100644
index b217c9ffd..000000000
--- a/uppsrc2/coff/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _coff_icpp_init_stub
-#define _coff_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/uppsrc2/coff/uar/init b/uppsrc2/coff/uar/init
deleted file mode 100644
index 708f20422..000000000
--- a/uppsrc2/coff/uar/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _coff_uar_icpp_init_stub
-#define _coff_uar_icpp_init_stub
-#include "coff/init"
-#endif
diff --git a/uppsrc2/coff/uld/init b/uppsrc2/coff/uld/init
deleted file mode 100644
index 802ad6b9e..000000000
--- a/uppsrc2/coff/uld/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _coff_uld_icpp_init_stub
-#define _coff_uld_icpp_init_stub
-#include "coff/init"
-#endif
diff --git a/uppsrc2/rw/init b/uppsrc2/rw/init
deleted file mode 100644
index aacac6778..000000000
--- a/uppsrc2/rw/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _rw_icpp_init_stub
-#define _rw_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/Assist/init b/upptst/Assist/init
deleted file mode 100644
index 9da03bb40..000000000
--- a/upptst/Assist/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _Assist_icpp_init_stub
-#define _Assist_icpp_init_stub
-#include "CtrlLib/init"
-#include "Sql/init"
-#include "TabBar/init"
-#endif
diff --git a/upptst/CachedRescale/init b/upptst/CachedRescale/init
deleted file mode 100644
index 20741ae4b..000000000
--- a/upptst/CachedRescale/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CachedRescale_icpp_init_stub
-#define _CachedRescale_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/CharMetrics/init b/upptst/CharMetrics/init
deleted file mode 100644
index f8e193b29..000000000
--- a/upptst/CharMetrics/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CharMetrics_icpp_init_stub
-#define _CharMetrics_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/CheckCompile/init b/upptst/CheckCompile/init
deleted file mode 100644
index 30c813af8..000000000
--- a/upptst/CheckCompile/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _CheckCompile_icpp_init_stub
-#define _CheckCompile_icpp_init_stub
-#include "CtrlLib/init"
-#include "RichEdit/init"
-#endif
diff --git a/upptst/CoWorkImg/init b/upptst/CoWorkImg/init
deleted file mode 100644
index 512f9a46c..000000000
--- a/upptst/CoWorkImg/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _CoWorkImg_icpp_init_stub
-#define _CoWorkImg_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/DDARasterizer/init b/upptst/DDARasterizer/init
deleted file mode 100644
index 53bfa2eac..000000000
--- a/upptst/DDARasterizer/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _DDARasterizer_icpp_init_stub
-#define _DDARasterizer_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/DisplayPopup/init b/upptst/DisplayPopup/init
deleted file mode 100644
index f14108489..000000000
--- a/upptst/DisplayPopup/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _DisplayPopup_icpp_init_stub
-#define _DisplayPopup_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/Dither/init b/upptst/Dither/init
deleted file mode 100644
index a7648e050..000000000
--- a/upptst/Dither/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Dither_icpp_init_stub
-#define _Dither_icpp_init_stub
-#include "CtrlLib/init"
-#include "plugin/jpg/init"
-#endif
diff --git a/upptst/DrawGeom/init b/upptst/DrawGeom/init
deleted file mode 100644
index e26f9a566..000000000
--- a/upptst/DrawGeom/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _DrawGeom_icpp_init_stub
-#define _DrawGeom_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/DrawLineDash/init b/upptst/DrawLineDash/init
deleted file mode 100644
index c4e05d942..000000000
--- a/upptst/DrawLineDash/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _DrawLineDash_icpp_init_stub
-#define _DrawLineDash_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/Drawing/init b/upptst/Drawing/init
deleted file mode 100644
index 3e4f9c8e6..000000000
--- a/upptst/Drawing/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Drawing_icpp_init_stub
-#define _Drawing_icpp_init_stub
-#include "CtrlLib/init"
-#include "Painter/init"
-#endif
diff --git a/upptst/DropGridTst/init b/upptst/DropGridTst/init
deleted file mode 100644
index a58e86220..000000000
--- a/upptst/DropGridTst/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _DropGridTst_icpp_init_stub
-#define _DropGridTst_icpp_init_stub
-#include "CtrlLib/init"
-#include "DropGrid/init"
-#endif
diff --git a/upptst/DropList/init b/upptst/DropList/init
deleted file mode 100644
index 52eddde24..000000000
--- a/upptst/DropList/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _DropList_icpp_init_stub
-#define _DropList_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/EditFieldLong/init b/upptst/EditFieldLong/init
deleted file mode 100644
index ba0d6f68d..000000000
--- a/upptst/EditFieldLong/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _EditFieldLong_icpp_init_stub
-#define _EditFieldLong_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/FileOutLocking/init b/upptst/FileOutLocking/init
deleted file mode 100644
index f5c1c22da..000000000
--- a/upptst/FileOutLocking/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _FileOutLocking_icpp_init_stub
-#define _FileOutLocking_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/upptst/FileSel/init b/upptst/FileSel/init
deleted file mode 100644
index 1967588ed..000000000
--- a/upptst/FileSel/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _FileSel_icpp_init_stub
-#define _FileSel_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/FileSelLazyIcon/init b/upptst/FileSelLazyIcon/init
deleted file mode 100644
index 639692ba2..000000000
--- a/upptst/FileSelLazyIcon/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _FileSelLazyIcon_icpp_init_stub
-#define _FileSelLazyIcon_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/FontZoomTest/init b/upptst/FontZoomTest/init
deleted file mode 100644
index 095190469..000000000
--- a/upptst/FontZoomTest/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _FontZoomTest_icpp_init_stub
-#define _FontZoomTest_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/GLDrawTest/init b/upptst/GLDrawTest/init
deleted file mode 100644
index 0054b6888..000000000
--- a/upptst/GLDrawTest/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _GLDrawTest_icpp_init_stub
-#define _GLDrawTest_icpp_init_stub
-#include "CtrlLib/init"
-#include "GLCtrl/init"
-#include "GLDraw/init"
-#endif
diff --git a/upptst/GuiJsonize/init b/upptst/GuiJsonize/init
deleted file mode 100644
index 2c0027215..000000000
--- a/upptst/GuiJsonize/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _GuiJsonize_icpp_init_stub
-#define _GuiJsonize_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/GuiMtTest/init b/upptst/GuiMtTest/init
deleted file mode 100644
index 882c3b44b..000000000
--- a/upptst/GuiMtTest/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _GuiMtTest_icpp_init_stub
-#define _GuiMtTest_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/HDPrompt/init b/upptst/HDPrompt/init
deleted file mode 100644
index d453c5900..000000000
--- a/upptst/HDPrompt/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _HDPrompt_icpp_init_stub
-#define _HDPrompt_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/I18NCtrlLayoutTest/init b/upptst/I18NCtrlLayoutTest/init
deleted file mode 100644
index 530583dca..000000000
--- a/upptst/I18NCtrlLayoutTest/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _I18NCtrlLayoutTest_icpp_init_stub
-#define _I18NCtrlLayoutTest_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/INI/init b/upptst/INI/init
deleted file mode 100644
index 2cedd1e6d..000000000
--- a/upptst/INI/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _INI_icpp_init_stub
-#define _INI_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/upptst/Keys/init b/upptst/Keys/init
deleted file mode 100644
index 5bc064e6a..000000000
--- a/upptst/Keys/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Keys_icpp_init_stub
-#define _Keys_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/LZ4Progress/init b/upptst/LZ4Progress/init
deleted file mode 100644
index 6eb824699..000000000
--- a/upptst/LZ4Progress/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _LZ4Progress_icpp_init_stub
-#define _LZ4Progress_icpp_init_stub
-#include "Core/init"
-#include "plugin/lz4/init"
-#include "plugin/zstd/init"
-#endif
diff --git a/upptst/MapRange/init b/upptst/MapRange/init
deleted file mode 100644
index 12d556ecc..000000000
--- a/upptst/MapRange/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _MapRange_icpp_init_stub
-#define _MapRange_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/upptst/Memory/init b/upptst/Memory/init
deleted file mode 100644
index f3ae85151..000000000
--- a/upptst/Memory/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Memory_icpp_init_stub
-#define _Memory_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/upptst/Mirrors/init b/upptst/Mirrors/init
deleted file mode 100644
index e018374b0..000000000
--- a/upptst/Mirrors/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _Mirrors_icpp_init_stub
-#define _Mirrors_icpp_init_stub
-#include "CtrlLib/init"
-#include "Report/init"
-#include "Painter/init"
-#endif
diff --git a/upptst/MouseWheel/init b/upptst/MouseWheel/init
deleted file mode 100644
index b4835ca99..000000000
--- a/upptst/MouseWheel/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _MouseWheel_icpp_init_stub
-#define _MouseWheel_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/MtDraw/init b/upptst/MtDraw/init
deleted file mode 100644
index 451e1cb6a..000000000
--- a/upptst/MtDraw/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _MtDraw_icpp_init_stub
-#define _MtDraw_icpp_init_stub
-#include "CtrlLib/init"
-#include "PdfDraw/init"
-#endif
diff --git a/upptst/OpenGlTest/init b/upptst/OpenGlTest/init
deleted file mode 100644
index de7fc2ece..000000000
--- a/upptst/OpenGlTest/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _OpenGlTest_icpp_init_stub
-#define _OpenGlTest_icpp_init_stub
-#include "CtrlLib/init"
-#include "GLCtrl/init"
-#endif
diff --git a/upptst/PdfText/init b/upptst/PdfText/init
deleted file mode 100644
index 257b2ecee..000000000
--- a/upptst/PdfText/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _PdfText_icpp_init_stub
-#define _PdfText_icpp_init_stub
-#include "Core/init"
-#include "PdfDraw/init"
-#endif
diff --git a/upptst/PdfUrl/init b/upptst/PdfUrl/init
deleted file mode 100644
index c53207cb0..000000000
--- a/upptst/PdfUrl/init
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _PdfUrl_icpp_init_stub
-#define _PdfUrl_icpp_init_stub
-#include "Core/init"
-#include "RichText/init"
-#include "PdfDraw/init"
-#endif
diff --git a/upptst/PrintImage/init b/upptst/PrintImage/init
deleted file mode 100644
index 8fe146aca..000000000
--- a/upptst/PrintImage/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _PrintImage_icpp_init_stub
-#define _PrintImage_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/Random/init b/upptst/Random/init
deleted file mode 100644
index 26ff0a8cc..000000000
--- a/upptst/Random/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Random_icpp_init_stub
-#define _Random_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/upptst/Range/init b/upptst/Range/init
deleted file mode 100644
index b2dba6aaa..000000000
--- a/upptst/Range/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Range_icpp_init_stub
-#define _Range_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/upptst/ReportTest/init b/upptst/ReportTest/init
deleted file mode 100644
index 284e3bc39..000000000
--- a/upptst/ReportTest/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ReportTest_icpp_init_stub
-#define _ReportTest_icpp_init_stub
-#include "CtrlLib/init"
-#include "Report/init"
-#endif
diff --git a/upptst/ReportTest2/init b/upptst/ReportTest2/init
deleted file mode 100644
index 47d047521..000000000
--- a/upptst/ReportTest2/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _ReportTest2_icpp_init_stub
-#define _ReportTest2_icpp_init_stub
-#include "CtrlLib/init"
-#include "Report/init"
-#endif
diff --git a/upptst/SetFace/init b/upptst/SetFace/init
deleted file mode 100644
index 975422c57..000000000
--- a/upptst/SetFace/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SetFace_icpp_init_stub
-#define _SetFace_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/StdFontAngle/init b/upptst/StdFontAngle/init
deleted file mode 100644
index 11b147dd2..000000000
--- a/upptst/StdFontAngle/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _StdFontAngle_icpp_init_stub
-#define _StdFontAngle_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/SysPathInfo/init b/upptst/SysPathInfo/init
deleted file mode 100644
index e325c5865..000000000
--- a/upptst/SysPathInfo/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _SysPathInfo_icpp_init_stub
-#define _SysPathInfo_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/upptst/TestChStyle/init b/upptst/TestChStyle/init
deleted file mode 100644
index 539c8a009..000000000
--- a/upptst/TestChStyle/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _TestChStyle_icpp_init_stub
-#define _TestChStyle_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/Tuple/init b/upptst/Tuple/init
deleted file mode 100644
index 906e2783e..000000000
--- a/upptst/Tuple/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _Tuple_icpp_init_stub
-#define _Tuple_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/upptst/WMF/init b/upptst/WMF/init
deleted file mode 100644
index f0406fac2..000000000
--- a/upptst/WMF/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _WMF_icpp_init_stub
-#define _WMF_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/upptst/Zip/init b/upptst/Zip/init
deleted file mode 100644
index 6fe970ab3..000000000
--- a/upptst/Zip/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _Zip_icpp_init_stub
-#define _Zip_icpp_init_stub
-#include "Core/init"
-#include "plugin/zip/init"
-#endif
diff --git a/upptst/build_info/init b/upptst/build_info/init
deleted file mode 100644
index 922306b57..000000000
--- a/upptst/build_info/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _build_info_icpp_init_stub
-#define _build_info_icpp_init_stub
-#include "Core/init"
-#endif
diff --git a/upptst/idetest/init b/upptst/idetest/init
deleted file mode 100644
index f5e401adc..000000000
--- a/upptst/idetest/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _idetest_icpp_init_stub
-#define _idetest_icpp_init_stub
-#include "CtrlLib/init"
-#include "ide/init"
-#endif
diff --git a/upptst/odbctst/init b/upptst/odbctst/init
deleted file mode 100644
index e016cad6c..000000000
--- a/upptst/odbctst/init
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _odbctst_icpp_init_stub
-#define _odbctst_icpp_init_stub
-#include "Core/init"
-#include "ODBC/init"
-#endif
diff --git a/upptst/umktest/init b/upptst/umktest/init
deleted file mode 100644
index 35270ee34..000000000
--- a/upptst/umktest/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _umktest_icpp_init_stub
-#define _umktest_icpp_init_stub
-#include "umk/init"
-#endif