diff --git a/.gitignore b/.gitignore
index 336a0576..9ac8561a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,9 +38,6 @@ bin/*
 # VSCode configurations
 .vscode/
 
-# Third party libraires
-third_party/
-
 # Cache folder
 .cache/
 
@@ -50,3 +47,7 @@ CMakeCache.txt
 # Since we are using conan, we can remove CMakeFiles folder
 CMakeFiles/
 
+# Clang specific files
+.clangd
+.clangd/
+
diff --git a/graphics/src/descriptor_builder.h b/graphics/src/descriptor_builder.h
index fcfaebdc..50980451 100644
--- a/graphics/src/descriptor_builder.h
+++ b/graphics/src/descriptor_builder.h
@@ -15,7 +15,7 @@
 #include <stdint.h>
 #include <vulkan/vulkan_core.h>
 
-#include "src/graphics_context.h"
+#include "graphics_context.h"
 
 struct descriptor_set_handle_t;
 struct descriptor_set_list_t;
diff --git a/graphics/src/graphics_context.h b/graphics/src/graphics_context.h
index 9eeac91c..62422e0a 100644
--- a/graphics/src/graphics_context.h
+++ b/graphics/src/graphics_context.h
@@ -15,7 +15,7 @@
 #include "SDL3/SDL.h"
 #include <stdbool.h>
 #include <stdint.h>
-#include <vma/vk_mem_alloc.h>
+#include "vma/vk_mem_alloc.h"
 #include <vulkan/vulkan.h>
 
 #include "utilities/linked_list.h"
diff --git a/graphics/src/window.c b/graphics/src/window.c
index 61d59f02..e3bf3ff0 100644
--- a/graphics/src/window.c
+++ b/graphics/src/window.c
@@ -15,9 +15,6 @@
 #include <SDL3/SDL_video.h>
 #include <stdint.h>
 
-#include "SDL3/SDL.h"
-#include "SDL3/SDL_main.h"
-
 #include "utilities/commons.h"
 #include "utilities/localization.h"
 #include "window_errors.h"
@@ -28,7 +25,7 @@
 
 rse_err_t window_init(SDL_Window **window_handle, bool *is_framebuffer_resized)
 {
-    SDL_Init(SDL_INIT_VIDEO);
+    SDL_Init(SDL_INIT_VIDEO); //TODO: Move to initial phase of RSE initialization
 
     *window_handle = SDL_CreateWindow("RedScarfEngine", 640, 480, SDL_WINDOW_VULKAN);