diff --git a/src/mame/drivers/cave.cpp b/src/mame/drivers/cave.cpp
index 4a8ac61a708..855ae2f1248 100644
--- a/src/mame/drivers/cave.cpp
+++ b/src/mame/drivers/cave.cpp
@@ -83,6 +83,7 @@ Versions known to exist but not dumped:
 
 #include "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
+#include "machine/nmk112.h"
 #include "machine/nvram.h"
 #include "machine/watchdog.h"
 #include "sound/2203intf.h"
@@ -2127,10 +2128,10 @@ MACHINE_CONFIG_START(cave_state::donpachi)
 	MCFG_DEVICE_ADD("oki2", OKIM6295, 4.224_MHz_XTAL/2, okim6295_device::PIN7_HIGH) // pin 7 not verified
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
-	MCFG_DEVICE_ADD("nmk112", NMK112, 0)
-	MCFG_NMK112_ROM0("oki1")
-	MCFG_NMK112_ROM1("oki2")
-	MCFG_NMK112_DISABLE_PAGEMASK(1 << 0)    // chip #0 (music) is not paged
+	nmk112_device &nmk112(NMK112(config, "nmk112", 0));
+	nmk112.set_rom0_tag("oki1");
+	nmk112.set_rom1_tag("oki2");
+	nmk112.set_page_mask(1 << 0);    // chip #0 (music) is not paged
 MACHINE_CONFIG_END
 
 
@@ -2633,9 +2634,9 @@ MACHINE_CONFIG_START(cave_state::pwrinst2)
 	MCFG_DEVICE_ADD("oki2", OKIM6295, 3_MHz_XTAL, okim6295_device::PIN7_LOW)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
 
-	MCFG_DEVICE_ADD("nmk112", NMK112, 0)
-	MCFG_NMK112_ROM0("oki1")
-	MCFG_NMK112_ROM1("oki2")
+	nmk112_device &nmk112(NMK112(config, "nmk112", 0));
+	nmk112.set_rom0_tag("oki1");
+	nmk112.set_rom1_tag("oki2");
 MACHINE_CONFIG_END
 
 
diff --git a/src/mame/drivers/nmk16.cpp b/src/mame/drivers/nmk16.cpp
index f6352035a98..3a75b7079ac 100644
--- a/src/mame/drivers/nmk16.cpp
+++ b/src/mame/drivers/nmk16.cpp
@@ -166,6 +166,7 @@ Afega stands for "Art-Fiction Electronic Game"
 #include "cpu/tlcs90/tlcs90.h"
 #include "cpu/z80/z80.h"
 #include "machine/nmk004.h"
+#include "machine/nmk112.h"
 #include "sound/2203intf.h"
 #include "sound/3812intf.h"
 #include "sound/okim6295.h"
@@ -4641,9 +4642,9 @@ MACHINE_CONFIG_START(nmk16_state::macross2)
 	MCFG_DEVICE_ADD("oki2", OKIM6295, 16000000/4, okim6295_device::PIN7_LOW)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
 
-	MCFG_DEVICE_ADD("nmk112", NMK112, 0)
-	MCFG_NMK112_ROM0("oki1")
-	MCFG_NMK112_ROM1("oki2")
+	nmk112_device &nmk112(NMK112(config, "nmk112", 0));
+	nmk112.set_rom0_tag("oki1");
+	nmk112.set_rom1_tag("oki2");
 MACHINE_CONFIG_END
 
 MACHINE_CONFIG_START(nmk16_state::tdragon2)
@@ -4686,9 +4687,9 @@ MACHINE_CONFIG_START(nmk16_state::tdragon2)
 	MCFG_DEVICE_ADD("oki2", OKIM6295, 16000000/4, okim6295_device::PIN7_LOW)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
 
-	MCFG_DEVICE_ADD("nmk112", NMK112, 0)
-	MCFG_NMK112_ROM0("oki1")
-	MCFG_NMK112_ROM1("oki2")
+	nmk112_device &nmk112(NMK112(config, "nmk112", 0));
+	nmk112.set_rom0_tag("oki1");
+	nmk112.set_rom1_tag("oki2");
 MACHINE_CONFIG_END
 
 // TODO : Sound system is different
