diff --git a/vulkan/libvulkan/driver.h b/vulkan/libvulkan/driver.h
index 28b0ce6..7af63fa 100644
--- a/vulkan/libvulkan/driver.h
+++ b/vulkan/libvulkan/driver.h
@@ -64,7 +64,10 @@
 
 struct InstanceData {
     InstanceData(const VkAllocationCallbacks& alloc)
-        : opaque_api_data(), allocator(alloc) {
+        : opaque_api_data(),
+          allocator(alloc),
+          driver(),
+          get_device_proc_addr(nullptr) {
         hook_extensions.set(ProcHook::EXTENSION_CORE);
         hal_extensions.set(ProcHook::EXTENSION_CORE);
     }
@@ -75,11 +78,14 @@
 
     std::bitset<ProcHook::EXTENSION_COUNT> hook_extensions;
     std::bitset<ProcHook::EXTENSION_COUNT> hal_extensions;
+
+    InstanceDriverTable driver;
+    PFN_vkGetDeviceProcAddr get_device_proc_addr;
 };
 
 struct DeviceData {
     DeviceData(const VkAllocationCallbacks& alloc)
-        : opaque_api_data(), allocator(alloc), get_device_proc_addr(nullptr) {
+        : opaque_api_data(), allocator(alloc), driver() {
         hook_extensions.set(ProcHook::EXTENSION_CORE);
         hal_extensions.set(ProcHook::EXTENSION_CORE);
     }
@@ -91,7 +97,7 @@
     std::bitset<ProcHook::EXTENSION_COUNT> hook_extensions;
     std::bitset<ProcHook::EXTENSION_COUNT> hal_extensions;
 
-    PFN_vkGetDeviceProcAddr get_device_proc_addr;
+    DeviceDriverTable driver;
 };
 
 bool Debuggable();