- Fix wrong placement of KEYBOARD_DEVICE_EXTENSION structure.

- Fix wrong include order.
- Fixes build.

svn path=/trunk/; revision=39918

reactos/drivers/usb/nt4compat/usbdriver/keyboard.c

@@ -7,7 +7,6 @@
  */
 
 #include "usbdriver.h"
-#include "kbdmou.h"
 
 NTSTATUS
 AddRegistryEntry(IN PCWSTR PortTypeName,

reactos/drivers/usb/nt4compat/usbdriver/keyboard.h

@@ -1,6 +1,8 @@
 #ifndef __KEYBOARD_H__
 #define __KEYBOARD_H__
 
+#include "kbdmou.h"
+
 typedef struct _KEYBOARD_DRVR_EXTENSION
 {
     PUSB_INTERFACE_DESC pif_desc;
@@ -17,6 +19,15 @@ typedef struct _KEYBOARD_DRVR_EXTENSION
     struct _KEYBOARD_DEVICE_EXTENSION *device_ext; // back pointer
 } KEYBOARD_DRVR_EXTENSION, *PKEYBOARD_DRVR_EXTENSION;
 
+typedef struct _KEYBOARD_DEVICE_EXTENSION
+{
+    DEVEXT_HEADER                 hdr; // mandatory header
+    PKEYBOARD_DRVR_EXTENSION      DriverExtension;
+    KEYBOARD_INDICATOR_PARAMETERS KeyboardIndicators;
+    CONNECT_DATA                  ConnectData;
+    PDEVICE_OBJECT                Fdo;
+} KEYBOARD_DEVICE_EXTENSION, *PKEYBOARD_DEVICE_EXTENSION;
+
 BOOLEAN
 kbd_driver_init(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver);