diff --git a/newdraw/Draw/Draw.upp b/newdraw/Draw/Draw.upp
index 544f958..da2a43d 100644
--- a/newdraw/Draw/Draw.upp
+++ b/newdraw/Draw/Draw.upp
@@ -1,5 +1,7 @@
 description "Fundamental graphics operations, including raster image processing\377B128,0,255";
 
+noblitz;
+
 acceptflags
 	NOGTK;
 
@@ -16,7 +18,7 @@ library(LINUX) dl;
 
 library(LINUX !XLFD) Xft;
 
-library(BSD) X11;
+library(BSD) "X11 Xau Xdmcp";
 
 library(BSD !XLFD) "Xft fontconfig Xrender freetype expat";
 
@@ -24,6 +26,8 @@ library(LINUX !XLFD !SHARED) "fontconfig Xrender freetype expat";
 
 library(OSX11) "X11 Xft fontconfig Xrender freetype expat";
 
+library(FREEBSD) xcb;
+
 file
 	Draw.h,
 	Mt.cpp,
diff --git a/uppsrc/Core/Stream.cpp b/uppsrc/Core/Stream.cpp
index 307eef7..5915546 100644
--- a/uppsrc/Core/Stream.cpp
+++ b/uppsrc/Core/Stream.cpp
@@ -1331,7 +1331,7 @@ bool FileMapping::Map(int64 mapoffset, dword maplen)
 			(dword)(rawoffset >> 32), (dword)(rawoffset >> 0), rawsize);
 #else
 		rawbase = (byte *)mmap(0, rawsize, PROT_READ | PROT_WRITE,
-#ifdef PLATFORM_BSD
+#ifdef PLATFORM_FREEBSD
 			MAP_NOSYNC,
 #else
 			MAP_SHARED,
diff --git a/uppsrc/Core/config.h b/uppsrc/Core/config.h
index 7295fc9..69f6f2a 100644
--- a/uppsrc/Core/config.h
+++ b/uppsrc/Core/config.h
@@ -20,7 +20,7 @@
 			#if __FreeBSD__ || __OpenBSD__ || __NetBSD__
 				#define PLATFORM_BSD 1
 				#if __FreeBSD__
-					#define PLATFORM_BSD 1
+					#define PLATFORM_FREEBSD 1
 				#endif
 				#if __OpenBSD__
 					#define PLATFORM_OPENBSD 1
diff --git a/uppsrc/Draw/Draw.upp b/uppsrc/Draw/Draw.upp
index 7a2813f..1feede9 100644
--- a/uppsrc/Draw/Draw.upp
+++ b/uppsrc/Draw/Draw.upp
@@ -1,5 +1,7 @@
 description "Fundamental graphics operations, including raster image processing\377B128,0,255";
 
+noblitz;
+
 acceptflags
 	NOGTK;
 
@@ -16,7 +18,7 @@ library(LINUX) dl;
 
 library(LINUX !XLFD) Xft;
 
-library(BSD) X11;
+library(BSD) "X11 Xau Xdmcp";
 
 library(BSD !XLFD) "Xft fontconfig Xrender freetype expat";
 
@@ -24,6 +26,8 @@ library(LINUX !XLFD !SHARED) "fontconfig Xrender freetype expat";
 
 library(OSX11) "X11 Xft fontconfig Xrender freetype expat";
 
+library(FREEBSD) xcb;
+
 file
 	Draw.h,
 	DrawWin32.h,