diff --git a/attachments/00_base_code.cpp b/attachments/00_base_code.cpp
index 36aa1bb7..6d1074bf 100644
--- a/attachments/00_base_code.cpp
+++ b/attachments/00_base_code.cpp
@@ -1,5 +1,10 @@
 #include <memory>
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+#include <vulkan/vk_platform.h>
 #include <GLFW/glfw3.h>
 
 #include <iostream>
diff --git a/attachments/01_instance_creation.cpp b/attachments/01_instance_creation.cpp
index f4f8e0fb..7e68df7f 100644
--- a/attachments/01_instance_creation.cpp
+++ b/attachments/01_instance_creation.cpp
@@ -4,7 +4,12 @@
 #include <cstdlib>
 #include <memory>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/02_validation_layers.cpp b/attachments/02_validation_layers.cpp
index af38c374..6aef3863 100644
--- a/attachments/02_validation_layers.cpp
+++ b/attachments/02_validation_layers.cpp
@@ -6,7 +6,12 @@
 #include <memory>
 #include <algorithm>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/03_physical_device_selection.cpp b/attachments/03_physical_device_selection.cpp
index ff79a64b..63fecd50 100644
--- a/attachments/03_physical_device_selection.cpp
+++ b/attachments/03_physical_device_selection.cpp
@@ -6,7 +6,12 @@
 #include <memory>
 #include <algorithm>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/04_logical_device.cpp b/attachments/04_logical_device.cpp
index d4541515..ee42963a 100644
--- a/attachments/04_logical_device.cpp
+++ b/attachments/04_logical_device.cpp
@@ -7,7 +7,12 @@
 #include <memory>
 #include <algorithm>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/05_window_surface.cpp b/attachments/05_window_surface.cpp
index 66e2f1a3..8b240b82 100644
--- a/attachments/05_window_surface.cpp
+++ b/attachments/05_window_surface.cpp
@@ -6,7 +6,12 @@
 #include <memory>
 #include <algorithm>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/06_swap_chain_creation.cpp b/attachments/06_swap_chain_creation.cpp
index 2c08953d..d86b06f0 100644
--- a/attachments/06_swap_chain_creation.cpp
+++ b/attachments/06_swap_chain_creation.cpp
@@ -7,7 +7,12 @@
 #include <algorithm>
 #include <limits>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/07_image_views.cpp b/attachments/07_image_views.cpp
index a53c7a31..4c3872f1 100644
--- a/attachments/07_image_views.cpp
+++ b/attachments/07_image_views.cpp
@@ -7,7 +7,12 @@
 #include <algorithm>
 #include <limits>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/08_graphics_pipeline.cpp b/attachments/08_graphics_pipeline.cpp
index d12dfa4e..a01adf69 100644
--- a/attachments/08_graphics_pipeline.cpp
+++ b/attachments/08_graphics_pipeline.cpp
@@ -7,7 +7,12 @@
 #include <algorithm>
 #include <limits>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/09_shader_modules.cpp b/attachments/09_shader_modules.cpp
index 3ecfa346..3bcc5006 100644
--- a/attachments/09_shader_modules.cpp
+++ b/attachments/09_shader_modules.cpp
@@ -8,7 +8,12 @@
 #include <algorithm>
 #include <limits>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/10_fixed_functions.cpp b/attachments/10_fixed_functions.cpp
index 5e3d4199..a4e59a86 100644
--- a/attachments/10_fixed_functions.cpp
+++ b/attachments/10_fixed_functions.cpp
@@ -8,7 +8,12 @@
 #include <algorithm>
 #include <limits>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/12_graphics_pipeline_complete.cpp b/attachments/12_graphics_pipeline_complete.cpp
index fa170645..bfdb8be2 100644
--- a/attachments/12_graphics_pipeline_complete.cpp
+++ b/attachments/12_graphics_pipeline_complete.cpp
@@ -8,7 +8,12 @@
 #include <algorithm>
 #include <limits>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/14_command_buffers.cpp b/attachments/14_command_buffers.cpp
