diff --git a/runtime/bin/bin.gypi b/runtime/bin/bin.gypi
index 2a0b6be65a4..d18807f4069 100644
--- a/runtime/bin/bin.gypi
+++ b/runtime/bin/bin.gypi
@@ -170,7 +170,6 @@
     {
       'target_name': 'libdart_io',
       'type': 'static_library',
-      'toolsets':['target', 'host'],
       'include_dirs': [
         '..',
       ],
@@ -256,7 +255,6 @@
       'dependencies': [
         'libdart_withcore',
         'libdart_builtin',
-        'libdart_io',
       ],
       'include_dirs': [
         '..',
@@ -492,7 +490,6 @@
     {
       'target_name': 'run_vm_tests',
       'type': 'executable',
-      'toolsets':['target'],
       'dependencies': [
         'libdart_withcore',
         'libdart_builtin',
@@ -548,7 +545,6 @@
       'dependencies': [
         'libdart_withcore',
         'libdart_builtin',
-        'libdart_io',
         'generate_snapshot_file#host',
         'generate_snapshot_test_dat_file#host',
       ],
diff --git a/runtime/bin/builtin_impl_sources.gypi b/runtime/bin/builtin_impl_sources.gypi
index e46300a4aab..4b4e4cc2c7c 100644
--- a/runtime/bin/builtin_impl_sources.gypi
+++ b/runtime/bin/builtin_impl_sources.gypi
@@ -7,8 +7,12 @@
 # io_impl_sources.gypi.
 {
   'sources': [
-    'io_buffer.cc',
-    'io_buffer.h',
+    'crypto.cc',
+    'crypto.h',
+    'crypto_android.cc',
+    'crypto_linux.cc',
+    'crypto_macos.cc',
+    'crypto_win.cc',
     'dartutils.cc',
     'dartutils.h',
     'dbg_connection.cc',
@@ -41,17 +45,13 @@
     'file_macos.cc',
     'file_win.cc',
     'file_test.cc',
-    'file_system_watcher.cc',
-    'file_system_watcher.h',
-    'file_system_watcher_android.cc',
-    'file_system_watcher_linux.cc',
-    'file_system_watcher_macos.cc',
-    'file_system_watcher_win.cc',
     'fdutils.h',
     'fdutils_android.cc',
     'fdutils_linux.cc',
     'fdutils_macos.cc',
     'hashmap_test.cc',
+    'io_buffer.cc',
+    'io_buffer.h',
     'isolate_data.h',
     'signal_blocker.h',
     'thread.h',
diff --git a/runtime/bin/builtin_natives.cc b/runtime/bin/builtin_natives.cc
index c5ef460dcfc..1c096ac4eab 100644
--- a/runtime/bin/builtin_natives.cc
+++ b/runtime/bin/builtin_natives.cc
@@ -23,6 +23,7 @@ namespace bin {
 // Advanced I/O classes like sockets and process management are implemented
 // using functions listed in io_natives.cc.
 #define BUILTIN_NATIVE_LIST(V)                                                 \
+  V(Crypto_GetRandomBytes, 1)                                                  \
   V(Directory_Exists, 1)                                                       \
   V(Directory_Create, 1)                                                       \
   V(Directory_Current, 0)                                                      \
@@ -61,13 +62,6 @@ namespace bin {
   V(File_GetStdioHandleType, 1)                                                \
   V(File_GetType, 2)                                                           \
   V(File_AreIdentical, 2)                                                      \
-  V(FileSystemWatcher_CloseWatcher, 1)                                         \
-  V(FileSystemWatcher_GetSocketId, 2)                                          \
-  V(FileSystemWatcher_InitWatcher, 0)                                          \
-  V(FileSystemWatcher_IsSupported, 0)                                          \
-  V(FileSystemWatcher_ReadEvents, 2)                                           \
-  V(FileSystemWatcher_UnwatchPath, 2)                                          \
-  V(FileSystemWatcher_WatchPath, 4)                                            \
   V(Logger_PrintString, 1)
 
 BUILTIN_NATIVE_LIST(DECLARE_FUNCTION);
diff --git a/runtime/bin/io_impl_sources.gypi b/runtime/bin/io_impl_sources.gypi
index a720c7f2794..390b4ef4be6 100644
--- a/runtime/bin/io_impl_sources.gypi
+++ b/runtime/bin/io_impl_sources.gypi
@@ -6,12 +6,6 @@
 # implementation files are in builtin_impl_sources.gypi.
 {
   'sources': [
-    'crypto.cc',
-    'crypto.h',
-    'crypto_android.cc',
-    'crypto_linux.cc',
-    'crypto_macos.cc',
-    'crypto_win.cc',
     'eventhandler.cc',
     'eventhandler.h',
     'eventhandler_android.cc',
@@ -21,6 +15,12 @@
     'eventhandler_macos.h',
     'eventhandler_win.cc',
     'eventhandler_win.h',
+    'file_system_watcher.cc',
+    'file_system_watcher.h',
+    'file_system_watcher_android.cc',
+    'file_system_watcher_linux.cc',
+    'file_system_watcher_macos.cc',
+    'file_system_watcher_win.cc',
     'filter.cc',
     'filter.h',
     'filter_unsupported.cc',
diff --git a/runtime/bin/io_natives.cc b/runtime/bin/io_natives.cc
index 6a860b7d66d..69a8123159f 100644
--- a/runtime/bin/io_natives.cc
+++ b/runtime/bin/io_natives.cc
@@ -20,8 +20,14 @@ namespace bin {
 // Some classes, like File and Directory, list their implementations in
 // builtin_natives.cc instead.
 #define IO_NATIVE_LIST(V)                                                      \
-  V(Crypto_GetRandomBytes, 1)                                                  \
   V(EventHandler_SendData, 3)                                                  \
+  V(FileSystemWatcher_CloseWatcher, 1)                                         \
+  V(FileSystemWatcher_GetSocketId, 2)                                          \
+  V(FileSystemWatcher_InitWatcher, 0)                                          \
+  V(FileSystemWatcher_IsSupported, 0)                                          \
+  V(FileSystemWatcher_ReadEvents, 2)                                           \
+  V(FileSystemWatcher_UnwatchPath, 2)                                          \
+  V(FileSystemWatcher_WatchPath, 4)                                            \
   V(Filter_CreateZLibDeflate, 3)                                               \
   V(Filter_CreateZLibInflate, 1)                                               \
   V(Filter_End, 1)                                                             \