diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000..c15ab36
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,10 @@
+{
+    "recommendations": [
+        "ms-vscode.cpptools-extension-pack",
+        "llvm-vs-code-extensions.vscode-clangd",
+        "eclipse-cdt.cdt-gdb-vscode",
+        "eclipse-cdt.memory-inspector",
+        "eclipse-cdt.peripheral-inspector",
+
+    ]
+}
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 0cf3870..cf58568 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,16 +5,18 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "type": "gdb",
+            "type": "gdbtarget",
             "request": "attach",
             "name": "Attach-to-gdbserver",
-            "executable": "./fw/hello-world/hello",
-            "target": ":10000",
-            "remote": true,
+            "program": "./fw/hello-world/hello",
+            "imageAndSymbols": {
+                "symbolFileName": "./fw/hello-world/hello"
+            },
+            "target": {
+                "port": "10000"
+            },
             "cwd": "${workspaceRoot}",
-            "valuesFormatting": "prettyPrinters",
-            "gdbpath": "/opt/riscv/bin/riscv32-unknown-elf-gdb",
-            "debugger_args": [],
+            "gdb": "riscv64-unknown-elf-gdb",
             "presentation": {
                 "hidden": true,
                 "group": "FW Debug",
@@ -24,10 +26,9 @@
         {
             "type": "gdb",
             "request": "launch",
-            "name": "Launch-VP-with-gdbserver",
+            "name": "Launch VP with gdbserver",
             "cwd": "${workspaceRoot}",
-            "valuesFormatting": "parseText",
-            "target": "./build/src/tgc-vp",
+            "program": "${workspaceFolder}/build/Debug/src/riscv-vp",
             "arguments": "-f fw/hello-world/hello -g 10000",
             "presentation": {
                 "hidden": true,
@@ -38,16 +39,17 @@
         {
             "type": "gdb",
             "request": "launch",
-            "name": "VP-Debug",
+            "name": "Launch VP",
             "cwd": "${workspaceRoot}",
-            "program": "${workspaceFolder}/out/build/Debug/src/riscv-vp",
-            "arguments": "--isa ? -f fw/hello-world/hello"
+            "program": "${workspaceFolder}/build/Debug/src/riscv-vp",
+            "arguments": "--isa tgc5c -f fw/hello-world/hello",
+            "openGdbConsole": true
         },
     ],
     "compounds": [
         {
             "name": "FW-Debug",
-            "configurations": ["Launch-VP-with-gdbserver", "Attach-to-gdbserver"]
+            "configurations": ["Launch VP with gdbserver", "Attach-to-gdbserver"]
         }
     ]
 }
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index c0a759c..1e6291f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,13 +5,15 @@
     "debug.allowBreakpointsEverywhere": true,
     "editor.rulers": [
         {
-            "column": 120,
+            "column": 140,
             "comment": "clang-format"
         }
     ],
-    "cmake.configureArgs": [
-        "--preset",
-        "Debug",
-        "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
-    ]
+    "clangd.arguments": [
+        "--pretty",
+        "--background-index",
+        "--compile-commands-dir=${workspaceFolder}/build"
+    ],
+    "cmake.copyCompileCommands": "${workspaceFolder}/build/compile_commands.json"
+
 }
\ No newline at end of file
diff --git a/src/vp/system.h b/src/vp/system.h
index 3ae7b54..c7674c1 100644
--- a/src/vp/system.h
+++ b/src/vp/system.h
@@ -67,7 +67,7 @@ private:
     sc_core::sc_signal<bool, sc_core::SC_MANY_WRITERS> core_int_s{"core_int_s"};
 
     void gen_reset();
-#include "../vp/gen/PipelinedMemoryBusToApbBridge.h"
+#include "../vp/gen/PipelinedMemoryBusToApbBridge.h" // IWYU pragma: keep
 };
 
 } // namespace vp