diff --git a/sys/Context.h b/sys/Context.h
index 6ad6838..dff79cb 100644
--- a/sys/Context.h
+++ b/sys/Context.h
@@ -29,56 +29,6 @@
 
 
 
-
-//
-// The PDO device-extension (context).
-//
-typedef struct _PDO_DEVICE_DATA
-{
-    //
-    // Unique serial number of the device on the bus
-    // 
-    ULONG SerialNo;
-
-    // 
-    // PID of the process creating this PDO
-    // 
-    DWORD OwnerProcessId;
-
-    //
-    // Device type this PDO is emulating
-    // 
-    VIGEM_TARGET_TYPE TargetType;
-
-    //
-    // If set, the vendor ID the emulated device is reporting
-    // 
-    USHORT VendorId;
-
-    //
-    // If set, the product ID the emulated device is reporting
-    // 
-    USHORT ProductId;
-
-    //
-    // Interface for PDO to FDO communication
-    // 
-    VIGEM_BUS_INTERFACE BusInterface;
-
-    //
-    // Queue for incoming data interrupt transfer
-    //
-    WDFQUEUE PendingUsbInRequests;
-
-    //
-    // Queue for inverted calls
-    //
-    WDFQUEUE PendingNotificationRequests;
-
-} PDO_DEVICE_DATA, *PPDO_DEVICE_DATA;
-
-WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(PDO_DEVICE_DATA, PdoGetData)
-
 //
 // FDO (bus device) context data
 // 
@@ -94,16 +44,6 @@ typedef struct _FDO_DEVICE_DATA
     // 
     LONG NextSessionId;
 
-    //
-    // Collection holding pending plugin requests
-    // 
-    WDFCOLLECTION PendingPluginRequests;
-
-    //
-    // Sync lock for pending request collection
-    // 
-    WDFSPINLOCK PendingPluginRequestsLock;
-
     //
     // Periodic timer sweeping up orphaned requests
     // 
diff --git a/sys/Queue.h b/sys/Queue.hpp
similarity index 100%
rename from sys/Queue.h
rename to sys/Queue.hpp
diff --git a/sys/ViGEmBus.vcxproj b/sys/ViGEmBus.vcxproj
index b3bda65..4548ac5 100644
--- a/sys/ViGEmBus.vcxproj
+++ b/sys/ViGEmBus.vcxproj
@@ -193,7 +193,7 @@
     <ClInclude Include="CRTCPP.hpp" />
     <ClInclude Include="Ds4Pdo.hpp" />
     <ClInclude Include="EmulationTargetPDO.hpp" />
-    <ClInclude Include="Queue.h" />
+    <ClInclude Include="Queue.hpp" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="trace.h" />
     <ClInclude Include="Util.h" />
diff --git a/sys/ViGEmBus.vcxproj.filters b/sys/ViGEmBus.vcxproj.filters
index 8dac57a..ac09d8a 100644
--- a/sys/ViGEmBus.vcxproj.filters
+++ b/sys/ViGEmBus.vcxproj.filters
@@ -39,9 +39,6 @@
     <ClInclude Include="busenum.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Context.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -75,6 +72,9 @@
     <ClInclude Include="Ds4Pdo.hpp">
       <Filter>Header Files\Targets</Filter>
     </ClInclude>
+    <ClInclude Include="Queue.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Util.c">
diff --git a/sys/busenum.h b/sys/busenum.h
index 2b34e0c..07b55d2 100644
--- a/sys/busenum.h
+++ b/sys/busenum.h
@@ -36,7 +36,7 @@
 #include <initguid.h>
 #include "ViGEmBusDriver.h"
 #include <ViGEm/km/BusShared.h>
-#include "Queue.h"
+#include "Queue.hpp"
 #include <usb.h>
 #include <usbbusif.h>
 #include "Context.h"
@@ -69,7 +69,9 @@ EXTERN_C_START
 DRIVER_INITIALIZE DriverEntry;
 
 EVT_WDF_DRIVER_DEVICE_ADD Bus_EvtDeviceAdd;
+
 EVT_WDF_DEVICE_FILE_CREATE Bus_DeviceFileCreate;
+
 EVT_WDF_FILE_CLOSE Bus_FileClose;
 
 EVT_WDF_CHILD_LIST_CREATE_DEVICE Bus_EvtDeviceListCreatePdo;