diff --git a/src/floppy/fdc.c b/src/floppy/fdc.c
index 756f43448..bce34e327 100644
--- a/src/floppy/fdc.c
+++ b/src/floppy/fdc.c
@@ -77,7 +77,7 @@ int         lastbyte = 0;
 int floppymodified[4];
 int floppyrate[4];
 
-int fdc_current[2] = { 0, 0 };
+int fdc_current[FDC_MAX] = { 0, 0 };
 
 #ifdef ENABLE_FDC_LOG
 int fdc_do_log = ENABLE_FDC_LOG;
diff --git a/src/include/86box/config.h b/src/include/86box/config.h
index d0b2857e7..4691686c7 100644
--- a/src/include/86box/config.h
+++ b/src/include/86box/config.h
@@ -113,7 +113,7 @@ typedef struct config_t {
 #    endif
 
     /* Other peripherals category */
-    int fdc_current[2];           /* Floppy disk controller type */
+    int fdc_current[FDC_MAX];     /* Floppy disk controller type */
     int hdc_current[2];           /* Hard disk controller type */
     int hdc;                      /* Hard disk controller */
     int scsi_card;                /* SCSI controller */
diff --git a/src/include/86box/fdc.h b/src/include/86box/fdc.h
index a00f59cd6..e03785df6 100644
--- a/src/include/86box/fdc.h
+++ b/src/include/86box/fdc.h
@@ -22,8 +22,6 @@
 #ifndef EMU_FDC_H
 #define EMU_FDC_H
 
-extern int fdc_current[2];
-
 #define FDC_PRIMARY_ADDR        0x03f0
 #define FDC_PRIMARY_IRQ         6
 #define FDC_PRIMARY_DMA         2
diff --git a/src/include/86box/fdc_ext.h b/src/include/86box/fdc_ext.h
index 2467b4901..188881f77 100644
--- a/src/include/86box/fdc_ext.h
+++ b/src/include/86box/fdc_ext.h
@@ -22,7 +22,9 @@
 #ifndef EMU_FDC_EXT_H
 #define EMU_FDC_EXT_H
 
-extern int fdc_current[2];
+#define FDC_MAX 2
+
+extern int fdc_current[FDC_MAX];
 
 /* Controller types. */
 #define FDC_NONE     0