diff --git a/CPPLINT.cfg b/CPPLINT.cfg
index 70f182a9..bfbf40cd 100644
--- a/CPPLINT.cfg
+++ b/CPPLINT.cfg
@@ -15,11 +15,10 @@ filter=-runtime/indentation_namespace
 filter=-whitespace/ending_newline
 filter=-build/header_guard
 filter=-readability/todo
-filer=-whitespace/indent # due to public class rule
-#filter=-readability/function,-readability/streams,-readability/todo
-#filter=-runtime/printf,-runtime/references,-runtime/sizeof,-runtime/threadsafe_fn
-# TODO: this should be re-enabled.
+filter=-whitespace/comments
+filter=-whitespace/indent # due to public class rule
+
 
 exclude_files=cmake-build-debug/*
 exclude_files=build/*
-exclude_files=*/tests/*
\ No newline at end of file
+exclude_files=tests/*
\ No newline at end of file
diff --git a/lib/Ray/sources/Drawables/Image.hpp b/lib/Ray/sources/Drawables/Image.hpp
index dae6385f..9e0097fe 100644
--- a/lib/Ray/sources/Drawables/Image.hpp
+++ b/lib/Ray/sources/Drawables/Image.hpp
@@ -39,7 +39,7 @@ namespace RAY
 
 			//! @brief An image is assignable
 			Image &operator=(const Image &image) = default;
-			
+
 			//! @brief Image destructor, will unload ressources
 			~Image() override;
 
diff --git a/lib/wal/CPPLINT.cfg b/lib/wal/CPPLINT.cfg
new file mode 100644
index 00000000..9992b3d2
--- /dev/null
+++ b/lib/wal/CPPLINT.cfg
@@ -0,0 +1,4 @@
+# Use 'ART_' as the cpp header guard prefix (e.g. #ifndef ART_PATH_TO_FILE_H_).
+root=.
+
+exclude_files=tests/*
\ No newline at end of file
diff --git a/lib/wal/sources/Exception/WalError.cpp b/lib/wal/sources/Exception/WalError.cpp
index 7a3d3b24..c1039567 100644
--- a/lib/wal/sources/Exception/WalError.cpp
+++ b/lib/wal/sources/Exception/WalError.cpp
@@ -2,6 +2,7 @@
 // Created by Zoe Roux on 2021-05-14.
 //
 
+#include <string>
 #include "WalError.hpp"
 
 namespace WAL
diff --git a/lib/wal/sources/Exception/WalError.hpp b/lib/wal/sources/Exception/WalError.hpp
index 417ebbd7..d7c04c96 100644
--- a/lib/wal/sources/Exception/WalError.hpp
+++ b/lib/wal/sources/Exception/WalError.hpp
@@ -7,6 +7,7 @@
 
 #include <exception>
 #include <stdexcept>
+#include <string>
 
 namespace WAL
 {
diff --git a/lib/wal/sources/Models/Callback.hpp b/lib/wal/sources/Models/Callback.hpp
index 4b5ed23a..b43ebfb0 100644
--- a/lib/wal/sources/Models/Callback.hpp
+++ b/lib/wal/sources/Models/Callback.hpp
@@ -6,6 +6,8 @@
 #pragma once
 
 #include <functional>
+#include <utility>
+#include <unordered_map>
 
 namespace WAL
 {
@@ -16,13 +18,13 @@ namespace WAL
 	private:
 		int _nextID = 0;
 		//! @brief The list of functions to call.
-		std::unordered_map<int, std::function<void (Types...)>> _functions = {};
+		std::unordered_map<int, std::function<void(Types...)>> _functions = {};
 
 	public:
 		//! @brief Add a method to be called when this callback is invoked.
 		//! @param callback The list of arguments of the callback method
 		//! @return A unique ID for this callback. That can be used to remove the callback later.
-		int addCallback(std::function<void (Types...)> callback)
+		int addCallback(std::function<void(Types...)> callback)
 		{
 			int id = this->_nextID++;
 			this->_functions[id] = std::move(callback);
diff --git a/lib/wal/sources/Models/Vector3.hpp b/lib/wal/sources/Models/Vector3.hpp
index 8ae6f2fe..0a43bbe7 100644
--- a/lib/wal/sources/Models/Vector3.hpp
+++ b/lib/wal/sources/Models/Vector3.hpp
@@ -157,11 +157,11 @@ namespace WAL
 	typedef Vector3<float> Vector3f;
 	typedef Vector3<unsigned> Vector3u;
 	typedef Vector3<int> Vector3i;
-}
+} // namespace WAL
 
 template<typename T>
 std::ostream &operator<<(std::ostream &s, const WAL::Vector3<T> &v)
 {
 	s << "Vector3<" << typeid(T).name() << ">("<< v.x << ", " << v.y << ", " << v.z << ")";
 	return s;
-} // namespace WAL
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lib/wal/sources/System/System.cpp b/lib/wal/sources/System/System.cpp
index 4cf91ac6..0dd69f30 100644
--- a/lib/wal/sources/System/System.cpp
+++ b/lib/wal/sources/System/System.cpp
@@ -3,7 +3,7 @@
 //
 
 #include "System.hpp"
-
+#include <vector>
 #include <utility>
 
 namespace WAL
diff --git a/lib/wal/sources/System/System.hpp b/lib/wal/sources/System/System.hpp
index 98905ee9..59c82c4a 100644
--- a/lib/wal/sources/System/System.hpp
+++ b/lib/wal/sources/System/System.hpp
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <chrono>
+#include <vector>
 #include "Entity/Entity.hpp"
 
 namespace WAL
diff --git a/lib/wal/sources/Wal.hpp b/lib/wal/sources/Wal.hpp
index d4be58c5..18bca212 100644
--- a/lib/wal/sources/Wal.hpp
+++ b/lib/wal/sources/Wal.hpp
@@ -84,7 +84,6 @@ namespace WAL
 			if (existing == this->_systems.end())
 				throw NotFoundError("A system of the type \"" + std::string(type.name()) + "\" could not be found.");
 			return *static_cast<T *>(existing->get());
-
 		}
 
 		//! @brief Remove a system using it's type.
diff --git a/lib/wal/tests/CallbackTest.cpp b/lib/wal/tests/CallbackTest.cpp
index c0d43f15..534ca9f4 100644
--- a/lib/wal/tests/CallbackTest.cpp
+++ b/lib/wal/tests/CallbackTest.cpp
@@ -4,7 +4,7 @@
 
 #include <catch2/catch.hpp>
 #include <stdexcept>
-#include <Entity/Entity.hpp>
+#include "Entity/Entity.hpp"
 #include "Models/Callback.hpp"
 
 using namespace WAL;
diff --git a/sources/main.cpp b/sources/main.cpp
index 29af56f6..bc091ba2 100644
--- a/sources/main.cpp
+++ b/sources/main.cpp
@@ -18,7 +18,7 @@ int main()
 		wal.run();
 		return 0;
 	} catch (const std::exception &ex) {
-std::cerr << ex.what() << std::endl;
+		std::cerr << ex.what() << std::endl;
 		return 84;
 	}
 }