From 268afe1faf53dcabb7e29b7f7270b855f5f91093 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 27 Jan 2014 12:29:29 +0000
Subject: [PATCH] [CONDRV] * Remove one time inclusions from the main header
 and put them back where they belong. * Improve header inclusions. CORE-7716

svn path=/trunk/; revision=61852
---
 reactos/drivers/base/condrv/condrv.c  |  1 -
 reactos/drivers/base/condrv/condrv.h  | 15 ++-------------
 reactos/drivers/base/condrv/control.c |  3 ++-
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/reactos/drivers/base/condrv/condrv.c b/reactos/drivers/base/condrv/condrv.c
index 7d1e2367e30..6b96b974921 100644
--- a/reactos/drivers/base/condrv/condrv.c
+++ b/reactos/drivers/base/condrv/condrv.c
@@ -13,7 +13,6 @@
 #define NDEBUG
 #include <debug.h>
 
-
 /* FUNCTIONS ******************************************************************/
 
 /*
diff --git a/reactos/drivers/base/condrv/condrv.h b/reactos/drivers/base/condrv/condrv.h
index 85f4f2199f8..38be86e15fc 100644
--- a/reactos/drivers/base/condrv/condrv.h
+++ b/reactos/drivers/base/condrv/condrv.h
@@ -17,34 +17,23 @@
     #include "VisualDDKHelpers.h"
 #endif
 
-
-#include <ntddk.h>
-#include <condrv/ntddcon.h>
-
+#include <wdm.h>
 
 #define CONDRV_TAG      ' noC'
 #define DD_CONDRV_TAG   '1noC'
 #define CONDRV_CONS_TAG '2noC'
 
-
-//
-// Console Driver object extension
-//
+/* Console Driver object extension */
 typedef struct _CONDRV_DRIVER
 {
     UNICODE_STRING RegistryPath;
     PDEVICE_OBJECT Controller; // The unique Controller device for the driver.
 } CONDRV_DRIVER, *PCONDRV_DRIVER;
 
-
-
 NTSTATUS NTAPI
 ConDrvCreateController(IN PDRIVER_OBJECT DriverObject,
                        IN PUNICODE_STRING RegistryPath);
 NTSTATUS NTAPI
 ConDrvDeleteController(IN PDRIVER_OBJECT DriverObject);
 
-
 #endif // __CONDRV_H__
-
-/* EOF */
diff --git a/reactos/drivers/base/condrv/control.c b/reactos/drivers/base/condrv/control.c
index 819a098f6fc..78ce5b402a1 100644
--- a/reactos/drivers/base/condrv/control.c
+++ b/reactos/drivers/base/condrv/control.c
@@ -10,10 +10,11 @@
 
 #include "condrv.h"
 
+#include <condrv/ntddcon.h>
+
 #define NDEBUG
 #include <debug.h>
 
-
 /* FUNCTIONS ******************************************************************/
 
 NTSTATUS NTAPI