diff --git a/src/mame/drivers/atari_s2.c b/src/mame/drivers/atari_s2.c
index aa43a08fb68..31158b6b26e 100644
--- a/src/mame/drivers/atari_s2.c
+++ b/src/mame/drivers/atari_s2.c
@@ -13,7 +13,6 @@
 
 #include "machine/genpin.h"
 #include "cpu/m6800/m6800.h"
-#include "machine/nvram.h"
 #include "atari_s2.lh"
 
 
diff --git a/src/mame/drivers/flicker.c b/src/mame/drivers/flicker.c
index 7749a5b81b2..d6086f8ecc3 100644
--- a/src/mame/drivers/flicker.c
+++ b/src/mame/drivers/flicker.c
@@ -19,7 +19,6 @@
 
 #include "machine/genpin.h"
 #include "cpu/i4004/i4004.h"
-#include "machine/nvram.h"
 #include "flicker.lh"
 
 class flicker_state : public genpin_class
diff --git a/src/mame/drivers/g627.c b/src/mame/drivers/g627.c
index ddd3844470b..86486e0f922 100644
--- a/src/mame/drivers/g627.c
+++ b/src/mame/drivers/g627.c
@@ -40,7 +40,6 @@ ToDo:
 #include "machine/genpin.h"
 #include "cpu/z80/z80.h"
 #include "machine/i8155.h"
-#include "machine/nvram.h"
 #include "sound/astrocde.h"
 #include "g627.lh"
 
diff --git a/src/mame/drivers/nsm.c b/src/mame/drivers/nsm.c
index 1bc2bc24b3c..27585669f02 100644
--- a/src/mame/drivers/nsm.c
+++ b/src/mame/drivers/nsm.c
@@ -15,10 +15,9 @@ ToDo:
 
 *********************************************************************************/
 
-#include "emu.h"
+#include "machine/genpin.h"
 #include "cpu/tms9900/tms9900l.h"
 #include "sound/ay8910.h"
-#include "machine/nvram.h"
 #include "nsm.lh"
 
 
diff --git a/src/mame/drivers/rowamet.c b/src/mame/drivers/rowamet.c
index f295751a8c5..e8e2d459892 100644
--- a/src/mame/drivers/rowamet.c
+++ b/src/mame/drivers/rowamet.c
@@ -13,7 +13,7 @@ ToDO:
 
 *************************************************************************************/
 
-#include "emu.h"
+#include "machine/genpin.h"
 #include "cpu/z80/z80.h"
 #include "sound/dac.h"
 #include "rowamet.lh"
diff --git a/src/mame/drivers/spectra.c b/src/mame/drivers/spectra.c
index 10691f19db6..e14e40971df 100644
--- a/src/mame/drivers/spectra.c
+++ b/src/mame/drivers/spectra.c
@@ -19,7 +19,6 @@
 #include "machine/genpin.h"
 #include "cpu/m6502/m6502.h"
 #include "machine/6532riot.h"
-#include "machine/nvram.h"
 #include "sound/sn76477.h"
 #include "spectra.lh"
 
diff --git a/src/mame/drivers/techno.c b/src/mame/drivers/techno.c
index 88ffe786ff1..1cfb99a8c3d 100644
--- a/src/mame/drivers/techno.c
+++ b/src/mame/drivers/techno.c
@@ -11,9 +11,8 @@ ToDo:
 ***********************************************************************************/
 
 
-#include "emu.h"
+#include "machine/genpin.h"
 #include "cpu/m68000/m68000.h"
-#include "machine/nvram.h"
 #include "techno.lh"
 
 #define TECHNO_MAINCLK 8e6
diff --git a/src/mame/drivers/wico.c b/src/mame/drivers/wico.c
index 6e327fb336f..3d02f10d2f1 100644
--- a/src/mame/drivers/wico.c
+++ b/src/mame/drivers/wico.c
@@ -29,7 +29,6 @@ ToDo:
 
 #include "machine/genpin.h"
 #include "cpu/m6809/m6809.h"
-#include "machine/nvram.h"
 #include "sound/sn76496.h"
 #include "wico.lh"
 
diff --git a/src/mame/drivers/zac_1.c b/src/mame/drivers/zac_1.c
index 00d99710ad2..5897662f74c 100644
--- a/src/mame/drivers/zac_1.c
+++ b/src/mame/drivers/zac_1.c
@@ -1,5 +1,6 @@
 /*************************************************************************************
 
+    Pinball
     Zaccaria Generation 1
 
     Made working in Sept 2012 [Robbbert]
@@ -29,7 +30,6 @@ ToDo:
 
 #include "machine/genpin.h"
 #include "cpu/s2650/s2650.h"
-#include "machine/nvram.h"
 #include "zac_1.lh"
 
 class zac_1_state : public genpin_class
diff --git a/src/mame/drivers/zac_2.c b/src/mame/drivers/zac_2.c
index c9aa439f256..67193aab765 100644
--- a/src/mame/drivers/zac_2.c
+++ b/src/mame/drivers/zac_2.c
@@ -3,9 +3,8 @@
 */
 
 
-#include "emu.h"
+#include "machine/genpin.h"
 #include "cpu/s2650/s2650.h"
-#include "machine/nvram.h"
 #include "zac_2.lh"
 
 class zac_2_state : public driver_device
diff --git a/src/mame/drivers/zac_proto.c b/src/mame/drivers/zac_proto.c
index 0da434f8967..970600f7c11 100644
--- a/src/mame/drivers/zac_proto.c
+++ b/src/mame/drivers/zac_proto.c
@@ -1,11 +1,13 @@
 /*********************************************************************
+
+    Pinball
     Zaccaria Prototype
 
- These use the INS8060 (SC/MP) processor, and are Zaccaria's first
- digital machines.
+    These use the INS8060 (SC/MP) processor, and are Zaccaria's first
+    digital machines.
 
-The inputs work with 'strike' and 'skijump'.
-The playboard inputs are unknown.
+    The inputs work with 'strike' and 'skijump'.
+    The playboard inputs are unknown.
 
 ToDo:
 - Mirrors of ram and switches
@@ -16,9 +18,8 @@ ToDo:
 
 **********************************************************************/
 
-#include "emu.h"
+#include "machine/genpin.h"
 #include "cpu/scmp/scmp.h"
-#include "machine/nvram.h"
 #include "zac_proto.lh"
 
 class zac_proto_state : public driver_device