diff --git a/src/d3d10/d3d10_buffer.h b/src/d3d10/d3d10_buffer.h
index 6b1f4483..f26a7154 100644
--- a/src/d3d10/d3d10_buffer.h
+++ b/src/d3d10/d3d10_buffer.h
@@ -12,8 +12,8 @@ namespace dxvk {
 
   public:
 
-    D3D10Buffer(D3D11Buffer* pParent, D3D10Device* pDevice)
-    : m_device(pDevice), m_d3d11(pParent) { }
+    D3D10Buffer(D3D11Buffer* pParent)
+    : m_d3d11(pParent) { }
 
     HRESULT STDMETHODCALLTYPE QueryInterface(
             REFIID                    riid,
@@ -64,7 +64,6 @@ namespace dxvk {
 
   private:
 
-    D3D10Device* m_device;
     D3D11Buffer* m_d3d11;
 
   };
diff --git a/src/d3d10/d3d10_query.h b/src/d3d10/d3d10_query.h
index 2f15ee94..c189e979 100644
--- a/src/d3d10/d3d10_query.h
+++ b/src/d3d10/d3d10_query.h
@@ -13,8 +13,8 @@ namespace dxvk {
 
   public:
 
-    D3D10Query(D3D11Query* pParent, D3D10Device* pDevice)
-    : m_device(pDevice), m_d3d11(pParent) { }
+    D3D10Query(D3D11Query* pParent)
+    : m_d3d11(pParent) { }
 
     HRESULT STDMETHODCALLTYPE QueryInterface(
             REFIID                    riid,
@@ -61,7 +61,6 @@ namespace dxvk {
 
   private:
 
-    D3D10Device* m_device;
     D3D11Query*  m_d3d11;
 
   };
diff --git a/src/d3d10/d3d10_texture.h b/src/d3d10/d3d10_texture.h
index abc3f2a2..9c663300 100644
--- a/src/d3d10/d3d10_texture.h
+++ b/src/d3d10/d3d10_texture.h
@@ -16,8 +16,8 @@ namespace dxvk {
 
   public:
 
-    D3D10Texture1D(D3D11Texture1D* pParent, D3D10Device* pDevice)
-    : m_device(pDevice), m_d3d11(pParent) { }
+    D3D10Texture1D(D3D11Texture1D* pParent)
+    : m_d3d11(pParent) { }
 
     HRESULT STDMETHODCALLTYPE QueryInterface(
             REFIID                    riid,
@@ -70,7 +70,6 @@ namespace dxvk {
     
   private:
 
-    D3D10Device*    m_device;
     D3D11Texture1D* m_d3d11;
 
   };
@@ -82,8 +81,8 @@ namespace dxvk {
 
   public:
 
-    D3D10Texture2D(D3D11Texture2D* pParent, D3D10Device* pDevice)
-    : m_device(pDevice), m_d3d11(pParent) { }
+    D3D10Texture2D(D3D11Texture2D* pParent)
+    :  m_d3d11(pParent) { }
 
     HRESULT STDMETHODCALLTYPE QueryInterface(
             REFIID                    riid,
@@ -136,7 +135,6 @@ namespace dxvk {
 
   private:
 
-    D3D10Device*    m_device;
     D3D11Texture2D* m_d3d11;
 
   };
@@ -148,8 +146,8 @@ namespace dxvk {
 
   public:
 
-    D3D10Texture3D(D3D11Texture3D* pParent, D3D10Device* pDevice)
-    : m_device(pDevice), m_d3d11(pParent) { }
+    D3D10Texture3D(D3D11Texture3D* pParent)
+    : m_d3d11(pParent) { }
 
     HRESULT STDMETHODCALLTYPE QueryInterface(
             REFIID                    riid,
@@ -202,7 +200,6 @@ namespace dxvk {
 
   private:
 
-    D3D10Device*    m_device;
     D3D11Texture3D* m_d3d11;
 
   };
diff --git a/src/d3d11/d3d11_buffer.cpp b/src/d3d11/d3d11_buffer.cpp
index f0119973..08398000 100644
--- a/src/d3d11/d3d11_buffer.cpp
+++ b/src/d3d11/d3d11_buffer.cpp
@@ -12,7 +12,7 @@ namespace dxvk {
   : m_device      (pDevice),
     m_desc        (*pDesc),
     m_resource    (this),
-    m_d3d10       (this, pDevice->GetD3D10Interface()) {
+    m_d3d10       (this) {
     DxvkBufferCreateInfo  info;
     info.size   = pDesc->ByteWidth;
     info.usage  = VK_BUFFER_USAGE_TRANSFER_SRC_BIT
diff --git a/src/d3d11/d3d11_query.cpp b/src/d3d11/d3d11_query.cpp
index 544853e5..bb763fcc 100644
--- a/src/d3d11/d3d11_query.cpp
+++ b/src/d3d11/d3d11_query.cpp
@@ -8,7 +8,7 @@ namespace dxvk {
     const D3D11_QUERY_DESC1& desc)
   : m_device(device), m_desc(desc),
     m_state(D3D11_VK_QUERY_INITIAL),
-    m_d3d10(this, device->GetD3D10Interface()) {
+    m_d3d10(this) {
     Rc<DxvkDevice> dxvkDevice = m_device->GetDXVKDevice();
 
     switch (m_desc.Query) {
diff --git a/src/d3d11/d3d11_texture.cpp b/src/d3d11/d3d11_texture.cpp
index af6fcb5a..ed74e0fc 100644
--- a/src/d3d11/d3d11_texture.cpp
+++ b/src/d3d11/d3d11_texture.cpp
@@ -788,7 +788,7 @@ namespace dxvk {
     m_interop (this, &m_texture),
     m_surface (this, &m_texture),
     m_resource(this),
-    m_d3d10   (this, pDevice->GetD3D10Interface()) {
+    m_d3d10   (this) {
     
   }
   
@@ -890,7 +890,7 @@ namespace dxvk {
     m_interop (this, &m_texture),
     m_surface (this, &m_texture),
     m_resource(this),
-    m_d3d10   (this, pDevice->GetD3D10Interface()) {
+    m_d3d10   (this) {
     
   }
   
@@ -1009,7 +1009,7 @@ namespace dxvk {
   : m_texture (pDevice, pDesc, D3D11_RESOURCE_DIMENSION_TEXTURE3D),
     m_interop (this, &m_texture),
     m_resource(this),
-    m_d3d10   (this, pDevice->GetD3D10Interface()) {
+    m_d3d10   (this) {
     
   }