Fixing license headers

65 files changed, 262 insertions, 139 deletions

diff --git a/scripts/add_version_headers b/scripts/add_version_headers
index 2d653675..dad385e7 100755
--- a/scripts/add_version_headers
+++ b/scripts/add_version_headers
@@ -37,14 +37,13 @@ header = """/* ---------------------------------------------------------------\
 """
 
 
-lic_regex = re.compile("\/\* -+\n \* [a-z]+\.cpp\n(?: \*[ a-zA-Z0-9_.,\-()<>@]*\n)+ \* -+\n \*/",
-                       re.MULTILINE)
+lic_regex = re.compile("\/\* -+\n \* ([a-z]+\.(?:cpp|h)|\{0\})\n(?: \*[ a-zA-Z0-9_.,\-()<>@]*\n)+ \* -+\n \*/", re.MULTILINE)
 
 
 class HeaderUpdate(object):
     """Updates the header in all the source and header files in the code"""
     def __init__(self, **kwargs):
-        self.match_re = ".*[.]cpp$|.*[.]hpp$"
+        self.match_re = ".*[.]cpp$|.*[.]h$"
         self.exclude_re = "^$"
         self.exclude_build = True
         self.exclude_dir = ".*build.*"
@@ -70,9 +69,14 @@ class HeaderUpdate(object):
             with open(filePath, "r+") as f:
                 src = f.read()
                 f.seek(0)
-                print("Updating {}:".format(os.path.basename(filePath)), end="")
-                lic_regex.sub(header.format(os.path.basename(filePath)), src)
-                print("done")
+                if lic_regex.match(src):
+                    print("Updating {}: ".format(os.path.basename(filePath)), end="")
+                    src = lic_regex.sub(header.format(os.path.basename(filePath)), src)
+                    print("done")
+                else:
+                    print("Adding {}: ".format(os.path.basename(filePath)), end="")
+                    src = header.format(os.path.basename(filePath)) + src
+                    print("done")
                 f.write(src)
                 f.truncate()
 
diff --git a/tests/activetest.cpp b/tests/activetest.cpp
index 74e72f54..cebf90d3 100644
--- a/tests/activetest.cpp
+++ b/tests/activetest.cpp
@@ -1,3 +1,11 @@
+/* ----------------------------------------------------------------------------
+ * activetest.cpp
+ *
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
+ * ----------------------------------------------------------------------------
+ */
+
 #include <yage.h>
 
 #include <iostream>
diff --git a/tests/logtest.cpp b/tests/logtest.cpp
index 9536f00a..74a71057 100644
--- a/tests/logtest.cpp
+++ b/tests/logtest.cpp
@@ -1,11 +1,13 @@
 /* ----------------------------------------------------------------------------
  * logtest.cpp
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
+
+
 #include <yage.h>
 
 #include <iostream>
diff --git a/tests/matrixtest.cpp b/tests/matrixtest.cpp
index 58786bae..be2ca186 100644
--- a/tests/matrixtest.cpp
+++ b/tests/matrixtest.cpp
@@ -1,11 +1,13 @@
 /* ----------------------------------------------------------------------------
  * matrixtest.cpp
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
+
+
 #include <gtest/gtest.h>
 #include <yage/yage.h>
 
diff --git a/tests/particlebodytest.cpp b/tests/particlebodytest.cpp
index 41c9a5c9..511e3ef5 100644
--- a/tests/particlebodytest.cpp
+++ b/tests/particlebodytest.cpp
@@ -1,11 +1,13 @@
 /* ----------------------------------------------------------------------------
- * rigidbodytest.cpp
+ * particlebodytest.cpp
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
+
+
 #include <gtest/gtest.h>
 #include <yage/yage.h>
 
diff --git a/tests/rendertest.cpp b/tests/rendertest.cpp
index 5f35b1fc..a0452ab4 100644
--- a/tests/rendertest.cpp
+++ b/tests/rendertest.cpp
@@ -1,11 +1,13 @@
 /* ----------------------------------------------------------------------------
- * renderingtest.cpp
+ * rendertest.cpp
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
+
+
 #include "rendertest.h"
 
 RenderTest::RenderTest(std::string sprite) : sprite_(sprite)
diff --git a/tests/rendertest.h b/tests/rendertest.h
index c239338f..f6ed36c6 100644
--- a/tests/rendertest.h
+++ b/tests/rendertest.h
@@ -1,11 +1,13 @@
 /* ----------------------------------------------------------------------------
- * renderingtest.h
+ * rendertest.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
+
+
 #include <string>
 
 class RenderTest
diff --git a/tests/simplegame.cpp b/tests/simplegame.cpp
index 7ca8db77..6bd180ef 100644
--- a/tests/simplegame.cpp
+++ b/tests/simplegame.cpp
@@ -1,3 +1,11 @@
+/* ----------------------------------------------------------------------------
+ * simplegame.cpp
+ *
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
+ * ----------------------------------------------------------------------------
+ */
+
 #include <yage.cpp>
 
 using namespace yage;
