diff --git a/liblava/resource/format.cpp b/liblava/resource/format.cpp
index e18d8d889f594039720dde5858832830ac96b66b..37d936d9c88cc7b6802499507bd4c3fbcbf3ace9 100644
--- a/liblava/resource/format.cpp
+++ b/liblava/resource/format.cpp
@@ -362,7 +362,7 @@ lava::ui32 lava::format_block_size(VkFormat format) {
 #undef fmt
 }
 
-std::optional<VkFormat> lava::get_supported_depth_format(VkPhysicalDevice physical_device) {
+lava::VkFormat_optional lava::get_supported_depth_format(VkPhysicalDevice physical_device) {
     static const VkFormat depth_formats[] = { VK_FORMAT_D32_SFLOAT_S8_UINT, VK_FORMAT_D32_SFLOAT, VK_FORMAT_D24_UNORM_S8_UINT, VK_FORMAT_D16_UNORM_S8_UINT, VK_FORMAT_D16_UNORM };
 
     for (auto& format : depth_formats) {
@@ -377,7 +377,7 @@ std::optional<VkFormat> lava::get_supported_depth_format(VkPhysicalDevice physic
     return std::nullopt;
 }
 
-std::optional<VkFormat> lava::get_supported_format(VkPhysicalDevice physical_device, lava::VkFormats const& possible_formats, VkImageUsageFlags usage) {
+lava::VkFormat_optional lava::get_supported_format(VkPhysicalDevice physical_device, lava::VkFormats const& possible_formats, VkImageUsageFlags usage) {
     VkFormatFeatureFlags features = 0;
     if (usage & VK_IMAGE_USAGE_TRANSFER_SRC_BIT)
         features |= VK_FORMAT_FEATURE_TRANSFER_SRC_BIT;
diff --git a/liblava/resource/format.hpp b/liblava/resource/format.hpp
index 7178cdcc58925b8012a847a322f0d257eb3dde47..6024ab36b53285a3033626cd73fd918e203989ee 100644
--- a/liblava/resource/format.hpp
+++ b/liblava/resource/format.hpp
@@ -9,6 +9,8 @@
 
 namespace lava {
 
+    using VkFormat_optional = std::optional<VkFormat>;
+
     bool format_depth(VkFormat format);
 
     bool format_stencil(VkFormat format);
@@ -27,9 +29,9 @@ namespace lava {
 
     ui32 format_block_size(VkFormat format);
 
-    std::optional<VkFormat> get_supported_depth_format(VkPhysicalDevice physical_device);
+    VkFormat_optional get_supported_depth_format(VkPhysicalDevice physical_device);
 
-    std::optional<VkFormat> get_supported_format(VkPhysicalDevice physical_device, VkFormats const& possible_formats, VkImageUsageFlags usage);
+    VkFormat_optional get_supported_format(VkPhysicalDevice physical_device, VkFormats const& possible_formats, VkImageUsageFlags usage);
 
     VkImageMemoryBarrier image_memory_barrier(VkImage image, VkImageLayout old_layout, VkImageLayout new_layout);