| Index: native_client_sdk/src/libraries/nacl_io/library.dsc | 
| diff --git a/native_client_sdk/src/libraries/nacl_io/library.dsc b/native_client_sdk/src/libraries/nacl_io/library.dsc | 
| index 533bcf4a10c00226983b4e3c4fea26a059272547..08523c6c3361ec8f5a6cf57f7b863fd68b2cf79f 100644 | 
| --- a/native_client_sdk/src/libraries/nacl_io/library.dsc | 
| +++ b/native_client_sdk/src/libraries/nacl_io/library.dsc | 
| @@ -13,7 +13,13 @@ | 
| 'SOURCES' : [ | 
| 'dbgprint.c', | 
| "event_emitter.cc", | 
| +        "event_emitter_pipe.cc", | 
| +        "event_emitter_stream.cc", | 
| +        "event_emitter_tcp.cc", | 
| +        "event_emitter_udp.cc", | 
| "event_listener.cc", | 
| +        "fifo_char.cc", | 
| +        "fifo_packet.cc", | 
| "h_errno.cc", | 
| "host_resolver.cc", | 
| "kernel_handle.cc", | 
| @@ -33,13 +39,16 @@ | 
| "mount_node_html5fs.cc", | 
| "mount_node_http.cc", | 
| "mount_node_mem.cc", | 
| +        "mount_node_pipe.cc", | 
| "mount_node_socket.cc", | 
| +        "mount_node_stream.cc", | 
| "mount_node_tcp.cc", | 
| "mount_node_tty.cc", | 
| "mount_node_udp.cc", | 
| "mount_passthrough.cc", | 
| -        "mount_socket.cc", | 
| +        "mount_stream.cc", | 
| "nacl_io.cc", | 
| +        "packet.cc", | 
| "path.cc", | 
| "pepper_interface.cc", | 
| "pepper_interface_delegate.cc", | 
| @@ -81,6 +90,7 @@ | 
| "syscalls/mount.c", | 
| "syscalls/ntohl.c", | 
| "syscalls/ntohs.c", | 
| +        "syscalls/pipe.c", | 
| "syscalls/poll.c", | 
| "syscalls/rmdir.c", | 
| "syscalls/recv.c", | 
| @@ -117,6 +127,14 @@ | 
| "error.h", | 
| "event_emitter.h", | 
| "event_listener.h", | 
| +        "event_emitter_pipe.h", | 
| +        "event_emitter_stream.h", | 
| +        "event_emitter_tcp.h", | 
| +        "event_emitter_udp.h", | 
| +        "fifo_char.h", | 
| +        "fifo_interface.h", | 
| +        "fifo_null.h", | 
| +        "fifo_packet.h", | 
| "host_resolver.h", | 
| "inode_pool.h", | 
| "ioctl.h", | 
| @@ -138,12 +156,14 @@ | 
| "mount_node_html5fs.h", | 
| "mount_node_http.h", | 
| "mount_node_mem.h", | 
| +        "mount_node_pipe.h", | 
| "mount_node_socket.h", | 
| +        "mount_node_stream.h", | 
| "mount_node_tcp.h", | 
| "mount_node_tty.h", | 
| "mount_node_udp.h", | 
| "mount_passthrough.h", | 
| -        "mount_socket.h", | 
| +        "mount_stream.h", | 
| "nacl_io.h", | 
| "osdirent.h", | 
| "osinttypes.h", | 
| @@ -156,6 +176,7 @@ | 
| "osunistd.h", | 
| "osutime.h", | 
| "ostermios.h", | 
| +        "packet.h", | 
| "path.h", | 
| "pepper_interface_delegate.h", | 
| "pepper_interface_dummy.h", | 
|  |