diff --git a/src/cdrom/cdrom.c b/src/cdrom/cdrom.c
index f57981234..ee5972756 100644
--- a/src/cdrom/cdrom.c
+++ b/src/cdrom/cdrom.c
@@ -25,6 +25,7 @@
 #include <86box/cdrom.h>
 #include <86box/cdrom_image.h>
 #include <86box/plat.h>
+#include <86box/scsi.h>
 #include <86box/scsi_device.h>
 #include <86box/sound.h>
 
diff --git a/src/disk/mo.c b/src/disk/mo.c
index d30cf9d94..18e49b2d7 100644
--- a/src/disk/mo.c
+++ b/src/disk/mo.c
@@ -31,6 +31,7 @@
 #include <86box/config.h>
 #include <86box/timer.h>
 #include <86box/device.h>
+#include <86box/scsi.h>
 #include <86box/scsi_device.h>
 #include <86box/nvr.h>
 #include <86box/path.h>
diff --git a/src/disk/zip.c b/src/disk/zip.c
index 1f45e4737..a4e124fee 100644
--- a/src/disk/zip.c
+++ b/src/disk/zip.c
@@ -27,6 +27,7 @@
 #include <86box/config.h>
 #include <86box/timer.h>
 #include <86box/device.h>
+#include <86box/scsi.h>
 #include <86box/scsi_device.h>
 #include <86box/nvr.h>
 #include <86box/plat.h>
diff --git a/src/include/86box/scsi.h b/src/include/86box/scsi.h
index 88259f18e..b0af25e44 100644
--- a/src/include/86box/scsi.h
+++ b/src/include/86box/scsi.h
@@ -21,6 +21,12 @@
 #ifndef EMU_SCSI_H
 # define EMU_SCSI_H
 
+/* Configuration. */
+#define SCSI_BUS_MAX    4  /* currently we support up to 4 controllers */
+
+#define SCSI_ID_MAX	    16 /* 16 on wide buses */
+#define SCSI_LUN_MAX    8  /* always 8 */
+
 extern int	scsi_card_current[SCSI_BUS_MAX];
 
 extern int	scsi_card_available(int card);
diff --git a/src/include/86box/scsi_device.h b/src/include/86box/scsi_device.h
index 6b6600d8e..f1a2a4728 100644
--- a/src/include/86box/scsi_device.h
+++ b/src/include/86box/scsi_device.h
@@ -21,10 +21,6 @@
 # define SCSI_DEVICE_H
 
 /* Configuration. */
-#define SCSI_BUS_MAX		4		/* currently we support up to 4 controllers */
-
-#define SCSI_ID_MAX		16		/* 16 on wide buses */
-#define SCSI_LUN_MAX		8		/* always 8 */
 
 #define SCSI_LUN_USE_CDB	0xff
 
@@ -361,8 +357,9 @@ typedef struct {
 #define SCSI_REMOVABLE_DISK 0x8000
 #define SCSI_REMOVABLE_CDROM 0x8005
 
+#ifdef EMU_SCSI_H
 extern scsi_device_t	scsi_devices[SCSI_BUS_MAX][SCSI_ID_MAX];
-
+#endif /* EMU_SCSI_H */
 
 extern int	cdrom_add_error_and_subchannel(uint8_t *b, int real_sector_type);
 extern int	cdrom_LBAtoMSF_accurate(void);
diff --git a/src/scsi/scsi_cdrom.c b/src/scsi/scsi_cdrom.c
index c7e9060e9..e90e0d773 100644
--- a/src/scsi/scsi_cdrom.c
+++ b/src/scsi/scsi_cdrom.c
@@ -27,6 +27,7 @@
 #include <86box/config.h>
 #include <86box/timer.h>
 #include <86box/device.h>
+#include <86box/scsi.h>
 #include <86box/scsi_device.h>
 #include <86box/nvr.h>
 #include <86box/hdc.h>
diff --git a/src/scsi/scsi_disk.c b/src/scsi/scsi_disk.c
index d3e7b6f11..133c23997 100644
--- a/src/scsi/scsi_disk.c
+++ b/src/scsi/scsi_disk.c
@@ -25,6 +25,7 @@
 #include <86box/nvr.h>
 #include <86box/hdd.h>
 #include <86box/hdc.h>
+#include <86box/scsi.h>
 #include <86box/scsi_device.h>
 #include <86box/hdc_ide.h>
 #include <86box/plat.h>