Index: uppsrc/plugin/bz2/bz2.upp
===================================================================
--- uppsrc/plugin/bz2/bz2.upp	(revision 4476)
+++ uppsrc/plugin/bz2/bz2.upp	(working copy)
@@ -5,19 +5,12 @@
 uses
 	Core;
 
+library(!WIN32) 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.cpp,
+	src.tpp;
 
Index: uppsrc/plugin/bz2/bz2upp.cpp
===================================================================
--- uppsrc/plugin/bz2/bz2upp.cpp	(revision 4476)
+++ uppsrc/plugin/bz2/bz2upp.cpp	(working copy)
@@ -1,8 +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
 
 static void* bzalloc_new(void *opaque, int items, int size)
Index: uppsrc/plugin/bz2/bzlib.cpp
===================================================================
--- uppsrc/plugin/bz2/bzlib.cpp	(revision 0)
+++ uppsrc/plugin/bz2/bzlib.cpp	(working copy)
@@ -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