diff --git a/Cargo.toml b/Cargo.toml
index 55d8d5e913..85785975e8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,10 +18,10 @@ fcntl = { path = "src/fcntl" }
 fenv = { path = "src/fenv" }
 float = { path = "src/float" }
 grp = { path = "src/grp" }
-semaphore = { path = "src/semaphore" }
 mman = { path = "src/mman" }
 platform = { path = "src/platform" }
 resource = { path = "src/resource" }
+semaphore = { path = "src/semaphore" }
 stat = { path = "src/stat" }
 stdio = { path = "src/stdio" }
 stdlib = { path = "src/stdlib" }
diff --git a/src/lib.rs b/src/lib.rs
index a45c9d7115..a2589ae795 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -7,8 +7,11 @@ extern crate platform;
 extern crate ctype;
 extern crate errno;
 extern crate fcntl;
+extern crate fenv;
+extern crate float;
 extern crate grp;
 extern crate mman;
+extern crate resource;
 extern crate semaphore;
 extern crate stat;
 extern crate stdio;
diff --git a/tests/alloc.c b/tests/alloc.c
index 30e59da92a..784125bcf6 100644
--- a/tests/alloc.c
+++ b/tests/alloc.c
@@ -16,5 +16,5 @@ int main(int argc, char ** argv) {
         ptrc[i] = (char)i;
     }
     free(ptrc);
-
+    return 0;
 }
diff --git a/tests/args.c b/tests/args.c
index 276ae3b8a5..fd9c779701 100644
--- a/tests/args.c
+++ b/tests/args.c
@@ -8,4 +8,5 @@ int main(int argc, char ** argv) {
         write(STDOUT_FILENO, " ", 1);
     }
     write(STDOUT_FILENO, "\n", 1);
+    return 0;
 }
diff --git a/tests/brk.c b/tests/brk.c
index a6f1e358fc..138b0080f3 100644
--- a/tests/brk.c
+++ b/tests/brk.c
@@ -4,5 +4,5 @@
 int main(int argc, char** argv) {
     int status = brk((void*)100);
     printf("brk exited with status code %d\n", status);
+    return 0;
 }
-
diff --git a/tests/chdir.c b/tests/chdir.c
index 38eb446708..be0e29018f 100644
--- a/tests/chdir.c
+++ b/tests/chdir.c
@@ -12,4 +12,5 @@ int main(int argc, char** argv) {
     getcwd(cwd2, 4096);
     printf("final cwd: %s\n", cwd2);
     free(cwd2);
+    return 0;
 }
diff --git a/tests/dup.c b/tests/dup.c
index 7e9f3083bd..54bbb159b0 100644
--- a/tests/dup.c
+++ b/tests/dup.c
@@ -13,4 +13,5 @@ int main(int argc, char** argv) {
     dup2(fd3, 1);
     printf("hello fd %d", fd3);
     close(fd3);
+    return 0;
 }
diff --git a/tests/error.c b/tests/error.c
index 9ab04c2bd9..0b539992d4 100644
--- a/tests/error.c
+++ b/tests/error.c
@@ -7,4 +7,5 @@ int main(int argc, char** argv) {
     chdir("nonexistent");
     printf("errno: %d = %s\n", errno, strerror(errno));
     perror("perror");
+    return 0;
 }
diff --git a/tests/fchdir.c b/tests/fchdir.c
index b778642324..e89c5ef593 100644
--- a/tests/fchdir.c
+++ b/tests/fchdir.c
@@ -8,4 +8,5 @@ int main (int argc, char** argv) {
     status = fchdir(fd);
     printf("fchdir exited with status code %d\n", status);
     close(fd);
+    return 0;
 }
diff --git a/tests/fcntl.c b/tests/fcntl.c
index f9293a5333..4ce261d188 100644
--- a/tests/fcntl.c
+++ b/tests/fcntl.c
@@ -10,4 +10,5 @@ int main() {
     printf("fd %d duped into fd %d\n", newfd, newfd2);
     close(newfd);
     close(newfd2);
+    return 0;
 }
