diff --git a/include/boost/variant/detail/visitation_impl.hpp b/include/boost/variant/detail/visitation_impl.hpp
index 8c318ac..c3d91b8 100644
--- a/include/boost/variant/detail/visitation_impl.hpp
+++ b/include/boost/variant/detail/visitation_impl.hpp
@@ -59,7 +59,7 @@
 #endif
 
 // Define a compiler generic null pointer value
-#if defined(BOOST_NO_NULLPTR)
+#if defined(BOOST_NO_CXX11_NULLPTR)
 #define BOOST_VARIANT_NULL 0
 #else
 #define BOOST_VARIANT_NULL nullptr
diff --git a/include/boost/variant/get.hpp b/include/boost/variant/get.hpp
index 431b5b2..3dfeffa 100644
--- a/include/boost/variant/get.hpp
+++ b/include/boost/variant/get.hpp
@@ -102,7 +102,7 @@ public: // visitor interfaces
 #   if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x0551))
 #       define BOOST_VARIANT_AUX_GET_EXPLICIT_TEMPLATE_TYPE(t)
 #   else
-#       if defined(BOOST_NO_NULLPTR)
+#       if defined(BOOST_NO_CXX11_NULLPTR)
 #           define BOOST_VARIANT_AUX_GET_EXPLICIT_TEMPLATE_TYPE(t)  \
             , t* = 0
 #       else
diff --git a/include/boost/variant/polymorphic_get.hpp b/include/boost/variant/polymorphic_get.hpp
index 4f6945a..3e6cd1a 100644
--- a/include/boost/variant/polymorphic_get.hpp
+++ b/include/boost/variant/polymorphic_get.hpp
@@ -135,7 +135,7 @@ public: // visitor interfaces
 #   if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x0551))
 #       define BOOST_VARIANT_AUX_GET_EXPLICIT_TEMPLATE_TYPE(t)
 #   else
-#       if defined(BOOST_NO_NULLPTR)
+#       if defined(BOOST_NO_CXX11_NULLPTR)
 #           define BOOST_VARIANT_AUX_GET_EXPLICIT_TEMPLATE_TYPE(t)  \
             , t* = 0
 #       else
diff --git a/include/boost/variant/static_visitor.hpp b/include/boost/variant/static_visitor.hpp
index 98d3d92..ee40fec 100644
--- a/include/boost/variant/static_visitor.hpp
+++ b/include/boost/variant/static_visitor.hpp
@@ -82,7 +82,7 @@ struct is_static_visitor_impl
 } // namespace detail
 
 template< typename T > struct is_static_visitor
-	: public ::boost::integral_constant<bool,(::boost::detail::is_static_visitor_impl<T>::value)>
+  : public ::boost::integral_constant<bool,(::boost::detail::is_static_visitor_impl<T>::value)>
 {
 public:
     BOOST_MPL_AUX_LAMBDA_SUPPORT(1,is_static_visitor,(T))
diff --git a/test/class_a.cpp b/test/class_a.cpp
index 7cb1ff8..f3feb30 100644
--- a/test/class_a.cpp
+++ b/test/class_a.cpp
@@ -13,7 +13,8 @@
 #include <algorithm> // for std::swap
 #include <sstream>
 #include <iostream>
-#include <assert.h>
+
+#include <boost/assert.hpp>
 
 #include "class_a.h"
 
@@ -22,7 +23,7 @@ using namespace std;
 
 class_a::~class_a()
 {
-   assert(self_p_ == this);
+   BOOST_ASSERT(self_p_ == this);
 }
 
 class_a::class_a(int n)
diff --git a/test/hash_recursive_variant_test.cpp b/test/hash_recursive_variant_test.cpp
index c6d5ef3..7e38ed9 100644
--- a/test/hash_recursive_variant_test.cpp
+++ b/test/hash_recursive_variant_test.cpp
@@ -28,8 +28,8 @@ template <typename T>
 using basic_set_t = std::unordered_set<T, hash>;
 
 using value_t = boost::make_recursive_variant<
-		int_t,
-		basic_set_t<boost::recursive_variant_>
+    int_t,
+    basic_set_t<boost::recursive_variant_>
 >::type;
 
 using set_t = basic_set_t<value_t>;