diff --git a/.ccls b/.ccls
new file mode 100644
index 0000000..6de41fa
--- /dev/null
+++ b/.ccls
@@ -0,0 +1,5 @@
+# Headers
+-Isrc/headers
+-Isrc/ecs/headers
+-Isrc/ecs/components/headers
+-Icore/src/headers
diff --git a/.gitignore b/.gitignore
index 524b093..df7a2db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
+.ccls-cache
 build
 core
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
deleted file mode 100644
index 4e4328e..0000000
--- a/.vscode/c_cpp_properties.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "configurations": [
-        {
-            "name": "Default",
-            "includePath": [
-                "src/**/headers",
-                "core/src/headers"
-            ]
-        }
-    ],
-    "version": 4
-}
\ No newline at end of file