9 files changed, 44 insertions, 28 deletions
diff --git a/Sluift/Lua/Check.cpp b/Sluift/Lua/Check.cpp
index 9a4951e..4eebf4f 100644
--- a/Sluift/Lua/Check.cpp
+++ b/Sluift/Lua/Check.cpp
@@ -1,19 +1,22 @@
 /*
- * Copyright (c) 2013-2014 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Sluift/Lua/Check.h>
 
-#include <boost/numeric/conversion/cast.hpp>
 #include <iostream>
 #include <sstream>
+
+#include <boost/numeric/conversion/cast.hpp>
+
 #include <lua.hpp>
 
-#include <Sluift/Lua/Exception.h>
 #include <Swiften/Base/ByteArray.h>
 
+#include <Sluift/Lua/Exception.h>
+
 using namespace Swift;
 
 
diff --git a/Sluift/Lua/Debug.h b/Sluift/Lua/Debug.h
index 368672d..32addd6 100644
--- a/Sluift/Lua/Debug.h
+++ b/Sluift/Lua/Debug.h
@@ -1,14 +1,15 @@
 /*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <lua.hpp>
 #include <iostream>
 
+#include <lua.hpp>
+
 namespace Swift {
 	namespace Lua {
 		inline void dumpStack(lua_State *L) {
diff --git a/Sluift/Lua/Exception.h b/Sluift/Lua/Exception.h
index a681b9c..0d327e0 100644
--- a/Sluift/Lua/Exception.h
+++ b/Sluift/Lua/Exception.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2014 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <stdexcept>
+
 #include <Swiften/Base/API.h>
 
 namespace Swift {
diff --git a/Sluift/Lua/FunctionRegistration.h b/Sluift/Lua/FunctionRegistration.h
index cc43d35..3f0afbb 100644
--- a/Sluift/Lua/FunctionRegistration.h
+++ b/Sluift/Lua/FunctionRegistration.h
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
+#include <string>
+
+#include <lua.hpp>
+
 #include <Swiften/Base/API.h>
+#include <Swiften/Base/Override.h>
+
 #include <Sluift/Lua/FunctionRegistry.h>
-#include <lua.hpp>
-#include <string>
 
 namespace Swift {
 	namespace Lua {
diff --git a/Sluift/Lua/FunctionRegistry.cpp b/Sluift/Lua/FunctionRegistry.cpp
index 99a1722..e1fac09 100644
--- a/Sluift/Lua/FunctionRegistry.cpp
+++ b/Sluift/Lua/FunctionRegistry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -7,8 +7,9 @@
 #include <Sluift/Lua/FunctionRegistry.h>
 
 #include <Swiften/Base/foreach.h>
-#include <Sluift/Lua/LuaUtils.h>
+
 #include <Sluift/Lua/Exception.h>
+#include <Sluift/Lua/LuaUtils.h>
 #include <Sluift/globals.h>
 
 using namespace Swift::Lua;
diff --git a/Sluift/Lua/FunctionRegistry.h b/Sluift/Lua/FunctionRegistry.h
index 800cf05..b6260e0 100644
--- a/Sluift/Lua/FunctionRegistry.h
+++ b/Sluift/Lua/FunctionRegistry.h
@@ -1,16 +1,18 @@
 /*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <Swiften/Base/Override.h>
-#include <lua.hpp>
 #include <string>
 #include <vector>
 
+#include <lua.hpp>
+
+#include <Swiften/Base/Override.h>
+
 namespace Swift {
 	namespace Lua {
 		class FunctionRegistry {
diff --git a/Sluift/Lua/LuaUtils.cpp b/Sluift/Lua/LuaUtils.cpp
index 78951d8..df1afce 100644
--- a/Sluift/Lua/LuaUtils.cpp
+++ b/Sluift/Lua/LuaUtils.cpp
@@ -1,20 +1,22 @@
 /*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Sluift/Lua/LuaUtils.h>
 
-#include <lua.hpp>
-
-#include <boost/scope_exit.hpp>
-#include <Sluift/Lua/Exception.h>
-#include <iostream>
 #include <cassert>
+#include <iostream>
 #include <sstream>
-#include <boost/numeric/conversion/cast.hpp>
+
 #include <boost/algorithm/string/trim.hpp>
+#include <boost/numeric/conversion/cast.hpp>
+#include <boost/scope_exit.hpp>
+
+#include <lua.hpp>
+
+#include <Sluift/Lua/Exception.h>
 #include <Sluift/globals.h>
 
 using namespace Swift::Lua;
diff --git a/Sluift/Lua/Value.cpp b/Sluift/Lua/Value.cpp
index 4ce3de8..b5c459a 100644
--- a/Sluift/Lua/Value.cpp
+++ b/Sluift/Lua/Value.cpp
@@ -1,16 +1,18 @@
 /*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
-#include "Value.h"
+#include <Sluift/Lua/Value.h>
+
+#include <boost/numeric/conversion/cast.hpp>
+#include <boost/variant/apply_visitor.hpp>
 
 extern "C" {
 	#include <lualib.h>
 }
-#include <boost/variant/apply_visitor.hpp>
-#include <boost/numeric/conversion/cast.hpp>
+
 #include <Swiften/Base/foreach.h>
 
 using namespace Swift;
diff --git a/Sluift/Lua/Value.h b/Sluift/Lua/Value.h
index 9dd870f..537d764 100644
--- a/Sluift/Lua/Value.h
+++ b/Sluift/Lua/Value.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -9,9 +9,10 @@
 #include <map>
 #include <string>
 #include <vector>
-#include <boost/variant.hpp>
+
 #include <boost/shared_ptr.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
+#include <boost/variant.hpp>
 
 struct lua_State;