diff --git a/uppsrc/Core/Defs.h b/uppsrc/Core/Defs.h
index db5d1972b..3790c0fa5 100644
--- a/uppsrc/Core/Defs.h
+++ b/uppsrc/Core/Defs.h
@@ -147,7 +147,7 @@ void    PanicMessageBox(const char *title, const char *text);
 #define MK__s__(x)       s__s##x
 #define MK__s_(x)        MK__s__(x)
 
-#ifdef  flagBLITZ
+#ifdef  BLITZ_INDEX__
 #define MK__s            MK__s_(COMBINE3(BLITZ_INDEX__, _, __LINE__))
 #else
 #define MK__s            MK__s_(__LINE__)
diff --git a/uppsrc/CtrlCore/init b/uppsrc/CtrlCore/init
index ec3aebdf4..b04d364a4 100644
--- a/uppsrc/CtrlCore/init
+++ b/uppsrc/CtrlCore/init
@@ -2,5 +2,7 @@
 #define _CtrlCore_icpp_init_stub
 #include "Draw/init"
 #include "plugin\bmp/init"
+#define BLITZ_INDEX__ FD3CD26184DBA93DB9B8430B11AEF738A
 #include "CtrlCore.icpp"
+#undef BLITZ_INDEX__
 #endif
diff --git a/uppsrc/CtrlLib/init b/uppsrc/CtrlLib/init
index 4932e041f..144bdde2d 100644
--- a/uppsrc/CtrlLib/init
+++ b/uppsrc/CtrlLib/init
@@ -3,5 +3,7 @@
 #include "CtrlCore/init"
 #include "RichText/init"
 #include "PdfDraw/init"
+#define BLITZ_INDEX__ FF8C05BA5437D7F0BDE90A0A8910FDCBE
 #include "CtrlLib.icpp"
+#undef BLITZ_INDEX__
 #endif
diff --git a/uppsrc/MySql/init b/uppsrc/MySql/init
new file mode 100644
index 000000000..425823b40
--- /dev/null
+++ b/uppsrc/MySql/init
@@ -0,0 +1,5 @@
+#ifndef _MySql_icpp_init_stub
+#define _MySql_icpp_init_stub
+#include "Sql/init"
+#include "plugin\z/init"
+#endif
diff --git a/uppsrc/Ole/init b/uppsrc/Ole/init
new file mode 100644
index 000000000..9f755ffa6
--- /dev/null
+++ b/uppsrc/Ole/init
@@ -0,0 +1,4 @@
+#ifndef _Ole_icpp_init_stub
+#define _Ole_icpp_init_stub
+#include "Core/init"
+#endif
diff --git a/uppsrc/Oracle/init b/uppsrc/Oracle/init
new file mode 100644
index 000000000..faab27743
--- /dev/null
+++ b/uppsrc/Oracle/init
@@ -0,0 +1,7 @@
+#ifndef _Oracle_icpp_init_stub
+#define _Oracle_icpp_init_stub
+#include "Sql/init"
+#define BLITZ_INDEX__ F0AF119D54AACDC900A9BFCA32F3503D1
+#include "Oracle_init.icpp"
+#undef BLITZ_INDEX__
+#endif
diff --git a/uppsrc/PdfDraw/init b/uppsrc/PdfDraw/init
index 5cee68b54..167e178ba 100644
--- a/uppsrc/PdfDraw/init
+++ b/uppsrc/PdfDraw/init
@@ -1,5 +1,7 @@
 #ifndef _PdfDraw_icpp_init_stub
 #define _PdfDraw_icpp_init_stub
 #include "Draw/init"
+#define BLITZ_INDEX__ F93111B8F4F7FD033DC60EAA2197447EF
 #include "PdfReport.icpp"
+#undef BLITZ_INDEX__
 #endif
diff --git a/uppsrc/RichEdit/init b/uppsrc/RichEdit/init
index c8aa774ff..12537af8c 100644
--- a/uppsrc/RichEdit/init
+++ b/uppsrc/RichEdit/init
@@ -1,5 +1,7 @@
 #ifndef _RichEdit_icpp_init_stub
 #define _RichEdit_icpp_init_stub
 #include "CtrlLib/init"
+#define BLITZ_INDEX__ F3380C166453FB2CAF755A2930C77612D
 #include "RichEdit.icpp"
+#undef BLITZ_INDEX__
 #endif
diff --git a/uppsrc/RichText/init b/uppsrc/RichText/init
index 9870ac10e..c51614def 100644
--- a/uppsrc/RichText/init
+++ b/uppsrc/RichText/init
@@ -2,5 +2,7 @@
 #define _RichText_icpp_init_stub
 #include "CtrlCore/init"
 #include "plugin\png/init"
+#define BLITZ_INDEX__ F0FCA6440468A87AF52C065841ED01B99
 #include "RichImage.icpp"
+#undef BLITZ_INDEX__
 #endif
diff --git a/uppsrc/Web/init b/uppsrc/Web/init
index d1df1ae75..321f2920d 100644
--- a/uppsrc/Web/init
+++ b/uppsrc/Web/init
@@ -1,5 +1,7 @@
 #ifndef _Web_icpp_init_stub
 #define _Web_icpp_init_stub
 #include "Core/init"
