From bc5311786fe3756a7fcd8bdc4ba68a8963e43fc3 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 3 Feb 2014 00:15:44 +0000
Subject: [PATCH] [SERIAL] * Do not include debug.h into the main header. *
 Remove one time inclusions from the main header and put them back where they
 belong. * Improve the GUIDs situation. CORE-7716

svn path=/trunk/; revision=61941
---
 reactos/drivers/serial/serial/CMakeLists.txt   | 1 +
 reactos/drivers/serial/serial/circularbuffer.c | 2 ++
 reactos/drivers/serial/serial/cleanup.c        | 2 ++
 reactos/drivers/serial/serial/close.c          | 2 ++
 reactos/drivers/serial/serial/create.c         | 2 ++
 reactos/drivers/serial/serial/devctrl.c        | 2 ++
 reactos/drivers/serial/serial/guid.c           | 7 +++++++
 reactos/drivers/serial/serial/info.c           | 2 ++
 reactos/drivers/serial/serial/legacy.c         | 2 ++
 reactos/drivers/serial/serial/misc.c           | 2 ++
 reactos/drivers/serial/serial/pnp.c            | 5 ++++-
 reactos/drivers/serial/serial/power.c          | 2 ++
 reactos/drivers/serial/serial/rw.c             | 2 ++
 reactos/drivers/serial/serial/serial.h         | 3 ---
 14 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 reactos/drivers/serial/serial/guid.c

diff --git a/reactos/drivers/serial/serial/CMakeLists.txt b/reactos/drivers/serial/serial/CMakeLists.txt
index 6bea2c8c9c7..6e3e1d92c24 100644
--- a/reactos/drivers/serial/serial/CMakeLists.txt
+++ b/reactos/drivers/serial/serial/CMakeLists.txt
@@ -12,6 +12,7 @@ add_library(serial SHARED
     power.c
     rw.c
     serial.c
+    guid.c
     serial.rc)
 
 add_pch(serial serial.h)
diff --git a/reactos/drivers/serial/serial/circularbuffer.c b/reactos/drivers/serial/serial/circularbuffer.c
index 2f7a97d9eff..23a7d554ca7 100644
--- a/reactos/drivers/serial/serial/circularbuffer.c
+++ b/reactos/drivers/serial/serial/circularbuffer.c
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS
 InitializeCircularBuffer(
 	IN PCIRCULAR_BUFFER pBuffer,
diff --git a/reactos/drivers/serial/serial/cleanup.c b/reactos/drivers/serial/serial/cleanup.c
index 96f7240054b..925eba6250a 100644
--- a/reactos/drivers/serial/serial/cleanup.c
+++ b/reactos/drivers/serial/serial/cleanup.c
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialCleanup(
 	IN PDEVICE_OBJECT DeviceObject,
diff --git a/reactos/drivers/serial/serial/close.c b/reactos/drivers/serial/serial/close.c
index f5dc747c705..704416b3d4f 100644
--- a/reactos/drivers/serial/serial/close.c
+++ b/reactos/drivers/serial/serial/close.c
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialClose(
 	IN PDEVICE_OBJECT DeviceObject,
diff --git a/reactos/drivers/serial/serial/create.c b/reactos/drivers/serial/serial/create.c
index 8a03ae30f96..89e2bb6ace3 100644
--- a/reactos/drivers/serial/serial/create.c
+++ b/reactos/drivers/serial/serial/create.c
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialCreate(
 	IN PDEVICE_OBJECT DeviceObject,
diff --git a/reactos/drivers/serial/serial/devctrl.c b/reactos/drivers/serial/serial/devctrl.c
index d89eaece216..b7f056dd600 100644
--- a/reactos/drivers/serial/serial/devctrl.c
+++ b/reactos/drivers/serial/serial/devctrl.c
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 #define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003)
 
 static VOID
diff --git a/reactos/drivers/serial/serial/guid.c b/reactos/drivers/serial/serial/guid.c
new file mode 100644
index 00000000000..4fa09ffd718
--- /dev/null
+++ b/reactos/drivers/serial/serial/guid.c
@@ -0,0 +1,7 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <ntdef.h>
+#include <initguid.h>
+#include <ntddser.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
diff --git a/reactos/drivers/serial/serial/info.c b/reactos/drivers/serial/serial/info.c
index 2ebe6b05429..d2804bfcaf4 100644
--- a/reactos/drivers/serial/serial/info.c
+++ b/reactos/drivers/serial/serial/info.c
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialQueryInformation(
 	IN PDEVICE_OBJECT DeviceObject,
diff --git a/reactos/drivers/serial/serial/legacy.c b/reactos/drivers/serial/serial/legacy.c
index 7e1fdf2e604..7b887da7581 100644
--- a/reactos/drivers/serial/serial/legacy.c
+++ b/reactos/drivers/serial/serial/legacy.c
@@ -10,6 +10,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 UART_TYPE
 SerialDetectUartType(
 	IN PUCHAR BaseAddress)
diff --git a/reactos/drivers/serial/serial/misc.c b/reactos/drivers/serial/serial/misc.c
index b72ccd908e2..b684c36ce66 100644
--- a/reactos/drivers/serial/serial/misc.c
+++ b/reactos/drivers/serial/serial/misc.c
@@ -10,6 +10,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion;
 
 static NTSTATUS NTAPI
diff --git a/reactos/drivers/serial/serial/pnp.c b/reactos/drivers/serial/serial/pnp.c
index 80fc0610906..15c0ff4a2de 100644
--- a/reactos/drivers/serial/serial/pnp.c
+++ b/reactos/drivers/serial/serial/pnp.c
@@ -8,9 +8,12 @@
  */
 /* FIXME: call IoAcquireRemoveLock/IoReleaseRemoveLock around each I/O operation */
 
-#define INITGUID
 #include "serial.h"
 
+#include <stdio.h>
+#include <ndk/haltypes.h>
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialAddDeviceInternal(
 	IN PDRIVER_OBJECT DriverObject,
diff --git a/reactos/drivers/serial/serial/power.c b/reactos/drivers/serial/serial/power.c
index 21297e24436..1043a75f4a4 100644
--- a/reactos/drivers/serial/serial/power.c
+++ b/reactos/drivers/serial/serial/power.c
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 NTSTATUS NTAPI
 SerialPower(
 	IN PDEVICE_OBJECT DeviceObject,
diff --git a/reactos/drivers/serial/serial/rw.c b/reactos/drivers/serial/serial/rw.c
index 716e34b7f24..df101ca07b8 100644
--- a/reactos/drivers/serial/serial/rw.c
+++ b/reactos/drivers/serial/serial/rw.c
@@ -9,6 +9,8 @@
 
 #include "serial.h"
 
+#include <debug.h>
+
 static IO_WORKITEM_ROUTINE SerialReadWorkItem;
 
 static PVOID
diff --git a/reactos/drivers/serial/serial/serial.h b/reactos/drivers/serial/serial/serial.h
index 98da08b4881..6d878c22804 100644
--- a/reactos/drivers/serial/serial/serial.h
+++ b/reactos/drivers/serial/serial/serial.h
@@ -8,10 +8,7 @@
  */
 
 #include <ntddk.h>
-#include <ndk/haltypes.h>
 #include <ntddser.h>
-#include <stdio.h>
-#include <debug.h>
 
 /* See winbase.h */
 #define PST_RS232 1