mame/v*-z*: put drivers in anonymous namespaces where applicable, updated #ifndef guards to the current tree structure

src/mame/vidbrain/uv201.h

@@ -51,8 +51,8 @@
 
 **********************************************************************/
 
-#ifndef MAME_VIDEO_UV201_H
+#ifndef MAME_VIDBRAIN_UV201_H
-#define MAME_VIDEO_UV201_H
+#define MAME_VIDBRAIN_UV201_H
 
 #pragma once
 
@@ -126,4 +126,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(UV201, uv201_device)
 
-#endif // MAME_VIDEO_UV201_H
+#endif // MAME_VIDBRAIN_UV201_H

src/mame/videoton/tvc.cpp

@@ -35,6 +35,9 @@
 
 #include "formats/tvc_cas.h"
 
+
+namespace {
+
 #define CENTRONICS_TAG  "centronics"
 
 
@@ -893,6 +896,9 @@ ROM_START( tvc64pru )
 	ROM_LOAD( "tvcru_d7.bin", 0x2000, 0x2000, CRC(70cde756) SHA1(c49662af9f6653347ead641e85777c3463cc161b))
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 //    YEAR  NAME      PARENT  COMPAT  MACHINE  INPUT     CLASS         INIT        COMPANY       FULLNAME             FLAGS

src/mame/videoton/tvc_a.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef MAME_AUDIO_TVC_H
+#ifndef MAME_VIDEOTON_TVC_H
-#define MAME_AUDIO_TVC_H
+#define MAME_VIDEOTON_TVC_H
 
 #pragma once
 
@@ -52,4 +52,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(TVC_SOUND, tvc_sound_device)
 
-#endif // MAME_AUDIO_TVC_H
+#endif // MAME_VIDEOTON_TVC_H

src/mame/virtual/ldplayer.cpp

@@ -29,6 +29,8 @@
 #include <cctype>
 
 
+namespace {
+
 class ldplayer_state : public driver_device
 {
 public:
@@ -661,6 +663,7 @@ ROM_START( simpr8210 )
 	DISK_REGION( "laserdisc" )
 ROM_END
 
+} // anonymous namespace
 
 
 /*************************************

src/mame/virtual/wavesynth.cpp

@@ -3,7 +3,7 @@
 
 // A "virtual" driver to turn waveblaster cards into a screen-less expander
 
-// Currently KS0164 only, and built-in.  Evetually should be slot-based with
+// Currently KS0164 only, and built-in.  Eventually should be slot-based with
 // multiple possible cards
 
 #include "emu.h"
@@ -13,6 +13,9 @@
 
 #include "sound/ks0164.h"
 
+
+namespace {
+
 class wavesynth_state : public driver_device
 {
 public:
@@ -65,4 +68,7 @@ ROM_START( wavesynth )
 	ROM_LOAD16_WORD_SWAP("ks0174-1m04.bin", 0, 0x100000, CRC(3cabaa2f) SHA1(1e894c0345eaf0ea713f36a75b065f7ee419c63c))
 ROM_END
 
+} // anonymous namespace
+
+
 CONS( 2020, wavesynth, 0, 0, wavesynth, wavesynth, wavesynth_state, empty_init, "MAME", "Waveblaster-based expander", MACHINE_SUPPORTS_SAVE )

src/mame/visual/v100.cpp

@@ -23,6 +23,9 @@
 #include "video/tms9927.h"
 #include "screen.h"
 
+
+namespace {
+
 // character matrix is supposed to be only 7x7, but 15 produces correct timings
 #define V100_CH_WIDTH 15
 
@@ -439,4 +442,7 @@ ROM_START( v100 )
 	ROM_LOAD( "241-001.u29",   0x0000, 0x0800, CRC(ef807141) SHA1(cbf3fed001811c5840b9a131d2d3133843cb3b6a) )
 ROM_END
 
+} // anonymous namespace
+
+
 COMP( 1980, v100, 0, 0, v100, v100, v100_state, empty_init, "Visual Technology", "Visual 100", MACHINE_IS_SKELETON )

src/mame/visual/v102.cpp

@@ -22,6 +22,9 @@ Skeleton driver for Visual 102 display terminal.
 
 #include "v102_kbd.h"
 
+
+namespace {
+
 class v102_state : public driver_device
 {
 public:
@@ -182,4 +185,7 @@ ROM_START( v102 )
 	ROM_LOAD( "260-001.u50", 0x0000, 0x1000, CRC(732f5b99) SHA1(d105bf9f3ed41109d7181bcf0223bb280afe3f0a) )
 ROM_END
 
+} // anonymous namespace
+
+
 COMP( 1984, v102, 0, 0, v102, v102, v102_state, empty_init, "Visual Technology", "Visual 102", MACHINE_IS_SKELETON )

src/mame/visual/v102_kbd.h

@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:AJR
 
-#ifndef MAME_MACHINE_V102_KBD_H
+#ifndef MAME_VISUAL_V102_KBD_H
-#define MAME_MACHINE_V102_KBD_H
+#define MAME_VISUAL_V102_KBD_H
 
 #pragma once
 
@@ -60,4 +60,4 @@ protected:
 DECLARE_DEVICE_TYPE(V102_KEYBOARD, v102_keyboard_device)
 DECLARE_DEVICE_TYPE(V550_KEYBOARD, v550_keyboard_device)
 
-#endif // MAME_MACHINE_V102_KBD_H
+#endif // MAME_VISUAL_V102_KBD_H

src/mame/visual/v1050kb.h

@@ -6,8 +6,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_MACHINE_V1050KB_H
+#ifndef MAME_VISUAL_V1050KB_H
-#define MAME_MACHINE_V1050KB_H
+#define MAME_VISUAL_V1050KB_H
 
 #pragma once
 
@@ -61,4 +61,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(V1050_KEYBOARD, v1050_keyboard_device)
 
-#endif // MAME_MACHINE_V1050KB_H
+#endif // MAME_VISUAL_V1050KB_H

src/mame/visual/v550.cpp

@@ -26,6 +26,9 @@
 #include "video/upd7220.h"
 #include "screen.h"
 
+
+namespace {
+
 class v550_state : public driver_device
 {
 public:
@@ -162,4 +165,7 @@ ROM_START( v550 )
 	ROM_LOAD("e242-085_r03_u97.bin", 0x0000, 0x1000, CRC(8a491cee) SHA1(d8a9546a7dd2ffc0a5e54524ee16068dde56975c))
 ROM_END
 
+} // anonymous namespace
+
+
 COMP( 1982, v550, 0, 0, v550, v550, v550_state, empty_init, "Visual Technology", "Visual 550", MACHINE_IS_SKELETON )

src/mame/votrax/votrtnt.cpp

@@ -40,6 +40,8 @@
 #include "votrtnt.lh"
 
 
+namespace {
+
 class votrtnt_state : public driver_device
 {
 public:
@@ -177,6 +179,8 @@ ROM_START(votrtnt)
 	ROM_LOAD("cn49752n.bin", 0x0000, 0x1000, CRC(a44e1af3) SHA1(af83b9e84f44c126b24ee754a22e34ca992a8d3d)) /* 2332 mask rom inside potted brick */
 ROM_END
 
+} // anonymous namespace
+
 
 /******************************************************************************
  Drivers

src/mame/vsystem/mb60553.h

@@ -2,8 +2,8 @@
 // copyright-holders:David Haywood
 
 /*** MB60553 **********************************************/
-#ifndef MAME_VIDEO_MB60533_H
+#ifndef MAME_VSYSTEM_MB60533_H
-#define MAME_VIDEO_MB60533_H
+#define MAME_VSYSTEM_MB60533_H
 
 #pragma once
 
@@ -60,4 +60,4 @@ private:
 
 DECLARE_DEVICE_TYPE(MB60553, mb60553_zooming_tilemap_device)
 
-#endif // MAME_VIDEO_MB60533_H
+#endif // MAME_VSYSTEM_MB60533_H

src/mame/vsystem/vs9209.h

@@ -6,8 +6,8 @@
 
 **********************************************************************/
 
-#ifndef MAME_MACHINE_VS9209_H
+#ifndef MAME_VSYSTEM_VS9209_H
-#define MAME_MACHINE_VS9209_H
+#define MAME_VSYSTEM_VS9209_H
 
 #pragma once
 
@@ -65,4 +65,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(VS9209, vs9209_device)
 
-#endif // MAME_MACHINE_VS9209_H
+#endif // MAME_VSYSTEM_VS9209_H

src/mame/vsystem/vs920a.h

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
-#ifndef MAME_VIDEO_VS920A_H
+#ifndef MAME_VSYSTEM_VS920A_H
-#define MAME_VIDEO_VS920A_H
+#define MAME_VSYSTEM_VS920A_H
 
 #pragma once
 
@@ -41,4 +41,4 @@ private:
 
 DECLARE_DEVICE_TYPE(VS920A, vs920a_text_tilemap_device)
 
-#endif // MAME_VIDEO_VS920A_H
+#endif // MAME_VSYSTEM_VS920A_H

src/mame/vsystem/vsystem_gga.h

@@ -41,8 +41,8 @@
 
 ******************************************************************************/
 
-#ifndef MAME_VIDEO_VSYSTEM_GGA_H
+#ifndef MAME_VSYSTEM_VSYSTEM_GGA_H
-#define MAME_VIDEO_VSYSTEM_GGA_H
+#define MAME_VSYSTEM_VSYSTEM_GGA_H
 
 #pragma once
 
@@ -82,4 +82,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(VSYSTEM_GGA, vsystem_gga_device)
 
-#endif // MAME_VIDEO_VSYSTEM_GGA_H
+#endif // MAME_VSYSTEM_VSYSTEM_GGA_H

src/mame/vsystem/vsystem_spr.h

@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Nicola Salmoria, David Haywood
 // Video System Sprites
-#ifndef MAME_VIDEO_VSYSTEM_SPR_H
+#ifndef MAME_VSYSTEM_VSYSTEM_SPR_H
-#define MAME_VIDEO_VSYSTEM_SPR_H
+#define MAME_VSYSTEM_VSYSTEM_SPR_H
 
 #pragma once
 
@@ -77,4 +77,4 @@ private:
 
 DECLARE_DEVICE_TYPE(VSYSTEM_SPR, vsystem_spr_device)
 
-#endif // MAME_VIDEO_VSYSTEM_SPR_H
+#endif // MAME_VSYSTEM_VSYSTEM_SPR_H

src/mame/vsystem/vsystem_spr2.h

@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Nicola Salmoria, David Haywood
 // Video System Sprites
-#ifndef MAME_VIDEO_VSYSTEM_SPR2_H
+#ifndef MAME_VSYSTEM_VSYSTEM_SPR2_H
-#define MAME_VIDEO_VSYSTEM_SPR2_H
+#define MAME_VSYSTEM_VSYSTEM_SPR2_H
 
 typedef device_delegate<uint32_t (uint32_t)> vsystem_tile2_indirection_delegate;
 
@@ -68,4 +68,4 @@ private:
 
 DECLARE_DEVICE_TYPE(VSYSTEM_SPR2, vsystem_spr2_device)
 
-#endif // MAME_VIDEO_VSYSTEM_SPR2_H
+#endif // MAME_VSYSTEM_VSYSTEM_SPR2_H

src/mame/vtech/clickstart.cpp

@@ -70,6 +70,9 @@
 #include "softlist_dev.h"
 #include "speaker.h"
 
+
+namespace {
+
 class clickstart_state : public driver_device
 {
 public:
@@ -472,5 +475,8 @@ ROM_START( clikstrt )
 	ROM_LOAD16_WORD_SWAP( "clickstartbios.bin", 0x000000, 0x800000, CRC(7c833bd0) SHA1(2e9ef38e1a7582705920339e6b9944f6404fcf9b) )
 ROM_END
 
+} // anonymous namespace
+
+
 // year, name, parent, compat, machine, input, class, init, company, fullname, flags
 CONS( 2007, clikstrt,  0,      0, clickstart,  clickstart, clickstart_state, empty_init, "LeapFrog Enterprises", "ClickStart",      MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING ) // 'My First Computer' tagline

src/mame/vtech/geniusiq.cpp

@@ -162,6 +162,9 @@ PCB - German Version:
 #include "screen.h"
 #include "softlist_dev.h"
 
+
+namespace {
+
 #define KEYBOARD_QUEUE_SIZE     0x80
 
 class geniusiq_state : public driver_device
@@ -762,6 +765,9 @@ ROM_START( itunlim )
 	ROM_LOAD( "27-06124-002.u3", 0x000000, 0x200000, CRC(0c0753ce) SHA1(d22504d583ca8d6a9d2f56fbaa3e1d52c442a1e9) )
 ROM_END
 
+} // anonymous namespace
+
+
 // Drivers
 
 //    YEAR  NAME      PARENT   COMPAT  MACHINE  INPUT        CLASS           INIT        COMPANY             FULLNAME                              FLAGS

src/mame/vtech/geniusjr.cpp

@@ -199,6 +199,8 @@ Undumped VTech laptops possibly on similar hardware:
 #include "softlist_dev.h"
 
 
+namespace {
+
 class geniusjr_state : public driver_device
 {
 public:
@@ -408,6 +410,8 @@ ROM_START( gls )
 	ROM_LOAD( "27-5635-00.u2", 0x000000, 0x40000, CRC(bc3c0587) SHA1(fe98f162bd80d96ce3264087b5869f4505955464))
 ROM_END
 
+} // anonymous namespace
+
 
 //    YEAR   NAME      PARENT   COMPAT  MACHINE   INPUT     CLASS           INIT        COMPANY    FULLNAME                             FLAGS
 COMP( 1996,  gj4000,   0,       0,      gj4000,   geniusjr, geniusjr_state, empty_init, "VTech",   "Genius Junior 4000 (Germany)",      MACHINE_IS_SKELETON )

src/mame/vtech/gkidabc.cpp

@@ -17,6 +17,9 @@
 
 #include "emu.h"
 
+
+namespace {
+
 class gkidabc_state : public driver_device
 {
 public:
@@ -55,6 +58,9 @@ ROM_START(gjrprofi)
 	ROM_LOAD("27-5476-00.u1", 0x00000, 0x20000, CRC(ad1ec838) SHA1(0cf90c02762ace656191a38ae423a4fa0e7484f7))
 ROM_END
 
+} // anonymous namespace
+
+
 COMP(1996, gkidabc,   0, 0, gkidabc, gkidabc, gkidabc_state, empty_init, "VTech", "Genius KID ABC Fan (Germany)",   MACHINE_IS_SKELETON)
 COMP(1995, miprimlec, 0, 0, gkidabc, gkidabc, gkidabc_state, empty_init, "VTech", "Mis Primeras Lecciones (Spain)", MACHINE_IS_SKELETON)
 COMP(1995, gjrprofi,  0, 0, gkidabc, gkidabc, gkidabc_state, empty_init, "VTech", "Genius Junior Profi (Germany)",  MACHINE_IS_SKELETON)

src/mame/vtech/glcx.cpp

@@ -51,6 +51,9 @@ TMP47C241MG = TLCS-47 series 4-bit CPU with 2048x8 internal ROM
 #include "screen.h"
 #include "softlist_dev.h"
 
+
+namespace {
+
 class glcx_state : public driver_device
 {
 public:
@@ -127,6 +130,8 @@ ROM_START( gtbmcx )
 	// Cartridge "EUROPA" contains no ROM
 ROM_END
 
+} // anonymous namespace
+
 
 COMP( 1999, gl6600cx, 0, 0, glcx, glcx, glcx_state, empty_init, "VTech", "Genius Leader 6600 CX (Germany)", MACHINE_IS_SKELETON )
 COMP( 1999, gl8008cx, 0, 0, glcx, glcx, glcx_state, empty_init, "VTech", "Genius Leader 8008 CX (Germany)", MACHINE_IS_SKELETON)

src/mame/vtech/innotv_innotabmax.cpp

@@ -25,7 +25,7 @@
    MicroSDHC 8GB card in internal slot
    Realtek RTL8188EU (Wireless)
 
-   There don't appear to be any ROM / SPI / NAND devicesonboard, so must either
+   There don't appear to be any ROM / SPI / NAND devices onboard, so must either
    boot directly from the SD, or have some boot program internal to the SoC
 
    The following pinout was used for the InnoTV / InnoTab MAX cartridges
@@ -70,6 +70,9 @@
 #include "speaker.h"
 #include "screen.h"
 
+
+namespace {
+
 class vtech_innotv_innotabmax_state : public driver_device
 {
 public:
@@ -160,4 +163,7 @@ ROM_START( innotv )
 	DISK_IMAGE( "8gb_sdhc_internal", 0, SHA1(443a0a9cc830387317d3218955b72295ee5a88eb) )
 ROM_END
 
+} // anonymous namespace
+
+
 CONS( 2015, innotv,      0,         0,      vtech_innotv_innotabmax,    vtech_innotv_innotabmax,  vtech_innotv_innotabmax_state,  empty_init, "VTech", "InnoTV", MACHINE_IS_SKELETON )

src/mame/vtech/inteladv.cpp

@@ -10,6 +10,9 @@
 #include "cpu/m6502/st2204.h"
 #include "cpu/m6502/st2205u.h"
 
+
+namespace {
+
 class inteladv_state : public driver_device
 {
 public:
@@ -97,6 +100,9 @@ ROM_START( cars2lap )
 	ROM_LOAD("n25s16.u6", 0x00000, 0x200000, CRC(ec1ba96e) SHA1(51b8844ae77adf20f74f268d380d268c9ce19785))
 ROM_END
 
+} // anonymous namespace
+
+
 //    YEAR  NAME      PARENT  COMPAT  MACHINE   INPUT     CLASS           INIT        COMPANY  FULLNAME                              FLAGS
 COMP( 2005, inteladv, 0,      0,      inteladv, inteladv, inteladv_state, empty_init, "VTech", "Intelligence Advance E/R (Germany)", MACHINE_IS_SKELETON )
 COMP( 2003, dyndesk,  0,      0,      dyndesk,  dyndesk,  inteladv_state, empty_init, "VTech", "DynamiDesk (Germany)",               MACHINE_IS_SKELETON )

src/mame/vtech/laser3k.cpp

@@ -45,6 +45,9 @@
 
 #include "utf8.h"
 
+
+namespace {
+
 enum
 {
 	TEXT = 0,
@@ -1013,5 +1016,8 @@ ROM_START(las3000)
 	ROM_LOAD ( "l3kdisk.rom", 0x0000, 0x0100, CRC(2d4b1584) SHA1(989780b77e100598124df7b72663e5a31a3339c0))
 ROM_END
 
+} // anonymous namespace
+
+
 //    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT    CLASS          INIT        COMPANY             FULLNAME      FLAGS
 COMP( 1983, las3000, 0,      0,      laser3k, laser3k, laser3k_state, empty_init, "Video Technology", "Laser 3000", MACHINE_NOT_WORKING )

src/mame/vtech/lcmate2.cpp

@@ -44,6 +44,8 @@
 #include "utf8.h"
 
 
+namespace {
+
 class lcmate2_state : public driver_device
 {
 public:
@@ -273,6 +275,9 @@ ROM_START( lcmate2 )
 	ROM_LOAD( "u3.bin",  0x20000, 0x20000, CRC(84fe767a) SHA1(8dd306f203e1220f0eab1a284be3095e2642c5b6) ) // spell library
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 //    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT    CLASS          INIT        COMPANY  FULLNAME             FLAGS

src/mame/vtech/socrates.cpp

@@ -99,6 +99,8 @@ TODO (socrates):
 #include "speaker.h"
 
 
+namespace {
+
 class socrates_state : public driver_device
 {
 public:
@@ -1650,6 +1652,9 @@ ROM_START( vpainter )
 	ROM_REGION(0x10000, "speechext", ROMREGION_ERASE00) // doesn't exist? on vpainter, presumably reads as all zeroes
 ROM_END
 
+} // anonymous namespace
+
+
 /******************************************************************************
  Drivers
 ******************************************************************************/

src/mame/vtech/socrates_a.h

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Jonathan Gevaryahu
-#ifndef MAME_AUDIO_SOCRATES_H
+#ifndef MAME_VTECH_SOCRATES_H
-#define MAME_AUDIO_SOCRATES_H
+#define MAME_VTECH_SOCRATES_H
 
 #pragma once
 
@@ -41,4 +41,4 @@ private:
 DECLARE_DEVICE_TYPE(SOCRATES_SOUND, socrates_snd_device)
 
 
-#endif // MAME_AUDIO_SOCRATES_H
+#endif // MAME_VTECH_SOCRATES_H

src/mame/vtech/storio.cpp

@@ -33,6 +33,9 @@
 #include "softlist_dev.h"
 #include "speaker.h"
 
+
+namespace {
+
 class vtech_storio_state : public driver_device
 {
 public:
@@ -178,6 +181,9 @@ ROM_START( storionl )
 	ROM_LOAD( "nldut-pack_20111017.bin", 0x000000, 0x03af81c6, CRC(6cfac599) SHA1(d16b45fd287c9d823bde13b88eb6c8158ac2b475) )
 ROM_END
 
+} // anonymous namespace
+
+
 //    year, name,         parent,  compat, machine,      input,        class,              init,       company,  fullname,                             flags
 CONS( 2011, vreader,      0,       0,      vtech_storio, vtech_storio, vtech_storio_state, empty_init, "VTech", "V.Reader (US, English, 2011-10-17)", MACHINE_IS_SKELETON )
 CONS( 2011, vreadercaen,  vreader, 0,      vtech_storio, vtech_storio, vtech_storio_state, empty_init, "VTech", "V.Reader (CA, English, 2011-10-17)", MACHINE_IS_SKELETON )

src/mame/vtech/vtech1.cpp

@@ -47,6 +47,8 @@ Todo:
 #include "formats/vt_cas.h"
 
 
+namespace {
+
 /***************************************************************************
     CONSTANTS & MACROS
 ***************************************************************************/
@@ -603,6 +605,8 @@ ROM_END
 #define rom_vz300       rom_laser310
 #define rom_laser310h   rom_laser310
 
+} // anonymous namespace
+
 
 /***************************************************************************
     GAME DRIVERS

src/mame/vtech/vtech_eu3a12.cpp

@@ -9,6 +9,9 @@
 #include "emupal.h"
 #include "screen.h"
 
+
+namespace {
+
 class vreadere_state : public driver_device
 {
 public:
@@ -165,4 +168,7 @@ ROM_START( vreadere )
 	ROM_LOAD( "27-08291.u2", 0x000000, 0x400000, CRC(f2eb801f) SHA1(33e2d28ab2f04b17f66880898832265d50de54d4) )
 ROM_END
 
+} // anonymous namespace
+
+
 COMP( 2004, vreadere, 0, 0, vreadere, vreadere, vreadere_state, empty_init, "Video Technology", "Reader Laptop E (Germany)", MACHINE_IS_SKELETON )

src/mame/vtech/vtech_innotab.cpp

@@ -24,6 +24,9 @@
 #include "softlist_dev.h"
 #include "speaker.h"
 
+
+namespace {
+
 class vtech_innotab_state : public driver_device
 {
 public:
@@ -215,4 +218,7 @@ ROM_START( innotab2 )
 	//ROM_LOAD( "emmc_ghost.mpj", 0x000000, 0x3712, CRC(16b705da) SHA1(fdb576385cf46984ea40d8e8b83758d94f67507e) )
 ROM_END
 
+} // anonymous namespace
+
+
 CONS( 2011, innotab2,     0,       0,      vtech_innotab, vtech_innotab, vtech_innotab_state, empty_init, "VTech", "InnoTAB 2 (UK)",   MACHINE_IS_SKELETON )

src/mame/wang/wangpc.cpp

@@ -37,6 +37,9 @@
 #include "machine/upd765.h"
 #include "wangpckb.h"
 
+
+namespace {
+
 #define I8086_TAG       "i8086"
 #define AM9517A_TAG     "am9517a"
 #define I8259A_TAG      "i8259"
@@ -1389,6 +1392,7 @@ ROM_START( wangpc )
 	ROM_LOAD16_BYTE( "379-0000 r2.l115", 0x0000, 0x2000, CRC(67b37684) SHA1(70d9f68eb88cc2bc9f53f949cc77411c09a4266e) )
 ROM_END
 
+} // anonymous namespace
 
 
 //**************************************************************************

src/mame/wang/wangpckb.h

@@ -6,8 +6,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_MACHINE_WANGPCKB_H
+#ifndef MAME_WANG_WANGPCKB_H
-#define MAME_MACHINE_WANGPCKB_H
+#define MAME_WANG_WANGPCKB_H
 
 #pragma once
 
@@ -74,4 +74,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(WANGPC_KEYBOARD, wangpc_keyboard_device)
 
-#endif // MAME_MACHINE_WANGPCKB_H
+#endif // MAME_WANG_WANGPCKB_H

src/mame/wing/slotcarn.cpp

@@ -26,6 +26,8 @@
 #include "speaker.h"
 
 
+namespace {
+
 #define MASTER_CLOCK            (XTAL(10'000'000))
 #define CPU_CLOCK               (MASTER_CLOCK / 4)
 #define PIXEL_CLOCK             (MASTER_CLOCK / 1)
@@ -696,6 +698,8 @@ ROM_START( spielbud )
 	ROM_LOAD( "spielbud.09", 0x0000, 0x2000, CRC(d88c72f2) SHA1(bb015685f4c2cc7723c24880c11cb6d31f71e73f) )
 ROM_END
 
+} // anonymous namespace
+
 
 /*********************************************
 *                Game Drivers                *

src/mame/wyse/wy100.cpp

@@ -27,6 +27,9 @@
 #include "screen.h"
 #include "speaker.h"
 
+
+namespace {
+
 class wy100_state : public driver_device
 {
 public:
@@ -260,5 +263,7 @@ ROM_START(wy100)
 	ROM_LOAD("wy100_23-002-01c.bin", 0x0000, 0x0800, CRC(93c31537) SHA1(085e5ad110a76bee83e819a718a7d4cbfb8e07e7))
 ROM_END
 
+} // anonymous namespace
+
 
 COMP(1981, wy100, 0, 0, wy100, wy100, wy100_state, empty_init, "Wyse Technology", "WY-100", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS)

src/mame/wyse/wy150.cpp

@@ -18,6 +18,9 @@
 #include "machine/nvram.h"
 #include "screen.h"
 
+
+namespace {
+
 class wy150_state : public driver_device
 {
 public:
@@ -122,6 +125,9 @@ void wy150_state::driver_start()
 	}
 }
 
+} // anonymous namespace
+
+
 COMP(1991, wy150, 0, 0, wy150, wy150, wy150_state, empty_init, "Wyse Technology", "WY-150 (v1.0)", MACHINE_IS_SKELETON)
 COMP(1992, wy120, 0, 0, wy150, wy150, wy150_state, empty_init, "Wyse Technology", "WY-120 (v1.4)", MACHINE_IS_SKELETON)
 COMP(1994, wy160, 0, 0, wy150, wy150, wy150_state, empty_init, "Wyse Technology", "WY-160 (v1.7)", MACHINE_IS_SKELETON)

src/mame/wyse/wy30p.cpp

@@ -14,6 +14,9 @@
 #include "machine/eepromser.h"
 #include "screen.h"
 
+
+namespace {
+
 class wy30p_state : public driver_device
 {
 public:
@@ -125,4 +128,7 @@ void wy30p_state::driver_start()
 	}
 }
 
+} // anonymous namespace
+
+
 COMP(1992, wy30p, 0, 0, wy30p, wy30p, wy30p_state, empty_init, "Wyse Technology", "WY-30+ (v1.8)", MACHINE_IS_SKELETON)

src/mame/wyse/wy50.cpp

@@ -39,6 +39,9 @@
 #include "screen.h"
 #include "speaker.h"
 
+
+namespace {
+
 class wy50_state : public driver_device
 {
 public:
@@ -351,6 +354,9 @@ ROM_START(wy75) // 8031, green, 101-key detached keyboard
 	ROM_LOAD("default.bin", 0x00, 0xc8, CRC(0efeff07) SHA1(304e07ef87a4b107700273321a1d4e34a56d6821))
 ROM_END
 
+} // anonymous namespace
+
+
 COMP(1984, wy50, 0, 0, wy50, wy50, wy50_state, empty_init, "Wyse Technology", "WY-50 (Rev. E)", MACHINE_IS_SKELETON)
 COMP(1984, wy75, 0, 0, wy50, wy50, wy50_state, empty_init, "Wyse Technology", "WY-75 (Rev. H)", MACHINE_IS_SKELETON)
 //COMP(1984, wy350, 0, 0, wy50, wy50, wy50_state, empty_init, "Wyse Technology", "WY-350", MACHINE_IS_SKELETON)

src/mame/wyse/wy50kb.h

@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:AJR
 
-#ifndef MAME_MACHINE_WY50KB_H
+#ifndef MAME_WYSE_WY50KB_H
-#define MAME_MACHINE_WY50KB_H
+#define MAME_WYSE_WY50KB_H
 
 #pragma once
 
@@ -44,4 +44,4 @@ protected:
 DECLARE_DEVICE_TYPE(WY50_KEYBOARD, wy50_keyboard_device)
 DECLARE_DEVICE_TYPE(WY100_KEYBOARD, wy100_keyboard_device)
 
-#endif // MAME_MACHINE_WY50KB_H
+#endif // MAME_WYSE_WY50KB_H

src/mame/wyse/wy85.cpp

@@ -16,6 +16,9 @@
 #include "video/scn2674.h"
 #include "screen.h"
 
+
+namespace {
+
 class wy85_state : public driver_device
 {
 public:
@@ -180,4 +183,7 @@ ROM_START(wy85)
 	ROM_LOAD("am9265.1h", 0x0000, 0x2000, CRC(5ee65b55) SHA1(a0b38a38838f262aaea22d212351e7441e4b07e8)) // AM9265EPC
 ROM_END
 
+} // anonymous namespace
+
+
 COMP(1985, wy85, 0, 0, wy85, wy85, wy85_state, empty_init, "Wyse Technology", "WY-85 (Rev. A)", MACHINE_IS_SKELETON)

src/mame/xerox/alto1.cpp

@@ -13,6 +13,9 @@ Similar in architecture to the Alto II and the Lilith, with 74181 ALUs and uniqu
 
 #include "emu.h"
 
+
+namespace {
+
 class alto1_state : public driver_device
 {
 public:
@@ -77,4 +80,7 @@ ROM_START( alto1 )
 	ROM_LOAD( "pram.bin",     0x2600, 0x0100, CRC(8087140e) SHA1(e17d9756150d41d6ff614afa86808a9c77516749) )
 ROM_END
 
+} // anonymous namespace
+
+
 COMP( 1973, alto1, 0, 0, alto1, alto1, alto1_state, empty_init, "Xerox", "Alto I", MACHINE_IS_SKELETON )

src/mame/xerox/notetaker.cpp

@@ -122,6 +122,9 @@ DONE:
 #define VERBOSE (0)
 #include "logmacro.h"
 
+
+namespace {
+
 class notetaker_state : public driver_device
 {
 public:
@@ -992,6 +995,9 @@ ROM_START( notetakr )
 	*/
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 //    YEAR  NAME      PARENT  COMPAT  MACHINE   INPUT     CLASS            INIT           COMPANY  FULLNAME     FLAGS

src/mame/xerox/x820kb.h

@@ -6,8 +6,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_MACHINE_X820KB_H
+#ifndef MAME_XEROX_X820KB_H
-#define MAME_MACHINE_X820KB_H
+#define MAME_XEROX_X820KB_H
 
 #pragma once
 
@@ -63,4 +63,4 @@ private:
 DECLARE_DEVICE_TYPE(XEROX_820_KEYBOARD, xerox_820_keyboard_device)
 
 
-#endif // MAME_MACHINE_X820KB_H
+#endif // MAME_XEROX_X820KB_H

src/mame/yamaha/fb01.cpp

@@ -23,6 +23,8 @@
 #include "fb01.lh"
 
 
+namespace {
+
 class fb01_state : public driver_device
 {
 public:
@@ -218,6 +220,8 @@ ROM_START( fb01 )
 	ROM_LOAD("nec__-011_xb712c0__8709ex700__d27c256c-15.ic11", 0, 0x8000, CRC(7357e9a4) SHA1(049c482d6c91b7e2846757dd0f5138e0d8b687f0)) // OTP 27c256 windowless eprom?
 ROM_END
 
+} // anonymous namespace
+
 
 /* Driver */
 

src/mame/yamaha/mulcd.h

@@ -4,8 +4,8 @@
 // HD44780/LCD image combo used in the yamaha mu, vl70m, fs1r and
 // probably others
 
-#ifndef MAME_MACHINE_MULCD_H
+#ifndef MAME_YAMAHA_MULCD_H
-#define MAME_MACHINE_MULCD_H
+#define MAME_YAMAHA_MULCD_H
 
 #pragma once
 
@@ -41,4 +41,4 @@ private:
 
 DECLARE_DEVICE_TYPE(MULCD, mulcd_device)
 
-#endif
+#endif // MAME_YAMAHA_MULCD_H

src/mame/yamaha/tg100.cpp

@@ -34,6 +34,9 @@
 #include "screen.h"
 #include "speaker.h"
 
+
+namespace {
+
 class tg100_state : public driver_device
 {
 public:
@@ -94,5 +97,8 @@ ROM_START( tg100 )
 	ROM_LOAD( "xk992a0.ic6", 0x000000, 0x200000, CRC(01dc6954) SHA1(32ec77a46f4d005538c735f56ad48fa7243c63be) )
 ROM_END
 
+} // anonymous namespace
+
+
 //    YEAR  NAME   PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY   FULLNAME      FLAGS
 CONS( 1991, tg100, 0,      0,      tg100,   tg100, tg100_state, empty_init, "Yamaha", "TG100",      MACHINE_NOT_WORKING | MACHINE_NO_SOUND )

src/mame/yamaha/ymdx11.cpp

@@ -17,6 +17,9 @@
 #include "screen.h"
 #include "speaker.h"
 
+
+namespace {
+
 class yamaha_dx11_state : public driver_device
 {
 public:
@@ -133,4 +136,7 @@ ROM_START(dx11)
 	ROM_LOAD("hd63b01y0d60p.ic18", 0x0000, 0x4000, NO_DUMP)
 ROM_END
 
+} // anonymous namespace
+
+
 SYST(1988, dx11, 0, 0, dx11, dx11, yamaha_dx11_state, empty_init, "Yamaha", "DX11 Digital Programmable Algorithm Synthesizer", MACHINE_IS_SKELETON)

src/mame/yamaha/ymdx7.cpp

@@ -38,12 +38,6 @@
 #include "emupal.h"
 #include "screen.h"
 
-constexpr auto DX7CLOCK    = 9'426'500;
-
-constexpr auto LCD_E  = 0x02;
-constexpr auto LCD_RW = 0x04;
-constexpr auto LCD_RS = 0x01;
-
 #define LOG_GENERAL (1U << 0)
 #define LOG_OPS     (1U << 1)
 #define LOG_EGS     (1U << 2)
@@ -53,6 +47,16 @@ constexpr auto LCD_RS = 0x01;
 
 #include "logmacro.h"
 
+
+namespace {
+
+constexpr auto DX7CLOCK    = 9'426'500;
+
+constexpr auto LCD_E  = 0x02;
+constexpr auto LCD_RW = 0x04;
+constexpr auto LCD_RS = 0x01;
+
+
 class yamaha_dx7_state : public driver_device
 {
 public:
@@ -331,4 +335,7 @@ ROM_START(dx7)
 	ROM_LOAD("hd6805s1p-a33.ic13", 0x0000, 0x800, CRC(ac1d84b3) SHA1(ee0ebb118dd0d282d7c195d3b246a0094b2cb6ad))
 ROM_END
 
+} // anonymous namespace
+
+
 SYST(1983, dx7, 0, 0, dx7, dx7, yamaha_dx7_state, empty_init, "Yamaha", "DX7 Digital Programmable Algorithm Synthesizer", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)

src/mame/yamaha/ymmu100.cpp

@@ -127,6 +127,8 @@
 #include "speaker.h"
 
 
+namespace {
+
 static INPUT_PORTS_START( mu100 )
 	PORT_START("P7")
 	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Enter")     PORT_CODE(KEYCODE_ENTER)
@@ -779,6 +781,9 @@ ROM_START( mu100b )
 	ROM_LOAD32_WORD( "xt463a0.ic38", 0x1000002, 0x400000, CRC(cce5f8d3) SHA1(bdca8c5158f452f2b5535c7d658c9b22c6d66048) )
 ROM_END
 
+} // anonymous namespace
+
+
 SYST( 1997, mu100,  0,     0, mu100, mu100, mu100_state,  empty_init, "Yamaha", "MU100",                  MACHINE_NOT_WORKING )
 SYST( 1997, mu100r, mu100, 0, mu100, mu100, mu100r_state, empty_init, "Yamaha", "MU100 Rackable version", MACHINE_NOT_WORKING )
 SYST( 1998, mu100b, mu100, 0, mu100, mu100, mu100_state,  empty_init, "Yamaha", "MU100B",                 MACHINE_NOT_WORKING )

src/mame/yamaha/ymmu5.cpp

@@ -18,6 +18,9 @@
 #include "screen.h"
 #include "speaker.h"
 
+
+namespace {
+
 class mu5_state : public driver_device
 {
 public:
@@ -258,4 +261,7 @@ ROM_START( mu5 )
 	ROM_LOAD("mu5lcd.svg", 0, 261774, CRC(3cccbb88) SHA1(3db0b16f27b501ff8d8ac3fb631dd315571230d3))
 ROM_END
 
+} // anonymous namespace
+
+
 CONS(1994, mu5, 0, 0, mu5, mu5, mu5_state, empty_init, "Yamaha", "MU-5", MACHINE_NOT_WORKING )

src/mame/yamaha/ymmu50.cpp

@@ -20,6 +20,8 @@
 #include "speaker.h"
 
 
+namespace {
+
 static INPUT_PORTS_START( mu50 )
 	PORT_START("O0")
 	PORT_BIT(0x83, IP_ACTIVE_LOW, IPT_UNUSED)
@@ -77,7 +79,7 @@ private:
 
 	u8 cur_p6, cur_pa, cur_pb, cur_pc;
 
-	u16 adc_zero_r();
+	[[maybe_unused]] u16 adc_zero_r();
 	u16 adc_ar_r();
 	u16 adc_al_r();
 	u16 adc_midisw_r();
@@ -261,4 +263,7 @@ ROM_START( mu50 )
 	ROM_LOAD( "xq058b00.ic18", 0x200000, 0x200000, NO_DUMP)
 ROM_END
 
+} // anonymous namespace
+
+
 CONS( 1995, mu50, 0, 0, mu50,  mu50, mu50_state, empty_init, "Yamaha", "MU50", MACHINE_NOT_WORKING )

src/mame/yamaha/ymmu80.cpp

@@ -131,6 +131,8 @@
 #include "speaker.h"
 
 
+namespace {
+
 static INPUT_PORTS_START( mu80 )
 	PORT_START("P7")
 	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Enter")     PORT_CODE(KEYCODE_ENTER)
@@ -381,4 +383,7 @@ ROM_START( mu80 )
 	ROM_LOAD( "xq090b0-825.bin", 0x0e00000, 0x200000, CRC(34c422b3) SHA1(14073c41fbdf4faa9da9c83dafe4dc2d6b01b53b))
 ROM_END
 
+} // anonymous namespace
+
+
 CONS( 1994, mu80, 0, 0, mu80, mu80, mu80_state, empty_init, "Yamaha", "MU80", MACHINE_NOT_WORKING )

src/mame/yamaha/ympsr340.cpp

@@ -27,6 +27,9 @@
 #include "screen.h"
 #include "speaker.h"
 
+
+namespace {
+
 class psr340_state : public driver_device
 {
 public:
@@ -316,4 +319,7 @@ ROM_START( psr340 )
 	ROM_LOAD("psr340-lcd.svg", 0, 0x5704b, CRC(d93af0a9) SHA1(76156443025e0b4089259417bb266888c547b2d7))
 ROM_END
 
+} // anonymous namespace
+
+
 CONS(1994, psr340, 0, 0, psr340, psr340, psr340_state, empty_init, "Yamaha", "PSR-340 PortaSound", MACHINE_NOT_WORKING)

src/mame/yamaha/ymqy70.cpp

@@ -12,6 +12,9 @@
 
 #include "speaker.h"
 
+
+namespace {
+
 static INPUT_PORTS_START(qy70)
 	PORT_START("SWA")
 	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Record")    PORT_CODE(KEYCODE_Z)
@@ -208,4 +211,7 @@ ROM_START(qy70)
 	// This t6963c_0101 internal CG ROM is similar to lm24014w_0101.bin which may be used as a replacement
 ROM_END
 
+} // anonymous namespace
+
+
 CONS(1997, qy70, 0, 0, qy70, qy70, qy70_state, empty_init, "Yamaha", "QY70 Music Sequencer", MACHINE_NOT_WORKING)

src/mame/yamaha/ymtx81z.cpp

@@ -23,6 +23,9 @@
 
 #include "tx81z.lh"
 
+
+namespace {
+
 class ymtx81z_state : public driver_device
 {
 public:
@@ -186,4 +189,7 @@ ROM_START(tx81z)
 	ROMX_LOAD("tx81z-27512-image-first-version-1_0.ic15", 0x00000, 0x10000, CRC(2f9628fa) SHA1(ce62dfb9a86da092c469fd25328b5447375f5bb2), ROM_BIOS(6))
 ROM_END
 
+} // anonymous namespace
+
+
 SYST(1987, tx81z, 0, 0, tx81z, tx81z, ymtx81z_state, empty_init, "Yamaha", "TX81Z FM Tone Generator", MACHINE_IMPERFECT_SOUND | MACHINE_CLICKABLE_ARTWORK)

src/mame/yamaha/ymvl70.cpp

@@ -14,6 +14,8 @@
 #include "speaker.h"
 
 
+namespace {
+
 static INPUT_PORTS_START( vl70 )
 	PORT_START("B0")
 	PORT_BIT(0x83, IP_ACTIVE_LOW, IPT_UNUSED)
@@ -87,8 +89,8 @@ private:
 	u8 cur_ic32;
 
 	u16 adc_zero_r();
-	u16 adc_ar_r();
+	[[maybe_unused]] u16 adc_ar_r();
-	u16 adc_al_r();
+	[[maybe_unused]] u16 adc_al_r();
 	u16 adc_midisw_r();
 	u16 adc_battery_r();
 	u16 adc_breath_r();
@@ -265,4 +267,7 @@ ROM_START( vl70 )
 	ROM_LOAD16_WORD_SWAP( "vl70m_v111_27c160.bin", 0x000000, 0x200000, CRC(efdba9f0) SHA1(cfa9fb7d2a991e4752393c9677e4ddcbe10866c7) )
 ROM_END
 
+} // anonymous namespace
+
+
 CONS( 1996, vl70, 0, 0, vl70,  vl70, vl70_state, empty_init, "Yamaha", "VL70-m", MACHINE_NOT_WORKING )

src/mame/yunsung/nmg5.cpp

@@ -237,6 +237,8 @@ Stephh's notes (based on the games M68000 code and some tests) :
 #include "tilemap.h"
 
 
+namespace {
+
 class nmg5_state : public driver_device
 {
 public:
@@ -1571,6 +1573,9 @@ void nmg5_state::init_prot_val_40()
 	m_prot_val = 0x40;
 }
 
+} // anonymous namespace
+
+
 GAME( 1998, nmg5,      0,        nmg5,     nmg5,      nmg5_state, init_prot_val_10, ROT0, "Yun Sung", "Multi 5 / New Multi Game 5 (set 1)", MACHINE_SUPPORTS_SAVE )
 GAME( 1998, nmg5a,     nmg5,     nmg5,     nmg5,      nmg5_state, init_prot_val_10, ROT0, "Yun Sung", "Multi 5 / New Multi Game 5 (set 2, censored)", MACHINE_SUPPORTS_SAVE )
 GAME( 1997, nmg5e,     nmg5,     nmg5,     nmg5,      nmg5_state, init_prot_val_10, ROT0, "Yun Sung", "Multi 5 / New Multi Game 5 (set 3, earlier)", MACHINE_SUPPORTS_SAVE )

src/mame/zaccaria/nl_zac1b11142.h

@@ -1,7 +1,7 @@
 // license:CC0-1.0
 // copyright-holders:Vas Crabb
-#ifndef MAME_AUDIO_NL_ZAC1B11142_H
+#ifndef MAME_ZACCARIA_NL_ZAC1B11142_H
-#define MAME_AUDIO_NL_ZAC1B11142_H
+#define MAME_ZACCARIA_NL_ZAC1B11142_H
 
 #pragma once
 
@@ -9,4 +9,4 @@
 
 NETLIST_EXTERNAL(zac1b11142)
 
-#endif // MAME_AUDIO_NL_ZAC1B11142_H
+#endif // MAME_ZACCARIA_NL_ZAC1B11142_H

src/mame/zaccaria/seabattl.cpp

@@ -43,6 +43,8 @@ the sound board should be fully discrete.
 #include "seabattl.lh"
 
 
+namespace {
+
 class seabattl_state : public driver_device
 {
 public:
@@ -552,6 +554,8 @@ ROM_START( seabattla ) // this was a very different looking PCB (bootleg called
 	ROM_LOAD( "seawawe.ic9",      0x0000, 0x0800, CRC(7e356dc5) SHA1(71d34fa39ff0b7d0fa6d32ba2b9dc0006a03d1bb) ) // identical to above set
 ROM_END
 
+} // anonymous namespace
+
 
 GAMEL(1980, seabattl,  0,        seabattl, seabattl, seabattl_state, empty_init, ROT0, "Zaccaria", "Sea Battle (set 1)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND, layout_seabattl )
 GAMEL(1980, seabattla, seabattl, seabattl, seabattl, seabattl_state, empty_init, ROT0, "Zaccaria", "Sea Battle (set 2)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_NOT_WORKING, layout_seabattl ) // incomplete dump

src/mame/zaccaria/zaccaria_a.h

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Vas Crabb
-#ifndef MAME_AUDIO_ZACCARIA_H
+#ifndef MAME_ZACCARIA_ZACCARIA_H
-#define MAME_AUDIO_ZACCARIA_H
+#define MAME_ZACCARIA_ZACCARIA_H
 
 #pragma once
 
@@ -123,4 +123,4 @@ protected:
 	u8  m_host_command;
 };
 
-#endif // MAME_AUDIO_ZACCARIA_H
+#endif // MAME_ZACCARIA_ZACCARIA_H

src/mame/zenith/mdt60.cpp

@@ -20,6 +20,9 @@
 #include "video/mc6845.h"
 #include "screen.h"
 
+
+namespace {
+
 class mdt60_state : public driver_device
 {
 public:
@@ -260,4 +263,7 @@ ROM_START(mdt60)
 	ROM_LOAD("char_gen_b207.u6", 0x0000, 0x1000, CRC(b19432da) SHA1(fa73641c08b778f19a17676a7f4074f69b7b55dd))
 ROM_END
 
+} // anonymous namespace
+
+
 SYST(1983, mdt60, 0, 0, mdt60, mdt60, mdt60_state, empty_init, "Morrow Designs", "MDT 60 Video Display Terminal", MACHINE_SUPPORTS_SAVE)

src/mame/zenith/z100.cpp

@@ -163,6 +163,9 @@ ZDIPSW      EQU 0FFH    ; Configuration dip switches
 #include "screen.h"
 #include "speaker.h"
 
+
+namespace {
+
 class z100_state : public driver_device
 {
 public:
@@ -898,6 +901,8 @@ ROM_START( z100 )
 	ROM_LOAD("444-127.u370", 0x0000, 0x0100, CRC(ac386f6b) SHA1(2b62b939d704d90edf59923a8a1a51ef1902f4d7) BAD_DUMP)
 ROM_END
 
+} // anonymous namespace
+
 
 /* Driver */
 

src/mame/zenith/z22.cpp

@@ -21,6 +21,9 @@
 #include "video/mc6845.h"
 #include "screen.h"
 
+
+namespace {
+
 class z22_state : public driver_device
 {
 public:
@@ -212,4 +215,7 @@ ROM_START(z22)
 	ROM_LOAD("u38.bin", 0x2000, 0x2000, CRC(f0bfe9b5) SHA1(8807841b28549d0ddf30275fc6035a66093f8768)) // D2764A-3
 ROM_END
 
+} // anonymous namespace
+
+
 SYST(1984, z22, 0, 0, z22, z22, z22_state, empty_init, "Zenith Data Systems", "Z-22 Terminal", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)

src/mame/zenith/z29.cpp

@@ -14,6 +14,9 @@
 #include "video/i8275.h"
 #include "screen.h"
 
+
+namespace {
+
 class z29_state : public driver_device
 {
 public:
@@ -171,5 +174,7 @@ ROM_START(z29) // All EPROMs on 85-2835-1 terminal board are HN482732AG-30
 	ROM_LOAD("u429.bin", 0x0000, 0x1000, CRC(5e3bc5bf) SHA1(18d73e3d74a9768bee8b063ea45891f955558ae7))
 ROM_END
 
+} // anonymous namespace
+
 
 COMP(1983, z29, 0, 0, z29, z29, z29_state, empty_init, "Zenith Data Systems", "Z-29", MACHINE_IS_SKELETON)

src/mame/zpa/iq151.cpp

@@ -69,6 +69,8 @@ ToDo:
 #include "speaker.h"
 
 
+namespace {
+
 class iq151_state : public driver_device
 {
 public:
@@ -484,6 +486,9 @@ ROM_START( iq151 )
 	ROMX_LOAD( "iq151_monitor_cpm_old.rom", 0xf000, 0x1000, CRC(6743e1b7) SHA1(ae4f3b1ba2511a1f91c4e8afdfc0e5aeb0fb3a42), ROM_BIOS(3))
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 //    YEAR  NAME   PARENT  COMPAT  MACHINE  INPUT  STATE        INIT        COMPANY         FULLNAME  FLAGS