Removed a lot of useless #include's from a lot of files and reworked the SCSI #include's a bit to resolve the problem of scsi.h being a mess.

src/cdrom/cdrom.c

@@ -9,7 +9,7 @@
  *		Implementation of the CD-ROM drive with SCSI(-like)
  *		commands, for both ATAPI and SCSI usage.
  *
- * Version:	@(#)cdrom.c	1.0.49	2018/09/22
+ * Version:	@(#)cdrom.c	1.0.50	2018/10/02
  *
  * Author:	Miran Grca, <mgrca8@gmail.com>
  *
@@ -28,7 +28,7 @@
 #include "../timer.h"
 #include "../device.h"
 #include "../piix.h"
-#include "../scsi/scsi.h"
+#include "../scsi/scsi_device.h"
 #include "../nvr.h"
 #include "../disk/hdc.h"
 #include "../disk/hdc_ide.h"

src/cdrom/cdrom_image.cc

@@ -8,7 +8,7 @@
  *
  *		CD-ROM image support.
  *
- * Version:	@(#)cdrom_image.cc	1.0.0	2018/03/29
+ * Version:	@(#)cdrom_image.cc	1.0.1	2018/10/02
  *
  * Author:	RichardG867,
  *		Miran Grca, <mgrca8@gmail.com>
@@ -29,7 +29,7 @@
 #include <wchar.h>
 #include "../config.h"
 #include "../plat.h"
-#include "../scsi/scsi.h"
+#include "../scsi/scsi_device.h"
 #include "cdrom_dosbox.h"
 #include "cdrom.h"
 #include "cdrom_image.h"

src/cdrom/cdrom_null.c

@@ -9,7 +9,7 @@
  *		Implementation of the CD-ROM null interface for unmounted
  *		guest CD-ROM drives.
  *
- * Version:	@(#)cdrom_null.c	1.0.7	2018/03/26
+ * Version:	@(#)cdrom_null.c	1.0.8	2018/10/02
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <wchar.h>
 #include "../86box.h"
-#include "../scsi/scsi.h"
+#include "../scsi/scsi_device.h"
 #include "cdrom.h"