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

svn path=/trunk/; revision=61949
---
 reactos/drivers/storage/ide/pciidex/fdo.c      | 3 +++
 reactos/drivers/storage/ide/pciidex/miniport.c | 1 -
 reactos/drivers/storage/ide/pciidex/pciidex.h  | 3 ---
 reactos/drivers/storage/ide/pciidex/pdo.c      | 2 ++
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/reactos/drivers/storage/ide/pciidex/fdo.c b/reactos/drivers/storage/ide/pciidex/fdo.c
index 497842fd09e..0d6cb3baa4f 100644
--- a/reactos/drivers/storage/ide/pciidex/fdo.c
+++ b/reactos/drivers/storage/ide/pciidex/fdo.c
@@ -11,6 +11,9 @@
 #define NDEBUG
 #include <debug.h>
 
+#include <initguid.h>
+#include <wdmguid.h>
+
 static NTSTATUS
 GetBusInterface(
 	IN PFDO_DEVICE_EXTENSION DeviceExtension)
diff --git a/reactos/drivers/storage/ide/pciidex/miniport.c b/reactos/drivers/storage/ide/pciidex/miniport.c
index 1eed359de9a..d26300f4092 100644
--- a/reactos/drivers/storage/ide/pciidex/miniport.c
+++ b/reactos/drivers/storage/ide/pciidex/miniport.c
@@ -6,7 +6,6 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
  */
 
-#define INITGUID
 #include "pciidex.h"
 
 #define NDEBUG
diff --git a/reactos/drivers/storage/ide/pciidex/pciidex.h b/reactos/drivers/storage/ide/pciidex/pciidex.h
index f2c2836e504..88db4587bc4 100644
--- a/reactos/drivers/storage/ide/pciidex/pciidex.h
+++ b/reactos/drivers/storage/ide/pciidex/pciidex.h
@@ -1,8 +1,5 @@
 #include <ntifs.h>
-#include <ntddk.h>
 #include <ide.h>
-#include <wdmguid.h>
-#include <stdio.h>
 
 typedef struct _PCIIDEX_DRIVER_EXTENSION
 {
diff --git a/reactos/drivers/storage/ide/pciidex/pdo.c b/reactos/drivers/storage/ide/pciidex/pdo.c
index f79b00a5315..af41e5f5f70 100644
--- a/reactos/drivers/storage/ide/pciidex/pdo.c
+++ b/reactos/drivers/storage/ide/pciidex/pdo.c
@@ -8,6 +8,8 @@
 
 #include "pciidex.h"
 
+#include <stdio.h>
+
 #define NDEBUG
 #include <debug.h>
 
-- 
2.17.1