index c8e6f19b..2c42e236 100644
--- a/attachments/14_command_buffers.cpp
+++ b/attachments/14_command_buffers.cpp
@@ -8,7 +8,12 @@
 #include <algorithm>
 #include <limits>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/15_hello_triangle.cpp b/attachments/15_hello_triangle.cpp
index 17d6d470..ede44cf0 100644
--- a/attachments/15_hello_triangle.cpp
+++ b/attachments/15_hello_triangle.cpp
@@ -8,7 +8,12 @@
 #include <algorithm>
 #include <limits>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/16_frames_in_flight.cpp b/attachments/16_frames_in_flight.cpp
index 6b9205ec..e385d656 100644
--- a/attachments/16_frames_in_flight.cpp
+++ b/attachments/16_frames_in_flight.cpp
@@ -8,7 +8,12 @@
 #include <algorithm>
 #include <limits>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/17_swap_chain_recreation.cpp b/attachments/17_swap_chain_recreation.cpp
index 6fc44e8c..dc383952 100644
--- a/attachments/17_swap_chain_recreation.cpp
+++ b/attachments/17_swap_chain_recreation.cpp
@@ -8,7 +8,12 @@
 #include <algorithm>
 #include <limits>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/18_vertex_input.cpp b/attachments/18_vertex_input.cpp
index d95088b2..f19569f8 100644
--- a/attachments/18_vertex_input.cpp
+++ b/attachments/18_vertex_input.cpp
@@ -9,7 +9,12 @@
 #include <limits>
 #include <array>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/19_vertex_buffer.cpp b/attachments/19_vertex_buffer.cpp
index f8d9dd30..277810a4 100644
--- a/attachments/19_vertex_buffer.cpp
+++ b/attachments/19_vertex_buffer.cpp
@@ -9,7 +9,12 @@
 #include <limits>
 #include <array>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/20_staging_buffer.cpp b/attachments/20_staging_buffer.cpp
index e684acd8..7a394a0a 100644
--- a/attachments/20_staging_buffer.cpp
+++ b/attachments/20_staging_buffer.cpp
@@ -9,7 +9,12 @@
 #include <limits>
 #include <array>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/21_index_buffer.cpp b/attachments/21_index_buffer.cpp
index 0f21c751..2d8b07da 100644
--- a/attachments/21_index_buffer.cpp
+++ b/attachments/21_index_buffer.cpp
@@ -9,7 +9,12 @@
 #include <limits>
 #include <array>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/22_descriptor_layout.cpp b/attachments/22_descriptor_layout.cpp
index feae9fe2..fdcb0c8a 100644
--- a/attachments/22_descriptor_layout.cpp
+++ b/attachments/22_descriptor_layout.cpp
@@ -10,7 +10,12 @@
 #include <array>
 #include <chrono>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/23_descriptor_sets.cpp b/attachments/23_descriptor_sets.cpp
index 68cc9521..3d23c10e 100644
--- a/attachments/23_descriptor_sets.cpp
+++ b/attachments/23_descriptor_sets.cpp
@@ -10,7 +10,12 @@
 #include <array>
 #include <chrono>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/24_texture_image.cpp b/attachments/24_texture_image.cpp
index 5a839da8..1599a0c8 100644
--- a/attachments/24_texture_image.cpp
+++ b/attachments/24_texture_image.cpp
@@ -10,7 +10,12 @@
 #include <array>
 #include <chrono>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/25_sampler.cpp b/attachments/25_sampler.cpp
index 0d6ac541..921e19e2 100644
--- a/attachments/25_sampler.cpp
+++ b/attachments/25_sampler.cpp
@@ -10,7 +10,12 @@
 #include <array>
 #include <chrono>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/26_texture_mapping.cpp b/attachments/26_texture_mapping.cpp
index f6fde51f..333d60c3 100644
--- a/attachments/26_texture_mapping.cpp
+++ b/attachments/26_texture_mapping.cpp
@@ -10,7 +10,12 @@
 #include <array>
 #include <chrono>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/27_depth_buffering.cpp b/attachments/27_depth_buffering.cpp
