diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
index 8f897e5..e56bdf4 100644
--- a/VulkanHppGenerator.cpp
+++ b/VulkanHppGenerator.cpp
@@ -8789,7 +8789,7 @@ std::string VulkanHppGenerator::generateRAIIFactoryReturnStatements( std::vector
                                                                      std::string const &              returnVariable,
                                                                      bool                             singular ) const
 {
-  auto handleIt = findByNameOrAlias(m_handles, vkType );
+  auto handleIt = findByNameOrAlias( m_handles, vkType );
   assert( handleIt != m_handles.end() );
 
   std::string successCodePassToElement = ( enumerating ? ( successCodes.size() <= 2 ) : ( successCodes.size() <= 1 ) ) ? "" : ", result";
@@ -10303,10 +10303,11 @@ std::string VulkanHppGenerator::generateRAIIHandleForwardDeclarations( std::vect
   {
     for ( auto const & type : require.types )
     {
-      auto handleIt = m_handles.find( type.name );
+      auto handleIt = findByNameOrAlias( m_handles, type.name );
       if ( handleIt != m_handles.end() )
       {
-        str += "  class " + stripPrefix( handleIt->first, "Vk" ) + ";\n";
+        str += ( handleIt->first == type.name ) ? ( "  class " + stripPrefix( handleIt->first, "Vk" ) + ";\n" )
+                                                : ( "  using " + stripPrefix( type.name, "Vk" ) + " = " + stripPrefix( handleIt->first, "Vk" ) + ";\n" );
       }
     }
   }
diff --git a/vulkan/vulkan_raii.hpp b/vulkan/vulkan_raii.hpp
index 7faf326..5f56526 100644
--- a/vulkan/vulkan_raii.hpp
+++ b/vulkan/vulkan_raii.hpp
@@ -2885,12 +2885,18 @@ namespace VULKAN_HPP_NAMESPACE
     class CuModuleNVX;
     class CuFunctionNVX;
 
+    //=== VK_KHR_descriptor_update_template ===
+    using DescriptorUpdateTemplateKHR = DescriptorUpdateTemplate;
+
     //=== VK_EXT_debug_utils ===
     class DebugUtilsMessengerEXT;
 
     //=== VK_KHR_acceleration_structure ===
     class AccelerationStructureKHR;
 
+    //=== VK_KHR_sampler_ycbcr_conversion ===
+    using SamplerYcbcrConversionKHR = SamplerYcbcrConversion;
+
     //=== VK_EXT_validation_cache ===
     class ValidationCacheEXT;
 
@@ -2906,6 +2912,9 @@ namespace VULKAN_HPP_NAMESPACE
     //=== VK_NV_device_generated_commands ===
     class IndirectCommandsLayoutNV;
 
+    //=== VK_EXT_private_data ===
+    using PrivateDataSlotEXT = PrivateDataSlot;
+
 #  if defined( VK_ENABLE_BETA_EXTENSIONS )
     //=== VK_NV_cuda_kernel_launch ===
     class CudaModuleNV;