diff --git a/include/vk_debug_report_lunarg.h b/include/vk_debug_report_lunarg.h
index eef7836..6bdd106 100644
--- a/include/vk_debug_report_lunarg.h
+++ b/include/vk_debug_report_lunarg.h
@@ -160,11 +160,11 @@
 
 typedef enum VkDbgReportFlags_
 {
-    VK_DBG_REPORT_INFO_BIT       = VK_BIT(0),
-    VK_DBG_REPORT_WARN_BIT       = VK_BIT(1),
-    VK_DBG_REPORT_PERF_WARN_BIT  = VK_BIT(2),
-    VK_DBG_REPORT_ERROR_BIT      = VK_BIT(3),
-    VK_DBG_REPORT_DEBUG_BIT      = VK_BIT(4),
+    VK_DBG_REPORT_INFO_BIT       = 0x0001,
+    VK_DBG_REPORT_WARN_BIT       = 0x0002,
+    VK_DBG_REPORT_PERF_WARN_BIT  = 0x0004,
+    VK_DBG_REPORT_ERROR_BIT      = 0x0008,
+    VK_DBG_REPORT_DEBUG_BIT      = 0x0010,
 } VkDbgReportFlags;
 
 // Debug Report ERROR codes
diff --git a/include/vk_wsi_lunarg.h b/include/vk_wsi_lunarg.h
index 4a86962..a986301 100644
--- a/include/vk_wsi_lunarg.h
+++ b/include/vk_wsi_lunarg.h
@@ -64,7 +64,6 @@
     // Info type for vkGetSwapChainInfo()
     VK_SWAP_CHAIN_INFO_TYPE_PERSISTENT_IMAGES_WSI           = 0x00000000,   // Return information about the persistent images of the swapchain
 
-    VK_ENUM_RANGE(SWAP_CHAIN_INFO_TYPE, PERSISTENT_IMAGES_WSI, PERSISTENT_IMAGES_WSI)
 } VkSwapChainInfoTypeWSI;
 
 // ------------------------------------------------------------------------------------------------
@@ -73,8 +72,8 @@
 typedef VkFlags VkSwapModeFlagsWSI;
 typedef enum VkSwapModeFlagBitsWSI_
 {
-    VK_SWAP_MODE_FLIP_BIT_WSI                               = VK_BIT(0),
-    VK_SWAP_MODE_BLIT_BIT_WSI                               = VK_BIT(1),
+    VK_SWAP_MODE_FLIP_BIT_WSI                               = 0x1,
+    VK_SWAP_MODE_BLIT_BIT_WSI                               = 0x2
 } VkSwapModeFlagBitsWSI;
 
 // ------------------------------------------------------------------------------------------------
diff --git a/loader/loader.c b/loader/loader.c
index 75701cf..07d0416 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -68,11 +68,11 @@
 static bool loader_init_ext_list(struct loader_extension_list *ext_info);
 
 enum loader_debug {
-    LOADER_INFO_BIT       = VK_BIT(0),
-    LOADER_WARN_BIT       = VK_BIT(1),
-    LOADER_PERF_BIT       = VK_BIT(2),
-    LOADER_ERROR_BIT      = VK_BIT(3),
-    LOADER_DEBUG_BIT      = VK_BIT(4),
+    LOADER_INFO_BIT       = 0x01,
+    LOADER_WARN_BIT       = 0x02,
+    LOADER_PERF_BIT       = 0x04,
+    LOADER_ERROR_BIT      = 0x08,
+    LOADER_DEBUG_BIT      = 0x10,
 };
 
 uint32_t g_loader_debug = 0;
diff --git a/tests/blit_tests.cpp b/tests/blit_tests.cpp
index ee1924f..3c6d674 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -301,7 +301,7 @@
 {
     static bool format_table_unverified = true;
     static const struct format_info {
-        VkFormat_ format;
+        VkFormat format;
         size_t size;
         uint32_t channel_count;
     } format_table[VK_NUM_FORMAT] = {
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index ab00a9b..74d2510 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -1475,6 +1475,7 @@
         .addressW     = VK_TEX_ADDRESS_CLAMP,
         .mipLodBias   = 1.0,
         .maxAnisotropy = 1,
+        .compareEnable = VK_FALSE,
         .compareOp    = VK_COMPARE_OP_NEVER,
         .minLod       = 1.0,
         .maxLod       = 1.0,
@@ -1562,6 +1563,7 @@
         .addressW     = VK_TEX_ADDRESS_CLAMP,
         .mipLodBias   = 1.0,
         .maxAnisotropy = 1,
+        .compareEnable = VK_FALSE,
         .compareOp    = VK_COMPARE_OP_NEVER,
         .minLod       = 1.0,
         .maxLod       = 1.0,
@@ -1650,6 +1652,7 @@
         .addressW     = VK_TEX_ADDRESS_CLAMP,
         .mipLodBias   = 1.0,
         .maxAnisotropy = 1,
+        .compareEnable = VK_FALSE,
         .compareOp    = VK_COMPARE_OP_NEVER,
         .minLod       = 1.0,
         .maxLod       = 1.0,
@@ -1738,6 +1741,7 @@
         .addressW     = VK_TEX_ADDRESS_CLAMP,
         .mipLodBias   = 1.0,
         .maxAnisotropy = 1,
+        .compareEnable = VK_FALSE,
         .compareOp    = VK_COMPARE_OP_NEVER,
         .minLod       = 1.0,
         .maxLod       = 1.0,