From 86bdd2b0e0cccec1e6e2828e112d6b5d65d1e112 Mon Sep 17 00:00:00 2001
From: Aleksey Bragin <aleksey@reactos.org>
Date: Mon, 9 Mar 2009 18:49:47 +0000
Subject: [PATCH] - 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 |  1 -
 reactos/drivers/usb/nt4compat/usbdriver/keyboard.h | 11 +++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c b/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c
index 6751d97b333..9bd151369d2 100644
--- a/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c
+++ b/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c
@@ -7,7 +7,6 @@
  */
 
 #include "usbdriver.h"
-#include "kbdmou.h"
 
 NTSTATUS
 AddRegistryEntry(IN PCWSTR PortTypeName,
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/keyboard.h b/reactos/drivers/usb/nt4compat/usbdriver/keyboard.h
index c046c5075f7..fc4105c5696 100644
--- a/reactos/drivers/usb/nt4compat/usbdriver/keyboard.h
+++ b/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);