@@ -4739,9 +4740,9 @@ MACHINE_CONFIG_START(nmk16_state::raphero)
 	MCFG_DEVICE_ADD("oki2", OKIM6295, 16000000/4, okim6295_device::PIN7_LOW)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
 
-	MCFG_DEVICE_ADD("nmk112", NMK112, 0)
-	MCFG_NMK112_ROM0("oki1")
-	MCFG_NMK112_ROM1("oki2")
+	nmk112_device &nmk112(NMK112(config, "nmk112", 0));
+	nmk112.set_rom0_tag("oki1");
+	nmk112.set_rom1_tag("oki2");
 MACHINE_CONFIG_END
 
 MACHINE_CONFIG_START(nmk16_state::bjtwin)
@@ -4771,9 +4772,9 @@ MACHINE_CONFIG_START(nmk16_state::bjtwin)
 	MCFG_DEVICE_ADD("oki2", OKIM6295, 16000000/4, okim6295_device::PIN7_LOW) /* verified on pcb */
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
 
-	MCFG_DEVICE_ADD("nmk112", NMK112, 0)
-	MCFG_NMK112_ROM0("oki1")
-	MCFG_NMK112_ROM1("oki2")
+	nmk112_device &nmk112(NMK112(config, "nmk112", 0));
+	nmk112.set_rom0_tag("oki1");
+	nmk112.set_rom1_tag("oki2");
 MACHINE_CONFIG_END
 
 
diff --git a/src/mame/drivers/patapata.cpp b/src/mame/drivers/patapata.cpp
index 8618f8d3a83..b79926f4405 100644
--- a/src/mame/drivers/patapata.cpp
+++ b/src/mame/drivers/patapata.cpp
@@ -313,9 +313,9 @@ MACHINE_CONFIG_START(patapata_state::patapata)
 	MCFG_DEVICE_ADD("oki2", OKIM6295, 16_MHz_XTAL / 4, okim6295_device::PIN7_LOW) // not verified
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
 
-	MCFG_DEVICE_ADD("nmk112", NMK112, 0) // or 212? difficult to read (maybe 212 is 2* 112?)
-	MCFG_NMK112_ROM0("oki1")
-	MCFG_NMK112_ROM1("oki2")
+	nmk112_device &nmk112(NMK112(config, "nmk112", 0)); // or 212? difficult to read (maybe 212 is 2* 112?)
+	nmk112.set_rom0_tag("oki1");
+	nmk112.set_rom1_tag("oki2");
 MACHINE_CONFIG_END
 
 ROM_START( patapata )
diff --git a/src/mame/drivers/powerins.cpp b/src/mame/drivers/powerins.cpp
index f8d472f88d8..4a9f19b6d3d 100644
--- a/src/mame/drivers/powerins.cpp
+++ b/src/mame/drivers/powerins.cpp
@@ -37,6 +37,7 @@ TODO:
 #include "cpu/z80/z80.h"
 #include "cpu/m68000/m68000.h"
 #include "machine/gen_latch.h"
+#include "machine/nmk112.h"
 #include "sound/okim6295.h"
 #include "sound/2203intf.h"
 #include "speaker.h"
@@ -325,9 +326,9 @@ MACHINE_CONFIG_START(powerins_state::powerins)
 	MCFG_YM2203_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
 
-	MCFG_DEVICE_ADD("nmk112", NMK112, 0)
-	MCFG_NMK112_ROM0("oki1")
-	MCFG_NMK112_ROM1("oki2")
+	nmk112_device &nmk112(NMK112(config, "nmk112", 0));
+	nmk112.set_rom0_tag("oki1");
+	nmk112.set_rom1_tag("oki2");
 MACHINE_CONFIG_END
 
 MACHINE_CONFIG_START(powerins_state::powerinsa)
@@ -351,7 +352,7 @@ MACHINE_CONFIG_START(powerins_state::powerinsa)
 
 	MCFG_DEVICE_REMOVE("oki2")
 	MCFG_DEVICE_REMOVE("ym2203")
-	MCFG_DEVICE_REMOVE("nmk112")
+	config.device_remove("nmk112");
 MACHINE_CONFIG_END
 
 MACHINE_CONFIG_START(powerins_state::powerinsb)
