diff --git a/uppsrc/plugin/bz2/bz2.upp b/uppsrc/plugin/bz2/bz2.upp
index 1aadaf14a..6c4750087 100644
--- a/uppsrc/plugin/bz2/bz2.upp
+++ b/uppsrc/plugin/bz2/bz2.upp
@@ -5,19 +5,12 @@ optimize_speed;
 uses
 	Core;
 
+library(POSIX) bz2;
+
 file
 	Wrapper readonly separator,
 	bz2.h,
 	bz2upp.cpp,
-	src.tpp,
-	"BZ2 files" readonly separator,
-	lib/bzlib.h,
-	lib/blocksort.c,
-	lib/bzlib.c,
-	lib/bzlib_private.h,
-	lib/compress.c,
-	lib/crctable.c,
-	lib/decompress.c,
-	lib/huffman.c,
-	lib/randtable.c;
+	bzlib.c,
+	src.tpp;
 
diff --git a/uppsrc/plugin/bz2/bz2upp.cpp b/uppsrc/plugin/bz2/bz2upp.cpp
index 2e3516d66..362f255d5 100644
--- a/uppsrc/plugin/bz2/bz2upp.cpp
+++ b/uppsrc/plugin/bz2/bz2upp.cpp
@@ -1,7 +1,11 @@
 #include <Core/Core.h>
 #include <plugin/bz2/bz2.h>
-#include "lib/bzlib.h"
 
+#ifdef flagWIN32
+	#include "lib/bzlib.h"
+#else
+	#include <bzlib.h>
+#endif
 
 NAMESPACE_UPP
 
diff --git a/uppsrc/plugin/bz2/bzlib.c b/uppsrc/plugin/bz2/bzlib.c
new file mode 100644
index 000000000..6b8035233
--- /dev/null
+++ b/uppsrc/plugin/bz2/bzlib.c
@@ -0,0 +1,11 @@
+#ifdef flagWIN32
+
+#include "lib/blocksort.c"
+#include "lib/bzlib.c"
+#include "lib/compress.c"
+#include "lib/crctable.c"
+#include "lib/decompress.c"
+#include "lib/huffman.c"
+#include "lib/randtable.c"
+
+#endif
diff --git a/uppsrc/plugin/jpg/init b/uppsrc/plugin/jpg/init
index 35cad3204..0039d3ea9 100644
--- a/uppsrc/plugin/jpg/init
+++ b/uppsrc/plugin/jpg/init
@@ -1,7 +1,7 @@
 #ifndef _plugin_jpg_icpp_init_stub
 #define _plugin_jpg_icpp_init_stub
 #include "Draw/init"
-#define BLITZ_INDEX__ FE833856160034180BCAB32D6048C9BB6
+#define BLITZ_INDEX__ F227b3ee1134af92a2493f791a66e2afe
 #include "jpgreg.icpp"
 #undef BLITZ_INDEX__
 #endif