From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Wed, 29 Jan 2014 10:56:25 +0000 (+0000)
Subject: [SERMOUSE]
X-Git-Tag: ReactOS-0.3.16~10
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=0bf31251eabbc46f177dc69a070c76a43f13843d

[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
---

diff --git a/reactos/drivers/input/sermouse/createclose.c b/reactos/drivers/input/sermouse/createclose.c
index 0c213dcdf53..a70bfd701d2 100644
--- a/reactos/drivers/input/sermouse/createclose.c
+++ b/reactos/drivers/input/sermouse/createclose.c
@@ -8,6 +8,8 @@
 
 #include "sermouse.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SermouseCreate(
 	IN PDEVICE_OBJECT DeviceObject,
diff --git a/reactos/drivers/input/sermouse/detect.c b/reactos/drivers/input/sermouse/detect.c
index f27ee82d46a..f5fa5271181 100644
--- a/reactos/drivers/input/sermouse/detect.c
+++ b/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
diff --git a/reactos/drivers/input/sermouse/fdo.c b/reactos/drivers/input/sermouse/fdo.c
index a8f7c7262b3..486abea139c 100644
--- a/reactos/drivers/input/sermouse/fdo.c
+++ b/reactos/drivers/input/sermouse/fdo.c
@@ -8,6 +8,8 @@
 
 #include "sermouse.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SermouseAddDevice(
 	IN PDRIVER_OBJECT DriverObject,
diff --git a/reactos/drivers/input/sermouse/internaldevctl.c b/reactos/drivers/input/sermouse/internaldevctl.c
index 37bf775193f..0022ac33eca 100644
--- a/reactos/drivers/input/sermouse/internaldevctl.c
+++ b/reactos/drivers/input/sermouse/internaldevctl.c
@@ -8,6 +8,8 @@
 
 #include "sermouse.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SermouseInternalDeviceControl(
 	IN PDEVICE_OBJECT DeviceObject,
diff --git a/reactos/drivers/input/sermouse/misc.c b/reactos/drivers/input/sermouse/misc.c
index cb288392831..0465e83988b 100644
--- a/reactos/drivers/input/sermouse/misc.c
+++ b/reactos/drivers/input/sermouse/misc.c
@@ -8,6 +8,8 @@
 
 #include "sermouse.h"
 
+#include <debug.h>
+
 static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion;
 
 static NTSTATUS NTAPI
diff --git a/reactos/drivers/input/sermouse/readmouse.c b/reactos/drivers/input/sermouse/readmouse.c
index 0c7f48c8559..6142e9bdeb9 100644
--- a/reactos/drivers/input/sermouse/readmouse.c
+++ b/reactos/drivers/input/sermouse/readmouse.c
@@ -10,6 +10,8 @@
 
 #include "sermouse.h"
 
+#include <debug.h>
+
 static NTSTATUS
 SermouseDeviceIoControl(
 	IN PDEVICE_OBJECT DeviceObject,
diff --git a/reactos/drivers/input/sermouse/sermouse.c b/reactos/drivers/input/sermouse/sermouse.c
index 10091b2b0ab..c7e8b789a46 100644
--- a/reactos/drivers/input/sermouse/sermouse.c
+++ b/reactos/drivers/input/sermouse/sermouse.c
@@ -6,9 +6,10 @@
  * PROGRAMMERS: Copyright 2005-2006 Hervé Poussineau (hpoussin@reactos.org)
  */
 
-#define INITGUID
 #include "sermouse.h"
 
+#include <debug.h>
+
 static DRIVER_UNLOAD DriverUnload;
 static DRIVER_DISPATCH IrpStub;
 DRIVER_INITIALIZE DriverEntry;
diff --git a/reactos/drivers/input/sermouse/sermouse.h b/reactos/drivers/input/sermouse/sermouse.h
index b884008b7b6..696bb171811 100644
--- a/reactos/drivers/input/sermouse/sermouse.h
+++ b/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'