diff --git a/include/boost/type_traits/has_trivial_assign.hpp b/include/boost/type_traits/has_trivial_assign.hpp
index a6afb52..7da4560 100644
--- a/include/boost/type_traits/has_trivial_assign.hpp
+++ b/include/boost/type_traits/has_trivial_assign.hpp
@@ -10,7 +10,7 @@
 #ifndef BOOST_TT_HAS_TRIVIAL_ASSIGN_HPP_INCLUDED
 #define BOOST_TT_HAS_TRIVIAL_ASSIGN_HPP_INCLUDED
 
-#include "boost/type_traits/is_pod.hpp"
+#include "boost/type_traits/is_POD.hpp"
 #include "boost/type_traits/is_const.hpp"
 #include "boost/type_traits/is_volatile.hpp"
 #include "boost/type_traits/detail/ice_and.hpp"
diff --git a/include/boost/type_traits/has_trivial_constructor.hpp b/include/boost/type_traits/has_trivial_constructor.hpp
index 4dabab4..38cd8e2 100644
--- a/include/boost/type_traits/has_trivial_constructor.hpp
+++ b/include/boost/type_traits/has_trivial_constructor.hpp
@@ -10,7 +10,7 @@
 #ifndef BOOST_TT_HAS_TRIVIAL_CONSTRUCTOR_HPP_INCLUDED
 #define BOOST_TT_HAS_TRIVIAL_CONSTRUCTOR_HPP_INCLUDED
 
-#include "boost/type_traits/is_pod.hpp"
+#include "boost/type_traits/is_POD.hpp"
 #include "boost/type_traits/detail/ice_or.hpp"
 #include "boost/type_traits/config.hpp"
 
diff --git a/include/boost/type_traits/has_trivial_copy.hpp b/include/boost/type_traits/has_trivial_copy.hpp
index 9bc8421..5d31cf5 100644
--- a/include/boost/type_traits/has_trivial_copy.hpp
+++ b/include/boost/type_traits/has_trivial_copy.hpp
@@ -11,7 +11,7 @@
 #define BOOST_TT_HAS_TRIVIAL_COPY_HPP_INCLUDED
 
 #include "boost/type_traits/is_volatile.hpp"
-#include "boost/type_traits/is_pod.hpp"
+#include "boost/type_traits/is_POD.hpp"
 #include "boost/type_traits/detail/ice_and.hpp"
 #include "boost/type_traits/detail/ice_or.hpp"
 #include "boost/type_traits/detail/ice_not.hpp"
diff --git a/include/boost/type_traits/has_trivial_destructor.hpp b/include/boost/type_traits/has_trivial_destructor.hpp
index b0f9d16..2314271 100644
--- a/include/boost/type_traits/has_trivial_destructor.hpp
+++ b/include/boost/type_traits/has_trivial_destructor.hpp
@@ -10,7 +10,7 @@
 #ifndef BOOST_TT_HAS_TRIVIAL_DESTRUCTOR_HPP_INCLUDED
 #define BOOST_TT_HAS_TRIVIAL_DESTRUCTOR_HPP_INCLUDED
 
-#include "boost/type_traits/is_pod.hpp"
+#include "boost/type_traits/is_POD.hpp"
 #include "boost/type_traits/detail/ice_or.hpp"
 #include "boost/type_traits/config.hpp"
 
diff --git a/include/boost/type_traits/object_traits.hpp b/include/boost/type_traits/object_traits.hpp
index f604aa1..f9c963a 100644
--- a/include/boost/type_traits/object_traits.hpp
+++ b/include/boost/type_traits/object_traits.hpp
@@ -27,7 +27,7 @@
 #include "boost/type_traits/is_compound.hpp"
 #include "boost/type_traits/is_empty.hpp"
 #include "boost/type_traits/is_object.hpp"
-#include "boost/type_traits/is_pod.hpp"
+#include "boost/type_traits/is_POD.hpp"
 #include "boost/type_traits/is_scalar.hpp"
 #include "boost/type_traits/is_stateless.hpp"
 
