[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

diff --git a/reactos/drivers/storage/class/cdrom/CMakeLists.txt b/reactos/drivers/storage/class/cdrom/CMakeLists.txt
index af05578..7b91827 100644 (file)
--- 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 6161e68..f573eed 100644 (file)
--- 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 6b0cab6..a412957 100644 (file)
--- 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 e1d5878..064d914 100644 (file)
--- 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>