diff --git a/src/cxa.rs b/src/cxa.rs
new file mode 100644
index 0000000000000000000000000000000000000000..621f5c7a4e8c440c235e605573cd69aede2c25f7
--- /dev/null
+++ b/src/cxa.rs
@@ -0,0 +1,28 @@
+use platform::types::*;
+
+#[derive(Clone, Copy)]
+struct CxaAtExitFunc {
+    func: extern "C" fn (*mut c_void),
+    arg: *mut c_void,
+    dso: *mut c_void
+}
+
+static mut CXA_ATEXIT_FUNCS: [Option<CxaAtExitFunc>; 32] = [None; 32];
+
+#[no_mangle]
+pub unsafe extern "C" fn __cxa_atexit (func_opt: Option<extern "C" fn (*mut c_void)>, arg: *mut c_void, dso: *mut c_void) -> c_int {
+    for i in 0..CXA_ATEXIT_FUNCS.len() {
+        if CXA_ATEXIT_FUNCS[i].is_none() {
+            CXA_ATEXIT_FUNCS[i] = func_opt.map(|func| CxaAtExitFunc {
+                func,
+                arg,
+                dso
+            });
+            return 0;
+        }
+    }
+
+    -1
+}
+
+// TODO: cxa_finalize
diff --git a/src/header/sys_ioctl/cbindgen.toml b/src/header/sys_ioctl/cbindgen.toml
index 65ae4ea043e8b964cd9521226ebb629d3172f61d..40b2c3fbd1902932820852de4e9a985c43e0879f 100644
--- a/src/header/sys_ioctl/cbindgen.toml
+++ b/src/header/sys_ioctl/cbindgen.toml
@@ -5,6 +5,10 @@ language = "C"
 # sgtty is used by another header, and cbindgen doesn't prefix that with `struct` :|
 style = "Both"
 
+[defines]
+"target_os=linux" = "__linux__"
+"target_os=redox" = "__redox__"
+
 [enum]
 prefix_with_name = true
 
diff --git a/src/header/sys_ioctl/mod.rs b/src/header/sys_ioctl/mod.rs
index bf3b8d69a7ef85943000f27e2004b885afe411ca..12ca0a4c714c3e5b350f2da99c3538a7cf1b31a7 100644
--- a/src/header/sys_ioctl/mod.rs
+++ b/src/header/sys_ioctl/mod.rs
@@ -12,20 +12,20 @@ pub struct sgttyb {
     sg_flags: c_ushort,
 }
 
-#[repr(C)]
-#[derive(Default)]
-pub struct winsize {
-    ws_row: c_ushort,
-    ws_col: c_ushort,
-    ws_xpixel: c_ushort,
-    ws_ypixel: c_ushort,
-}
-
 #[cfg(target_os = "linux")]
 pub mod inner {
     use platform::types::*;
     use platform::Sys;
 
+    #[repr(C)]
+    #[derive(Default)]
+    pub struct winsize {
+        ws_row: c_ushort,
+        ws_col: c_ushort,
+        ws_xpixel: c_ushort,
+        ws_ypixel: c_ushort,
+    }
+
     #[no_mangle]
     pub extern "C" fn ioctl(fd: c_int, request: c_ulong, out: *mut c_void) -> c_int {
         // TODO: Somehow support varargs to syscall??
diff --git a/src/lib.rs b/src/lib.rs
index a9f19ab240204e725fe5731dc4ffa682c697c791..33f107acebb08c4747c7c407fe7636548e17f624 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -36,6 +36,7 @@ extern crate spin;
 #[macro_use]
 mod macros;
 pub mod c_str;
+pub mod cxa;
 pub mod fs;
 pub mod header;
 pub mod io;