diff --git a/base/components/ast.hpp b/base/components/ast.hpp
index bcac8ae..13c679e 100644
--- a/base/components/ast.hpp
+++ b/base/components/ast.hpp
@@ -1,11 +1,6 @@
 #ifdef INTELLISENSE_DIRECTIVES
 #pragma once
-#include "basic_types.hpp"
-#include "strings.hpp"
-#include "types.hpp"
-#include "gen/ecodetypes.hpp"
-#include "gen/eoperator.hpp"
-#include "gen/especifier.hpp"
+#include "parser_types.hpp"
 #endif
 
 /*
diff --git a/base/components/gen/ast_inlines.hpp b/base/components/gen/ast_inlines.hpp
index 7ec01aa..2ccb518 100644
--- a/base/components/gen/ast_inlines.hpp
+++ b/base/components/gen/ast_inlines.hpp
@@ -1,6 +1,6 @@
 #ifdef INTELLISENSE_DIRECTIVES
 #pragma once
-#include "components/types.hpp"
+#include "inlines.hpp"
 #endif
 
 // This file was generated automatially by gencpp's bootstrap.cpp (See: https://github.com/Ed94/gencpp)
diff --git a/base/components/inlines.hpp b/base/components/inlines.hpp
index 45e572c..4489516 100644
--- a/base/components/inlines.hpp
+++ b/base/components/inlines.hpp
@@ -1,6 +1,6 @@
 #ifdef INTELLISENSE_DIRECTIVES
 #pragma once
-#include "interface.hpp"
+#include "constants.hpp"
 #endif
 
 #pragma region Serialization
diff --git a/base/components/static_data.cpp b/base/components/static_data.cpp
index 696b5e2..81c21a6 100644
--- a/base/components/static_data.cpp
+++ b/base/components/static_data.cpp
@@ -1,6 +1,6 @@
 #ifdef INTELLISENSE_DIRECTIVES
 #pragma once
-#include "../gen.hpp"
+#include "interface.hpp"
 #endif
 
 #pragma region StaticData
diff --git a/base/components/types.hpp b/base/components/types.hpp
index e64a706..73a0aaa 100644
--- a/base/components/types.hpp
+++ b/base/components/types.hpp
@@ -1,6 +1,18 @@
 #ifdef INTELLISENSE_DIRECTIVES
 #pragma once
-#include "header_start.hpp"
+#include "dependencies/platform.hpp"
+#include "dependencies/macros.hpp"
+#include "dependencies/basic_types.hpp"
+#include "dependencies/debug.hpp"
+#include "dependencies/memory.hpp"
+#include "dependencies/string_ops.hpp"
+#include "dependencies/printing.hpp"
+#include "dependencies/containers.hpp"
+#include "dependencies/hashing.hpp"
+#include "dependencies/strings.hpp"
+#include "dependencies/filesystem.hpp"
+#include "dependencies/timing.hpp"
+#include "dependencies/parsing.hpp"
 #endif
 
 /*
diff --git a/base/dependencies/debug.hpp b/base/dependencies/debug.hpp
index 90a8334..6efbeb4 100644
--- a/base/dependencies/debug.hpp
+++ b/base/dependencies/debug.hpp
@@ -1,7 +1,5 @@
 #ifdef INTELLISENSE_DIRECTIVES
 #	pragma once
-#	include "platform.hpp"
-#	include "macros.hpp"
 #	include "basic_types.hpp"
 #endif
 
diff --git a/base/dependencies/strings.hpp b/base/dependencies/strings.hpp
index 69cead9..866e944 100644
--- a/base/dependencies/strings.hpp
+++ b/base/dependencies/strings.hpp
@@ -1,7 +1,5 @@
 #ifdef INTELLISENSE_DIRECTIVES
 #	pragma once
-#	include "basic_types.hpp"
-#	include "memory.hpp"
 #	include "hashing.hpp"
 #endif