diff --git a/tests/spritesheettest.cpp b/tests/spritesheettest.cpp
index 47469cf9..2ece61bf 100644
--- a/tests/spritesheettest.cpp
+++ b/tests/spritesheettest.cpp
@@ -6,6 +6,8 @@
  * ----------------------------------------------------------------------------
  */
 
+
+
 /** @file */
 
 #include <gtest/gtest.h>
diff --git a/tests/syncqueuetest.cpp b/tests/syncqueuetest.cpp
index 07167dc6..db347854 100644
--- a/tests/syncqueuetest.cpp
+++ b/tests/syncqueuetest.cpp
@@ -1,3 +1,11 @@
+/* ----------------------------------------------------------------------------
+ * syncqueuetest.cpp
+ *
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
+ * ----------------------------------------------------------------------------
+ */
+
 #include <yage.h>
 
 #include <atomic>
diff --git a/tests/threadtest.cpp b/tests/threadtest.cpp
index dd1877e5..9ea46e62 100644
--- a/tests/threadtest.cpp
+++ b/tests/threadtest.cpp
@@ -1,3 +1,11 @@
+/* ----------------------------------------------------------------------------
+ * threadtest.cpp
+ *
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
+ * ----------------------------------------------------------------------------
+ */
+
 #include <yage.h>
 
 #include <iostream>
diff --git a/tests/vector3test.cpp b/tests/vector3test.cpp
index 0e10458a..daab02af 100644
--- a/tests/vector3test.cpp
+++ b/tests/vector3test.cpp
@@ -6,6 +6,14 @@
  * ----------------------------------------------------------------------------
  */
 
+/* ----------------------------------------------------------------------------
+ * vector3test.cpp
+ *
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
+ * ----------------------------------------------------------------------------
+ */
+
 #include <gtest/gtest.h>
 #include <yage/yage.h>
 
diff --git a/tests/vector4test.cpp b/tests/vector4test.cpp
index cc2418f4..fd67d802 100644
--- a/tests/vector4test.cpp
+++ b/tests/vector4test.cpp
@@ -6,6 +6,14 @@
  * ----------------------------------------------------------------------------
  */
 
+/* ----------------------------------------------------------------------------
+ * vector4test.cpp
+ *
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
+ * ----------------------------------------------------------------------------
+ */
+
 #include <gtest/gtest.h>
 #include <yage/yage.h>
 
diff --git a/tests/windowtest.cpp b/tests/windowtest.cpp
index 464d4c68..53ff3e9c 100644
--- a/tests/windowtest.cpp
+++ b/tests/windowtest.cpp
@@ -6,6 +6,8 @@
  * ----------------------------------------------------------------------------
  */
 
+
+
 #include <yage/yage.h>
 #include <gtest/gtest.h>
 
