[KBDCLASS]

* Do not include debug.h from within the main header.
* Improve the GUIDs situation.
* Remove one time inclusions from the main header and put them back where they belong.
CORE-7716

svn path=/trunk/; revision=61878

reactos/drivers/input/kbdclass/CMakeLists.txt

@@ -2,6 +2,7 @@
 add_library(kbdclass SHARED
     kbdclass.c
     misc.c
+    guid.c
     kbdclass.rc)
 
 set_module_type(kbdclass kernelmodedriver)

reactos/drivers/input/kbdclass/guid.c

@@ -0,0 +1,8 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#define STDAPICALLTYPE __stdcall
+#include <wdm.h>
+#include <initguid.h>
+#include <kbdmou.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

reactos/drivers/input/kbdclass/kbdclass.c

@@ -7,9 +7,13 @@
  * PROGRAMMERS:     Hervé Poussineau ([email protected])
  */
 
-#define INITGUID
 #include "kbdclass.h"
 
+#include <stdio.h>
+#include <pseh/pseh2.h>
+#include <kbdmou.h>
+#include <debug.h>
+
 static DRIVER_UNLOAD DriverUnload;
 static DRIVER_DISPATCH ClassCreate;
 static DRIVER_DISPATCH ClassClose;

reactos/drivers/input/kbdclass/kbdclass.h

@@ -1,10 +1,5 @@
 #include <ntifs.h>
-#include <kbdmou.h>
 #include <ntddkbd.h>
-#include <stdio.h>
-#include <pseh/pseh2.h>
-
-#include <debug.h>
 
 #define MAX_PATH 260
 

reactos/drivers/input/kbdclass/misc.c

@@ -9,6 +9,8 @@
 
 #include "kbdclass.h"
 
+#include <debug.h>
+
 static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion;
 
 static NTSTATUS NTAPI