diff --git a/iree/hal/local/elf/elf_module_test.cc b/iree/hal/local/elf/elf_module_test.cc
index cde09ae9f11f..d46eb7ab0514 100644
--- a/iree/hal/local/elf/elf_module_test.cc
+++ b/iree/hal/local/elf/elf_module_test.cc
@@ -94,7 +94,7 @@ TEST_F(ELFModuleTest, Check) {
   float arg0[4] = {1.0f, 2.0f, 3.0f, 4.0f};
   float arg1[4] = {100.0f, 200.0f, 300.0f, 400.0f};
   float ret0[4] = {0.0f, 0.0f, 0.0f, 0.0f};
-  iree_device_size_t binding_lengths[3] = {
+  size_t binding_lengths[3] = {
       sizeof(arg0),
       sizeof(arg1),
       sizeof(ret0),
diff --git a/iree/hal/local/inline_command_buffer.c b/iree/hal/local/inline_command_buffer.c
index a1e881406dac..b3a8fa705e44 100644
--- a/iree/hal/local/inline_command_buffer.c
+++ b/iree/hal/local/inline_command_buffer.c
@@ -43,17 +43,15 @@ typedef struct {
     // iree_hal_buffer_mapping_t and map/unmap where appropriate.
     void* full_bindings[IREE_HAL_LOCAL_MAX_DESCRIPTOR_SET_COUNT *
                         IREE_HAL_LOCAL_MAX_DESCRIPTOR_BINDING_COUNT];
-    iree_device_size_t
-        full_binding_lengths[IREE_HAL_LOCAL_MAX_DESCRIPTOR_SET_COUNT *
-                             IREE_HAL_LOCAL_MAX_DESCRIPTOR_BINDING_COUNT];
+    size_t full_binding_lengths[IREE_HAL_LOCAL_MAX_DESCRIPTOR_SET_COUNT *
+                                IREE_HAL_LOCAL_MAX_DESCRIPTOR_BINDING_COUNT];
 
     // Packed bindings scratch space used during dispatch. Executable bindings
     // are packed into a dense list with unused bindings removed.
     void* packed_bindings[IREE_HAL_LOCAL_MAX_DESCRIPTOR_SET_COUNT *
                           IREE_HAL_LOCAL_MAX_DESCRIPTOR_BINDING_COUNT];
-    iree_device_size_t
-        packed_binding_lengths[IREE_HAL_LOCAL_MAX_DESCRIPTOR_SET_COUNT *
-                               IREE_HAL_LOCAL_MAX_DESCRIPTOR_BINDING_COUNT];
+    size_t packed_binding_lengths[IREE_HAL_LOCAL_MAX_DESCRIPTOR_SET_COUNT *
+                                  IREE_HAL_LOCAL_MAX_DESCRIPTOR_BINDING_COUNT];
 
     // All available push constants updated each time push_constants is called.
     // Reset only with the command buffer and otherwise will maintain its values