From 79551e8e303c1274a17a0fc67d50ff1e9e376f55 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 3 Feb 2014 10:40:25 +0000
Subject: [PATCH] [DISK_NEW] * Remove one time inclusions from the main header
 and put them back where they belong. * Improve header inclusions. CORE-7716

svn path=/trunk/; revision=61945
---
 reactos/drivers/storage/class/disk_new/data.c     |  1 -
 reactos/drivers/storage/class/disk_new/disk.c     |  5 ++---
 reactos/drivers/storage/class/disk_new/disk.h     | 14 ++++++--------
 reactos/drivers/storage/class/disk_new/diskwmi.c  |  2 ++
 reactos/drivers/storage/class/disk_new/enum.c     |  1 -
 reactos/drivers/storage/class/disk_new/geometry.c |  2 --
 6 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/reactos/drivers/storage/class/disk_new/data.c b/reactos/drivers/storage/class/disk_new/data.c
index c2fab4fea00..1b555bf3e4f 100644
--- a/reactos/drivers/storage/class/disk_new/data.c
+++ b/reactos/drivers/storage/class/disk_new/data.c
@@ -79,4 +79,3 @@ DISK_MEDIA_TYPES_LIST const DiskMediaTypes[] = {
 #ifdef ALLOC_DATA_PRAGMA
 #pragma data_seg()
 #endif
-
diff --git a/reactos/drivers/storage/class/disk_new/disk.c b/reactos/drivers/storage/class/disk_new/disk.c
index cc0cd957c42..dba37bdbc44 100644
--- a/reactos/drivers/storage/class/disk_new/disk.c
+++ b/reactos/drivers/storage/class/disk_new/disk.c
@@ -26,9 +26,8 @@ Revision History:
 // Now instantiate the GUIDs
 //
 
-#include "initguid.h"
-#include "ntddstor.h"
-#include "ioevent.h"
+#include <initguid.h>
+#include <ioevent.h>
 
 NTSTATUS
 NTAPI
diff --git a/reactos/drivers/storage/class/disk_new/disk.h b/reactos/drivers/storage/class/disk_new/disk.h
index 55eefc08593..d7bc16af3d2 100644
--- a/reactos/drivers/storage/class/disk_new/disk.h
+++ b/reactos/drivers/storage/class/disk_new/disk.h
@@ -19,22 +19,21 @@ Notes:
 Revision History:
 
 --*/
+
 #undef _WIN32_WINNT
 #define _WIN32_WINNT 0x0501
 #define NTDDI_VERSION NTDDI_WINXP
 
-#include "ntddk.h"
-#include "scsi.h"
+#include <ntddk.h>
 #include <wmidata.h>
-#include "classpnp.h"
+#include <classpnp.h>
+
 #if defined(JAPAN) && defined(_X86_)
-#include "machine.h"
+#include <machine.h>
 #endif
 
-#include <wmistr.h>
-
 #if defined(_X86_)
-#include "mountdev.h"
+#include <mountdev.h>
 #endif
 
 #ifdef ExAllocatePool
@@ -976,4 +975,3 @@ DiskReadSignature(
 
 
 #define DiskHashGuid(Guid) (((PULONG) &Guid)[0] ^ ((PULONG) &Guid)[0] ^ ((PULONG) &Guid)[0] ^ ((PULONG) &Guid)[0])
-
diff --git a/reactos/drivers/storage/class/disk_new/diskwmi.c b/reactos/drivers/storage/class/disk_new/diskwmi.c
index 115793d3d5e..28ec458c992 100644
--- a/reactos/drivers/storage/class/disk_new/diskwmi.c
+++ b/reactos/drivers/storage/class/disk_new/diskwmi.c
@@ -22,6 +22,8 @@ Revision History:
 
 #include "disk.h"
 
+#include <wmistr.h>
+
 NTSTATUS
 NTAPI
 DiskSendFailurePredictIoctl(
diff --git a/reactos/drivers/storage/class/disk_new/enum.c b/reactos/drivers/storage/class/disk_new/enum.c
index b22fe8032f5..5c6ee6c4808 100644
--- a/reactos/drivers/storage/class/disk_new/enum.c
+++ b/reactos/drivers/storage/class/disk_new/enum.c
@@ -1244,4 +1244,3 @@ DiskReleasePartitioningLock(
     KeSetEvent(&(diskData->PartitioningEvent), IO_NO_INCREMENT, FALSE);
     return;
 }
-
diff --git a/reactos/drivers/storage/class/disk_new/geometry.c b/reactos/drivers/storage/class/disk_new/geometry.c
index 6e1b47dc00f..53df0969e84 100644
--- a/reactos/drivers/storage/class/disk_new/geometry.c
+++ b/reactos/drivers/storage/class/disk_new/geometry.c
@@ -21,9 +21,7 @@ Revision History:
 
 --*/
 
-
 #include "disk.h"
-#include "ntddstor.h"
 
 #if defined (_X86_)
 
-- 
2.17.1