diff --git a/src/mame/drivers/quizpani.cpp b/src/mame/drivers/quizpani.cpp
index 1babbcba21a..f724091da97 100644
--- a/src/mame/drivers/quizpani.cpp
+++ b/src/mame/drivers/quizpani.cpp
@@ -219,8 +219,8 @@ MACHINE_CONFIG_START(quizpani_state::quizpani)
 	MCFG_DEVICE_ADD("oki", OKIM6295, 16000000/4, okim6295_device::PIN7_LOW)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
-	MCFG_DEVICE_ADD("nmk112", NMK112, 0)
-	MCFG_NMK112_ROM0("oki")
+	nmk112_device &nmk112(NMK112(config, "nmk112", 0));
+	nmk112.set_rom0_tag("oki");
 MACHINE_CONFIG_END
 
 ROM_START( quizpani )
diff --git a/src/mame/drivers/toaplan2.cpp b/src/mame/drivers/toaplan2.cpp
index 445e08fc2c5..2bfab0c13e7 100644
--- a/src/mame/drivers/toaplan2.cpp
+++ b/src/mame/drivers/toaplan2.cpp
@@ -729,8 +729,8 @@ WRITE8_MEMBER(toaplan2_state::raizing_z80_bankswitch_w)
 
 WRITE8_MEMBER(toaplan2_state::raizing_oki_bankswitch_w)
 {
-	m_nmk112->okibank_w(space, offset, data & 0x0f);
-	m_nmk112->okibank_w(space, offset + 1, (data >> 4) & 0x0f);
+	m_nmk112->okibank_w(offset, data & 0x0f);
+	m_nmk112->okibank_w(offset + 1, (data >> 4) & 0x0f);
 }
 
 
diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h
index 9e8f7f0856a..6883dbaaf98 100644
--- a/src/mame/includes/cave.h
+++ b/src/mame/includes/cave.h
@@ -13,7 +13,6 @@
 
 #include "machine/eepromser.h"
 #include "machine/gen_latch.h"
-#include "machine/nmk112.h"
 #include "machine/timer.h"
 #include "sound/okim6295.h"
 #include "emupal.h"
diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h
index d3df34dfe97..8e86d1a8048 100644
--- a/src/mame/includes/nmk16.h
+++ b/src/mame/includes/nmk16.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include "machine/nmk112.h"
 #include "sound/okim6295.h"
 #include "audio/seibu.h"
 #include "machine/nmk004.h"
diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h
index 66792390e30..0a89cbc0483 100644
--- a/src/mame/includes/powerins.h
+++ b/src/mame/includes/powerins.h
@@ -1,6 +1,5 @@
 // license:BSD-3-Clause
 // copyright-holders:Luca Elia
-#include "machine/nmk112.h"
 #include "emupal.h"
 #include "screen.h"
 
diff --git a/src/mame/machine/nmk112.cpp b/src/mame/machine/nmk112.cpp
index 1a4b52daea0..4de5062ac14 100644
--- a/src/mame/machine/nmk112.cpp
+++ b/src/mame/machine/nmk112.cpp
@@ -90,7 +90,7 @@ void nmk112_device::do_bankswitch( int offset, int data )
     DEVICE HANDLERS
 *****************************************************************************/
 
-WRITE8_MEMBER( nmk112_device::okibank_w )
+void nmk112_device::okibank_w(offs_t offset, u8 data)
 {
 	if (m_current_bank[offset] != data)
 		do_bankswitch(offset, data);
diff --git a/src/mame/machine/nmk112.h b/src/mame/machine/nmk112.h
index 7f0855fb1c7..1138349f317 100644
--- a/src/mame/machine/nmk112.h
+++ b/src/mame/machine/nmk112.h
@@ -25,7 +25,7 @@ public:
 	template <typename T> nmk112_device &set_rom1_tag(T &&tag) { m_rom1.set_tag(std::forward<T>(tag)); return *this; }
 	nmk112_device &set_page_mask(uint8_t mask) { m_page_mask = ~mask; return *this; }
 
-	DECLARE_WRITE8_MEMBER( okibank_w );
+	void okibank_w(offs_t offset, u8 data);
 
 protected:
 	// device-level overrides