diff --git a/library/io/win32-io-internals.factor b/library/io/win32-io-internals.factor
index 026425f57c..1f47fff47f 100644
--- a/library/io/win32-io-internals.factor
+++ b/library/io/win32-io-internals.factor
@@ -25,7 +25,7 @@
 
 IN: win32-io-internals
 USING: alien errors kernel kernel-internals lists math namespaces threads 
-       vectors win32-api stdio streams generic ;
+       vectors win32-api stdio streams generic io-internals ;
 
 SYMBOL: completion-port
 SYMBOL: io-queue
diff --git a/library/io/win32-server.factor b/library/io/win32-server.factor
index 19718ea104..1cf1a9d2c9 100644
--- a/library/io/win32-server.factor
+++ b/library/io/win32-server.factor
@@ -26,7 +26,7 @@
 IN: win32-stream
 USING: alien errors generic kernel kernel-internals lists math namespaces
        prettyprint stdio streams strings threads unparser win32-api
-       win32-io-internals ;
+       win32-io-internals io-internals ;
 
 TUPLE: win32-server this ;
 TUPLE: win32-client-stream host ;
diff --git a/library/io/win32-stream.factor b/library/io/win32-stream.factor
index 86c635c287..a3e1a4a19b 100644
--- a/library/io/win32-stream.factor
+++ b/library/io/win32-stream.factor
@@ -26,7 +26,7 @@
 IN: win32-stream
 USING: alien continuations generic kernel kernel-internals lists math
        namespaces prettyprint stdio streams strings threads win32-api
-       win32-io-internals ;
+       win32-io-internals io-internals ;
 
 TUPLE: win32-stream this ; ! FIXME: rewrite using tuples
 GENERIC: win32-stream-handle
@@ -67,7 +67,7 @@ SYMBOL: file-size
 
 M: integer do-write ( int -- )
     out-buffer get [ buffer-capacity 0 = [ flush-output ] when ] keep
-    >r ch>str r> >buffer ;
+    >r ch>string r> >buffer ;
 
 M: string do-write ( str -- )
     dup string-length out-buffer get buffer-capacity <= [
diff --git a/library/win32/win32-errors.factor b/library/win32/win32-errors.factor
index bdeabdb0a0..4860a2b5c4 100644
--- a/library/win32/win32-errors.factor
+++ b/library/win32/win32-errors.factor
@@ -29,7 +29,7 @@ IN: win32-api
 USE: buffer
 USE: errors
 USE: kernel
-USE: kernel-internals
+USE: io-internals
 USE: lists
 USE: math
 USE: parser
diff --git a/native/bignum.h b/native/bignum.h
index c3b0f40637..0c5e1f9396 100644
--- a/native/bignum.h
+++ b/native/bignum.h
@@ -51,7 +51,7 @@ INLINE CELL tag_cell(CELL x)
 }
 
 /* FFI calls this */
-void box_signed_cell(F_FIXNUM integer);
+DLLEXPORT void box_signed_cell(F_FIXNUM integer);
 DLLEXPORT F_FIXNUM unbox_signed_cell(void);
 
 DLLEXPORT void box_unsigned_cell(CELL cell);