diff --git a/UsbDk/FilterDevice.cpp b/UsbDk/FilterDevice.cpp
index b37b4d0..903c825 100644
--- a/UsbDk/FilterDevice.cpp
+++ b/UsbDk/FilterDevice.cpp
@@ -56,7 +56,7 @@ NTSTATUS CUsbDkFilterDeviceInit::Configure(ULONG InstanceNumber)
     PAGED_CODE();
 
     WDF_OBJECT_ATTRIBUTES requestAttributes;
-    WDF_OBJECT_ATTRIBUTES_INIT_CONTEXT_TYPE(&requestAttributes, USBDK_FILTER_REQUEST_CONTEXT);
+    WDF_OBJECT_ATTRIBUTES_INIT_CONTEXT_TYPE(&requestAttributes, WDF_REQUEST_CONTEXT);
     requestAttributes.ContextSizeOverride = CUsbDkFilterDevice::CStrategist::GetRequestContextSize();
 
     SetRequestAttributes(requestAttributes);
diff --git a/UsbDk/FilterStrategy.h b/UsbDk/FilterStrategy.h
index a732a42..849e0fc 100644
--- a/UsbDk/FilterStrategy.h
+++ b/UsbDk/FilterStrategy.h
@@ -96,8 +96,3 @@ public:
     virtual NTSTATUS MakeAvailable() override
     { return STATUS_SUCCESS; }
 };
-
-typedef struct _USBDK_FILTER_REQUEST_CONTEXT {
-} USBDK_FILTER_REQUEST_CONTEXT, *PUSBDK_FILTER_REQUEST_CONTEXT;
-
-WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(USBDK_FILTER_REQUEST_CONTEXT, UsbDkFilterRequestGetContext);
diff --git a/UsbDk/RedirectorStrategy.cpp b/UsbDk/RedirectorStrategy.cpp
index 2d1b3de..50beca2 100644
--- a/UsbDk/RedirectorStrategy.cpp
+++ b/UsbDk/RedirectorStrategy.cpp
@@ -199,7 +199,7 @@ public:
     {}
 
     PUSBDK_REDIRECTOR_REQUEST_CONTEXT Context() const
-    { return reinterpret_cast<PUSBDK_REDIRECTOR_REQUEST_CONTEXT>(UsbDkFilterRequestGetContext(m_Request)); }
+    { return reinterpret_cast<PUSBDK_REDIRECTOR_REQUEST_CONTEXT>(CWdfRequest::Context()); }
 
 private:
     void SetBytesWritten(size_t numBytes);