diff --git a/include/boost/math/special_functions/detail/fp_traits.hpp b/include/boost/math/special_functions/detail/fp_traits.hpp
index 38041d3e7e..fcc3aab893 100644
--- a/include/boost/math/special_functions/detail/fp_traits.hpp
+++ b/include/boost/math/special_functions/detail/fp_traits.hpp
@@ -27,34 +27,40 @@ With these techniques, the code could be simplified.
 #include <boost/math/tools/is_standalone.hpp>
 #include <boost/math/tools/assert.hpp>
 
-// Determine endinaness
+// Determine endianness
 #ifndef BOOST_MATH_STANDALONE
 
 #include <boost/predef/other/endian.h>
 #define BOOST_MATH_ENDIAN_BIG_BYTE BOOST_ENDIAN_BIG_BYTE
 #define BOOST_MATH_ENDIAN_LITTLE_BYTE BOOST_ENDIAN_LITTLE_BYTE
 
-#elif (__cplusplus > 202000L || _MSVC_LANG > 202000L)
+#elif (__cplusplus >= 202002L || _MSVC_LANG >= 202002L)
 
 #if __has_include(<bit>)
 #include <bit>
 #define BOOST_MATH_ENDIAN_BIG_BYTE (std::endian::native == std::endian::big)
 #define BOOST_MATH_ENDIAN_LITTLE_BYTE (std::endian::native == std::endian::little)
+#else
+#error Missing <bit> header. Please disable standalone mode, and file an issue at https://github.com/boostorg/math
 #endif
 
 #elif defined(_WIN32)
 
-#define BOOST_MATH_ENDIAN_BIG_BYTE 1
-#define BOOST_MATH_ENDIAN_LITTLE_BYTE 0
+#define BOOST_MATH_ENDIAN_BIG_BYTE 0
+#define BOOST_MATH_ENDIAN_LITTLE_BYTE 1
 
 #elif defined(__BYTE_ORDER__)
 
 #define BOOST_MATH_ENDIAN_BIG_BYTE (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
 #define BOOST_MATH_ENDIAN_LITTLE_BYTE (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
 
-#else 
+#else
 #error Could not determine endian type. Please disable standalone mode, and file an issue at https://github.com/boostorg/math
-#endif // Determine endinaness
+#endif // Determine endianness
+
+static_assert((BOOST_MATH_ENDIAN_BIG_BYTE || BOOST_MATH_ENDIAN_LITTLE_BYTE)
+    && !(BOOST_MATH_ENDIAN_BIG_BYTE && BOOST_MATH_ENDIAN_LITTLE_BYTE),
+    "Inconsistent endianness detected. Please disable standalone mode, and file an issue at https://github.com/boostorg/math");
 
 #ifdef BOOST_NO_STDC_NAMESPACE
   namespace std{ using ::memcpy; }
@@ -243,14 +249,7 @@ template<> struct fp_traits_non_native<double, double_precision>
     }
 
 private:
-
-#if BOOST_MATH_ENDIAN_BIG_BYTE
-    static constexpr int offset_ = 0;
-#elif BOOST_MATH_ENDIAN_LITTLE_BYTE
-    static constexpr int offset_ = 4;
-#else
-    static_assert(sizeof(double_precision) == 0, "Endian type could not be identified");
-#endif
+    static constexpr int offset_ = BOOST_MATH_ENDIAN_BIG_BYTE ? 0 : 4;
 };
 
 //..............................................................................
@@ -303,14 +302,7 @@ template<> struct fp_traits_non_native<long double, double_precision>
     }
 
 private:
-
-#if BOOST_MATH_ENDIAN_BIG_BYTE
-    static constexpr int offset_ = 0;
-#elif BOOST_MATH_ENDIAN_LITTLE_BYTE
-    static constexpr int offset_ = 4;
-#else
-    static_assert(sizeof(double_precision) == 0, "Endian type could not be identified");
-#endif
+    static constexpr int offset_ = BOOST_MATH_ENDIAN_BIG_BYTE ? 0 : 4;
 };
 
 //..............................................................................
@@ -417,14 +409,7 @@ struct fp_traits_non_native<long double, extended_double_precision>
     }
 
 private:
-
-#if BOOST_MATH_ENDIAN_BIG_BYTE
-    static constexpr int offset_ = 0;
-#elif BOOST_MATH_ENDIAN_LITTLE_BYTE
-    static constexpr int offset_ = 12;
-#else
-    static_assert(sizeof(extended_double_precision) == 0, "Endian type could not be identified");
-#endif
+    static constexpr int offset_ = BOOST_MATH_ENDIAN_BIG_BYTE ? 0 : 12;
 };
 
 
@@ -498,14 +483,7 @@ struct fp_traits_non_native<long double, extended_double_precision>
     }
 
 private:
-
-#if BOOST_MATH_ENDIAN_BIG_BYTE
-    static constexpr int offset_ = 0;
-#elif BOOST_MATH_ENDIAN_LITTLE_BYTE
-    static constexpr int offset_ = 12;
-#else
-    static_assert(sizeof(extended_double_precision) == 0, "Endian type could not be identified");
-#endif
+    static constexpr int offset_ = BOOST_MATH_ENDIAN_BIG_BYTE ? 0 : 12;
 };
 
 #endif