diff --git a/extra/yassl/include/buffer.hpp b/extra/yassl/include/buffer.hpp
index 126bdbc19b778b249d81bb2e3cdb7b3a98a04355..cdf44ee60a5d1d273afe0ba52b597c65ae0c4e7e 100644
--- a/extra/yassl/include/buffer.hpp
+++ b/extra/yassl/include/buffer.hpp
@@ -27,7 +27,7 @@
 #ifndef yaSSL_BUFFER_HPP
 #define yaSSL_BUFFER_HPP
 
-#include <cassert>              // assert
+#include <assert.h>             // assert
 #include "yassl_error.hpp"      // Error
 #include "memory.hpp"           // mySTL::auto_ptr
 #include "algorithm.hpp"        // mySTL::swap
diff --git a/extra/yassl/include/log.hpp b/extra/yassl/include/log.hpp
index 5753bb4502d74a9dbcacecbbf7e5ea44006c5c6e..c20116901adc1e5b0c61e19e8225683e748be79b 100644
--- a/extra/yassl/include/log.hpp
+++ b/extra/yassl/include/log.hpp
@@ -30,7 +30,7 @@
 #include "socket_wrapper.hpp"
 
 #ifdef YASSL_LOG
-#include <cstdio>
+#include <stdio.h>
 #endif
 
 namespace yaSSL {
diff --git a/extra/yassl/include/socket_wrapper.hpp b/extra/yassl/include/socket_wrapper.hpp
index dddbd65e2201dc83df30c0e53beecdb5c5016560..2a4ac142ec8163d0c0879cdd6ebe493da86283c8 100644
--- a/extra/yassl/include/socket_wrapper.hpp
+++ b/extra/yassl/include/socket_wrapper.hpp
@@ -29,7 +29,7 @@
 #ifndef yaSSL_SOCKET_WRAPPER_HPP
 #define yaSSL_SOCKET_WRAPPER_HPP
 
-#include <cassert>
+#include <assert.h>
 
 #ifdef WIN32
     #include <winsock2.h>
diff --git a/extra/yassl/mySTL/helpers.hpp b/extra/yassl/mySTL/helpers.hpp
index 1b62d60cd2ef5e8aecb954e43fa18b4188c2e99e..10f120e914bb7bc40406b51ae160bb493fa367ea 100644
--- a/extra/yassl/mySTL/helpers.hpp
+++ b/extra/yassl/mySTL/helpers.hpp
@@ -27,7 +27,7 @@
 #ifndef mySTL_HELPERS_HPP
 #define mySTL_HELPERS_HPP
 
-#include <cstdlib>
+#include <stdlib.h>
 
 
 namespace mySTL {
diff --git a/extra/yassl/mySTL/stdexcept.hpp b/extra/yassl/mySTL/stdexcept.hpp
index 817861438a5754b1f85ee3ad4a92bf1240804e89..7b797f43c2be949d0337010f1fe92f0aadeee9f1 100644
--- a/extra/yassl/mySTL/stdexcept.hpp
+++ b/extra/yassl/mySTL/stdexcept.hpp
@@ -28,7 +28,7 @@
 #define mySTL_STDEXCEPT_HPP
 
 
-#include <cstring>  // strncpy
+#include <string.h>  // strncpy
 
 
 namespace mySTL {
diff --git a/extra/yassl/mySTL/vector.hpp b/extra/yassl/mySTL/vector.hpp
index 7f1f99295e46b43b2fc9cfcee5efd6419bcf1f50..6d5a9b6c05762734baaa5c1110494ff7e66159cb 100644
--- a/extra/yassl/mySTL/vector.hpp
+++ b/extra/yassl/mySTL/vector.hpp
@@ -31,7 +31,7 @@
 #include "helpers.hpp"    // construct, destory, fill, etc.
 #include "algorithm.hpp"  // swap
 #include <new>            // ::operator new and delete, placement too
-#include <cassert>        // assert
+#include <assert.h>       // assert
 
 
 namespace mySTL {
diff --git a/extra/yassl/src/ssl.cpp b/extra/yassl/src/ssl.cpp
index 065b3c260bf2664e95cebf6eab56784fb8a1216b..53bd8a75ab69a0017cd5c299f4f6f33371670b93 100644
--- a/extra/yassl/src/ssl.cpp
+++ b/extra/yassl/src/ssl.cpp
@@ -36,7 +36,7 @@
 #include "openssl/ssl.h"
 #include "handshake.hpp"
 #include "yassl_int.hpp"
-#include <cstdio>
+#include <stdio.h>
 
 
 namespace yaSSL {
diff --git a/extra/yassl/taocrypt/include/block.hpp b/extra/yassl/taocrypt/include/block.hpp
index 6e96ec9cc35ad70a0f959e21e1d9df56923b2e93..f490fb0b6e7bb7b4158551e2760fea6c915c64c6 100644
--- a/extra/yassl/taocrypt/include/block.hpp
+++ b/extra/yassl/taocrypt/include/block.hpp
@@ -31,7 +31,7 @@
 #include "stdexcept.hpp"    // mySTL::runtime_error
 #include "misc.hpp"
 #include <string.h>         // memcpy
-#include <cstddef>          // ptrdiff_t
+#include <stddef.h>         // ptrdiff_t
 
 
 #if defined(_MSC_VER) && defined(_CRTAPI1)
@@ -49,11 +49,7 @@ class AllocatorBase
 public:
     typedef T      value_type;
     typedef size_t size_type;
-#ifdef TAOCRYPT_MSVCRT6
     typedef ptrdiff_t      difference_type;
-#else
-    typedef std::ptrdiff_t difference_type;
-#endif
     typedef T*       pointer;
     typedef const T* const_pointer;
     typedef T&       reference;
diff --git a/extra/yassl/taocrypt/include/file.hpp b/extra/yassl/taocrypt/include/file.hpp
index b27ab3aebf39a172e5ce59d06c527eb5fa04a31b..fe7e1073c9901439c89a9f3fd38c2dea3d44e4bb 100644
--- a/extra/yassl/taocrypt/include/file.hpp
+++ b/extra/yassl/taocrypt/include/file.hpp
@@ -29,7 +29,7 @@
 #include "misc.hpp"
 #include "block.hpp"
 #include "error.hpp"
-#include <cstdio>
+#include <stdio.h>
 
 namespace TaoCrypt {
 
diff --git a/extra/yassl/taocrypt/include/integer.hpp b/extra/yassl/taocrypt/include/integer.hpp
index 94383f8061da9c8dbda299b4111af9bf6f92d8d5..3713d09d9f9619167897a68fd060fa5d719b703e 100644
--- a/extra/yassl/taocrypt/include/integer.hpp
+++ b/extra/yassl/taocrypt/include/integer.hpp
@@ -29,7 +29,7 @@
 #include "block.hpp"
 #include "random.hpp"
 #include "file.hpp"
-#include <cstring>
+#include <string.h>
 #include "algorithm.hpp"    // mySTL::swap
 
 
diff --git a/extra/yassl/taocrypt/include/runtime.hpp b/extra/yassl/taocrypt/include/runtime.hpp
index e2c04af44f45b580cfa00674a36bae2250f3e3a4..43f1b72fd51127ebc27e384d03c517e49efc5db3 100644
--- a/extra/yassl/taocrypt/include/runtime.hpp
+++ b/extra/yassl/taocrypt/include/runtime.hpp
@@ -31,7 +31,7 @@
 
 #if __GNUC__ > 2
 
-#include <cstdlib>
+#include <stdlib.h>
 
 
 static void* operator new (size_t sz)
diff --git a/extra/yassl/taocrypt/src/dh.cpp b/extra/yassl/taocrypt/src/dh.cpp
index e5a6a562c520febb0775d153f867107ee2008885..af50d471b52c2b79063f75d00ec8244b521b939f 100644
--- a/extra/yassl/taocrypt/src/dh.cpp
+++ b/extra/yassl/taocrypt/src/dh.cpp
@@ -26,7 +26,7 @@
 #include "runtime.hpp"
 #include "dh.hpp"
 #include "asn.hpp"
-#include <cmath>
+#include <math.h>
 
 namespace TaoCrypt {