diff --git a/compiler/cheaders.v b/compiler/cheaders.v
index a9280a4144..cf2b30fba8 100644
--- a/compiler/cheaders.v
+++ b/compiler/cheaders.v
@@ -16,6 +16,11 @@ CommonCHeaders = '
 #include <locale.h> // tolower
 #endif
 
+#ifdef __APPLE__
+#include <execinfo.h> // for backtrace and backtrace_symbols_fd
+#endif
+
+
 #define EMPTY_STRUCT_DECLARATION
 #define OPTION_CAST(x) (x)
 
diff --git a/vlib/builtin/int.v b/vlib/builtin/int.v
index 2af1dec65f..7e8b316dcc 100644
--- a/vlib/builtin/int.v
+++ b/vlib/builtin/int.v
@@ -5,6 +5,7 @@
 module builtin
 
 #include <float.h>
+#include <math.h>
 
 pub fn (d double) str() string {
 	buf := malloc(sizeof(double) * 5 + 1)// TODO
diff --git a/vlib/crypto/rand/rand_mac.v b/vlib/crypto/rand/rand_mac.v
index db10d3503f..649f5204ab 100644
--- a/vlib/crypto/rand/rand_mac.v
+++ b/vlib/crypto/rand/rand_mac.v
@@ -4,6 +4,8 @@
 
 module rand
 
+#include <Security/SecRandom.h>
+
 #flag darwin -framework Security
 
 pub fn read(bytes_needed int) ?[]byte {
diff --git a/vlib/net/socket_nix.v b/vlib/net/socket_nix.v
index 0ee48b4f5c..6b6b8e1124 100644
--- a/vlib/net/socket_nix.v
+++ b/vlib/net/socket_nix.v
@@ -1,5 +1,6 @@
-module net
-
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
+module net
+
+#include <sys/socket.h>
+#include <unistd.h>
+#include <netinet/in.h>
+#include <netdb.h>
diff --git a/vlib/os/os.v b/vlib/os/os.v
index 8a631e32b3..3b65470c7a 100644
--- a/vlib/os/os.v
+++ b/vlib/os/os.v
@@ -9,7 +9,6 @@ module os
 #include <errno.h>
 
 $if mac {
-	#include <execinfo.h> // for backtrace and backtrace_symbols_fd
 	#include <libproc.h> // proc_pidpath
 }
 
diff --git a/vlib/time/time.v b/vlib/time/time.v
index 386ff8fcfa..fa2c5732f2 100644
--- a/vlib/time/time.v
+++ b/vlib/time/time.v
@@ -12,6 +12,7 @@ const (
 )
 
 #include <time.h>
+#include <unistd.h> // sleep
 
 $if !windows {
 #include <sys/time.h>