avoiding PCH pitfalls is annoying (nw)

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 */

src/mame/drivers/spg2xx.cpp

@@ -148,6 +148,7 @@
 
 *******************************************************************************/
 
+#include "emu.h"
 #include "includes/spg2xx.h"
 
 /*************************

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

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:

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:

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:

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:

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"
 
 

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:

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"
 
 

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:

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:

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:

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:

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:

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:

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"