+#define BLITZ_INDEX__ F1E190FA046586FB8AD9AE8914E797DBD
 #include "Web_init.icpp"
+#undef BLITZ_INDEX__
 #endif
diff --git a/uppsrc/art/BlueBar/init b/uppsrc/art/BlueBar/init
index 834034f85..9fa8344c2 100644
--- a/uppsrc/art/BlueBar/init
+++ b/uppsrc/art/BlueBar/init
@@ -1,3 +1,3 @@
-#ifndef _BlueSkin_icpp_init_stub
-#define _BlueSkin_icpp_init_stub
+#ifndef _art_BlueBar_icpp_init_stub
+#define _art_BlueBar_icpp_init_stub
 #endif
diff --git a/uppsrc/ide/Browser/init b/uppsrc/ide/Browser/init
index a1ca1d74a..edf995345 100644
--- a/uppsrc/ide/Browser/init
+++ b/uppsrc/ide/Browser/init
@@ -4,5 +4,7 @@
 #include "ide\Common/init"
 #include "PdfDraw/init"
 #include "RichEdit/init"
+#define BLITZ_INDEX__ FD3AB2D43400856DF83A0D88469362A24
 #include "TopicI.icpp"
+#undef BLITZ_INDEX__
 #endif
diff --git a/uppsrc/ide/UppWspc.cpp b/uppsrc/ide/UppWspc.cpp
index 5acaef4f3..87d477833 100644
--- a/uppsrc/ide/UppWspc.cpp
+++ b/uppsrc/ide/UppWspc.cpp
@@ -83,7 +83,9 @@ void WorkspaceWork::SavePackage()
 	for(int i = 0; i < actual.GetCount(); i++) {
 		String f = actual[i];
 		if(ToLower(GetFileExt(f)) == ".icpp")
-			init << "#include \"" << f << "\"\r\n";
+			init << "#define BLITZ_INDEX__ " << "F" + AsString(Uuid::Create()) << "\r\n"
+			     << "#include \"" << f << "\"\r\n"
+			     << "#undef BLITZ_INDEX__\r\n";
 	}
 	init << "#endif\r\n";
 	SaveChangedFile(SourcePath(actualpackage, "init"), init);
diff --git a/uppsrc/ide/version.h b/uppsrc/ide/version.h
index 84ea96828..5381148a7 100644
--- a/uppsrc/ide/version.h
+++ b/uppsrc/ide/version.h
@@ -1 +1 @@
-#define IDE_VERSION    "806.r124"
+#define IDE_VERSION    "806.r125"
diff --git a/uppsrc/plugin/bmp/init b/uppsrc/plugin/bmp/init
index 328b32c6a..c6bda695e 100644
--- a/uppsrc/plugin/bmp/init
+++ b/uppsrc/plugin/bmp/init
@@ -1,5 +1,7 @@
 #ifndef _plugin_bmp_icpp_init_stub
 #define _plugin_bmp_icpp_init_stub
 #include "Draw/init"
+#define BLITZ_INDEX__ F5B782B394FF534E3BA5944B56C5A7693
 #include "BmpReg.icpp"
+#undef BLITZ_INDEX__
 #endif
diff --git a/uppsrc/plugin/gif/init b/uppsrc/plugin/gif/init
index 863a9dd86..34c79a546 100644
--- a/uppsrc/plugin/gif/init
+++ b/uppsrc/plugin/gif/init
@@ -1,5 +1,7 @@
 #ifndef _plugin_gif_icpp_init_stub
 #define _plugin_gif_icpp_init_stub
 #include "Draw/init"
+#define BLITZ_INDEX__ FC651A1994C830142E19F8F9B17C1A114
 #include "gif.icpp"
+#undef BLITZ_INDEX__
 #endif
diff --git a/uppsrc/plugin/jpg/init b/uppsrc/plugin/jpg/init
index 80b4d590b..4816f0260 100644
--- a/uppsrc/plugin/jpg/init
+++ b/uppsrc/plugin/jpg/init
@@ -1,5 +1,7 @@
 #ifndef _plugin_jpg_icpp_init_stub
 #define _plugin_jpg_icpp_init_stub
 #include "Draw/init"
+#define BLITZ_INDEX__ F56D83EE246B85AC219DC308441603E8B
 #include "jpgreg.icpp"
+#undef BLITZ_INDEX__
 #endif
diff --git a/uppsrc/plugin/png/init b/uppsrc/plugin/png/init
index 00baea3c9..d1abfaa6d 100644
--- a/uppsrc/plugin/png/init
+++ b/uppsrc/plugin/png/init
@@ -1,5 +1,7 @@
 #ifndef _plugin_png_icpp_init_stub
 #define _plugin_png_icpp_init_stub
 #include "Core/init"
+#define BLITZ_INDEX__ F4CEA6A654EC57B326933ADB68C21BD2F
 #include "pngreg.icpp"
+#undef BLITZ_INDEX__
 #endif