diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 228bc3e..28b04d0 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -1,6 +1,9 @@
 {
     "configurations": [
         {
+            "defines":[
+                "GLFW_INCLUDE_NONE"
+            ],
             "name": "linux-gcc-x64",
             "includePath": [
                 "${workspaceFolder}/**",
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 692aaed..623a2f9 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -2,6 +2,9 @@
   "version": "0.2.0",
   "configurations": [
     {
+      "defines": [
+        "GLFW_INCLUDE_NONE"
+      ],
       "name": "C/C++ Runner: Debug Session",
       "type": "cppdbg",
       "request": "launch",
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 9ffffd8..93dcf4d 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -9,12 +9,17 @@
                 "-std=c++2a",
                 "-I${workspaceFolder}/dependencies/include",
                 "-L${workspaceFolder}/dependencies/library",
-                "-Wall",      
-                "${workspaceFolder}/Engine/engine/*.hpp",                           
+                "-Wall",
+                "${workspaceFolder}/Engine/engine/*.hpp",
                 "${workspaceFolder}/Engine/engine/*.cpp",
                 "${workspaceFolder}/Engine/engine/glad.c",
                 "-o",
-                "${workspaceFolder}/Engine/engine/match", "-lglut", "-lglfw", "-lGLU", "-lGL", "-lm",
+                "${workspaceFolder}/Engine/engine/match",
+                "-lglut",
+                "-lglfw",
+                "-lGLU",
+                "-lGL",
+                "-lm",
                 "-ldl"
             ],
             "options": {
diff --git a/Engine/engine/beforeRender.cpp b/Engine/engine/beforeRender.cpp
index 9fe1da2..f76271d 100644
--- a/Engine/engine/beforeRender.cpp
+++ b/Engine/engine/beforeRender.cpp
@@ -3,8 +3,8 @@
 #define BEFORE_RENDER_CPP
 #include "./beforeRender.hpp"
 
-#include <GLFW/glfw3.h>
 #include <glad/glad.h>
+#include <GLFW/glfw3.h>
 
 #include <iostream>
 
diff --git a/Engine/engine/beforeRender.hpp b/Engine/engine/beforeRender.hpp
index 9ac85fb..48d538d 100644
--- a/Engine/engine/beforeRender.hpp
+++ b/Engine/engine/beforeRender.hpp
@@ -1,6 +1,7 @@
 // "Copyright [2023] <Krzysztof Rudnicki>"
 #ifndef ENGINE_ENGINE_BEFORERENDER_HPP_
 #define ENGINE_ENGINE_BEFORERENDER_HPP_
+#include <glad/glad.h>
 #include <GLFW/glfw3.h>
 
 void configureGLFW(const int GLFWMajorVersion, const int GLFWMinorVersion);
diff --git a/Engine/engine/constants.hpp b/Engine/engine/constants.hpp
index ad5e39d..bc79463 100644
--- a/Engine/engine/constants.hpp
+++ b/Engine/engine/constants.hpp
@@ -1,6 +1,7 @@
 // "Copyright [2023] <Krzysztof Rudnicki>"
 #ifndef ENGINE_ENGINE_CONSTANTS_HPP_
 #define ENGINE_ENGINE_CONSTANTS_HPP_
+#include <glad/glad.h>
 #include <GLFW/glfw3.h>
 
 #include <iostream>
diff --git a/Engine/engine/draw.cpp b/Engine/engine/draw.cpp
index db7346d..2702cfd 100644
--- a/Engine/engine/draw.cpp
+++ b/Engine/engine/draw.cpp
@@ -3,8 +3,8 @@
 #define DRAW_CPP
 #include "./draw.hpp"
 
-#include <GLFW/glfw3.h>
 #include <glad/glad.h>
+#include <GLFW/glfw3.h>
 
 #include <cmath>
 #include <filesystem>
diff --git a/Engine/engine/draw.hpp b/Engine/engine/draw.hpp
index f50b282..7bf7a6c 100644
--- a/Engine/engine/draw.hpp
+++ b/Engine/engine/draw.hpp
@@ -1,8 +1,8 @@
 // "Copyright [2023] <Krzysztof Rudnicki>"
 #ifndef ENGINE_ENGINE_DRAW_HPP_
 #define ENGINE_ENGINE_DRAW_HPP_
-#include <GLFW/glfw3.h>
 #include <glad/glad.h>
+#include <GLFW/glfw3.h>
 
 #include <string>
 
diff --git a/Engine/engine/match b/Engine/engine/match
index 556d71c..241abb8 100755
Binary files a/Engine/engine/match and b/Engine/engine/match differ
diff --git a/Engine/engine/match.cpp b/Engine/engine/match.cpp
index 85ae73d..486831d 100644
--- a/Engine/engine/match.cpp
+++ b/Engine/engine/match.cpp
@@ -1,8 +1,8 @@
 // "Copyright [2023] <Krzysztof Rudnicki>"
 #ifndef MAIN_CPP
 #define MAIN_CPP
-#include <GLFW/glfw3.h>
 #include <glad/glad.h>
+#include <GLFW/glfw3.h>
 
 #include <iostream>
 #include <random>
diff --git a/Engine/engine/renderLoop.cpp b/Engine/engine/renderLoop.cpp
index baaa7d2..3931ba3 100644
--- a/Engine/engine/renderLoop.cpp
+++ b/Engine/engine/renderLoop.cpp
@@ -3,8 +3,8 @@
 #define RENDER_LOOP_CPP
 #include "./renderLoop.hpp"
 
-#include <GLFW/glfw3.h>
 #include <glad/glad.h>
+#include <GLFW/glfw3.h>
 
 #include <iostream>
 
diff --git a/Engine/engine/renderLoop.hpp b/Engine/engine/renderLoop.hpp
index abc2932..0e99610 100644
--- a/Engine/engine/renderLoop.hpp
+++ b/Engine/engine/renderLoop.hpp
@@ -1,6 +1,7 @@
 // "Copyright [2023] <Krzysztof Rudnicki>"
 #ifndef ENGINE_ENGINE_RENDERLOOP_HPP_
 #define ENGINE_ENGINE_RENDERLOOP_HPP_
+#include <glad/glad.h>
 #include <GLFW/glfw3.h>
 
 #include <iostream>
diff --git a/Engine/engine/shaders.cpp b/Engine/engine/shaders.cpp
index a69fe2d..604ebbf 100644
--- a/Engine/engine/shaders.cpp
+++ b/Engine/engine/shaders.cpp
@@ -3,8 +3,8 @@
 #define SHADERS_CPP
 #include "./shaders.hpp"
 
-#include <GLFW/glfw3.h>
 #include <glad/glad.h>
+#include <GLFW/glfw3.h>
 
 #include "./constants.hpp"
 #include "./misc.hpp"
diff --git a/Engine/engine/shaders.hpp b/Engine/engine/shaders.hpp
index e90fc83..f42843b 100644
--- a/Engine/engine/shaders.hpp
+++ b/Engine/engine/shaders.hpp
@@ -1,8 +1,8 @@
 // "Copyright [2023] <Krzysztof Rudnicki>"
 #ifndef ENGINE_ENGINE_SHADERS_HPP_
 #define ENGINE_ENGINE_SHADERS_HPP_
-#include <GLFW/glfw3.h>
 #include <glad/glad.h>
+#include <GLFW/glfw3.h>
 
 #include <iostream>
 #include <utility>
diff --git a/Engine/engine/textures.cpp b/Engine/engine/textures.cpp
index 099385a..7f9d2a2 100644
--- a/Engine/engine/textures.cpp
+++ b/Engine/engine/textures.cpp
@@ -3,8 +3,8 @@
 #define TEXTURES_CPP
 #include "textures.hpp"
 
-#include <GLFW/glfw3.h>
 #include <glad/glad.h>
+#include <GLFW/glfw3.h>
 
 #include "stb_image.h"
 
diff --git a/Engine/engine/textures.hpp b/Engine/engine/textures.hpp
index 0f0be80..3428b97 100644
--- a/Engine/engine/textures.hpp
+++ b/Engine/engine/textures.hpp
@@ -1,8 +1,8 @@
 // "Copyright [2023] <Krzysztof Rudnicki>"
 #ifndef TEXTURES_HPP
 #define TEXTURES_HPP
-#include <GLFW/glfw3.h>
 #include <glad/glad.h>
+#include <GLFW/glfw3.h>
 
 #include <iostream>