diff --git a/src/chipset/ali1489.c b/src/chipset/ali1489.c
index 921c7d082..da6ff39cc 100644
--- a/src/chipset/ali1489.c
+++ b/src/chipset/ali1489.c
@@ -197,9 +197,7 @@ ali1489_defaults(ali1489_t *dev)
 
     picintc(1 << 10);
     picintc(1 << 15);
-#ifdef OLD_NMI_BEHAVIOR
     nmi = 0;
-#endif
     smi_line = 0;
     in_smm = 0;
 
diff --git a/src/chipset/via_pipc.c b/src/chipset/via_pipc.c
index 720ad7561..bcb54130f 100644
--- a/src/chipset/via_pipc.c
+++ b/src/chipset/via_pipc.c
@@ -728,10 +728,8 @@ pipc_fmnmi_read(uint16_t addr, void *priv)
     if  (dev->ac97_regs[0][0x48] & 0x01) {
 	if (dev->ac97_regs[0][0x48] & 0x04)
 		smi_line = 0;
-#ifdef OLD_NMI_BEHAVIOR
 	else
 		nmi = 0;
-#endif
     }
 #endif
 
diff --git a/src/machine/m_amstrad.c b/src/machine/m_amstrad.c
index cac5a29d2..baf78d071 100644
--- a/src/machine/m_amstrad.c
+++ b/src/machine/m_amstrad.c
@@ -1068,9 +1068,7 @@ vid_in_200(uint16_t addr, void *priv)
 	case 0x03dd:
 		ret = vid->crtc_index;		/* Read NMI reason */
 		vid->crtc_index &= 0x1f;	/* Reset NMI reason */
-#ifdef OLD_NMI_BEHAVIOR
 		nmi = 0;			/* And reset NMI flag */
-#endif
 		return(ret);
 
 	case 0x03de:
diff --git a/src/sound/snd_audiopci.c b/src/sound/snd_audiopci.c
index fe00038c7..4791be6a0 100644
--- a/src/sound/snd_audiopci.c
+++ b/src/sound/snd_audiopci.c
@@ -306,9 +306,7 @@ es1371_reset(void *p)
     es1371_t *dev = (es1371_t *) p;
     int       i;
 
-#ifdef OLD_NMI_BEHAVIOR
     nmi = 0;
-#endif
 
     /* Interrupt/Chip Select Control Register, Address 00H
        Addressable as byte, word, longword */
diff --git a/src/video/vid_sigma.c b/src/video/vid_sigma.c
index 154469317..73a9363e8 100644
--- a/src/video/vid_sigma.c
+++ b/src/video/vid_sigma.c
@@ -245,9 +245,7 @@ sigma_out(uint16_t addr, uint8_t val, void *p)
 		sigma->lastport &= 0x7F;
 		return;
 	case 0x2DC:	/* Reset NMI */
-#ifdef OLD_NMI_BEHAVIOR
 		nmi = 0;
-#endif
 		sigma->lastport &= 0x7F;
 		return;
 	case 0x2DD:	/* Page in RAM at 0xC1800 */