diff --git a/library/io/windows/io-internals.factor b/library/io/windows/io-internals.factor
index 1b90e5965e..ace759e079 100644
--- a/library/io/windows/io-internals.factor
+++ b/library/io/windows/io-internals.factor
@@ -16,7 +16,6 @@ TUPLE: io-callback overlapped quotation stream ;
         997
     ] member? ;
 
-USE: prettyprint
 : handle-io-error ( -- )
     GetLastError expected-error? [ win32-throw-error ] unless ;
 
diff --git a/library/io/windows/server.factor b/library/io/windows/server.factor
index 318bcc41aa..0f14f168ec 100644
--- a/library/io/windows/server.factor
+++ b/library/io/windows/server.factor
@@ -70,7 +70,6 @@ M: win32-client-stream client-stream-port ( win32-client-stream -- port )
 
 IN: io 
 
-USE: interpreter
 SYMBOL: serv
 : accept ( server -- client )
     [
diff --git a/library/io/windows/stream.factor b/library/io/windows/stream.factor
index 91301baa65..adbf9eb3a5 100644
--- a/library/io/windows/stream.factor
+++ b/library/io/windows/stream.factor
@@ -4,13 +4,11 @@ IN: win32-stream
 USING: alien errors generic hashtables io-internals kernel
 kernel-internals math namespaces prettyprint sequences
 io strings threads win32-api win32-io-internals ;
-USE: interpreter
 
 TUPLE: win32-stream handle timeout cutoff fileptr file-size ;
 TUPLE: win32-stream-reader in ;
 TUPLE: win32-stream-writer out ;
 TUPLE: win32-duplex-stream ;
-SYMBOL: stream
 
 : win32-buffer-size 16384 ; inline
 
@@ -45,7 +43,7 @@ SYMBOL: stream
         over win32-stream-reader-in
         [ buffer@ ] keep buffer-capacity
         >r pick r> swap dup win32-stream-file-size
-        [ swap win32-stream-fileptr - min ] when*
+        [ swap win32-stream-fileptr - min ] [ drop ] if*
         f r> ReadFile zero? [ handle-io-error ] when stop
     ] callcc1 [ over win32-stream-reader-in n>buffer ] keep
     swap update-file-pointer ;