diff --git a/dlltest.cpp b/dlltest.cpp
index dac90933..4afd305b 100644
--- a/dlltest.cpp
+++ b/dlltest.cpp
@@ -3,7 +3,6 @@
 #endif
 
 #include "dll.h"
-#include <iostream>
 
 USING_NAMESPACE(CryptoPP)
 USING_NAMESPACE(std)
diff --git a/stdcpp.h b/stdcpp.h
index 535f0e75..461fee9d 100644
--- a/stdcpp.h
+++ b/stdcpp.h
@@ -1,6 +1,11 @@
 #ifndef CRYPTOPP_STDCPP_H
 #define CRYPTOPP_STDCPP_H
 
+#if _MSC_VER >= 1500
+#define _DO_NOT_DECLARE_INTERLOCKED_INTRINSICS_IN_MEMORY
+#include <intrin.h>
+#endif
+
 #include <stddef.h>
 #include <assert.h>
 #include <limits.h>
@@ -22,7 +27,7 @@
 // for alloca
 #ifdef __sun
 #include <alloca.h>
-#elif defined(__MINGW32__)
+#elif defined(__MINGW32__) || defined(__BORLANDC__)
 #include <malloc.h>
 #endif