diff --git a/src/devices/cpu/gigatron/gigatron.cpp b/src/devices/cpu/gigatron/gigatron.cpp
index 139e8d8fcfa..643e99dabe5 100644
--- a/src/devices/cpu/gigatron/gigatron.cpp
+++ b/src/devices/cpu/gigatron/gigatron.cpp
@@ -13,7 +13,7 @@
 #include "gigatrondasm.h"
 
 
-DEFINE_DEVICE_TYPE(GTRON, gigatron_cpu_device, "gigatron_cpu", "Gigatron")
+DEFINE_DEVICE_TYPE(GTRON, gigatron_cpu_device, "gigatron_cpu", "Gigatron CPU")
 
 
 /* FLAGS */
diff --git a/src/mame/drivers/spg2xx.cpp b/src/mame/drivers/spg2xx.cpp
index e17b256d820..4091d27d68e 100644
--- a/src/mame/drivers/spg2xx.cpp
+++ b/src/mame/drivers/spg2xx.cpp
@@ -148,6 +148,7 @@
 
 *******************************************************************************/
 
+#include "emu.h"
 #include "includes/spg2xx.h"
 
 /*************************
diff --git a/src/mame/drivers/spg2xx_dreamlife.cpp b/src/mame/drivers/spg2xx_dreamlife.cpp
index 53fb40bd29e..e580c308d49 100644
--- a/src/mame/drivers/spg2xx_dreamlife.cpp
+++ b/src/mame/drivers/spg2xx_dreamlife.cpp
@@ -1,7 +1,9 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz, David Haywood
 
+#include "emu.h"
 #include "includes/spg2xx.h"
+
 #include "machine/eepromser.h"
 
 class dreamlif_state : public spg2xx_game_state
diff --git a/src/mame/drivers/spg2xx_ican.cpp b/src/mame/drivers/spg2xx_ican.cpp
index 01e2f570fa9..c0892d8feb2 100644
--- a/src/mame/drivers/spg2xx_ican.cpp
+++ b/src/mame/drivers/spg2xx_ican.cpp
@@ -3,10 +3,13 @@
 
 /* Fisher Price / Mattel "I Can..." systems */
 
+#include "emu.h"
 #include "includes/spg2xx.h"
+
 #include "bus/generic/slot.h"
 #include "bus/generic/carts.h"
 