diff --git a/tests/fsync.c b/tests/fsync.c
index a86887185e..d9f42bd239 100644
--- a/tests/fsync.c
+++ b/tests/fsync.c
@@ -8,4 +8,5 @@ int main (int argc, char** argv) {
     status = fsync(fd);
     printf("fsync exited with status code %d\n", status);
     close(fd);
+    return 0;
 }
diff --git a/tests/ftruncate.c b/tests/ftruncate.c
index 7dc4b90d82..67f39f4c45 100644
--- a/tests/ftruncate.c
+++ b/tests/ftruncate.c
@@ -3,9 +3,10 @@
 #include <stdio.h>
 
 int main (int argc, char** argv) {
-    int fd = creat("ftruncate.out", 0777); 
+    int fd = creat("ftruncate.out", 0777);
     int status;
     status = ftruncate(fd, 100);
     printf("ftruncate exited with status code %d\n", status);
     close(fd);
+    return 0;
 }
diff --git a/tests/getid.c b/tests/getid.c
index f461884d39..774ffea260 100644
--- a/tests/getid.c
+++ b/tests/getid.c
@@ -11,4 +11,5 @@ int main(int argc, char** argv) {
     uid_t uid = getuid();
     printf("egid: %d, euid: %d, gid: %d, pgid: %d, pid: %d, ppid %d, uid %d\n",
             egid, euid, gid, pgid, pid, ppid, uid);
+    return 0;
 }
diff --git a/tests/link.c b/tests/link.c
index 4df0dfde2f..a6cf06b6e9 100644
--- a/tests/link.c
+++ b/tests/link.c
@@ -4,4 +4,5 @@
 int main(int argc, char** argv) {
     link("./link.c", "./link.out");
     perror("link");
+    return 0;
 }
diff --git a/tests/math.c b/tests/math.c
index 981300fdef..fb53fa2438 100644
--- a/tests/math.c
+++ b/tests/math.c
@@ -5,4 +5,5 @@ int main(int argc, char ** argv) {
     double pi = 3.14;
     float c = cos(pi);
     printf("cos(%f) = %f\n", pi, c);
+    return 0;
 }
diff --git a/tests/mem.c b/tests/mem.c
index cc104cbb92..3cc4278431 100644
--- a/tests/mem.c
+++ b/tests/mem.c
@@ -20,4 +20,5 @@ int main(int argc, char ** argv) {
 		exit(1);
 	}
 	printf("Correct memccpy\n");
+    return 0;
 }
diff --git a/tests/pipe.c b/tests/pipe.c
index 6772cd5112..703073cc35 100644
--- a/tests/pipe.c
+++ b/tests/pipe.c
@@ -30,4 +30,5 @@ int main()
         /* close read end */
         close(pip[0]);
     }
+    return 0;
 }
diff --git a/tests/rmdir.c b/tests/rmdir.c
index cd9889380b..97aa50fe17 100644
--- a/tests/rmdir.c
+++ b/tests/rmdir.c
@@ -6,4 +6,5 @@ int main(int argc, char** argv) {
     mkdir("foo", 0);
     int status = rmdir("foo");
     printf("rmdir exited with status code %d\n", status);
+    return 0;
 }
diff --git a/tests/setid.c b/tests/setid.c
index ce2b42ea93..cf6abc6c67 100644
--- a/tests/setid.c
+++ b/tests/setid.c
@@ -23,4 +23,5 @@ int main( void )
         perror( "setreuid" );
     }
     printf("%d has euid %d and uid %d\n", getpid(), geteuid(), getuid());
+    return 0;
   }
diff --git a/tests/sleep.c b/tests/sleep.c
index ab66a4e75e..40672c278c 100644
--- a/tests/sleep.c
+++ b/tests/sleep.c
@@ -10,4 +10,5 @@ int main(int argc, char** argv) {
     timespec tm = {0, 10000};
     nanosleep(&tm, NULL);
     perror("nanosleep");
+    return 0;
 }
diff --git a/tests/unlink.c b/tests/unlink.c
index 0eceae0ac2..e8bbb517bf 100644
--- a/tests/unlink.c
+++ b/tests/unlink.c
@@ -4,4 +4,5 @@
 int main(int argc, char** argv) {
     link("./unlink.c", "./unlink.out");
     perror("unlink");
+    return 0;
 }