diff --git a/uppsrc/Core/Core.upp b/uppsrc/Core/Core.upp
index cfd90432f..f103a70d0 100644
--- a/uppsrc/Core/Core.upp
+++ b/uppsrc/Core/Core.upp
@@ -3,7 +3,7 @@ description "Non-GUI code. Streams, NTL containers, concrete types, Value, XML,
 acceptflags
 	USEMALLOC;
 
-uses(WIN32) plugin\z;
+uses(WIN32 | NOSO) plugin\z;
 
 library(LINUX !ANDROID) "pthread dl rt";
 
@@ -11,7 +11,7 @@ library(BSD !OSX) "pthread rt execinfo";
 
 library(SOLARIS) "posix4 dl";
 
-library(!WIN32) z;
+library(!WIN32 & !NOSO) z;
 
 library(OSX) pthread;
 
diff --git a/uppsrc/plugin/bz2/bz2.upp b/uppsrc/plugin/bz2/bz2.upp
index cb5b0f994..10d4cc289 100644
--- a/uppsrc/plugin/bz2/bz2.upp
+++ b/uppsrc/plugin/bz2/bz2.upp
@@ -5,7 +5,7 @@ options(BUILDER_OPTION) NOWARNINGS;
 uses
 	Core;
 
-library(POSIX) bz2;
+library(POSIX & !NOSO) bz2;
 
 file
 	bz2.h,
diff --git a/uppsrc/plugin/bz2/bzlib.c b/uppsrc/plugin/bz2/bzlib.c
index 6b8035233..11258bcf5 100644
--- a/uppsrc/plugin/bz2/bzlib.c
+++ b/uppsrc/plugin/bz2/bzlib.c
@@ -1,4 +1,4 @@
-#ifdef flagWIN32
+#if defined(flagWIN32) || defined(flagNOSO)
 
 #include "lib/blocksort.c"
 #include "lib/bzlib.c"