+
 class icanguit_state : public spg2xx_game_state
 {
 public:
diff --git a/src/mame/drivers/spg2xx_jakks.cpp b/src/mame/drivers/spg2xx_jakks.cpp
index 18590249053..46bbd408382 100644
--- a/src/mame/drivers/spg2xx_jakks.cpp
+++ b/src/mame/drivers/spg2xx_jakks.cpp
@@ -3,9 +3,12 @@
 
 // Note: even after the GameKey port was physically removed and the PCBs redesigned, many of the test modes still show the value read from the port (and many games still show the Game Key Ready splash screen on startup)
 
+#include "emu.h"
 #include "includes/spg2xx.h"
+
 #include "bus/jakks_gamekey/slot.h"
 
+
 class jakks_gkr_state : public spg2xx_game_state
 {
 public:
diff --git a/src/mame/drivers/spg2xx_lexibook.cpp b/src/mame/drivers/spg2xx_lexibook.cpp
index 4519dd4dde1..cf61f2c4aee 100644
--- a/src/mame/drivers/spg2xx_lexibook.cpp
+++ b/src/mame/drivers/spg2xx_lexibook.cpp
@@ -1,8 +1,10 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz, David Haywood
 
+#include "emu.h"
 #include "includes/spg2xx.h"
 
+
 class spg2xx_lexiseal_game_state : public spg2xx_game_state
 {
 public:
diff --git a/src/mame/drivers/spg2xx_pdc.cpp b/src/mame/drivers/spg2xx_pdc.cpp
index 52cd17de569..1c0b97a3303 100644
--- a/src/mame/drivers/spg2xx_pdc.cpp
+++ b/src/mame/drivers/spg2xx_pdc.cpp
@@ -1,8 +1,10 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz, David Haywood
 
+#include "emu.h"
 #include "includes/spg2xx.h"
 
+
 class spg2xx_pdc100_game_state : public spg2xx_game_state
 {
 public:
diff --git a/src/mame/drivers/spg2xx_playvision.cpp b/src/mame/drivers/spg2xx_playvision.cpp
index 7d8650d345b..5fafc471b8f 100644
--- a/src/mame/drivers/spg2xx_playvision.cpp
+++ b/src/mame/drivers/spg2xx_playvision.cpp
@@ -1,7 +1,9 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz, David Haywood
 
+#include "emu.h"
 #include "includes/spg2xx.h"
+
 #include "pvmil.lh"
 
 
diff --git a/src/mame/drivers/spg2xx_senario.cpp b/src/mame/drivers/spg2xx_senario.cpp
index 4b217e1063a..dc8c945d87f 100644
--- a/src/mame/drivers/spg2xx_senario.cpp
+++ b/src/mame/drivers/spg2xx_senario.cpp
@@ -14,9 +14,12 @@
 
 */
 
+#include "emu.h"
 #include "includes/spg2xx.h"
+
 #include "machine/intelfsh.h"
 
+
 class spg2xx_senario_state : public spg2xx_game_state
 {
 public:
diff --git a/src/mame/drivers/spg2xx_senario_poker.cpp b/src/mame/drivers/spg2xx_senario_poker.cpp
index 3a532ba3d30..6cbba4ada8b 100644
--- a/src/mame/drivers/spg2xx_senario_poker.cpp
+++ b/src/mame/drivers/spg2xx_senario_poker.cpp
@@ -8,7 +8,9 @@ improve controller hookup / simulation and remove PC-based hacks!
 
 */
 
+#include "emu.h"
 #include "includes/spg2xx.h"
+
 #include "sentx6p.lh"
 
 
diff --git a/src/mame/drivers/spg2xx_shredmjr.cpp b/src/mame/drivers/spg2xx_shredmjr.cpp
index bc6304e12ed..09cbdfbc101 100644
--- a/src/mame/drivers/spg2xx_shredmjr.cpp
+++ b/src/mame/drivers/spg2xx_shredmjr.cpp
@@ -1,8 +1,10 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz, David Haywood
 
+#include "emu.h"
 #include "includes/spg2xx.h"
 
+
 class shredmjr_game_state : public spg2xx_game_state
 {
 public:
diff --git a/src/mame/drivers/spg2xx_telestory.cpp b/src/mame/drivers/spg2xx_telestory.cpp
index bfc9537bd8e..97fde832e7e 100644
--- a/src/mame/drivers/spg2xx_telestory.cpp
+++ b/src/mame/drivers/spg2xx_telestory.cpp
@@ -1,10 +1,13 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz, David Haywood
 
+#include "emu.h"
 #include "includes/spg2xx.h"
+
 #include "bus/generic/slot.h"
 #include "bus/generic/carts.h"
 
+
 class telestory_state : public spg2xx_game_state
 {
 public:
diff --git a/src/mame/drivers/spg2xx_tvgogo.cpp b/src/mame/drivers/spg2xx_tvgogo.cpp
index 47208b85a09..8fe9e3948c2 100644
--- a/src/mame/drivers/spg2xx_tvgogo.cpp
+++ b/src/mame/drivers/spg2xx_tvgogo.cpp
@@ -1,10 +1,13 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz, David Haywood
 
+#include "emu.h"
 #include "includes/spg2xx.h"
+
 #include "bus/generic/slot.h"
 #include "bus/generic/carts.h"
 
+
 class tvgogo_state : public spg2xx_game_state
 {
 public:
diff --git a/src/mame/drivers/spg2xx_vii.cpp b/src/mame/drivers/spg2xx_vii.cpp
index 00f71242817..537d2cdd8c9 100644
--- a/src/mame/drivers/spg2xx_vii.cpp
+++ b/src/mame/drivers/spg2xx_vii.cpp
@@ -3,10 +3,13 @@
 
 /* 'Zone' systems */
 
+#include "emu.h"
 #include "includes/spg2xx.h"
+
 #include "bus/generic/slot.h"
 #include "bus/generic/carts.h"
 
+
 class vii_state : public spg2xx_game_state
 {
 public:
diff --git a/src/mame/drivers/spg2xx_zone.cpp b/src/mame/drivers/spg2xx_zone.cpp
index 9de42371fe4..f8e7fe075a3 100644
--- a/src/mame/drivers/spg2xx_zone.cpp
+++ b/src/mame/drivers/spg2xx_zone.cpp
@@ -3,8 +3,10 @@
 
 /* 'Zone' systems */
 
+#include "emu.h"
 #include "includes/spg2xx.h"
 
+
 class wireless60_state : public spg2xx_game_state
 {
 public:
diff --git a/src/mame/drivers/spg2xx_zone_32bit.cpp b/src/mame/drivers/spg2xx_zone_32bit.cpp
index 7a048a4b2e8..c056fc15f92 100644
--- a/src/mame/drivers/spg2xx_zone_32bit.cpp
+++ b/src/mame/drivers/spg2xx_zone_32bit.cpp
@@ -3,8 +3,10 @@
 
 /* 'Zone' '32-bit' systems */
 
+#include "emu.h"
 #include "includes/spg2xx.h"
 
+
 class zon32bit_state : public spg2xx_game_state
 {
 public:
diff --git a/src/mame/includes/spg2xx.h b/src/mame/includes/spg2xx.h
index 8ec57d6fabb..d12bc476de1 100644
--- a/src/mame/includes/spg2xx.h
+++ b/src/mame/includes/spg2xx.h
@@ -1,11 +1,9 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz, David Haywood
-#pragma once
-
 #ifndef MAME_INCLUDES_SPG2XX_H
 #define MAME_INCLUDES_SPG2XX_H
 
-#include "emu.h"
+#pragma once
 
 #include "cpu/unsp/unsp.h"
 #include "machine/i2cmem.h"