Inclusion argument order sorting

sol.hpp

@@ -25,6 +25,9 @@
 #include "sol/state.hpp"
 #include "sol/object.hpp"
 #include "sol/function.hpp"
+#include "sol/protected_function.hpp"
+#include "sol/state.hpp"
 #include "sol/coroutine.hpp"
+#include "sol/variadic_args.hpp"
 
 #endif // SOL_HPP

sol/function.hpp

@@ -24,7 +24,6 @@
 
 #include "reference.hpp"
 #include "stack.hpp"
-#include "resolve.hpp"
 #include "function_result.hpp"
 #include "function_types.hpp"
 #include <cstdint>

sol/function_result.hpp

@@ -25,7 +25,6 @@
 #include "reference.hpp"
 #include "tuple.hpp"
 #include "stack.hpp"
-#include "stack_proxy.hpp"
 #include "proxy_base.hpp"
 #include <cstdint>
 
@@ -76,14 +75,6 @@ public:
         lua_pop(L, returncount);
     }
 };
-
-template <>
-struct bond_size<function_result> : std::integral_constant<std::size_t, SIZE_MAX> {};
-
-template <std::size_t I>
-stack_proxy get(const function_result& fr) {
-    return stack_proxy(fr.lua_state(), static_cast<int>(fr.stack_index() + I));
-}
 } // sol
 
 #endif // SOL_FUNCTION_RESULT_HPP

sol/protected_function_result.hpp

@@ -26,7 +26,6 @@
 #include "tuple.hpp"
 #include "stack.hpp"
 #include "proxy_base.hpp"
-#include "stack_proxy.hpp"
 #include <cstdint>
 
 namespace sol {
@@ -126,14 +125,6 @@ public:
         stack::remove(L, index, popcount);
     }
 };
-
-template <>
-struct bond_size<protected_function_result> : std::integral_constant<std::size_t, SIZE_MAX> {};
-
-template <std::size_t I>
-stack_proxy get(const protected_function_result& fr) {
-    return stack_proxy(fr.lua_state(), static_cast<int>(fr.stack_index() + I));
-}
 } // sol
 
 #endif // SOL_FUNCTION_RESULT_HPP

sol/stack.hpp

@@ -24,7 +24,6 @@
 
 #include "stack_core.hpp"
 #include "stack_reference.hpp"
-#include "stack_proxy.hpp"
 #include "stack_check.hpp"
 #include "stack_get.hpp"
 #include "stack_check_get.hpp"

sol/stack_proxy.hpp

@@ -23,6 +23,8 @@
 #define SOL_STACK_PROXY_HPP
 
 #include "stack.hpp"
+#include "function.hpp"
+#include "protected_function.hpp"
 #include "proxy_base.hpp"
 
 namespace sol {
@@ -74,6 +76,22 @@ struct pusher<stack_proxy> {
     }
 };
 } // stack
+
+template <>
+struct bond_size<function_result> : std::integral_constant<std::size_t, SIZE_MAX> {};
+
+template <std::size_t I>
+stack_proxy get(const function_result& fr) {
+    return stack_proxy(fr.lua_state(), static_cast<int>(fr.stack_index() + I));
+}
+
+template <>
+struct bond_size<protected_function_result> : std::integral_constant<std::size_t, SIZE_MAX> {};
+
+template <std::size_t I>
+stack_proxy get(const protected_function_result& fr) {
+    return stack_proxy(fr.lua_state(), static_cast<int>(fr.stack_index() + I));
+}
 } // sol
 
 #endif // SOL_STACK_PROXY_HPP

sol/state_view.hpp

@@ -24,7 +24,6 @@
 
 #include "error.hpp"
 #include "table.hpp"
-#include "stack_proxy.hpp"
 #include <memory>
 
 namespace sol {