index 6db0b0f4..d475a262 100644
--- a/attachments/27_depth_buffering.cpp
+++ b/attachments/27_depth_buffering.cpp
@@ -10,7 +10,12 @@
 #include <array>
 #include <chrono>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/28_model_loading.cpp b/attachments/28_model_loading.cpp
index d67b9d37..3261d941 100644
--- a/attachments/28_model_loading.cpp
+++ b/attachments/28_model_loading.cpp
@@ -10,7 +10,12 @@
 #include <array>
 #include <chrono>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/29_mipmapping.cpp b/attachments/29_mipmapping.cpp
index a5212957..b8821288 100644
--- a/attachments/29_mipmapping.cpp
+++ b/attachments/29_mipmapping.cpp
@@ -10,7 +10,12 @@
 #include <array>
 #include <chrono>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/30_multisampling.cpp b/attachments/30_multisampling.cpp
index 25c3a8b3..fde957cc 100644
--- a/attachments/30_multisampling.cpp
+++ b/attachments/30_multisampling.cpp
@@ -10,7 +10,12 @@
 #include <array>
 #include <chrono>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/31_compute_shader.cpp b/attachments/31_compute_shader.cpp
index c52979e5..72c54651 100644
--- a/attachments/31_compute_shader.cpp
+++ b/attachments/31_compute_shader.cpp
@@ -14,7 +14,12 @@
 #include <chrono>
 #include <random>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
+
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/32_ecosystem_utilities.cpp b/attachments/32_ecosystem_utilities.cpp
index afb10aa3..ced855ae 100644
--- a/attachments/32_ecosystem_utilities.cpp
+++ b/attachments/32_ecosystem_utilities.cpp
@@ -11,7 +11,11 @@
 #include <chrono>
 #include <optional>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
diff --git a/attachments/33_vulkan_profiles.cpp b/attachments/33_vulkan_profiles.cpp
index 44199bfe..a9bd7883 100644
--- a/attachments/33_vulkan_profiles.cpp
+++ b/attachments/33_vulkan_profiles.cpp
@@ -11,7 +11,11 @@
 #include <chrono>
 #include <optional>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
 #include <vulkan/vk_platform.h>
 #include <vulkan/vulkan_profiles.hpp>
 
diff --git a/attachments/34_android.cpp b/attachments/34_android.cpp
index 3e74c805..e72c21f0 100644
--- a/attachments/34_android.cpp
+++ b/attachments/34_android.cpp
@@ -11,7 +11,11 @@
 #include <chrono>
 #include <optional>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
 #include <vulkan/vk_platform.h>
 #if defined(__ANDROID__)
 #include <vulkan/vulkan_core.h>
diff --git a/attachments/35_gltf_ktx.cpp b/attachments/35_gltf_ktx.cpp
index 20cc665e..29b11304 100644
--- a/attachments/35_gltf_ktx.cpp
+++ b/attachments/35_gltf_ktx.cpp
@@ -11,7 +11,11 @@
 #include <chrono>
 #include <optional>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
 #include <vulkan/vk_platform.h>
 #if defined(__ANDROID__)
 #include <vulkan/vulkan_core.h>
diff --git a/attachments/36_multiple_objects.cpp b/attachments/36_multiple_objects.cpp
index 2cf9b8bb..2260c1ce 100644
--- a/attachments/36_multiple_objects.cpp
+++ b/attachments/36_multiple_objects.cpp
@@ -11,7 +11,11 @@
 #include <chrono>
 #include <optional>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
 #include <vulkan/vk_platform.h>
 #if defined(__ANDROID__)
 #include <vulkan/vulkan_core.h>
diff --git a/attachments/37_multithreading.cpp b/attachments/37_multithreading.cpp
index e658961d..db4dc7ff 100644
--- a/attachments/37_multithreading.cpp
+++ b/attachments/37_multithreading.cpp
@@ -16,7 +16,11 @@
 #include <condition_variable>
 #include <future>
 
+#ifdef __INTELLISENSE__
+#include <vulkan/vulkan_raii.hpp>
+#else
 import vulkan_hpp;
+#endif
 #include <vulkan/vk_platform.h>
 
 #define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.