[SERMOUSE]

* 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=61880

reactos/drivers/input/sermouse/createclose.c

@@ -8,6 +8,8 @@
 
 #include "sermouse.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SermouseCreate(
 	IN PDEVICE_OBJECT DeviceObject,

reactos/drivers/input/sermouse/detect.c

@@ -10,6 +10,9 @@
 
 #include "sermouse.h"
 
+#include <ntifs.h>
+#include <debug.h>
+
 /* Most of this file is ripped from reactos/drivers/bus/serenum/detect.c */
 
 static NTSTATUS

reactos/drivers/input/sermouse/fdo.c

@@ -8,6 +8,8 @@
 
 #include "sermouse.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SermouseAddDevice(
 	IN PDRIVER_OBJECT DriverObject,

reactos/drivers/input/sermouse/internaldevctl.c

@@ -8,6 +8,8 @@
 
 #include "sermouse.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SermouseInternalDeviceControl(
 	IN PDEVICE_OBJECT DeviceObject,

reactos/drivers/input/sermouse/misc.c

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

reactos/drivers/input/sermouse/readmouse.c

@@ -10,6 +10,8 @@
 
 #include "sermouse.h"
 
+#include <debug.h>
+
 static NTSTATUS
 SermouseDeviceIoControl(
 	IN PDEVICE_OBJECT DeviceObject,

reactos/drivers/input/sermouse/sermouse.c

@@ -6,9 +6,10 @@
  * PROGRAMMERS: Copyright 2005-2006 Hervé Poussineau ([email protected])
  */
 
-#define INITGUID
 #include "sermouse.h"
 
+#include <debug.h>
+
 static DRIVER_UNLOAD DriverUnload;
 static DRIVER_DISPATCH IrpStub;
 DRIVER_INITIALIZE DriverEntry;

reactos/drivers/input/sermouse/sermouse.h

@@ -1,8 +1,6 @@
-#include <ntifs.h>
-#include <kbdmou.h>
+#include <ntddk.h>
 #include <ntddser.h>
-#include <ntddmou.h>
-#include <debug.h>
+#include <kbdmou.h>
 
 #define SERMOUSE_TAG 'uoMS'