[akhaldi] 61945: [DISK_NEW] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

Author: akhaldi
Date: Mon Feb  3 10:40:25 2014
New Revision: 61945

URL: http://svn.reactos.org/svn/reactos?rev=61945&view=rev
Log:
[DISK_NEW]
* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

Modified:
    trunk/reactos/drivers/storage/class/disk_new/data.c
    trunk/reactos/drivers/storage/class/disk_new/disk.c
    trunk/reactos/drivers/storage/class/disk_new/disk.h
    trunk/reactos/drivers/storage/class/disk_new/diskwmi.c
    trunk/reactos/drivers/storage/class/disk_new/enum.c
    trunk/reactos/drivers/storage/class/disk_new/geometry.c

Modified: trunk/reactos/drivers/storage/class/disk_new/data.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk_...
==============================================================================
--- trunk/reactos/drivers/storage/class/disk_new/data.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/disk_new/data.c	[iso-8859-1] Mon Feb  3 10:40:25 2014
@@ -79,4 +79,3 @@
 #ifdef ALLOC_DATA_PRAGMA
 #pragma data_seg()
 #endif
-

Modified: trunk/reactos/drivers/storage/class/disk_new/disk.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk_...
==============================================================================
--- trunk/reactos/drivers/storage/class/disk_new/disk.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/disk_new/disk.c	[iso-8859-1] Mon Feb  3 10:40:25 2014
@@ -26,9 +26,8 @@
 // Now instantiate the GUIDs
 //

-#include "initguid.h"
-#include "ntddstor.h"
-#include "ioevent.h"
+#include <initguid.h>
+#include <ioevent.h>

NTSTATUS
 NTAPI

Modified: trunk/reactos/drivers/storage/class/disk_new/disk.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk_...
==============================================================================
--- trunk/reactos/drivers/storage/class/disk_new/disk.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/disk_new/disk.h	[iso-8859-1] Mon Feb  3 10:40:25 2014
@@ -19,22 +19,21 @@
 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 @@

#define DiskHashGuid(Guid) (((PULONG) &Guid)[0] ^ ((PULONG) &Guid)[0] ^ ((PULONG) &Guid)[0] ^ ((PULONG) &Guid)[0])
-

Modified: trunk/reactos/drivers/storage/class/disk_new/diskwmi.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk_...
==============================================================================
--- trunk/reactos/drivers/storage/class/disk_new/diskwmi.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/disk_new/diskwmi.c	[iso-8859-1] Mon Feb  3 10:40:25 2014
@@ -21,6 +21,8 @@
 --*/

#include "disk.h"
+
+#include <wmistr.h>

NTSTATUS
 NTAPI

Modified: trunk/reactos/drivers/storage/class/disk_new/enum.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk_...
==============================================================================
--- trunk/reactos/drivers/storage/class/disk_new/enum.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/disk_new/enum.c	[iso-8859-1] Mon Feb  3 10:40:25 2014
@@ -1244,4 +1244,3 @@
     KeSetEvent(&(diskData->PartitioningEvent), IO_NO_INCREMENT, FALSE);
     return;
 }
-

Modified: trunk/reactos/drivers/storage/class/disk_new/geometry.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk_...
==============================================================================
--- trunk/reactos/drivers/storage/class/disk_new/geometry.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/disk_new/geometry.c	[iso-8859-1] Mon Feb  3 10:40:25 2014
@@ -21,9 +21,7 @@

--*/

-
 #include "disk.h"
-#include "ntddstor.h"

#if defined (_X86_)