diff --git a/freebsd/toku_stdint.h b/freebsd/toku_stdint.h
new file mode 120000
index 00000000000..33c585ea463
--- /dev/null
+++ b/freebsd/toku_stdint.h
@@ -0,0 +1 @@
+../linux/toku_stdint.h
\ No newline at end of file
diff --git a/linux/linux.c b/linux/linux.c
index 5cac7d76640..51201b42f41 100644
--- a/linux/linux.c
+++ b/linux/linux.c
@@ -12,7 +12,7 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <assert.h>
-#include <toku_portability.h>
+#include "toku_portability.h"
 #include "toku_os.h"
 #include <malloc.h>
 
diff --git a/linux/tests/test-max-data.c b/linux/tests/test-max-data.c
index bb2be8b1339..c0a0c62836e 100644
--- a/linux/tests/test-max-data.c
+++ b/linux/tests/test-max-data.c
@@ -1,6 +1,5 @@
 #include <stdio.h>
-#include <stdint.h>
-#include <inttypes.h>
+#include <toku_stdint.h>
 #include <unistd.h>
 #include <assert.h>
 #include <string.h>
diff --git a/linux/tests/test-pagesize.c b/linux/tests/test-pagesize.c
index 239292153ea..7d79abed9c3 100644
--- a/linux/tests/test-pagesize.c
+++ b/linux/tests/test-pagesize.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <stdint.h>
+#include <toku_stdint.h>
 #include <unistd.h>
 #include <assert.h>
 #include "toku_os.h"
diff --git a/linux/tests/test-wss.c b/linux/tests/test-wss.c
index 632cb1d971c..25dbbb3d45e 100644
--- a/linux/tests/test-wss.c
+++ b/linux/tests/test-wss.c
@@ -2,8 +2,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
-#include <stdint.h>
-#include <inttypes.h>
+#include <toku_stdint.h>
 #include <toku_os.h>
 
 const int nbuffers = 1000;
diff --git a/linux/tests/test-xid.c b/linux/tests/test-xid.c
index ae494a79d01..db20a91d4bc 100644
--- a/linux/tests/test-xid.c
+++ b/linux/tests/test-xid.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <stdint.h>
+#include <toku_stdint.h>
 #include <unistd.h>
 #include <assert.h>
 #include "toku_os.h"
diff --git a/linux/toku_stdint.h b/linux/toku_stdint.h
new file mode 100644
index 00000000000..c0970f86da9
--- /dev/null
+++ b/linux/toku_stdint.h
@@ -0,0 +1,8 @@
+#ifndef TOKU_STDINT_H
+#define TOKU_STDINT_H
+
+#include <stdint.h>
+#include <inttypes.h>
+
+#endif
+
diff --git a/newbrt/includes.h b/newbrt/includes.h
index 519ad91acfb..7d62ea03523 100644
--- a/newbrt/includes.h
+++ b/newbrt/includes.h
@@ -6,7 +6,7 @@
 #ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
 
 // Portability first!
-#include "stdint.h"
+#include "toku_stdint.h"
 #include <toku_portability.h>
 #include "toku_os.h"
 
diff --git a/src/lock_tree/locktree.c b/src/lock_tree/locktree.c
index ab2a33cbcf1..4d19c227fa5 100644
--- a/src/lock_tree/locktree.c
+++ b/src/lock_tree/locktree.c
@@ -12,7 +12,7 @@
 #include <locktree.h>
 #include <ydb-internal.h>
 #include <brt-internal.h>
-#include <stdint.h>
+#include <toku_stdint.h>
 
 /* TODO: Yoni should check that all asserts make sense instead of panic,
          and all early returns make sense instead of panic,
diff --git a/src/range_tree/log_nooverlap.c b/src/range_tree/log_nooverlap.c
index b3d6299b7d9..97e849d02d3 100644
--- a/src/range_tree/log_nooverlap.c
+++ b/src/range_tree/log_nooverlap.c
@@ -16,7 +16,7 @@
 #include <errno.h>
 #include <assert.h>
 #include <stdlib.h>
-#include <stdint.h>
+#include <toku_stdint.h>
 #include <string.h>
 typedef toku_range *OMTVALUE;
 #include "../../newbrt/omt.h"
diff --git a/src/tests/test.h b/src/tests/test.h
index 6ac2cd40bcc..9df77643e31 100644
--- a/src/tests/test.h
+++ b/src/tests/test.h
@@ -4,7 +4,7 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <stdint.h>
+#include <toku_stdint.h>
 #include <stdio.h>
 #include <db.h>
 #include <assert.h>
diff --git a/src/ydb_lib.c b/src/ydb_lib.c
index 09b81cb2fcc..790bb58c968 100644
--- a/src/ydb_lib.c
+++ b/src/ydb_lib.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <stdint.h>
+#include <toku_stdint.h>
 #include <toku_portability.h>
 #include <db.h>
 #include "ydb.h"
diff --git a/toku_include/toku_portability.h b/toku_include/toku_portability.h
index 557f99a6ee0..76f9036d4c4 100644
--- a/toku_include/toku_portability.h
+++ b/toku_include/toku_portability.h
@@ -26,8 +26,7 @@ extern "C" {
 #define __attribute__(x)      /* Nothing */
 #endif
 
-#include "stdint.h"
-#include "inttypes.h"
+#include "toku_stdint.h"
 
 #ifndef TOKU_OFF_T_DEFINED
 #define TOKU_OFF_T_DEFINED
@@ -47,9 +46,7 @@ typedef int64_t toku_off_t;
 #if defined(__ICC)
 // Intel linux
 
-#include <stdint.h>
-#include <inttypes.h>
-
+#include <toku_stdint.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -59,8 +56,7 @@ typedef int64_t toku_off_t;
 #elif defined(__GNUC__)
 // GCC linux
 
-#include <stdint.h>
-#include <inttypes.h>
+#include <toku_stdint.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/windows/toku_stdint.h b/windows/toku_stdint.h
new file mode 100644
index 00000000000..c0970f86da9
--- /dev/null
+++ b/windows/toku_stdint.h
@@ -0,0 +1,8 @@
+#ifndef TOKU_STDINT_H
+#define TOKU_STDINT_H
+
+#include <stdint.h>
+#include <inttypes.h>
+
+#endif
+