diff --git a/src/libstd/arena.rs b/src/libstd/arena.rs
index 7bbd5cd41a3f..9ed6d285ce68 100644
--- a/src/libstd/arena.rs
+++ b/src/libstd/arena.rs
@@ -46,18 +46,26 @@ use core::sys;
 use core::uint;
 use core::vec;
 
-#[abi = "rust-intrinsic"]
-extern mod rusti {
-    fn move_val_init<T>(dst: &mut T, -src: T);
-    fn needs_drop<T>() -> bool;
+pub mod rusti {
+    #[abi = "rust-intrinsic"]
+    pub extern {
+        fn move_val_init<T>(dst: &mut T, -src: T);
+        fn needs_drop<T>() -> bool;
+    }
 }
 
-extern mod rustrt {
-    #[rust_stack]
-    unsafe fn rust_call_tydesc_glue(root: *u8,
-                                    tydesc: *TypeDesc,
-                                    field: size_t);
+pub mod rustrt {
+    use core::libc::size_t;
+    use core::sys::TypeDesc;
+
+    pub extern {
+        #[rust_stack]
+        unsafe fn rust_call_tydesc_glue(root: *u8,
+                                        tydesc: *TypeDesc,
+                                        field: size_t);
+    }
 }
+
 // This probably belongs somewhere else. Needs to be kept in sync with
 // changes to glue...
 const tydesc_drop_glue_index: size_t = 3 as size_t;
diff --git a/src/libstd/dbg.rs b/src/libstd/dbg.rs
index 7813357caf22..9a9c19ca1768 100644
--- a/src/libstd/dbg.rs
+++ b/src/libstd/dbg.rs
@@ -14,15 +14,19 @@ use core::cast::reinterpret_cast;
 use core::ptr;
 use core::sys;
 
-#[abi = "cdecl"]
-extern mod rustrt {
-    pub unsafe fn debug_tydesc(td: *sys::TypeDesc);
-    pub unsafe fn debug_opaque(td: *sys::TypeDesc, x: *());
-    pub unsafe fn debug_box(td: *sys::TypeDesc, x: *());
-    pub unsafe fn debug_tag(td: *sys::TypeDesc, x: *());
-    pub unsafe fn debug_fn(td: *sys::TypeDesc, x: *());
-    pub unsafe fn debug_ptrcast(td: *sys::TypeDesc, x: *()) -> *();
-    pub unsafe fn rust_dbg_breakpoint();
+pub mod rustrt {
+    use core::sys;
+
+    #[abi = "cdecl"]
+    pub extern {
+        pub unsafe fn debug_tydesc(td: *sys::TypeDesc);
+        pub unsafe fn debug_opaque(td: *sys::TypeDesc, x: *());
+        pub unsafe fn debug_box(td: *sys::TypeDesc, x: *());
+        pub unsafe fn debug_tag(td: *sys::TypeDesc, x: *());
+        pub unsafe fn debug_fn(td: *sys::TypeDesc, x: *());
+        pub unsafe fn debug_ptrcast(td: *sys::TypeDesc, x: *()) -> *();
+        pub unsafe fn rust_dbg_breakpoint();
+    }
 }
 
 pub fn debug_tydesc<T>() {
diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs
index f270739b2f2e..67e10b586179 100644
--- a/src/libstd/net_tcp.rs
+++ b/src/libstd/net_tcp.rs
@@ -32,12 +32,16 @@ use core::result;
 use core::uint;
 use core::vec;
 
-#[nolink]
-extern mod rustrt {
-    unsafe fn rust_uv_current_kernel_malloc(size: libc::c_uint)
-                                         -> *libc::c_void;
-    unsafe fn rust_uv_current_kernel_free(mem: *libc::c_void);
-    unsafe fn rust_uv_helper_uv_tcp_t_size() -> libc::c_uint;
+pub mod rustrt {
+    use core::libc;
+
+    #[nolink]
+    pub extern {
+        unsafe fn rust_uv_current_kernel_malloc(size: libc::c_uint)
+                                             -> *libc::c_void;
+        unsafe fn rust_uv_current_kernel_free(mem: *libc::c_void);
+        unsafe fn rust_uv_helper_uv_tcp_t_size() -> libc::c_uint;
+    }
 }
 
 /**
diff --git a/src/libstd/rl.rs b/src/libstd/rl.rs
index 1ee67d76af57..b2b30c1057ef 100644
--- a/src/libstd/rl.rs
+++ b/src/libstd/rl.rs
@@ -16,14 +16,18 @@ use core::prelude::*;
 use core::str;
 use core::task;
 
-extern mod rustrt {
-    pub unsafe fn linenoise(prompt: *c_char) -> *c_char;
-    pub unsafe fn linenoiseHistoryAdd(line: *c_char) -> c_int;
-    pub unsafe fn linenoiseHistorySetMaxLen(len: c_int) -> c_int;
-    pub unsafe fn linenoiseHistorySave(file: *c_char) -> c_int;
-    pub unsafe fn linenoiseHistoryLoad(file: *c_char) -> c_int;
-    pub unsafe fn linenoiseSetCompletionCallback(callback: *u8);
-    pub unsafe fn linenoiseAddCompletion(completions: *(), line: *c_char);
+pub mod rustrt {
+    use core::libc::{c_char, c_int};
+
+    pub extern {
+        pub unsafe fn linenoise(prompt: *c_char) -> *c_char;
+        pub unsafe fn linenoiseHistoryAdd(line: *c_char) -> c_int;
+        pub unsafe fn linenoiseHistorySetMaxLen(len: c_int) -> c_int;
+        pub unsafe fn linenoiseHistorySave(file: *c_char) -> c_int;
+        pub unsafe fn linenoiseHistoryLoad(file: *c_char) -> c_int;
+        pub unsafe fn linenoiseSetCompletionCallback(callback: *u8);
+        pub unsafe fn linenoiseAddCompletion(completions: *(), line: *c_char);
+    }
 }
 
 /// Add a line to history
diff --git a/src/libstd/test.rs b/src/libstd/test.rs
index b5f568f19213..3d2d5a0b3716 100644
--- a/src/libstd/test.rs
+++ b/src/libstd/test.rs
@@ -35,9 +35,13 @@ use core::str;
 use core::task;
 use core::vec;
 
-#[abi = "cdecl"]
-extern mod rustrt {
-    pub unsafe fn rust_sched_threads() -> size_t;
+pub mod rustrt {
+    use core::libc::size_t;
+
+    #[abi = "cdecl"]
+    pub extern {
+        pub unsafe fn rust_sched_threads() -> size_t;
+    }
 }
 
 // The name of a test. By convention this follows the rules for rust
diff --git a/src/libstd/time.rs b/src/libstd/time.rs
index 3801fdf88347..525f9284cc31 100644
--- a/src/libstd/time.rs
+++ b/src/libstd/time.rs
@@ -19,18 +19,26 @@ use core::str;
 
 const NSEC_PER_SEC: i32 = 1_000_000_000_i32;
 
-#[abi = "cdecl"]
-extern mod rustrt {
-    pub unsafe fn get_time(sec: &mut i64, nsec: &mut i32);
+pub mod rustrt {
+    use super::Tm;
 
-    pub unsafe fn precise_time_ns(ns: &mut u64);
+    #[cfg(target_os = "linux")]
+    #[link_args = "-lrt"]
+    pub extern {}
 
-    pub unsafe fn rust_tzset();
-    // FIXME: The i64 values can be passed by-val when #2064 is fixed.
-    pub unsafe fn rust_gmtime(&&sec: i64, &&nsec: i32, &&result: Tm);
-    pub unsafe fn rust_localtime(&&sec: i64, &&nsec: i32, &&result: Tm);
-    pub unsafe fn rust_timegm(&&tm: Tm, sec: &mut i64);
-    pub unsafe fn rust_mktime(&&tm: Tm, sec: &mut i64);
+    #[abi = "cdecl"]
+    pub extern {
+        pub unsafe fn get_time(sec: &mut i64, nsec: &mut i32);
+
+        pub unsafe fn precise_time_ns(ns: &mut u64);
+
+        pub unsafe fn rust_tzset();
+        // FIXME: The i64 values can be passed by-val when #2064 is fixed.
+        pub unsafe fn rust_gmtime(&&sec: i64, &&nsec: i32, &&result: Tm);
+        pub unsafe fn rust_localtime(&&sec: i64, &&nsec: i32, &&result: Tm);
+        pub unsafe fn rust_timegm(&&tm: Tm, sec: &mut i64);
+        pub unsafe fn rust_mktime(&&tm: Tm, sec: &mut i64);
+    }
 }
 
 /// A record specifying a time value in seconds and nanoseconds.
diff --git a/src/libstd/unicode.rs b/src/libstd/unicode.rs
index baf3610591a7..acafc4035f86 100644
--- a/src/libstd/unicode.rs
+++ b/src/libstd/unicode.rs
@@ -157,16 +157,19 @@ pub mod icu {
 
     pub const UCHAR_INVALID_CODE : UProperty = -1;
 
-    #[link_name = "icuuc"]
-    #[abi = "cdecl"]
-    pub extern mod libicu {
-        unsafe fn u_hasBinaryProperty(c: UChar32, which: UProperty) -> UBool;
-        unsafe fn u_isdigit(c: UChar32) -> UBool;
-        unsafe fn u_islower(c: UChar32) -> UBool;
-        unsafe fn u_isspace(c: UChar32) -> UBool;
-        unsafe fn u_isupper(c: UChar32) -> UBool;
-        unsafe fn u_tolower(c: UChar32) -> UChar32;
-        unsafe fn u_toupper(c: UChar32) -> UChar32;
+    pub mod libicu {
+        #[link_name = "icuuc"]
+        #[abi = "cdecl"]
+        pub extern {
+            unsafe fn u_hasBinaryProperty(c: UChar32, which: UProperty)
+                                       -> UBool;
+            unsafe fn u_isdigit(c: UChar32) -> UBool;
+            unsafe fn u_islower(c: UChar32) -> UBool;
+            unsafe fn u_isspace(c: UChar32) -> UBool;
+            unsafe fn u_isupper(c: UChar32) -> UBool;
+            unsafe fn u_tolower(c: UChar32) -> UChar32;
+            unsafe fn u_toupper(c: UChar32) -> UChar32;
+        }
     }
 }
 
diff --git a/src/libstd/uv_ll.rs b/src/libstd/uv_ll.rs
index 6b6e644a5eed..64ee682a43e3 100644
--- a/src/libstd/uv_ll.rs
+++ b/src/libstd/uv_ll.rs
@@ -724,146 +724,154 @@ pub mod uv_ll_struct_stubgen {
     }
 }
 
-#[nolink]
-extern mod rustrt {
-    // libuv public API
-    unsafe fn rust_uv_loop_new() -> *libc::c_void;
-    unsafe fn rust_uv_loop_delete(lp: *libc::c_void);
-    unsafe fn rust_uv_run(loop_handle: *libc::c_void);
-    unsafe fn rust_uv_close(handle: *libc::c_void, cb: *u8);
-    unsafe fn rust_uv_walk(loop_handle: *libc::c_void, cb: *u8,
-                           arg: *libc::c_void);
-    unsafe fn rust_uv_async_send(handle: *uv_async_t);
-    unsafe fn rust_uv_async_init(loop_handle: *libc::c_void,
-                          async_handle: *uv_async_t,
-                          cb: *u8) -> libc::c_int;
-    unsafe fn rust_uv_tcp_init(
-        loop_handle: *libc::c_void,
-        handle_ptr: *uv_tcp_t) -> libc::c_int;
-    // FIXME ref #2604 .. ?
-    unsafe fn rust_uv_buf_init(out_buf: *uv_buf_t, base: *u8,
-                        len: libc::size_t);
-    unsafe fn rust_uv_last_error(loop_handle: *libc::c_void) -> uv_err_t;
-    // FIXME ref #2064
-    unsafe fn rust_uv_strerror(err: *uv_err_t) -> *libc::c_char;
-    // FIXME ref #2064
-    unsafe fn rust_uv_err_name(err: *uv_err_t) -> *libc::c_char;
-    unsafe fn rust_uv_ip4_addr(ip: *u8, port: libc::c_int)
-        -> sockaddr_in;
-    unsafe fn rust_uv_ip6_addr(ip: *u8, port: libc::c_int)
-        -> sockaddr_in6;
-    unsafe fn rust_uv_ip4_name(src: *sockaddr_in,
-                               dst: *u8,
-                               size: libc::size_t)
-                            -> libc::c_int;
-    unsafe fn rust_uv_ip6_name(src: *sockaddr_in6,
-                               dst: *u8,
-                               size: libc::size_t)
-                            -> libc::c_int;
-    unsafe fn rust_uv_ip4_port(src: *sockaddr_in) -> libc::c_uint;
-    unsafe fn rust_uv_ip6_port(src: *sockaddr_in6) -> libc::c_uint;
-    // FIXME ref #2064
-    unsafe fn rust_uv_tcp_connect(connect_ptr: *uv_connect_t,
-                                  tcp_handle_ptr: *uv_tcp_t,
-                                  ++after_cb: *u8,
-                                  ++addr: *sockaddr_in) -> libc::c_int;
-    // FIXME ref #2064
-    unsafe fn rust_uv_tcp_bind(tcp_server: *uv_tcp_t,
-                               ++addr: *sockaddr_in) -> libc::c_int;
-    // FIXME ref #2064
-    unsafe fn rust_uv_tcp_connect6(connect_ptr: *uv_connect_t,
-                                   tcp_handle_ptr: *uv_tcp_t,
-                                   ++after_cb: *u8,
-                                   ++addr: *sockaddr_in6) -> libc::c_int;
-    // FIXME ref #2064
-    unsafe fn rust_uv_tcp_bind6(tcp_server: *uv_tcp_t,
-                                ++addr: *sockaddr_in6) -> libc::c_int;
-    unsafe fn rust_uv_tcp_getpeername(tcp_handle_ptr: *uv_tcp_t,
-                                      ++name: *sockaddr_in) -> libc::c_int;
-    unsafe fn rust_uv_tcp_getpeername6(tcp_handle_ptr: *uv_tcp_t,
-                                       ++name: *sockaddr_in6) ->libc::c_int;
-    unsafe fn rust_uv_listen(stream: *libc::c_void,
-                             backlog: libc::c_int,
-                             cb: *u8) -> libc::c_int;
-    unsafe fn rust_uv_accept(server: *libc::c_void, client: *libc::c_void)
-                          -> libc::c_int;
-    unsafe fn rust_uv_write(req: *libc::c_void,
-                            stream: *libc::c_void,
-                            ++buf_in: *uv_buf_t,
-                            buf_cnt: libc::c_int,
-                            cb: *u8)
-                         -> libc::c_int;
-    unsafe fn rust_uv_read_start(stream: *libc::c_void,
-                                 on_alloc: *u8,
-                                 on_read: *u8)
-                              -> libc::c_int;
-    unsafe fn rust_uv_read_stop(stream: *libc::c_void) -> libc::c_int;
-    unsafe fn rust_uv_timer_init(loop_handle: *libc::c_void,
-                                 timer_handle: *uv_timer_t)
-                              -> libc::c_int;
-    unsafe fn rust_uv_timer_start(
-        timer_handle: *uv_timer_t,
-        cb: *u8,
-        timeout: libc::c_uint,
-        repeat: libc::c_uint) -> libc::c_int;
-    unsafe fn rust_uv_timer_stop(handle: *uv_timer_t) -> libc::c_int;
+pub mod rustrt {
+    use super::{addrinfo, sockaddr_in, sockaddr_in6, uv_async_t, uv_buf_t};
+    use super::{uv_connect_t, uv_err_t, uv_getaddrinfo_t, uv_stream_t};
+    use super::{uv_tcp_t, uv_timer_t, uv_write_t};
 
-    unsafe fn rust_uv_getaddrinfo(loop_ptr: *libc::c_void,
-                                  handle: *uv_getaddrinfo_t,
-                                  cb: *u8,
-                                  node_name_ptr: *u8,
-                                  service_name_ptr: *u8,
-                                  // should probably only pass ptr::null()
-                                  hints: *addrinfo)
-                               -> libc::c_int;
-    unsafe fn rust_uv_freeaddrinfo(res: *addrinfo);
+    use core::libc;
 
-    // data accessors/helpers for rust-mapped uv structs
-    unsafe fn rust_uv_helper_get_INADDR_NONE() -> u32;
-    unsafe fn rust_uv_is_ipv4_addrinfo(input: *addrinfo) -> bool;
-    unsafe fn rust_uv_is_ipv6_addrinfo(input: *addrinfo) -> bool;
-    unsafe fn rust_uv_get_next_addrinfo(input: *addrinfo) -> *addrinfo;
-    unsafe fn rust_uv_addrinfo_as_sockaddr_in(input: *addrinfo)
-                                           -> *sockaddr_in;
-    unsafe fn rust_uv_addrinfo_as_sockaddr_in6(input: *addrinfo)
-                                            -> *sockaddr_in6;
-    unsafe fn rust_uv_malloc_buf_base_of(sug_size: libc::size_t) -> *u8;
-    unsafe fn rust_uv_free_base_of_buf(++buf: uv_buf_t);
-    unsafe fn rust_uv_get_stream_handle_from_connect_req(
-        connect_req: *uv_connect_t)
-        -> *uv_stream_t;
-    unsafe fn rust_uv_get_stream_handle_from_write_req(
-        write_req: *uv_write_t)
-        -> *uv_stream_t;
-    unsafe fn rust_uv_get_loop_for_uv_handle(handle: *libc::c_void)
-        -> *libc::c_void;
-    unsafe fn rust_uv_get_data_for_uv_loop(loop_ptr: *libc::c_void)
-                                        -> *libc::c_void;
-    unsafe fn rust_uv_set_data_for_uv_loop(loop_ptr: *libc::c_void,
+    #[nolink]
+    pub extern {
+        // libuv public API
+        unsafe fn rust_uv_loop_new() -> *libc::c_void;
+        unsafe fn rust_uv_loop_delete(lp: *libc::c_void);
+        unsafe fn rust_uv_run(loop_handle: *libc::c_void);
+        unsafe fn rust_uv_close(handle: *libc::c_void, cb: *u8);
+        unsafe fn rust_uv_walk(loop_handle: *libc::c_void, cb: *u8,
+                               arg: *libc::c_void);
+        unsafe fn rust_uv_async_send(handle: *uv_async_t);
+        unsafe fn rust_uv_async_init(loop_handle: *libc::c_void,
+                              async_handle: *uv_async_t,
+                              cb: *u8) -> libc::c_int;
+        unsafe fn rust_uv_tcp_init(
+            loop_handle: *libc::c_void,
+            handle_ptr: *uv_tcp_t) -> libc::c_int;
+        // FIXME ref #2604 .. ?
+        unsafe fn rust_uv_buf_init(out_buf: *uv_buf_t, base: *u8,
+                            len: libc::size_t);
+        unsafe fn rust_uv_last_error(loop_handle: *libc::c_void) -> uv_err_t;
+        // FIXME ref #2064
+        unsafe fn rust_uv_strerror(err: *uv_err_t) -> *libc::c_char;
+        // FIXME ref #2064
+        unsafe fn rust_uv_err_name(err: *uv_err_t) -> *libc::c_char;
+        unsafe fn rust_uv_ip4_addr(ip: *u8, port: libc::c_int)
+            -> sockaddr_in;
+        unsafe fn rust_uv_ip6_addr(ip: *u8, port: libc::c_int)
+            -> sockaddr_in6;
+        unsafe fn rust_uv_ip4_name(src: *sockaddr_in,
+                                   dst: *u8,
+                                   size: libc::size_t)
+                                -> libc::c_int;
+        unsafe fn rust_uv_ip6_name(src: *sockaddr_in6,
+                                   dst: *u8,
+                                   size: libc::size_t)
+                                -> libc::c_int;
+        unsafe fn rust_uv_ip4_port(src: *sockaddr_in) -> libc::c_uint;
+        unsafe fn rust_uv_ip6_port(src: *sockaddr_in6) -> libc::c_uint;
+        // FIXME ref #2064
+        unsafe fn rust_uv_tcp_connect(connect_ptr: *uv_connect_t,
+                                      tcp_handle_ptr: *uv_tcp_t,
+                                      ++after_cb: *u8,
+                                      ++addr: *sockaddr_in) -> libc::c_int;
+        // FIXME ref #2064
+        unsafe fn rust_uv_tcp_bind(tcp_server: *uv_tcp_t,
+                                   ++addr: *sockaddr_in) -> libc::c_int;
+        // FIXME ref #2064
+        unsafe fn rust_uv_tcp_connect6(connect_ptr: *uv_connect_t,
+                                       tcp_handle_ptr: *uv_tcp_t,
+                                       ++after_cb: *u8,
+                                       ++addr: *sockaddr_in6) -> libc::c_int;
+        // FIXME ref #2064
+        unsafe fn rust_uv_tcp_bind6(tcp_server: *uv_tcp_t,
+                                    ++addr: *sockaddr_in6) -> libc::c_int;
+        unsafe fn rust_uv_tcp_getpeername(tcp_handle_ptr: *uv_tcp_t,
+                                          ++name: *sockaddr_in) -> libc::c_int;
+        unsafe fn rust_uv_tcp_getpeername6(tcp_handle_ptr: *uv_tcp_t,
+                                           ++name: *sockaddr_in6) ->libc::c_int;
+        unsafe fn rust_uv_listen(stream: *libc::c_void,
+                                 backlog: libc::c_int,
+                                 cb: *u8) -> libc::c_int;
+        unsafe fn rust_uv_accept(server: *libc::c_void, client: *libc::c_void)
+                              -> libc::c_int;
+        unsafe fn rust_uv_write(req: *libc::c_void,
+                                stream: *libc::c_void,
+                                ++buf_in: *uv_buf_t,
+                                buf_cnt: libc::c_int,
+                                cb: *u8)
+                             -> libc::c_int;
+        unsafe fn rust_uv_read_start(stream: *libc::c_void,
+                                     on_alloc: *u8,
+                                     on_read: *u8)
+                                  -> libc::c_int;
+        unsafe fn rust_uv_read_stop(stream: *libc::c_void) -> libc::c_int;
+        unsafe fn rust_uv_timer_init(loop_handle: *libc::c_void,
+                                     timer_handle: *uv_timer_t)
+                                  -> libc::c_int;
+        unsafe fn rust_uv_timer_start(
+            timer_handle: *uv_timer_t,
+            cb: *u8,
+            timeout: libc::c_uint,
+            repeat: libc::c_uint) -> libc::c_int;
+        unsafe fn rust_uv_timer_stop(handle: *uv_timer_t) -> libc::c_int;
+
+        unsafe fn rust_uv_getaddrinfo(loop_ptr: *libc::c_void,
+                                      handle: *uv_getaddrinfo_t,
+                                      cb: *u8,
+                                      node_name_ptr: *u8,
+                                      service_name_ptr: *u8,
+                                      // should probably only pass ptr::null()
+                                      hints: *addrinfo)
+                                   -> libc::c_int;
+        unsafe fn rust_uv_freeaddrinfo(res: *addrinfo);
+
+        // data accessors/helpers for rust-mapped uv structs
+        unsafe fn rust_uv_helper_get_INADDR_NONE() -> u32;
+        unsafe fn rust_uv_is_ipv4_addrinfo(input: *addrinfo) -> bool;
+        unsafe fn rust_uv_is_ipv6_addrinfo(input: *addrinfo) -> bool;
+        unsafe fn rust_uv_get_next_addrinfo(input: *addrinfo) -> *addrinfo;
+        unsafe fn rust_uv_addrinfo_as_sockaddr_in(input: *addrinfo)
+                                               -> *sockaddr_in;
+        unsafe fn rust_uv_addrinfo_as_sockaddr_in6(input: *addrinfo)
+                                                -> *sockaddr_in6;
+        unsafe fn rust_uv_malloc_buf_base_of(sug_size: libc::size_t) -> *u8;
+        unsafe fn rust_uv_free_base_of_buf(++buf: uv_buf_t);
+        unsafe fn rust_uv_get_stream_handle_from_connect_req(
+            connect_req: *uv_connect_t)
+            -> *uv_stream_t;
+        unsafe fn rust_uv_get_stream_handle_from_write_req(
+            write_req: *uv_write_t)
+            -> *uv_stream_t;
+        unsafe fn rust_uv_get_loop_for_uv_handle(handle: *libc::c_void)
+            -> *libc::c_void;
+        unsafe fn rust_uv_get_data_for_uv_loop(loop_ptr: *libc::c_void)
+                                            -> *libc::c_void;
+        unsafe fn rust_uv_set_data_for_uv_loop(loop_ptr: *libc::c_void,
+                                               data: *libc::c_void);
+        unsafe fn rust_uv_get_data_for_uv_handle(handle: *libc::c_void)
+                                              -> *libc::c_void;
+        unsafe fn rust_uv_set_data_for_uv_handle(handle: *libc::c_void,
+                                                 data: *libc::c_void);
+        unsafe fn rust_uv_get_data_for_req(req: *libc::c_void) -> *libc::c_void;
+        unsafe fn rust_uv_set_data_for_req(req: *libc::c_void,
                                            data: *libc::c_void);
-    unsafe fn rust_uv_get_data_for_uv_handle(handle: *libc::c_void)
-                                          -> *libc::c_void;
-    unsafe fn rust_uv_set_data_for_uv_handle(handle: *libc::c_void,
-                                             data: *libc::c_void);
-    unsafe fn rust_uv_get_data_for_req(req: *libc::c_void) -> *libc::c_void;
-    unsafe fn rust_uv_set_data_for_req(req: *libc::c_void,
-                                       data: *libc::c_void);
-    unsafe fn rust_uv_get_base_from_buf(++buf: uv_buf_t) -> *u8;
-    unsafe fn rust_uv_get_len_from_buf(++buf: uv_buf_t) -> libc::size_t;
+        unsafe fn rust_uv_get_base_from_buf(++buf: uv_buf_t) -> *u8;
+        unsafe fn rust_uv_get_len_from_buf(++buf: uv_buf_t) -> libc::size_t;
 
-    // sizeof testing helpers
-    unsafe fn rust_uv_helper_uv_tcp_t_size() -> libc::c_uint;
-    unsafe fn rust_uv_helper_uv_connect_t_size() -> libc::c_uint;
-    unsafe fn rust_uv_helper_uv_buf_t_size() -> libc::c_uint;
-    unsafe fn rust_uv_helper_uv_write_t_size() -> libc::c_uint;
-    unsafe fn rust_uv_helper_uv_err_t_size() -> libc::c_uint;
-    unsafe fn rust_uv_helper_sockaddr_in_size() -> libc::c_uint;
-    unsafe fn rust_uv_helper_sockaddr_in6_size() -> libc::c_uint;
-    unsafe fn rust_uv_helper_uv_async_t_size() -> libc::c_uint;
-    unsafe fn rust_uv_helper_uv_timer_t_size() -> libc::c_uint;
-    unsafe fn rust_uv_helper_uv_getaddrinfo_t_size() -> libc::c_uint;
-    unsafe fn rust_uv_helper_addrinfo_size() -> libc::c_uint;
-    unsafe fn rust_uv_helper_addr_in_size() -> libc::c_uint;
+        // sizeof testing helpers
+        unsafe fn rust_uv_helper_uv_tcp_t_size() -> libc::c_uint;
+        unsafe fn rust_uv_helper_uv_connect_t_size() -> libc::c_uint;
+        unsafe fn rust_uv_helper_uv_buf_t_size() -> libc::c_uint;
+        unsafe fn rust_uv_helper_uv_write_t_size() -> libc::c_uint;
+        unsafe fn rust_uv_helper_uv_err_t_size() -> libc::c_uint;
+        unsafe fn rust_uv_helper_sockaddr_in_size() -> libc::c_uint;
+        unsafe fn rust_uv_helper_sockaddr_in6_size() -> libc::c_uint;
+        unsafe fn rust_uv_helper_uv_async_t_size() -> libc::c_uint;
+        unsafe fn rust_uv_helper_uv_timer_t_size() -> libc::c_uint;
+        unsafe fn rust_uv_helper_uv_getaddrinfo_t_size() -> libc::c_uint;
+        unsafe fn rust_uv_helper_addrinfo_size() -> libc::c_uint;
+        unsafe fn rust_uv_helper_addr_in_size() -> libc::c_uint;
+    }
 }
 
 pub unsafe fn loop_new() -> *libc::c_void {