diff --git a/tests/yagetest.cpp b/tests/yagetest.cpp
index afadc745..2e961327 100644
--- a/tests/yagetest.cpp
+++ b/tests/yagetest.cpp
@@ -1,11 +1,13 @@
 /* ----------------------------------------------------------------------------
  * yagetest.cpp
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
+
+
 #include <yage/yage.h>
 #include <gtest/gtest.h>
 
diff --git a/yage/core/camera2d.cpp b/yage/core/camera2d.cpp
index 9eda38ee..52c5c50f 100644
--- a/yage/core/camera2d.cpp
+++ b/yage/core/camera2d.cpp
@@ -1,6 +1,14 @@
 /* ----------------------------------------------------------------------------
  * camera2d.cpp
  *
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
+ * ----------------------------------------------------------------------------
+ */
+
+/* ----------------------------------------------------------------------------
+ * camera2d.cpp
+ *
  * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
  * See file LICENSE for more details
  * ----------------------------------------------------------------------------
diff --git a/yage/core/camera2d.h b/yage/core/camera2d.h
index a60893ac..333f907d 100644
--- a/yage/core/camera2d.h
+++ b/yage/core/camera2d.h
@@ -6,6 +6,14 @@
  * ----------------------------------------------------------------------------
  */
 
+/* ----------------------------------------------------------------------------
+ * camera2d.h
+ *
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
+ * ----------------------------------------------------------------------------
+ */
+
 #ifndef YAGE_CAMERA2D_H
 #define YAGE_CAMERA2D_H
 
diff --git a/yage/core/glslprogram.cpp b/yage/core/glslprogram.cpp
index cff84e40..542afc6f 100644
--- a/yage/core/glslprogram.cpp
+++ b/yage/core/glslprogram.cpp
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * glslprogram.cpp
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/core/glslprogram.h b/yage/core/glslprogram.h
index 545dbe54..d4bbe093 100644
--- a/yage/core/glslprogram.h
+++ b/yage/core/glslprogram.h
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * glslprogram.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/core/imageloader.cpp b/yage/core/imageloader.cpp
index 89aeb067..ae67a94a 100644
--- a/yage/core/imageloader.cpp
+++ b/yage/core/imageloader.cpp
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * imageloader.cpp
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/core/imageloader.h b/yage/core/imageloader.h
index 8d5c5cd1..ab9f9e4d 100644
--- a/yage/core/imageloader.h
+++ b/yage/core/imageloader.h
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * imageloader.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/core/inputmanager.cpp b/yage/core/inputmanager.cpp
index 391c9931..7f4e121a 100644
--- a/yage/core/inputmanager.cpp
+++ b/yage/core/inputmanager.cpp
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * inputmanager.cpp
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/core/inputmanager.h b/yage/core/inputmanager.h
index 84728fff..9fabd997 100644
--- a/yage/core/inputmanager.h
+++ b/yage/core/inputmanager.h
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * inputmanager.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/core/iomanager.cpp b/yage/core/iomanager.cpp
index 6bb083ab..33286d5d 100644
--- a/yage/core/iomanager.cpp
+++ b/yage/core/iomanager.cpp
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * iomanager.cpp
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/core/iomanager.h b/yage/core/iomanager.h
index 95abd652..14ad2d16 100644
--- a/yage/core/iomanager.h
+++ b/yage/core/iomanager.h
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * iomanager.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/core/logger.cpp b/yage/core/logger.cpp
index a0114a66..7a58efb6 100644
--- a/yage/core/logger.cpp
+++ b/yage/core/logger.cpp
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * logger.cpp
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/core/logger.h b/yage/core/logger.h
index 30b06b98..76f38641 100644
--- a/yage/core/logger.h
+++ b/yage/core/logger.h
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * logger.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/core/loglevel.h b/yage/core/loglevel.h
index 5e11ed83..ca763321 100644
--- a/yage/core/loglevel.h
+++ b/yage/core/loglevel.h
@@ -1,3 +1,11 @@
+/* ----------------------------------------------------------------------------
+ * loglevel.h
+ *
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
+ * ----------------------------------------------------------------------------
+ */
+
 #ifndef YAGE_CORE_LOGLEVEL_H
 #define YAGE_CORE_LOGLEVEL_H
 
