diff --git a/.gitignore b/.gitignore
index 9ffca222..63f7ea37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,3 +80,4 @@ temp.bad_runtime.lua
 temp.bad_syntax.lua
 temp.good.lua
 catch_mock.hpp
+main_aux.cpp
diff --git a/single/sol/sol.hpp b/single/sol/sol.hpp
index 6fab8293..055ddaef 100644
--- a/single/sol/sol.hpp
+++ b/single/sol/sol.hpp
@@ -20,8 +20,8 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 // This file was generated with a script.
-// Generated 2017-08-27 04:00:40.261712 UTC
-// This header was generated with sol v2.18.1 (revision 626da4d)
+// Generated 2017-08-27 04:40:46.804312 UTC
+// This header was generated with sol v2.18.0 (revision a396792)
 // https://github.com/ThePhD/sol2
 
 #ifndef SOL_SINGLE_INCLUDE_HPP
@@ -11835,13 +11835,14 @@ namespace sol {
 
 namespace sol {
 
-	protected_function_result::protected_function_result(function_result&& o) noexcept : L(o.lua_state()), index(o.stack_index()), returncount(o.return_count()), popcount(o.return_count()), err(o.status()) {
+	inline protected_function_result::protected_function_result(function_result&& o) noexcept : L(o.lua_state()), index(o.stack_index()), returncount(o.return_count()), popcount(o.return_count()), err(o.status()) {
 		// Must be manual, otherwise destructor will screw us
 		// return count being 0 is enough to keep things clean
 		// but we will be thorough
 		o.abandon();
 	}
-	protected_function_result& protected_function_result::operator=(function_result&& o) noexcept {
+
+	inline protected_function_result& protected_function_result::operator=(function_result&& o) noexcept {
 		L = o.lua_state();
 		index = o.stack_index();
 		returncount = o.return_count();
@@ -11854,13 +11855,13 @@ namespace sol {
 		return *this;
 	}
 
-	function_result::function_result(protected_function_result&& o) noexcept : L(o.lua_state()), index(o.stack_index()), returncount(o.return_count()) {
+	inline function_result::function_result(protected_function_result&& o) noexcept : L(o.lua_state()), index(o.stack_index()), returncount(o.return_count()) {
 		// Must be manual, otherwise destructor will screw us
 		// return count being 0 is enough to keep things clean
 		// but we will be thorough
 		o.abandon();
 	}
-	function_result& function_result::operator=(protected_function_result&& o) noexcept {
+	inline function_result& function_result::operator=(protected_function_result&& o) noexcept {
 		L = o.lua_state();
 		index = o.stack_index();
 		returncount = o.return_count();
diff --git a/sol/function.hpp b/sol/function.hpp
index 46e337c4..7dabf0b2 100644
--- a/sol/function.hpp
+++ b/sol/function.hpp
@@ -29,13 +29,14 @@
 
 namespace sol {
 
-	protected_function_result::protected_function_result(function_result&& o) noexcept : L(o.lua_state()), index(o.stack_index()), returncount(o.return_count()), popcount(o.return_count()), err(o.status()) {
+	inline protected_function_result::protected_function_result(function_result&& o) noexcept : L(o.lua_state()), index(o.stack_index()), returncount(o.return_count()), popcount(o.return_count()), err(o.status()) {
 		// Must be manual, otherwise destructor will screw us
 		// return count being 0 is enough to keep things clean
 		// but we will be thorough
 		o.abandon();
 	}
-	protected_function_result& protected_function_result::operator=(function_result&& o) noexcept {
+
+	inline protected_function_result& protected_function_result::operator=(function_result&& o) noexcept {
 		L = o.lua_state();
 		index = o.stack_index();
 		returncount = o.return_count();
@@ -48,13 +49,13 @@ namespace sol {
 		return *this;
 	}
 
-	function_result::function_result(protected_function_result&& o) noexcept : L(o.lua_state()), index(o.stack_index()), returncount(o.return_count()) {
+	inline function_result::function_result(protected_function_result&& o) noexcept : L(o.lua_state()), index(o.stack_index()), returncount(o.return_count()) {
 		// Must be manual, otherwise destructor will screw us
 		// return count being 0 is enough to keep things clean
 		// but we will be thorough
 		o.abandon();
 	}
-	function_result& function_result::operator=(protected_function_result&& o) noexcept {
+	inline function_result& function_result::operator=(protected_function_result&& o) noexcept {
 		L = o.lua_state();
 		index = o.stack_index();
 		returncount = o.return_count();