diff --git a/src/include/86box/snd_opl.h b/src/include/86box/snd_opl.h
index 71dc6813f..f5a1058a8 100644
--- a/src/include/86box/snd_opl.h
+++ b/src/include/86box/snd_opl.h
@@ -37,9 +37,7 @@ enum fm_type {
     FM_YM2612    = 16, /* OPN2 */
     FM_YM3438    = 17, /* OPN2C */
     FM_YMF276    = 18, /* OPN2L */
-#if 0
     FM_YM2164    = 19, /* OPP */
-#endif
     FM_ESFM      = 20, /* ESFM */
     FM_OPL2BOARD = 21, /* OPL2Board (External Device) */
     FM_MAX       = 22
@@ -97,10 +95,8 @@ extern const device_t ym2612_ymfm_device;
 extern const device_t ym3438_ymfm_device;
 extern const device_t ymf276_ymfm_device;
 
-#if 0
 /* OPP Series */
 extern const device_t ym2164_ymfm_device;
-#endif
 
 extern const device_t esfm_esfmu_device;
 
diff --git a/src/sound/snd_opl.c b/src/sound/snd_opl.c
index 434fec6c6..9fb96777e 100644
--- a/src/sound/snd_opl.c
+++ b/src/sound/snd_opl.c
@@ -144,12 +144,10 @@ fm_driver_get(int chip_id, fm_drv_t *drv)
             drv->priv = device_add_inst(&ymf276_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
             break;
 
-#if 0
         case FM_YM2164: /* OPP */
             *drv      = ymfm_drv;
             drv->priv = device_add_inst(&ym2164_ymfm_device, fm_dev_inst[fm_driver][chip_id]++);
             break;
-#endif
         
         case FM_ESFM:
             *drv      = esfmu_opl_drv;
diff --git a/src/sound/snd_opl_ymfm.cpp b/src/sound/snd_opl_ymfm.cpp
index 1f69a8d35..d414e910e 100644
--- a/src/sound/snd_opl_ymfm.cpp
+++ b/src/sound/snd_opl_ymfm.cpp
@@ -416,12 +416,10 @@ ymfm_drv_init(const device_t *info)
             fm = (YMFMChipBase *) new YMFMChip<ymfm::ymf276>(14318181, FM_YMF276, FREQ_49716);
             break;
 
-#if 0
         case FM_YM2164: /* OPP */
             // TODO: Check rates and frequency
             fm = (YMFMChipBase *) new YMFMChip<ymfm::ym2164>(14318181, FM_YM2164, FREQ_49716);
             break;
-#endif
     }
 
     fm->set_do_cycles(1);
@@ -768,7 +766,6 @@ const device_t ymf276_ymfm_device = {
     .config        = NULL
 };
 
-#if 0
 const device_t ym2164_ymfm_device = {
     .name          = "Yamaha YM2164 OPP (YMFM)",
     .internal_name = "ym2164_ymfm",
@@ -782,7 +779,6 @@ const device_t ym2164_ymfm_device = {
     .force_redraw  = NULL,
     .config        = NULL
 };
-#endif
 
 const fm_drv_t ymfm_drv {
     .read          = &ymfm_drv_read,