[FDC]

* 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 header inclusions.
CORE-7716

svn path=/trunk/; revision=61947

diff --git a/reactos/drivers/storage/fdc/fdc/fdc.c b/reactos/drivers/storage/fdc/fdc/fdc.c
index cf07a14..493fac8 100644 (file)
--- a/reactos/drivers/storage/fdc/fdc/fdc.c
+++ b/reactos/drivers/storage/fdc/fdc/fdc.c
@@ -13,7 +13,6 @@
 #define NDEBUG
 #include <debug.h>
 
-
 /* GLOBALS ********************************************************************/
 
 ULONG ControllerCount = 0;
@@ -166,4 +165,4 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject,
     DriverObject->DriverUnload = FdcDriverUnload;
 
     return STATUS_SUCCESS;
-}
\ No newline at end of file
+}

diff --git a/reactos/drivers/storage/fdc/fdc/fdc.h b/reactos/drivers/storage/fdc/fdc/fdc.h
index e63099c..4a2ed0c 100644 (file)
--- a/reactos/drivers/storage/fdc/fdc/fdc.h
+++ b/reactos/drivers/storage/fdc/fdc/fdc.h
@@ -7,9 +7,6 @@
  */
 
 #include <ntifs.h>
-#include <ntddk.h>
-#include <stdio.h>
-#include <debug.h>
 
 #define MAX_DEVICE_NAME 255
 #define MAX_ARC_PATH_LEN 255
@@ -124,5 +121,3 @@ NTAPI
 FdcPdoPnp(
     IN PDEVICE_OBJECT DeviceObject,
     IN PIRP Irp);
-
-/* EOF */

diff --git a/reactos/drivers/storage/fdc/fdc/fdo.c b/reactos/drivers/storage/fdc/fdc/fdo.c
index 0872417..869fe6c 100644 (file)
--- a/reactos/drivers/storage/fdc/fdc/fdo.c
+++ b/reactos/drivers/storage/fdc/fdc/fdo.c
@@ -10,6 +10,9 @@
 
 #include "fdc.h"
 
+#include <stdio.h>
+#include <debug.h>
+
 /* FUNCTIONS ******************************************************************/
 
 static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion;
@@ -573,4 +576,4 @@ FdcFdoPnp(
     return Status;
 }
 
-/* EOF */
\ No newline at end of file
+/* EOF */

diff --git a/reactos/drivers/storage/fdc/fdc/pdo.c b/reactos/drivers/storage/fdc/fdc/pdo.c
index 8b3d3d5..c24c24d 100644 (file)
--- a/reactos/drivers/storage/fdc/fdc/pdo.c
+++ b/reactos/drivers/storage/fdc/fdc/pdo.c
@@ -10,6 +10,8 @@
 
 #include "fdc.h"
 
+#include <debug.h>
+
 /* FUNCTIONS ******************************************************************/
 
 static