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

svn path=/trunk/; revision=61950
---
 reactos/drivers/storage/scsiport/precomp.h      | 11 +----------
 reactos/drivers/storage/scsiport/scsiport.c     | 13 ++++++++-----
 reactos/drivers/storage/scsiport/scsiport_int.h |  2 ++
 reactos/drivers/storage/scsiport/stubs.c        |  5 ++---
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/reactos/drivers/storage/scsiport/precomp.h b/reactos/drivers/storage/scsiport/precomp.h
index 8cfb69e8948..2289e17e7c6 100644
--- a/reactos/drivers/storage/scsiport/precomp.h
+++ b/reactos/drivers/storage/scsiport/precomp.h
@@ -1,10 +1 @@
-#include <ntddk.h>
-#include <srb.h>
-#include <scsi.h>
-#include <ntddscsi.h>
-#include <ntddstor.h>
-#include <ntdddisk.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "scsiport_int.h"
+#include <wdm.h>
diff --git a/reactos/drivers/storage/scsiport/scsiport.c b/reactos/drivers/storage/scsiport/scsiport.c
index d3e1b326200..d67d136be66 100644
--- a/reactos/drivers/storage/scsiport/scsiport.c
+++ b/reactos/drivers/storage/scsiport/scsiport.c
@@ -29,17 +29,21 @@
 
 #include "precomp.h"
 
-#ifndef NDEBUG
+#include <ntddk.h>
+#include <stdio.h>
+#include <scsi.h>
+#include <ntddscsi.h>
+#include <ntdddisk.h>
+
 #define NDEBUG
-#endif
 #include <debug.h>
 
+#include "scsiport_int.h"
+
 ULONG InternalDebugLevel = 0x00;
 
 #undef ScsiPortMoveMemory
 
-/* TYPES *********************************************************************/
-
 /* GLOBALS *******************************************************************/
 
 static BOOLEAN
@@ -6407,5 +6411,4 @@ ScsiPortConvertPhysicalAddressToUlong(IN SCSI_PHYSICAL_ADDRESS Address)
   return(Address.u.LowPart);
 }
 
-
 /* EOF */
diff --git a/reactos/drivers/storage/scsiport/scsiport_int.h b/reactos/drivers/storage/scsiport/scsiport_int.h
index 97ef8d4fcad..f865dd8187e 100644
--- a/reactos/drivers/storage/scsiport/scsiport_int.h
+++ b/reactos/drivers/storage/scsiport/scsiport_int.h
@@ -5,6 +5,8 @@
  *	An enumeration containing the states in the timer DFA
  */
 
+#pragma once
+
 #define VERSION "0.0.3"
 
 #ifndef PAGE_ROUND_UP
diff --git a/reactos/drivers/storage/scsiport/stubs.c b/reactos/drivers/storage/scsiport/stubs.c
index ac84daeb902..e23fb369472 100644
--- a/reactos/drivers/storage/scsiport/stubs.c
+++ b/reactos/drivers/storage/scsiport/stubs.c
@@ -6,10 +6,10 @@
  * PROGRAMMER:      Timo Kreuzer (timo.kreuzer@reactos.org)
  */
 
-/* INCLUDES *****************************************************************/
-
 #include "precomp.h"
 
+#include <srb.h>
+
 #define NDEBUG
 #include <debug.h>
 
@@ -270,4 +270,3 @@ ScsiPortWriteRegisterUlong(
 {
     WRITE_REGISTER_ULONG(Register, Value);
 }
-
-- 
2.17.1