diff --git a/include/boost/math/concepts/distributions.hpp b/include/boost/math/concepts/distributions.hpp
index 37e0c00e7..865a3ea48 100644
--- a/include/boost/math/concepts/distributions.hpp
+++ b/include/boost/math/concepts/distributions.hpp
@@ -11,6 +11,8 @@
 #ifndef BOOST_MATH_DISTRIBUTION_CONCEPT_HPP
 #define BOOST_MATH_DISTRIBUTION_CONCEPT_HPP
 
+#ifndef BOOST_MATH_STANDALONE
+
 #include <boost/math/distributions/complement.hpp>
 #include <boost/math/distributions/fwd.hpp>
 #ifdef BOOST_MSVC
@@ -487,5 +489,9 @@ Distribution* DistributionConcept<Distribution>::pd = 0;
 } // namespace math
 } // namespace boost
 
+#else
+#error This header can not be used in standalone mode.
+#endif // BOOST_MATH_STANDALONE
+
 #endif // BOOST_MATH_DISTRIBUTION_CONCEPT_HPP
 
diff --git a/include/boost/math/concepts/real_concept.hpp b/include/boost/math/concepts/real_concept.hpp
index f6dcce4f8..595398ff9 100644
--- a/include/boost/math/concepts/real_concept.hpp
+++ b/include/boost/math/concepts/real_concept.hpp
@@ -24,7 +24,6 @@
 #define BOOST_MATH_REAL_CONCEPT_HPP
 
 #include <boost/config.hpp>
-#include <boost/limits.hpp>
 #include <boost/math/special_functions/round.hpp>
 #include <boost/math/special_functions/trunc.hpp>
 #include <boost/math/special_functions/modf.hpp>
@@ -38,8 +37,8 @@
 #endif
 #include <ostream>
 #include <istream>
-#include <boost/config/no_tr1/cmath.hpp>
-#include <math.h> // fmodl
+#include <limits>
+#include <cmath>
 
 #if defined(__SGI_STL_PORT) || defined(_RWSTD_VER) || defined(__LIBCOMO__)
 #  include <cstdio>
@@ -377,7 +376,7 @@ inline concepts::real_concept epsilon<concepts::real_concept>(BOOST_MATH_EXPLICI
 }
 
 template <>
-inline BOOST_MATH_CONSTEXPR int digits<concepts::real_concept>(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE_SPEC(concepts::real_concept)) BOOST_NOEXCEPT
+inline constexpr int digits<concepts::real_concept>(BOOST_MATH_EXPLICIT_TEMPLATE_TYPE_SPEC(concepts::real_concept)) BOOST_NOEXCEPT
 {
    // Assume number of significand bits is same as real_concept_base_type,
    // unless std::numeric_limits<T>::is_specialized to provide digits.
diff --git a/include/boost/math/concepts/real_type_concept.hpp b/include/boost/math/concepts/real_type_concept.hpp
index 97da78012..1156852f2 100644
--- a/include/boost/math/concepts/real_type_concept.hpp
+++ b/include/boost/math/concepts/real_type_concept.hpp
@@ -6,6 +6,7 @@
 #ifndef BOOST_MATH_REAL_TYPE_CONCEPT_HPP
 #define BOOST_MATH_REAL_TYPE_CONCEPT_HPP
 
+#include <cmath>
 #include <boost/config.hpp>
 #ifdef BOOST_MSVC
 #pragma warning(push)
@@ -13,7 +14,6 @@
 #pragma warning(disable: 4510)
 #pragma warning(disable: 4610)
 #endif
-#include <boost/concept_check.hpp>
 #ifdef BOOST_MSVC
 #pragma warning(pop)
 #endif