diff --git a/yage/core/logmessage.cpp b/yage/core/logmessage.cpp
index 9f460bec..172cef4b 100644
--- a/yage/core/logmessage.cpp
+++ b/yage/core/logmessage.cpp
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * logmessage.cpp
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/core/logmessage.h b/yage/core/logmessage.h
index 8080f914..75a8cf47 100644
--- a/yage/core/logmessage.h
+++ b/yage/core/logmessage.h
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * logmessage.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/core/logsink.cpp b/yage/core/logsink.cpp
index 081eb5b3..2f59d620 100644
--- a/yage/core/logsink.cpp
+++ b/yage/core/logsink.cpp
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * logsink.cpp
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
@@ -92,11 +92,13 @@ private:
 
 } // namespace
 
-LogSink makeFileSink(const std::string &filename) {
+LogSink makeFileSink(const std::string &filename)
+{
     return FileSink(filename);
 }
 
-LogSink makeFileSink(std::string &&filename) {
+LogSink makeFileSink(std::string &&filename)
+{
     return FileSink(filename);
 }
 
diff --git a/yage/core/logsink.h b/yage/core/logsink.h
index f51d9f2a..064abc63 100644
--- a/yage/core/logsink.h
+++ b/yage/core/logsink.h
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * logsink.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/core/picopng.cpp b/yage/core/picopng.cpp
index dcc4b367..9758bd4a 100644
--- a/yage/core/picopng.cpp
+++ b/yage/core/picopng.cpp
@@ -715,8 +715,8 @@ int decodePNG(std::vector<unsigned char> &out_image, unsigned long &image_width,
                                       1, 8, 8, 8, 4, 4, 2, 2}; // values for the
                                                                // adam7 passes
                 for (int i = 0; i < 6; i++) {
-                    passstart[i + 1] = passstart[i] +
-                                       passh[i] * ((passw[i] ? 1 : 0) +
+                    passstart[i + 1] =
+                        passstart[i] + passh[i] * ((passw[i] ? 1 : 0) +
                                                    (passw[i] * bpp + 7) / 8);
                 }
                 std::vector<unsigned char> scanlineo((info.width * bpp + 7) /
diff --git a/yage/core/picopng.h b/yage/core/picopng.h
index 095bf68a..9b2cb081 100644
--- a/yage/core/picopng.h
+++ b/yage/core/picopng.h
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * picopng.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/core/resourcemanager.cpp b/yage/core/resourcemanager.cpp
index aa234c9f..3fefc4f5 100644
--- a/yage/core/resourcemanager.cpp
+++ b/yage/core/resourcemanager.cpp
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * resourcemanager.cpp
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/core/resourcemanager.h b/yage/core/resourcemanager.h
index 52d98e12..8fc6a16e 100644
--- a/yage/core/resourcemanager.h
+++ b/yage/core/resourcemanager.h
@@ -1,3 +1,10 @@
+/* ----------------------------------------------------------------------------
+ * resourcemanager.h
+ *
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
+ * ----------------------------------------------------------------------------
+ */
 
 /* ----------------------------------------------------------------------------
  * resourcemanager.h
@@ -25,7 +32,6 @@ private:
 
 public:
     static Texture getTexture(const std::string &texture_path);
-    
 };
 
 } // namespace yage
diff --git a/yage/core/sprite.cpp b/yage/core/sprite.cpp
index 769c8b81..246d415d 100644
--- a/yage/core/sprite.cpp
+++ b/yage/core/sprite.cpp
@@ -1,13 +1,13 @@
 /* ----------------------------------------------------------------------------
  * sprite.cpp
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
-#include <yage/core/sprite.h>
 #include <yage/core/resourcemanager.h>
+#include <yage/core/sprite.h>
 #include <yage/core/vertex.h>
 
 #include <cstddef>
diff --git a/yage/core/sprite.h b/yage/core/sprite.h
index 725d2160..9cba1daf 100644
--- a/yage/core/sprite.h
+++ b/yage/core/sprite.h
@@ -1,13 +1,13 @@
 /* ----------------------------------------------------------------------------
  * sprite.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
 /** @file
-  */
+ */
 
 #ifndef SPRITE_H
 #define SPRITE_H
@@ -22,7 +22,7 @@ namespace yage
 {
 
 /** @deprecated Use SpriteBatch instead
-  */
+ */
 class Sprite
 {
 private:
diff --git a/yage/core/spritebatch.cpp b/yage/core/spritebatch.cpp
index ad6feeab..6eac7f09 100644
--- a/yage/core/spritebatch.cpp
+++ b/yage/core/spritebatch.cpp
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * spritebatch.cpp
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/core/spritebatch.h b/yage/core/spritebatch.h
index 2c525ba7..e0b612a4 100644
--- a/yage/core/spritebatch.h
+++ b/yage/core/spritebatch.h
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * spritebatch.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/core/spritesheet.cpp b/yage/core/spritesheet.cpp
index 09c344e3..e18d7fe8 100644
--- a/yage/core/spritesheet.cpp
+++ b/yage/core/spritesheet.cpp
@@ -35,7 +35,7 @@ SpriteSheet::SpriteSheet(string pngFileName, string jsonFileName)
 
     if (texture_.width != jsonWidth)
         throw runtime_error("JSON width does not match texture width");
-    if (texture_.height != jsonHeight) 
+    if (texture_.height != jsonHeight)
         throw runtime_error("JSON height does not match texture height");
 }
 
diff --git a/yage/core/texture.h b/yage/core/texture.h
index 82b7dde3..6f61afd3 100644
--- a/yage/core/texture.h
+++ b/yage/core/texture.h
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * texture.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/core/texturecache.cpp b/yage/core/texturecache.cpp
index af22c93e..d94340ff 100644
--- a/yage/core/texturecache.cpp
+++ b/yage/core/texturecache.cpp
@@ -1,13 +1,13 @@
 /* ----------------------------------------------------------------------------
  * texturecache.cpp
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
-#include <yage/core/texturecache.h>
 #include <yage/core/imageloader.h>
+#include <yage/core/texturecache.h>
 
 namespace yage
 {
diff --git a/yage/core/texturecache.h b/yage/core/texturecache.h
index b28349ec..a9a18693 100644
--- a/yage/core/texturecache.h
+++ b/yage/core/texturecache.h
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * texturecache.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/core/vertex.h b/yage/core/vertex.h
index 586e8190..270a6825 100644
--- a/yage/core/vertex.h
+++ b/yage/core/vertex.h
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * vertex.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/core/window.cpp b/yage/core/window.cpp
index 9774bf9e..94e9f763 100644
--- a/yage/core/window.cpp
+++ b/yage/core/window.cpp
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * window.cpp
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
@@ -10,14 +10,13 @@
 
 #include <stdexcept>
 
-
-
 namespace yage
 {
 
-void key_callback(GLFWwindow *window, int key, int scanCode, int action, int mods)
+void key_callback(GLFWwindow *window, int key, int scanCode, int action,
+                  int mods)
 {
-    if(key == GLFW_KEY_E && action == GLFW_PRESS) {
+    if (key == GLFW_KEY_E && action == GLFW_PRESS) {
         glClearColor(0.5f, 0.f, 0.f, 1.f);
     } else {
         glClearColor(0.f, 0.5f, 0.f, 1.f);
@@ -34,7 +33,7 @@ Window::~Window()
 
 void Window::create(std::string window_name, int width, int height)
 {
-    if(glfwInit() == GLFW_FALSE) {
+    if (glfwInit() == GLFW_FALSE) {
         throw std::runtime_error("GLFW Initialisation failed");
     }
 
@@ -51,7 +50,7 @@ void Window::create(std::string window_name, int width, int height)
     glfwMakeContextCurrent(window_);
 
     // initialize glad
-    gladLoadGLLoader((GLADloadproc) glfwGetProcAddress);
+    gladLoadGLLoader((GLADloadproc)glfwGetProcAddress);
 
     // set key callback
     glfwSetKeyCallback(window_, key_callback);
diff --git a/yage/core/window.h b/yage/core/window.h
index 84ba8303..57e21ae4 100644
--- a/yage/core/window.h
+++ b/yage/core/window.h
@@ -1,13 +1,13 @@
 /* ----------------------------------------------------------------------------
  * window.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
 /** @file
-  */
+ */
 
 #ifndef WINDOW_H
 #define WINDOW_H
diff --git a/yage/math/math.h b/yage/math/math.h
index b729dbe6..87f1af6c 100644
--- a/yage/math/math.h
+++ b/yage/math/math.h
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * math.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/math/matrix.h b/yage/math/matrix.h
index d6d281d3..e7e82651 100644
--- a/yage/math/matrix.h
+++ b/yage/math/matrix.h
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * matrix.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/physics/body.cpp b/yage/physics/body.cpp
index 81d26699..b5283d76 100644
--- a/yage/physics/body.cpp
+++ b/yage/physics/body.cpp
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * body.cpp
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/physics/body.h b/yage/physics/body.h
index 90682682..312ceb58 100644
--- a/yage/physics/body.h
+++ b/yage/physics/body.h
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * body.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/physics/collider.h b/yage/physics/collider.h
index 2fd2ff89..fe070fa6 100644
--- a/yage/physics/collider.h
+++ b/yage/physics/collider.h
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * collider.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/physics/collisionbody.h b/yage/physics/collisionbody.h
index 715c4a54..62f12ade 100644
--- a/yage/physics/collisionbody.h
+++ b/yage/physics/collisionbody.h
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * collisionbody.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/physics/particlebody.cpp b/yage/physics/particlebody.cpp
index 3ccba546..91078d45 100644
--- a/yage/physics/particlebody.cpp
+++ b/yage/physics/particlebody.cpp
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * particlebody.cpp
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/physics/particlebody.h b/yage/physics/particlebody.h
index c750c1a4..336c0bd0 100644
--- a/yage/physics/particlebody.h
+++ b/yage/physics/particlebody.h
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * particlebody.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/physics/physics.h b/yage/physics/physics.h
index 900f4b6a..fb42b257 100644
--- a/yage/physics/physics.h
+++ b/yage/physics/physics.h
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * physics.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/physics/rectanglecollider.cpp b/yage/physics/rectanglecollider.cpp
index d9a1a6c1..ea70611f 100644
--- a/yage/physics/rectanglecollider.cpp
+++ b/yage/physics/rectanglecollider.cpp
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * rectanglecollider.cpp
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/physics/rectanglecollider.h b/yage/physics/rectanglecollider.h
index c009f665..62d1033c 100644
--- a/yage/physics/rectanglecollider.h
+++ b/yage/physics/rectanglecollider.h
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * rectanglecollider.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/physics/rigidbody.cpp b/yage/physics/rigidbody.cpp
index efbef8d9..ea58efeb 100644
--- a/yage/physics/rigidbody.cpp
+++ b/yage/physics/rigidbody.cpp
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * rigidbody.cpp
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/physics/rigidbody.h b/yage/physics/rigidbody.h
index 67ccb4ca..cbf01109 100644
--- a/yage/physics/rigidbody.h
+++ b/yage/physics/rigidbody.h
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
  * rigidbody.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/util/active.cpp b/yage/util/active.cpp
index 13e7fc38..1516b7d3 100644
--- a/yage/util/active.cpp
+++ b/yage/util/active.cpp
@@ -1,3 +1,11 @@
+/* ----------------------------------------------------------------------------
+ * active.cpp
+ *
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
+ * ----------------------------------------------------------------------------
+ */
+
 #include "active.h"
 
 namespace yage
diff --git a/yage/util/active.h b/yage/util/active.h
index ca8d30ad..b7137a47 100644
--- a/yage/util/active.h
+++ b/yage/util/active.h
@@ -1,3 +1,11 @@
+/* ----------------------------------------------------------------------------
+ * active.h
+ *
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
+ * ----------------------------------------------------------------------------
+ */
+
 #ifndef YAGE_UTIL_ACTIVE_H
 #define YAGE_UTIL_ACTIVE_H
 
diff --git a/yage/util/syncqueue.h b/yage/util/syncqueue.h
index a23b1857..ab9204e3 100644
--- a/yage/util/syncqueue.h
+++ b/yage/util/syncqueue.h
@@ -1,3 +1,11 @@
+/* ----------------------------------------------------------------------------
+ * syncqueue.h
+ *
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
+ * ----------------------------------------------------------------------------
+ */
+
 #ifndef YAGE_UTIL_SYNCQUEUE_H
 #define YAGE_UTIL_SYNCQUEUE_H
 
diff --git a/yage/yage.cpp b/yage/yage.cpp
index 68acac5a..80333766 100644
--- a/yage/yage.cpp
+++ b/yage/yage.cpp
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------------
- * yage.h
+ * yage.cpp
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
diff --git a/yage/yage.h b/yage/yage.h
index d9f5a6e6..630bc1be 100644
--- a/yage/yage.h
+++ b/yage/yage.h
@@ -1,15 +1,15 @@
 /* ----------------------------------------------------------------------------
  * yage.h
  *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
+ * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com>
+ * MIT License, see LICENSE file for more details.
  * ----------------------------------------------------------------------------
  */
 
 /** @file Includes all the headers in the main yage project.
-  *
-  * This does not include
-  */
+ *
+ * This does not include
+ */
 
 #ifndef YAGE_YAGE_H
 #define YAGE_YAGE_H
@@ -19,6 +19,9 @@
 #include "core/imageloader.h"
 #include "core/inputmanager.h"
 #include "core/iomanager.h"
+#include "core/logger.h"
+#include "core/logmessage.h"
+#include "core/logsink.h"
 #include "core/picopng.h"
 #include "core/resourcemanager.h"
 #include "core/spritebatch.h"
@@ -26,9 +29,6 @@
 #include "core/texture.h"
 #include "core/vertex.h"
 #include "core/window.h"
-#include "core/logger.h"
-#include "core/logmessage.h"
-#include "core/logsink.h"
 
 #include "physics/body.h"
 #include "physics/particlebody.h"
@@ -41,27 +41,27 @@
 #include "util/syncqueue.h"
 
 /** Project namespace.
-  *
-  * Avoids collision as all the classes and global functions are wrapped in.
-  * it.
-  */
+ *
+ * Avoids collision as all the classes and global functions are wrapped in.
+ * it.
+ */
 namespace yage
 {
 
 extern void glfwErrorCallback(int, const char *);
 
 /** Initializes yage.
-  *
-  * This is only there to initialize glfw.
-  *
-  * @return Returns true if the initialization was successful.
-  */
+ *
+ * This is only there to initialize glfw.
+ *
+ * @return Returns true if the initialization was successful.
+ */
 extern void init();
 
 /** Quit and cleanup yage
-  *
-  * glfw needs to clean itself up.
-  */
+ *
+ * glfw needs to clean itself up.
+ */
 extern void quit();
 
 } // namespace yage