diff --git a/ueforth/Makefile b/ueforth/Makefile
index 46ec2a0..8da6117 100644
--- a/ueforth/Makefile
+++ b/ueforth/Makefile
@@ -162,14 +162,14 @@ COMMON_PREPLATFORM = common/boot.fs common/conditionals.fs common/vocabulary.fs
 COMMON_DESKTOP = common/hide_calls.fs common/ansi.fs
 
 COMMON_POSTPLATFORM = common/utils.fs common/locals.fs \
-                      common/filetools.fs common/highlevel.fs
+                      common/filetools.fs common/highlevel.fs \
+                      common/streams.fs common/blocks.fs
 
 POSIX_BOOT =  $(COMMON_PREPLATFORM) \
               $(COMMON_DESKTOP) \
               posix/posix.fs posix/posix_highlevel.fs posix/termios.fs \
               common/tasks.fs $(COMMON_POSTPLATFORM) \
               common/desktop.fs posix/posix_desktop.fs \
-              common/streams.fs common/blocks.fs \
               posix/sockets.fs posix/telnetd.fs posix/httpd.fs posix/web_interface.fs \
               posix/autoboot.fs \
               common/fini.fs
@@ -180,8 +180,6 @@ WINDOWS_BOOT = $(COMMON_PREPLATFORM) \
                $(COMMON_DESKTOP) \
                windows/windows.fs windows/windows_highlevel.fs \
                common/tasks.fs $(COMMON_POSTPLATFORM) common/desktop.fs \
-               common/streams.fs \
-               common/blocks.fs \
                posix/autoboot.fs \
                common/fini.fs
 $(GEN)/windows_boot.h: common/source_to_string.js $(WINDOWS_BOOT) | $(GEN)
@@ -191,10 +189,10 @@ ESP32_BOOT = $(COMMON_PREPLATFORM) \
              common/tasks.fs esp32/platform.fs esp32/highlevel.fs \
              esp32/bindings.fs \
              $(COMMON_POSTPLATFORM) \
-             common/streams.fs posix/httpd.fs posix/web_interface.fs esp32/web_interface.fs \
+             posix/httpd.fs posix/web_interface.fs esp32/web_interface.fs \
              esp32/registers.fs esp32/timers.fs \
              esp32/bterm.fs posix/telnetd.fs \
-             esp32/camera.fs esp32/camera_server.fs common/blocks.fs \
+             esp32/camera.fs esp32/camera_server.fs \
              esp32/autoboot.fs common/fini.fs
 $(GEN)/esp32_boot.h: common/source_to_string.js $(ESP32_BOOT) | $(GEN)
 	$< boot $(VERSION) $(REVISION) $(ESP32_BOOT) >$@
diff --git a/ueforth/common/forth_namespace_tests.fs b/ueforth/common/forth_namespace_tests.fs
index a1607fe..597cefd 100644
--- a/ueforth/common/forth_namespace_tests.fs
+++ b/ueforth/common/forth_namespace_tests.fs
@@ -391,9 +391,9 @@ e: test-forth-namespace
 e: test-forth-namespace
   ' forth list-from
   out: FORTH 
+  check-args
   check-blocks
   out: streams 
-  check-args
   check-highlevel
   check-snapshots
   check-locals
@@ -450,10 +450,10 @@ e: test-forth-namespace
   out: httpd 
   out: telnetd 
   out: sockets 
-  check-blocks
-  out: streams 
   out: xlib 
   check-args
+  check-blocks
+  out: streams 
   check-highlevel
   check-snapshots
   check-locals