diff --git a/EnginePatches/EnginePatch b/EnginePatches/EnginePatch
index 22b0a2da..72c2f73f 100644
--- a/EnginePatches/EnginePatch
+++ b/EnginePatches/EnginePatch
@@ -1,3 +1,12 @@
+diff --git a/.clangd b/.clangd
+new file mode 100644
+index 000000000000..e10607a4bc4f
+--- /dev/null
++++ b/.clangd
+@@ -0,0 +1,3 @@
++CompileFlags:
++  Add:
++    - "-D__INTELLISENSE__=1"
 diff --git a/Engine/Extras/LLDBDataFormatters/UEDataFormatters_2ByteChars.py b/Engine/Extras/LLDBDataFormatters/UEDataFormatters_2ByteChars.py
 index f56f5ea9cac4..ff1c4030b38f 100644
 --- a/Engine/Extras/LLDBDataFormatters/UEDataFormatters_2ByteChars.py
diff --git a/Integration.code-workspace.tpl.json b/Integration.code-workspace.tpl.json
index d8fd8a5f..9a16a8b8 100644
--- a/Integration.code-workspace.tpl.json
+++ b/Integration.code-workspace.tpl.json
@@ -39,8 +39,9 @@
         },
         "editor.acceptSuggestionOnEnter": "off",
         "C_Cpp.intelliSenseEngine": "disabled",
-        "clangd.path": "/usr/bin/clangd-15",
+        "clangd.path": "/usr/bin/clangd-16",
         "clangd.arguments": [
+          "--log=verbose",
           "--query-driver=/usr/bin/g++",
           "--compile-commands-dir=[INTEGRATION]/.vscode",
           "--header-insertion=never"
diff --git a/Source/Integration/AnimQueue.cpp b/Source/Integration/AnimQueue.cpp
index b19f6343..f5cb7548 100644
--- a/Source/Integration/AnimQueue.cpp
+++ b/Source/Integration/AnimQueue.cpp
@@ -1,6 +1,7 @@
 
 #include "AnimQueue.h"
 #include "UtilityLibrary.h"
+#include "GameFramework/Actor.h"
 
 FlxAnimationStep::FlxAnimationStep(uint64 hash, std::string_view body) {
 	Finished = false;
diff --git a/Source/Integration/AnimQueue.h b/Source/Integration/AnimQueue.h
index c5ad8441..ce4baf17 100644
--- a/Source/Integration/AnimQueue.h
+++ b/Source/Integration/AnimQueue.h
@@ -1,8 +1,10 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "CoreUObject.h"
 #include "StringDecoder.h"
 #include "Containers/Deque.h"
+
 #include "AnimQueue.generated.h"
 
 ////////////////////////////////////////////////
diff --git a/Source/Integration/AssetLookup.cpp b/Source/Integration/AssetLookup.cpp
index ab3c5024..ce6b39ab 100644
--- a/Source/Integration/AssetLookup.cpp
+++ b/Source/Integration/AssetLookup.cpp
@@ -7,6 +7,7 @@
 #include "Components/Widget.h"
 #include "WidgetBlueprint.h"
 #include "Blueprint/UserWidget.h"
+#include "Engine/StaticMesh.h"
 
 void UlxAssetLookup::RebuildIndex()
 {
diff --git a/Source/Integration/BlueprintErrors.h b/Source/Integration/BlueprintErrors.h
index aab88d42..82de9485 100644
--- a/Source/Integration/BlueprintErrors.h
+++ b/Source/Integration/BlueprintErrors.h
@@ -6,11 +6,13 @@
 
 #include "Containers/Array.h"
 #include "CoreMinimal.h"
+#include "InputCoreTypes.h"
 #include "HAL/Platform.h"
 #include "Misc/OutputDeviceError.h"
 #include "UObject/NameTypes.h"
 #include "UObject/ObjectMacros.h"
 #include "UObject/UObjectGlobals.h"
+#include "Kismet/BlueprintFunctionLibrary.h"
 
 #include "BlueprintErrors.generated.h"
 
diff --git a/Source/Integration/CommonTypes.h b/Source/Integration/CommonTypes.h
index 9bc0f13d..dba89aa2 100644
--- a/Source/Integration/CommonTypes.h
+++ b/Source/Integration/CommonTypes.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string_view>
+
 #include "CommonTypes.generated.h"
 
 namespace CommonTypes {
diff --git a/Source/Integration/ConsoleOutput.h b/Source/Integration/ConsoleOutput.h
index c65a2e19..359ba68c 100644
--- a/Source/Integration/ConsoleOutput.h
+++ b/Source/Integration/ConsoleOutput.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Containers/UnrealString.h"
+
 //////////////////////////////////////////////////////////////
 //
 // ConsoleOutput
diff --git a/Source/Integration/LuaCall.h b/Source/Integration/LuaCall.h
index 34d43ca4..734729ba 100644
--- a/Source/Integration/LuaCall.h
+++ b/Source/Integration/LuaCall.h
@@ -2,6 +2,8 @@
 
 #include "CoreMinimal.h"
 #include "EdGraph/EdGraphPin.h"
+#include <string_view>
+#include <string>
 
 #include "LuaCall.generated.h"
 
diff --git a/Source/Integration/TriggeredTask.h b/Source/Integration/TriggeredTask.h
index 5e781a4f..659149fd 100644
--- a/Source/Integration/TriggeredTask.h
+++ b/Source/Integration/TriggeredTask.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "HAL/Runnable.h"
 
 ///////////////////////////////////////////////
 //
diff --git a/build.py b/build.py
index 6c02b580..c2ee2a24 100755
--- a/build.py
+++ b/build.py
@@ -275,11 +275,11 @@ def build_intellisense_database_for_clangd(force):
             error = e
         else:
             error = None
-        finally:
-            tarfile.open(f"{INTEGRATION}/rsp_files.tgz").extractall(path=f"{INTEGRATION}/Intermediate")
-            tarfile.open(f"{UNREALENGINE}/rsp_files.tgz").extractall(path=f"{UNREALENGINE}/Engine")
-            Path(f"{INTEGRATION}/rsp_files.tgz").unlink()
-            Path(f"{UNREALENGINE}/rsp_files.tgz").unlink()
+        # finally:
+        #     tarfile.open(f"{INTEGRATION}/rsp_files.tgz").extractall(path=f"{INTEGRATION}/Intermediate")
+        #     tarfile.open(f"{UNREALENGINE}/rsp_files.tgz").extractall(path=f"{UNREALENGINE}/Engine")
+        #     Path(f"{INTEGRATION}/rsp_files.tgz").unlink()
+        #     Path(f"{UNREALENGINE}/rsp_files.tgz").unlink()
         if error: raise error
         hash_file.write_text(new_hash)
 
@@ -319,6 +319,9 @@ CONFIG = autodetect_system_config()
 store_system_config_in_globals(CONFIG)
 os.chdir(f"{INTEGRATION}/EnginePatches")
 
+if MODE == "experiment":
+    build_intellisense_database_for_clangd(True)
+
 if MODE == "all":
     checkout_correct_unreal_engine_branch_and_apply_patch()
     generate_buildconfiguration_xml()
@@ -330,7 +333,7 @@ if MODE == "all":
 
 if MODE in ["all", "c++"]:
     build_luprex_and_integration()
-    build_intellisense_database_for_clangd(MODE == "all")
+#    build_intellisense_database_for_clangd(MODE == "all")
 
 if MODE == "clean":
     build_clean()