diff --git a/include/polarssl/bignum.h b/include/polarssl/bignum.h
index e2d9347..3b8b1f6 100644
--- a/include/polarssl/bignum.h
+++ b/include/polarssl/bignum.h
@@ -34,8 +34,13 @@
 
 #ifdef _MSC_VER
 #include <basetsd.h>
+#if (_MSC_VER <= 1200)
+typedef   signed short  int16_t;
+typedef unsigned short uint16_t;
+#else
 typedef  INT16  int16_t;
 typedef UINT16 uint16_t;
+#endif
 typedef  INT32  int32_t;
 typedef UINT32 uint32_t;
 typedef UINT64 uint64_t;
diff --git a/include/polarssl/gcm.h b/include/polarssl/gcm.h
index 2f88c70..77baa17 100644
--- a/include/polarssl/gcm.h
+++ b/include/polarssl/gcm.h
@@ -29,7 +29,12 @@
 
 #include "aes.h"
 
+#ifdef _MSC_VER
+#include <basetsd.h>
+typedef UINT64 uint64_t;
+#else
 #include <stdint.h>
+#endif
 
 #define GCM_ENCRYPT     1
 #define GCM_DECRYPT     0
diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h
index c7da8c4..071288e 100644
--- a/include/polarssl/ssl.h
+++ b/include/polarssl/ssl.h
@@ -682,7 +682,7 @@
  *                 data) is cleared by the SSL/TLS layer when the connection is
  *                 terminated. It is recommended to add metadata to determine if
  *                 an entry is still valid in the future. Return 0 if
- *                 successfully cached, return 0 otherwise.
+ *                 successfully cached, return 1 otherwise.
  *
  * \param ssl            SSL context
  * \param f_get_cache    session get callback