diff --git a/include/boost/type_traits/type_with_alignment.hpp b/include/boost/type_traits/type_with_alignment.hpp
index dfc6313..8d095b4 100644
--- a/include/boost/type_traits/type_with_alignment.hpp
+++ b/include/boost/type_traits/type_with_alignment.hpp
@@ -13,7 +13,7 @@
 #include "boost/preprocessor/tuple/to_list.hpp"
 #include "boost/preprocessor/cat.hpp"
 #include "boost/type_traits/alignment_of.hpp"
-#include "boost/type_traits/is_pod.hpp"
+#include "boost/type_traits/is_POD.hpp"
 #include "boost/static_assert.hpp"
 #include "boost/config.hpp"
 
diff --git a/test/is_pod_test.cpp b/test/is_pod_test.cpp
index 89d0b4e..f33f44c 100644
--- a/test/is_pod_test.cpp
+++ b/test/is_pod_test.cpp
@@ -8,7 +8,7 @@
 #include "check_integral_constant.hpp"
 #include TYPE_TRAITS(is_pod)
 
-TT_TEST_BEGIN(is_pod)
+TT_TEST_BEGIN(is_POD)
 
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_POD<bool>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_POD<bool const>::value, true);
diff --git a/test/is_polymorphic_test.cpp b/test/is_polymorphic_test.cpp
index 8f5e089..389cac8 100644
--- a/test/is_polymorphic_test.cpp
+++ b/test/is_polymorphic_test.cpp
@@ -8,6 +8,13 @@
 #include "check_integral_constant.hpp"
 #include TYPE_TRAITS(is_polymorphic)
 
+#include <exception>
+#include <stdexcept>
+
+#if defined(_WINDOWS) || defined(_WIN32) || defined(_WIN64)
+#include <windows.h> // more things to test
+#endif
+
 TT_TEST_BEGIN(is_polymorphic)
 
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<int>::value, false);
@@ -35,11 +42,27 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<VB>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<VD>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<test_abc1>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<test_abc2>::value, true);
+#ifndef BOOST_NO_STD_LOCALE
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<std::iostream>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<std::ios_base>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<std::basic_streambuf<char> >::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<std::basic_ios<char> >::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<std::basic_istream<char> >::value, true);
+BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<std::basic_streambuf<char> >::value, true);
+#endif
+BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<std::exception>::value, true);
+BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<std::bad_alloc>::value, true);
+BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<std::runtime_error>::value, true);
+BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<std::out_of_range>::value, true);
+BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<std::range_error>::value, true);
+
+#if defined(_WINDOWS) || defined(_WIN32) || defined(_WIN64)
+BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<IUnknown>::value, true);
+BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<ITypeInfo>::value, true);
+BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<ITypeComp>::value, true);
+BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<ICreateTypeInfo>::value, true);
+BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<IDispatch>::value, true);
+#endif
 
 TT_TEST_END
 
diff --git a/test/tricky_partial_specialization_test.cpp b/test/tricky_partial_specialization_test.cpp
index d587637..d710e07 100644
--- a/test/tricky_partial_specialization_test.cpp
+++ b/test/tricky_partial_specialization_test.cpp
@@ -17,7 +17,7 @@
 #include TYPE_TRAITS(has_trivial_destructor)
 #include TYPE_TRAITS(is_base_and_derived)
 #include TYPE_TRAITS(is_object)
-#include TYPE_TRAITS(is_pod)
+#include TYPE_TRAITS(is_POD)
 #include TYPE_TRAITS(is_scalar)
 #include TYPE_COMPARE(is_same)
 #include TYPE_COMPARE(is_convertible)
diff --git a/test/type_with_alignment_test.cpp b/test/type_with_alignment_test.cpp
index a81f803..ba3379b 100644
--- a/test/type_with_alignment_test.cpp
+++ b/test/type_with_alignment_test.cpp
@@ -8,7 +8,7 @@
 #include "check_integral_constant.hpp"
 #include TYPE_TRAITS(alignment_of)
 #include TYPE_TRAITS(type_with_alignment)
-#include TYPE_TRAITS(is_pod)
+#include TYPE_TRAITS(is_POD)
 
 
 TT_TEST_BEGIN(type_with_alignment)