diff --git a/include/boost/endian/conversion.hpp b/include/boost/endian/conversion.hpp
index 3792f0d..c975514 100644
--- a/include/boost/endian/conversion.hpp
+++ b/include/boost/endian/conversion.hpp
@@ -9,7 +9,7 @@
 #define BOOST_ENDIAN_CONVERSION_HPP
 
 #include <boost/endian/detail/endian_reverse.hpp>
-#include <boost/core/scoped_enum.hpp>
+#include <boost/endian/detail/order.hpp>
 #include <boost/predef/other/endian.h>
 #include <boost/static_assert.hpp>
 #include <boost/cstdint.hpp>
@@ -23,15 +23,6 @@ namespace boost
 {
 namespace endian
 {
-  BOOST_SCOPED_ENUM_START(order)
-  {
-    big, little,
-# if BOOST_ENDIAN_BIG_BYTE
-      native = big
-# else
-      native = little
-# endif
-  }; BOOST_SCOPED_ENUM_END
 
 //--------------------------------------------------------------------------------------//
 //                                                                                      //
diff --git a/include/boost/endian/detail/endian_load.hpp b/include/boost/endian/detail/endian_load.hpp
index 8fac68a..589e623 100644
--- a/include/boost/endian/detail/endian_load.hpp
+++ b/include/boost/endian/detail/endian_load.hpp
@@ -6,9 +6,10 @@
 // Distributed under the Boost Software License, Version 1.0.
 // http://www.boost.org/LICENSE_1_0.txt
 
+#include <boost/endian/detail/endian_reverse.hpp>
+#include <boost/endian/detail/order.hpp>
 #include <boost/endian/detail/integral_by_size.hpp>
 #include <boost/endian/detail/is_trivially_copyable.hpp>
-#include <boost/endian/conversion.hpp>
 #include <boost/type_traits/is_signed.hpp>
 #include <boost/type_traits/is_integral.hpp>
 #include <boost/type_traits/is_enum.hpp>
diff --git a/include/boost/endian/detail/endian_store.hpp b/include/boost/endian/detail/endian_store.hpp
index 03edbbe..5e758d1 100644
--- a/include/boost/endian/detail/endian_store.hpp
+++ b/include/boost/endian/detail/endian_store.hpp
@@ -6,9 +6,12 @@
 // Distributed under the Boost Software License, Version 1.0.
 // http://www.boost.org/LICENSE_1_0.txt
 
+#include <boost/endian/detail/endian_reverse.hpp>
+#include <boost/endian/detail/order.hpp>
 #include <boost/endian/detail/integral_by_size.hpp>
 #include <boost/endian/detail/is_trivially_copyable.hpp>
-#include <boost/endian/conversion.hpp>
+#include <boost/type_traits/is_integral.hpp>
+#include <boost/type_traits/is_enum.hpp>
 #include <boost/static_assert.hpp>
 #include <cstddef>
 #include <cstring>
diff --git a/include/boost/endian/detail/order.hpp b/include/boost/endian/detail/order.hpp
new file mode 100644
index 0000000..786be4f
--- /dev/null
+++ b/include/boost/endian/detail/order.hpp
@@ -0,0 +1,35 @@
+#ifndef BOOST_ENDIAN_DETAIL_ORDER_HPP_INCLUDED
+#define BOOST_ENDIAN_DETAIL_ORDER_HPP_INCLUDED
+
+// Copyright 2019 Peter Dimov
+//
+// Distributed under the Boost Software License, Version 1.0.
+// http://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/core/scoped_enum.hpp>
+#include <boost/predef/other/endian.h>
+
+namespace boost
+{
+namespace endian
+{
+
+BOOST_SCOPED_ENUM_START(order)
+{
+    big, little,
+
+# if BOOST_ENDIAN_BIG_BYTE
+
+    native = big
+
+# else
+
+    native = little
+
+# endif
+}; BOOST_SCOPED_ENUM_END
+
+} // namespace endian
+} // namespace boost
+
+#endif  // BOOST_ENDIAN_DETAIL_ORDER_HPP_INCLUDED