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

svn path=/trunk/; revision=61943
---
 reactos/drivers/storage/class/cdrom/CMakeLists.txt | 2 +-
 reactos/drivers/storage/class/cdrom/cdrom.c        | 7 +++++++
 reactos/drivers/storage/class/cdrom/findscsi.c     | 1 -
 reactos/drivers/storage/class/cdrom/precomp.h      | 9 ++-------
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/reactos/drivers/storage/class/cdrom/CMakeLists.txt b/reactos/drivers/storage/class/cdrom/CMakeLists.txt
index af0557833a7..7b91827505c 100644
--- a/reactos/drivers/storage/class/cdrom/CMakeLists.txt
+++ b/reactos/drivers/storage/class/cdrom/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-include_directories(..)
+include_directories(${REACTOS_SOURCE_DIR}/drivers/storage/class)
 
 add_library(cdrom SHARED cdrom.c findscsi.c cdrom.rc)
 
diff --git a/reactos/drivers/storage/class/cdrom/cdrom.c b/reactos/drivers/storage/class/cdrom/cdrom.c
index 6161e68ccf7..f573eeda932 100644
--- a/reactos/drivers/storage/class/cdrom/cdrom.c
+++ b/reactos/drivers/storage/class/cdrom/cdrom.c
@@ -8,6 +8,13 @@
 
 #include "precomp.h"
 
+#include <ntddk.h>
+#include <scsi.h>
+#include <ntdddisk.h>
+#include <ntddcdrm.h>
+#include <include/class2.h>
+#include <stdio.h>
+
 //#define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/drivers/storage/class/cdrom/findscsi.c b/reactos/drivers/storage/class/cdrom/findscsi.c
index 6b0cab655be..a4129579a78 100644
--- a/reactos/drivers/storage/class/cdrom/findscsi.c
+++ b/reactos/drivers/storage/class/cdrom/findscsi.c
@@ -306,4 +306,3 @@ FindScsiAdapter (
 #endif
    return (STATUS_OBJECT_PATH_NOT_FOUND);
 }
-
diff --git a/reactos/drivers/storage/class/cdrom/precomp.h b/reactos/drivers/storage/class/cdrom/precomp.h
index e1d5878ae1e..064d9149022 100644
--- a/reactos/drivers/storage/class/cdrom/precomp.h
+++ b/reactos/drivers/storage/class/cdrom/precomp.h
@@ -1,7 +1,2 @@
-#include <ntddk.h>
-#include <scsi.h>
-#include <ntddscsi.h>
-#include <ntdddisk.h>
-#include <ntddcdrm.h>
-#include <include/class2.h>
-#include <stdio.h>
+#include <ntdef.h>
+#include <ntstatus.h>