diff --git a/library/io/windows/load.factor b/library/io/windows/load.factor
index 317526970d..16488c031c 100644
--- a/library/io/windows/load.factor
+++ b/library/io/windows/load.factor
@@ -1,11 +1,10 @@
-IN: scratchpad
-USING: alien compiler kernel namespaces parser sequences words ;
+REQUIRES: library/windows library/io/buffer ;
 
-{ 
-    "errors"
-    "winsock"
-    "io-internals"
-    "stream"
-    "server"
-    "io-last"
-} [ "/library/io/windows/" swap ".factor" append3 run-resource ] each
+PROVIDE: library/io/windows {
+    "errors.factor"
+    "winsock.factor"
+    "io-internals.factor"
+    "stream.factor"
+    "server.factor"
+    "io-last.factor"
+} ;
diff --git a/library/windows/load.factor b/library/windows/load.factor
index 67f4af1a6b..4f242fbe3f 100644
--- a/library/windows/load.factor
+++ b/library/windows/load.factor
@@ -15,22 +15,5 @@ PROVIDE: library/windows {
     "utils.factor"
 } ;
 
-{ 
-    "windows-messages"
-    "types"
-    "gdi32-constants"
-    "gdi32"
-    "kernel32-constants"
-    "kernel32-structs"
-    "kernel32-types"
-    "kernel32"
-    "user32-constants"
-    "user32-structs"
-    "user32-types"
-    "user32"
-    "opengl32"
-    "utils"
-} [ "/library/windows/" swap ".factor" append3 run-resource ] each
-    
 IN: command-line
 : default-shell "tty" ;