diff --git a/framework/core/hpp_instance.cpp b/framework/core/hpp_instance.cpp
index a9a7e7beaf..2c49229b7a 100644
--- a/framework/core/hpp_instance.cpp
+++ b/framework/core/hpp_instance.cpp
@@ -35,35 +35,41 @@ namespace vkb
 namespace
 {
 #ifdef USE_VALIDATION_LAYERS
-VKAPI_ATTR VkBool32 VKAPI_CALL debug_utils_messenger_callback(VkDebugUtilsMessageSeverityFlagBitsEXT message_severity, VkDebugUtilsMessageTypeFlagsEXT message_type,
-                                                              const VkDebugUtilsMessengerCallbackDataEXT *callback_data,
-                                                              void                                       *user_data)
+VKAPI_ATTR vk::Bool32 VKAPI_CALL debug_utils_messenger_callback(vk::DebugUtilsMessageSeverityFlagBitsEXT      message_severity,
+                                                                vk::DebugUtilsMessageTypeFlagsEXT             message_type,
+                                                                const vk::DebugUtilsMessengerCallbackDataEXT *callback_data,
+                                                                void                                         *user_data)
 {
 	// Log debug message
-	if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT)
+	if (message_severity & vk::DebugUtilsMessageSeverityFlagBitsEXT::eWarning)
 	{
 		LOGW("{} - {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage);
 	}
-	else if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT)
+	else if (message_severity & vk::DebugUtilsMessageSeverityFlagBitsEXT::eError)
 	{
 		LOGE("{} - {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage);
 	}
 	return VK_FALSE;
 }
 
-static VKAPI_ATTR VkBool32 VKAPI_CALL debug_callback(VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT /*type*/,
-                                                     uint64_t /*object*/, size_t /*location*/, int32_t /*message_code*/,
-                                                     const char *layer_prefix, const char *message, void * /*user_data*/)
+static VKAPI_ATTR vk::Bool32 VKAPI_CALL debug_callback(vk::DebugReportFlagsEXT flags,
+                                                       vk::DebugReportObjectTypeEXT /*type*/,
+                                                       uint64_t /*object*/,
+                                                       size_t /*location*/,
+                                                       int32_t /*message_code*/,
+                                                       const char *layer_prefix,
+                                                       const char *message,
+                                                       void * /*user_data*/)
 {
-	if (flags & VK_DEBUG_REPORT_ERROR_BIT_EXT)
+	if (flags & vk::DebugReportFlagBitsEXT::eError)
 	{
 		LOGE("{}: {}", layer_prefix, message);
 	}
-	else if (flags & VK_DEBUG_REPORT_WARNING_BIT_EXT)
+	else if (flags & vk::DebugReportFlagBitsEXT::eWarning)
 	{
 		LOGW("{}: {}", layer_prefix, message);
 	}
-	else if (flags & VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT)
+	else if (flags & vk::DebugReportFlagBitsEXT::ePerformanceWarning)
 	{
 		LOGW("{}: {}", layer_prefix, message);
 	}
diff --git a/framework/vulkan_sample.h b/framework/vulkan_sample.h
index 873b7a68a9..32d20c393c 100644
--- a/framework/vulkan_sample.h
+++ b/framework/vulkan_sample.h
@@ -1026,9 +1026,9 @@ inline bool VulkanSample<bindingType>::prepare(const ApplicationOptions &options
 
 	// initialize C++-Bindings default dispatcher, first step
 #if defined(_HPP_VULKAN_LIBRARY)
-	static vk::DynamicLoader dl(_HPP_VULKAN_LIBRARY);
+	static vk::detail::DynamicLoader dl(_HPP_VULKAN_LIBRARY);
 #else
-	static vk::DynamicLoader        dl;
+	static vk::detail::DynamicLoader dl;
 #endif
 	VULKAN_HPP_DEFAULT_DISPATCHER.init(dl.getProcAddress<PFN_vkGetInstanceProcAddr>("vkGetInstanceProcAddr"));
 
diff --git a/samples/api/hpp_hello_triangle/hpp_hello_triangle.cpp b/samples/api/hpp_hello_triangle/hpp_hello_triangle.cpp
index ec7e967ad2..60990b863e 100644
--- a/samples/api/hpp_hello_triangle/hpp_hello_triangle.cpp
+++ b/samples/api/hpp_hello_triangle/hpp_hello_triangle.cpp
@@ -30,16 +30,17 @@
 
 #if defined(VKB_DEBUG) || defined(VKB_VALIDATION_LAYERS)
 /// @brief A debug callback called from Vulkan validation layers.
-VKAPI_ATTR VkBool32 VKAPI_CALL debug_utils_messenger_callback(VkDebugUtilsMessageSeverityFlagBitsEXT message_severity, VkDebugUtilsMessageTypeFlagsEXT message_type,
-                                                              const VkDebugUtilsMessengerCallbackDataEXT *callback_data,
-                                                              void                                       *user_data)
+VKAPI_ATTR vk::Bool32 VKAPI_CALL debug_utils_messenger_callback(vk::DebugUtilsMessageSeverityFlagBitsEXT      message_severity,
+                                                                vk::DebugUtilsMessageTypeFlagsEXT             message_type,
+                                                                const vk::DebugUtilsMessengerCallbackDataEXT *callback_data,
+                                                                void                                         *user_data)
 {
 	// Log debug message
-	if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT)
+	if (message_severity & vk::DebugUtilsMessageSeverityFlagBitsEXT::eWarning)
 	{
 		LOGW("{} - {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage);
 	}
-	else if (message_severity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT)
+	else if (message_severity & vk::DebugUtilsMessageSeverityFlagBitsEXT::eError)
 	{
 		LOGE("{} - {}: {}", callback_data->messageIdNumber, callback_data->pMessageIdName, callback_data->pMessage);
 	}
@@ -382,9 +383,9 @@ vk::ImageView HPPHelloTriangle::create_image_view(vk::Image image)
 vk::Instance HPPHelloTriangle::create_instance(std::vector<const char *> const &required_instance_extensions, std::vector<const char *> const &required_validation_layers)
 {
 #if defined(_HPP_VULKAN_LIBRARY)
-	static vk::DynamicLoader dl(_HPP_VULKAN_LIBRARY);
+	static vk::detail::DynamicLoader dl(_HPP_VULKAN_LIBRARY);
 #else
-	static vk::DynamicLoader dl;
+	static vk::detail::DynamicLoader dl;
 #endif
 	PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr = dl.getProcAddress<PFN_vkGetInstanceProcAddr>("vkGetInstanceProcAddr");
 	VULKAN_HPP_DEFAULT_DISPATCHER.init(vkGetInstanceProcAddr);
diff --git a/third_party/vulkan b/third_party/vulkan
index d91597a82f..d4a196d8c8 160000
--- a/third_party/vulkan
+++ b/third_party/vulkan
@@ -1 +1 @@
-Subproject commit d91597a82f881d473887b560a03a7edf2720b72c
+Subproject commit d4a196d8c84e032d27f999adcea3075517c1c97f