diff --git a/except.cpp b/except.cpp
index 81f2ec5..6469fae 100644
--- a/except.cpp
+++ b/except.cpp
@@ -26,34 +26,34 @@ using cruft::vk::error_code;
 
 ///////////////////////////////////////////////////////////////////////////////
 #define VK_RESULT_MAP(FUNC)\
-    MAP(FUNC, \
-        VK_SUCCESS, \
-        VK_NOT_READY, \
-        VK_TIMEOUT, \
-        VK_EVENT_SET, \
-        VK_EVENT_RESET, \
-        VK_INCOMPLETE, \
-        VK_ERROR_OUT_OF_HOST_MEMORY, \
-        VK_ERROR_OUT_OF_DEVICE_MEMORY, \
-        VK_ERROR_INITIALIZATION_FAILED, \
-        VK_ERROR_DEVICE_LOST, \
-        VK_ERROR_MEMORY_MAP_FAILED, \
-        VK_ERROR_LAYER_NOT_PRESENT, \
-        VK_ERROR_EXTENSION_NOT_PRESENT, \
-        VK_ERROR_FEATURE_NOT_PRESENT, \
-        VK_ERROR_INCOMPATIBLE_DRIVER, \
-        VK_ERROR_TOO_MANY_OBJECTS, \
-        VK_ERROR_FORMAT_NOT_SUPPORTED, \
-        VK_ERROR_FRAGMENTED_POOL, \
-        VK_ERROR_VALIDATION_FAILED_EXT, \
-        VK_ERROR_SURFACE_LOST_KHR, \
-        VK_ERROR_NATIVE_WINDOW_IN_USE_KHR, \
-        VK_SUBOPTIMAL_KHR, \
-        VK_ERROR_OUT_OF_DATE_KHR, \
-        VK_ERROR_INCOMPATIBLE_DISPLAY_KHR, \
-        VK_ERROR_OUT_OF_POOL_MEMORY_KHR, \
-        VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR, \
-        VK_ERROR_INVALID_SHADER_NV)
+    MAP0(FUNC, \
+         VK_SUCCESS, \
+         VK_NOT_READY, \
+         VK_TIMEOUT, \
+         VK_EVENT_SET, \
+         VK_EVENT_RESET, \
+         VK_INCOMPLETE, \
+         VK_ERROR_OUT_OF_HOST_MEMORY, \
+         VK_ERROR_OUT_OF_DEVICE_MEMORY, \
+         VK_ERROR_INITIALIZATION_FAILED, \
+         VK_ERROR_DEVICE_LOST, \
+         VK_ERROR_MEMORY_MAP_FAILED, \
+         VK_ERROR_LAYER_NOT_PRESENT, \
+         VK_ERROR_EXTENSION_NOT_PRESENT, \
+         VK_ERROR_FEATURE_NOT_PRESENT, \
+         VK_ERROR_INCOMPATIBLE_DRIVER, \
+         VK_ERROR_TOO_MANY_OBJECTS, \
+         VK_ERROR_FORMAT_NOT_SUPPORTED, \
+         VK_ERROR_FRAGMENTED_POOL, \
+         VK_ERROR_VALIDATION_FAILED_EXT, \
+         VK_ERROR_SURFACE_LOST_KHR, \
+         VK_ERROR_NATIVE_WINDOW_IN_USE_KHR, \
+         VK_SUBOPTIMAL_KHR, \
+         VK_ERROR_OUT_OF_DATE_KHR, \
+         VK_ERROR_INCOMPATIBLE_DISPLAY_KHR, \
+         VK_ERROR_OUT_OF_POOL_MEMORY_KHR, \
+         VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR, \
+         VK_ERROR_INVALID_SHADER_NV)
 
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/fwd.hpp b/fwd.hpp
index 1e9b3ad..64b018e 100644
--- a/fwd.hpp
+++ b/fwd.hpp
@@ -55,30 +55,30 @@ namespace cruft::vk {
     template <VkResult> class error_code;
 
     #define VK_ENUMERATED_TYPE_MAP(FUNC) \
-        MAP(FUNC,               \
-            physical_device)
+        MAP0(FUNC,               \
+             physical_device)
 
     #define VK_DESCENDANT_TYPE_MAP(FUNC) \
-        MAP(FUNC,       \
-            device)
+        MAP0(FUNC,       \
+             device)
 
     #define VK_OWNED_TYPE_MAP(FUNC) \
-        MAP(FUNC, \
-            buffer, \
-            command_pool, \
-            device_memory, \
-            framebuffer, \
-            image_view, \
-            pipeline_layout, \
-            queue, \
-            render_pass, \
-            semaphore, \
-            shader_module, \
-            surface, \
-            swapchain)
+        MAP0(FUNC, \
+             buffer, \
+             command_pool, \
+             device_memory, \
+             framebuffer, \
+             image_view, \
+             pipeline_layout, \
+             queue, \
+             render_pass, \
+             semaphore, \
+             shader_module, \
+             surface, \
+             swapchain)
 
     #define VK_TYPE_MAP(FUNC) \
-        MAP(FUNC,instance) \
+        MAP0(FUNC,instance) \
         VK_ENUMERATED_TYPE_MAP(FUNC) \
         VK_DESCENDANT_TYPE_MAP(FUNC) \
         VK_OWNED_TYPE_MAP(FUNC)