diff --git a/drivers/usb/usbehci/fdo.c b/drivers/usb/usbehci/fdo.c
index 645f4cb6e24..d09ffbf0bff 100644
--- a/drivers/usb/usbehci/fdo.c
+++ b/drivers/usb/usbehci/fdo.c
@@ -22,6 +22,9 @@ EhciDefferedRoutine(PKDPC Dpc, PVOID DeferredContext, PVOID SystemArgument1, PVO
     ULONG OpRegisters;
     PEHCI_HOST_CONTROLLER hcd;
     LONG i;
+    ULONG CurrentAddr, OffSet;
+    PQUEUE_HEAD CompletedQH, NextQH;
+    PQUEUE_TRANSFER_DESCRIPTOR CompletedTD, NextTD;
 
     FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) DeferredContext;
 
@@ -44,10 +47,7 @@ EhciDefferedRoutine(PKDPC Dpc, PVOID DeferredContext, PVOID SystemArgument1, PVO
     if (CStatus & (EHCI_STS_INT | EHCI_ERROR_INT))
     {
         DPRINT("Asyn Complete!\n");
-        ULONG CurrentAddr, OffSet;
-        PQUEUE_HEAD CompletedQH, NextQH;
-        PQUEUE_TRANSFER_DESCRIPTOR CompletedTD, NextTD;
-        
+
         /* AsyncListAddr Register will have the next QueueHead to execute */
         CurrentAddr = GetAsyncListQueueRegister(hcd);
 
diff --git a/drivers/usb/usbehci/hwiface.c b/drivers/usb/usbehci/hwiface.c
index 92313ee13aa..b55105aa141 100644
--- a/drivers/usb/usbehci/hwiface.c
+++ b/drivers/usb/usbehci/hwiface.c
@@ -58,11 +58,12 @@ VOID
 DumpQueueHeadList(PEHCI_HOST_CONTROLLER hcd)
 {
     KIRQL OldIrql;
+    PQUEUE_HEAD QueueHead, FirstQueueHead;
 
     KeAcquireSpinLock(&hcd->Lock, &OldIrql);
 
-    PQUEUE_HEAD QueueHead = (PQUEUE_HEAD)hcd->CommonBufferVA;
-    PQUEUE_HEAD FirstQueueHead = QueueHead;
+    QueueHead = (PQUEUE_HEAD)hcd->CommonBufferVA;
+    FirstQueueHead = QueueHead;
     DPRINT1("Dumping QueueHead List!!!!!!!!!!!!!\n");
     while (1)
     {
diff --git a/drivers/usb/usbehci/pdo.c b/drivers/usb/usbehci/pdo.c
index 0254fcc8204..4b332822cfd 100644
--- a/drivers/usb/usbehci/pdo.c
+++ b/drivers/usb/usbehci/pdo.c
@@ -360,6 +360,8 @@ PdoDispatchPnp(
     PIO_STACK_LOCATION Stack;
     ULONG_PTR Information = Irp->IoStatus.Information;
     NTSTATUS Status = Irp->IoStatus.Status;
+    PDEVICE_CAPABILITIES DeviceCapabilities;
+    ULONG i;
 
     Stack = IoGetCurrentIrpStackLocation(Irp);
     MinorFunction = Stack->MinorFunction;
@@ -514,8 +516,6 @@ PdoDispatchPnp(
         case IRP_MN_QUERY_CAPABILITIES:
         {
             DPRINT("Ehci: PDO Query Capabilities\n");
-            PDEVICE_CAPABILITIES DeviceCapabilities;
-            ULONG i;
 
             DeviceCapabilities = (PDEVICE_CAPABILITIES)Stack->Parameters.DeviceCapabilities.Capabilities;