diff --git a/icd/intel/cmd_barrier.c b/icd/intel/cmd_barrier.c
index 65adad1..900db83 100644
--- a/icd/intel/cmd_barrier.c
+++ b/icd/intel/cmd_barrier.c
@@ -272,7 +272,7 @@
     VkPipelineStageFlags                        sourceStageMask,
     VkPipelineStageFlags                        destStageMask,
     uint32_t                                    memBarrierCount,
-    const void**                                ppMemBarriers)
+    const void* const*                          ppMemBarriers)
 {
     struct intel_cmd *cmd = intel_cmd(cmdBuffer);
 
diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index 15077ee..f497c52 100644
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -1270,7 +1270,7 @@
     VkPipelineStageFlags                        sourceStageMask,
     VkPipelineStageFlags                        destStageMask,
     uint32_t                                    memBarrierCount,
-    const void**                                ppMemBarriers)
+    const void* const*                          ppMemBarriers)
 {
     NULLDRV_LOG_FUNC;
 }
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 4738426..2114b8b 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -2680,7 +2680,7 @@
     }
 }
 
-VK_LAYER_EXPORT void VKAPI vkCmdWaitEvents(VkCmdBuffer cmdBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags sourceStageMask, VkPipelineStageFlags destStageMask, uint32_t memBarrierCount, const void** ppMemBarriers)
+VK_LAYER_EXPORT void VKAPI vkCmdWaitEvents(VkCmdBuffer cmdBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags sourceStageMask, VkPipelineStageFlags destStageMask, uint32_t memBarrierCount, const void* const* ppMemBarriers)
 {
     GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
     if (pCB) {
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 7a04861..816b1be 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -7857,7 +7857,7 @@
 bool PreCmdWaitEvents(
     VkCmdBuffer cmdBuffer,
     const VkEvent* pEvents,
-    const void** ppMemBarriers)
+    const void* const* ppMemBarriers)
 {
     if(pEvents == nullptr)
     {
@@ -7898,7 +7898,7 @@
     VkPipelineStageFlags sourceStageMask,
     VkPipelineStageFlags destStageMask,
     uint32_t memBarrierCount,
-    const void** ppMemBarriers)
+    const void* const* ppMemBarriers)
 {
     PreCmdWaitEvents(cmdBuffer, pEvents, ppMemBarriers);
 
diff --git a/loader/trampoline.c b/loader/trampoline.c
index 358ab23..71ec674 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -1370,7 +1370,7 @@
     disp->CmdResetEvent(cmdBuffer, event, stageMask);
 }
 
-LOADER_EXPORT void VKAPI vkCmdWaitEvents(VkCmdBuffer cmdBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags sourceStageMask, VkPipelineStageFlags destStageMask, uint32_t memBarrierCount, const void** ppMemBarriers)
+LOADER_EXPORT void VKAPI vkCmdWaitEvents(VkCmdBuffer cmdBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags sourceStageMask, VkPipelineStageFlags destStageMask, uint32_t memBarrierCount, const void* const* ppMemBarriers)
 {
     const VkLayerDispatchTable *disp;
 
diff --git a/vulkan.py b/vulkan.py
index df9a778..f006572 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -930,7 +930,7 @@
              Param("VkPipelineStageFlags", "sourceStageMask"),
              Param("VkPipelineStageFlags", "destStageMask"),
              Param("uint32_t", "memBarrierCount"),
-             Param("const void**", "ppMemBarriers")]),
+             Param("const void* const*", "ppMemBarriers")]),
 
         Proto("void", "CmdPipelineBarrier",
             [Param("VkCmdBuffer", "cmdBuffer"),