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

src/mame/f32/silvmil.cpp

@@ -37,6 +37,8 @@ Very likely to be 'whatever crystals we had on hand which were close enough for
 #include "tilemap.h"
 
 
+namespace {
+
 class silvmil_state : public driver_device
 {
 public:
@@ -583,6 +585,8 @@ ROM_START( puzzlovek )
 	ROM_LOAD16_BYTE( "8.u56", 0x100001, 0x80000, CRC(95b5f049) SHA1(1104dac1fbf6a894b7d8294b3f44a0edbf363157) ) // sldh
 ROM_END
 
+} // anonymous namespace
+
 
 GAME( 1995, silvmil,    0,        silvmil,   silvmil,   silvmil_state, empty_init, ROT270, "Para", "Silver Millennium", MACHINE_SUPPORTS_SAVE )
 GAME( 1994, puzzlove,   0,        puzzlove,  puzzlove,  silvmil_state, empty_init, ROT0,   "Para", "PuzzLove", MACHINE_SUPPORTS_SAVE )

src/mame/facit/facit4440.cpp

@@ -42,6 +42,9 @@
 #include "screen.h"
 #include "speaker.h"
 
+
+namespace {
+
 class facit4440_state : public driver_device
 {
 public:
@@ -316,4 +319,7 @@ ROM_START(facit4440)
 	ROM_LOAD("rom2.bin", 0x0000, 0x0800, CRC(9e1a190c) SHA1(fb08ee806f1056bcdfb5b08ea85995e1d3d01298))
 ROM_END
 
+} // anonymous namespace
+
+
 COMP(1984, facit4440, 0, 0, facit4440, facit4440, facit4440_state, empty_init, "Facit", "4440 Twist (30M-F1)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS)

src/mame/fairchild/channelf_a.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef MAME_AUDIO_CHANNELF_H
-#define MAME_AUDIO_CHANNELF_H
+#ifndef MAME_FAIRCHILD_CHANNELF_H
+#define MAME_FAIRCHILD_CHANNELF_H
 
 class channelf_sound_device : public device_t, public device_sound_interface
 {
@@ -36,4 +36,4 @@ private:
 
 DECLARE_DEVICE_TYPE(CHANNELF_SOUND, channelf_sound_device)
 
-#endif // MAME_AUDIO_CHANNELF_H
+#endif // MAME_FAIRCHILD_CHANNELF_H

src/mame/fairchild/f387x.cpp

@@ -12,6 +12,8 @@
 #include "machine/f3853.h"
 
 
+namespace {
+
 class f387x_state : public driver_device
 {
 public:
@@ -170,4 +172,7 @@ ROM_START(f387x)
 	// 2716 sockets at U14 and U15 are not populated
 ROM_END
 
+} // anonymous namespace
+
+
 COMP(1979, f387x, 0, 0, f387x, f387x, f387x_state, empty_init, "Fairchild Instrument & Camera Corporation", "F387X PEP System", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)

src/mame/fairlight/cmi.cpp

@@ -109,6 +109,9 @@
 #define VERBOSE     (0)
 #include "logmacro.h"
 
+
+namespace {
+
 #define Q209_CPU_CLOCK          (40.21_MHz_XTAL / 40) // verified by manual
 #define SYSTEM_CAS_CLOCK        (40.21_MHz_XTAL / 20) // likewise
 
@@ -278,8 +281,8 @@ public:
 	template <int CpuNum> u8 periphs_range_r(offs_t offset);
 	template <int CpuNum> void periphs_range_w(offs_t offset, u8 data);
 
-	u8 tvt_r();
-	void tvt_w(u8 data);
+	[[maybe_unused]] u8 tvt_r();
+	[[maybe_unused]] void tvt_w(u8 data);
 	DECLARE_WRITE_LINE_MEMBER(pia_q219_irqa);
 	DECLARE_WRITE_LINE_MEMBER(pia_q219_irqb);
 	DECLARE_WRITE_LINE_MEMBER(ptm_q219_irq);
@@ -2270,4 +2273,7 @@ void cmi_state::init_cmi2x()
 {
 }
 
+} // anonymous namespace
+
+
 CONS( 1983, cmi2x, 0, 0, cmi2x, cmi2x, cmi_state, init_cmi2x, "Fairlight", "CMI IIx", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )

src/mame/fairlight/cmi01a.h

@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_AUDIO_CMI01A_H
-#define MAME_AUDIO_CMI01A_H
+#ifndef MAME_FAIRLIGHT_CMI01A_H
+#define MAME_FAIRLIGHT_CMI01A_H
 
 #include "machine/6821pia.h"
 #include "machine/6840ptm.h"
@@ -188,4 +188,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(CMI01A_CHANNEL_CARD, cmi01a_device)
 
-#endif // MAME_AUDIO_CMI01A_H
+#endif // MAME_FAIRLIGHT_CMI01A_H

src/mame/fairlight/cmi_ankbd.h

@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_CMI_ANKBD_H
-#define MAME_MACHINE_CMI_ANKBD_H
+#ifndef MAME_FAIRLIGHT_CMI_ANKBD_H
+#define MAME_FAIRLIGHT_CMI_ANKBD_H
 
 #pragma once
 
@@ -49,4 +49,4 @@ private:
 
 DECLARE_DEVICE_TYPE(CMI_ALPHANUMERIC_KEYBOARD, cmi_alphanumeric_keyboard_device)
 
-#endif // MAME_MACHINE_CMI_ANKBD_H
+#endif // MAME_FAIRLIGHT_CMI_ANKBD_H

src/mame/fairlight/cmi_mkbd.h

@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_CMI_MKBD_H
-#define MAME_MACHINE_CMI_MKBD_H
+#ifndef MAME_FAIRLIGHT_CMI_MKBD_H
+#define MAME_FAIRLIGHT_CMI_MKBD_H
 
 #pragma once
 
@@ -180,4 +180,4 @@ private:
 
 DECLARE_DEVICE_TYPE(CMI_MUSIC_KEYBOARD, cmi_music_keyboard_device)
 
-#endif // MAME_MACHINE_CMI_MKBD_H
+#endif // MAME_FAIRLIGHT_CMI_MKBD_H

src/mame/falco/f5220_kbd.h

@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_F5220_KBD_H
-#define MAME_MACHINE_F5220_KBD_H
+#ifndef MAME_FALCO_F5220_KBD_H
+#define MAME_FALCO_F5220_KBD_H
 
 #pragma once
 
@@ -58,4 +58,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(F5220_KBD, f5220_kbd_device)
 
-#endif // MAME_MACHINE_F5220_KBD_H
+#endif // MAME_FALCO_F5220_KBD_H

src/mame/falco/falcots.cpp

@@ -17,6 +17,9 @@
 #include "video/mc6845.h"
 #include "screen.h"
 
+
+namespace {
+
 class falcots_state : public driver_device
 {
 public:
@@ -453,5 +456,8 @@ ROM_START(ts2624)
 	ROM_LOAD("prom.12f",   0x20, 0x20, NO_DUMP) // 74S288 or equivalent
 ROM_END
 
+} // anonymous namespace
+
+
 COMP(1980, ts1,    0, 0, ts1,    ts1,    falcots_state, empty_init, "Falco Data Products", "TS-1 (v2.13.0)", MACHINE_IS_SKELETON)
 COMP(1982, ts2624, 0, 0, ts2624, ts2624, falcots_state, empty_init, "Falco Data Products", "TS-2624", MACHINE_IS_SKELETON)

src/mame/fidelity/clockdiv.h

@@ -6,8 +6,8 @@
 
 */
 
-#ifndef MAME_MACHINE_FIDEL_CLOCKDIV_H
-#define MAME_MACHINE_FIDEL_CLOCKDIV_H
+#ifndef MAME_FIDELITY_FIDEL_CLOCKDIV_H
+#define MAME_FIDELITY_FIDEL_CLOCKDIV_H
 
 #pragma once
 
@@ -48,4 +48,4 @@ private:
 INPUT_PORTS_EXTERN( fidel_clockdiv_2 );
 INPUT_PORTS_EXTERN( fidel_clockdiv_4 );
 
-#endif // MAME_MACHINE_FIDEL_CLOCKDIV_H
+#endif // MAME_FIDELITY_FIDEL_CLOCKDIV_H

src/mame/force/fccpu20.cpp

@@ -87,6 +87,9 @@
 #define FUNCNAME __PRETTY_FUNCTION__
 #endif
 
+
+namespace {
+
 class cpu20_state : public driver_device
 {
 public:
@@ -207,6 +210,9 @@ ROM_START(fccpu20sbc)   ROM_END
 #define rom_fccpu21bsbc     rom_fccpu20sbc
 #define rom_fccpu21ybsbc    rom_fccpu20sbc
 
+} // anonymous namespace
+
+
 /* Driver */
 /*    YEAR  NAME          PARENT      COMPAT MACHINE  INPUT  CLASS        INIT          COMPANY                 FULLNAME           FLAGS */
 COMP( 1986, fccpu20sbc,   0,          0,     cpu20,   cpu20, cpu20_state, empty_init,   "Force Computers GmbH", "SYS68K/CPU-20",   MACHINE_NO_SOUND_HW )

src/mame/force/fccpu30.cpp

@@ -231,6 +231,9 @@
 #define FUNCNAME __PRETTY_FUNCTION__
 #endif
 
+
+namespace {
+
 #define DUSCC_CLOCK XTAL(14'745'600) /* Verified */
 
 class cpu30_state : public driver_device
@@ -1039,6 +1042,9 @@ void cpu30_state::fga_irq_callback(int)(01)
 void fga002_device::check_interrupts()()
  */
 
+ } // anonymous namespace
+ 
+ 
 /* Driver */
 /*    YEAR  NAME            PARENT   COMPAT  MACHINE        INPUT  CLASS        INIT             COMPANY                 FULLNAME                  FLAGS */
 COMP( 1988, fccpu30,        0,       0,      cpu30,         cpu30, cpu30_state, empty_init,      "Force Computers GmbH", "SYS68K/CPU-30",          MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )

src/mame/force/force68k.cpp

@@ -137,6 +137,9 @@
 #define FUNCNAME __PRETTY_FUNCTION__
 #endif
 
+
+namespace {
+
 class force68k_state : public driver_device
 {
 public:
@@ -728,6 +731,9 @@ ROM_START (fccpu6vb)
 ROM_END
 #endif
 
+} // anonymous namespace
+
+
 /* Driver */
 /*    YEAR  NAME      PARENT  COMPAT  MACHINE   INPUT     CLASS           INIT        COMPANY                 FULLNAME          FLAGS */
 COMP( 1983, fccpu1,   0,      0,      fccpu1,   force68k, force68k_state, empty_init, "Force Computers GmbH", "SYS68K/CPU-1",   MACHINE_NO_SOUND_HW )

src/mame/force/miniforce.cpp

@@ -127,6 +127,9 @@
 #define FUNCNAME __PRETTY_FUNCTION__
 #endif
 
+
+namespace {
+
 class miniforce_state : public driver_device
 {
 public:
@@ -202,6 +205,9 @@ void miniforce_state::miniforce(machine_config &config)
 ROM_START(miniforce)
 ROM_END
 
+} // anonymous namespace
+
+
 /* Drivers TODO: setup distinct miniforce machine configurations */
 /*    YEAR  NAME       PARENT  COMPAT  MACHINE    INPUT      CLASS            INIT        COMPANY            FULLNAME     FLAGS */
 COMP( 1987, miniforce, 0,      0,      miniforce, miniforce, miniforce_state, empty_init, "Force Computers", "miniFORCE", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )

src/mame/fujitsu/fmt_icmem.h

@@ -8,8 +8,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_MACHINE_FMT_ICMEM_H
-#define MAME_MACHINE_FMT_ICMEM_H
+#ifndef MAME_FUJITSU_FMT_ICMEM_H
+#define MAME_FUJITSU_FMT_ICMEM_H
 
 #pragma once
 
@@ -60,4 +60,4 @@ private:
 DECLARE_DEVICE_TYPE(FMT_ICMEM, fmt_icmem_device)
 
 
-#endif  // MAME_MACHINE_FMT_ICMEM_H
+#endif  // MAME_FUJITSU_FMT_ICMEM_H

src/mame/funtech/acan.h

@@ -6,8 +6,8 @@
 
 **********************************************************************/
 
-#ifndef MAME_AUDIO_ACAN_H
-#define MAME_AUDIO_ACAN_H
+#ifndef MAME_FUNTECH_ACAN_H
+#define MAME_FUNTECH_ACAN_H
 
 #pragma once
 
@@ -67,4 +67,4 @@ private:
 
 DECLARE_DEVICE_TYPE(ACANSND, acan_sound_device)
 
-#endif // MAME_AUDIO_ACAN_H
+#endif // MAME_FUNTECH_ACAN_H

src/mame/funworld/4roses.cpp

@@ -184,6 +184,8 @@
 #include "speaker.h"
 
 
+namespace {
+
 #define MASTER_CLOCK    XTAL(16'000'000)
 
 class _4roses_state : public funworld_state
@@ -580,6 +582,8 @@ void rugby_state::driver_init()
 		rom[addr] = bitswap<8>(rom[addr], 6, 7, 4, 5, 2, 3, 0, 1);
 }
 
+} // anonymous namespace
+
 
 /*************************
 *      Game Drivers      *

src/mame/fuuki/fuukifg.h

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Luca Elia, David Haywood
-#ifndef MAME_VIDEO_FUUKIFH_H
-#define MAME_VIDEO_FUUKIFH_H
+#ifndef MAME_FUUKI_FUUKIFH_H
+#define MAME_FUUKI_FUUKIFH_H
 
 #pragma once
 
@@ -35,4 +35,4 @@ private:
 
 DECLARE_DEVICE_TYPE(FUUKI_VIDEO, fuukivid_device)
 
-#endif // MAME_VIDEO_FUUKIFH_H
+#endif // MAME_FUUKI_FUUKIFH_H

src/mame/gaelco/atvtrack.cpp

@@ -63,7 +63,7 @@ Gaelco Football
 PCB:
 GAELCO
 REF. 020201
-Same PCB as above ATV Track, exept for HD6417750 SH4 CPUs was used intead of HD6417750S.
+Same PCB as above ATV Track, except for HD6417750 SH4 CPUs was used instead of HD6417750S.
 
 */
 
@@ -107,6 +107,8 @@ TODO:
 #include "screen.h"
 
 
+namespace {
+
 //#define SPECIALMODE 1 // Alternate code path
 
 class atvtrack_state : public driver_device
@@ -135,7 +137,7 @@ protected:
 	virtual void video_start() override;
 	u32 screen_update_atvtrack(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 	inline u32 decode64_32(offs_t offset64, u64 data, u64 mem_mask, offs_t &offset32);
-	void logbinary(u32 data,int high,int low);
+	[[maybe_unused]] void logbinary(u32 data, int high, int low);
 
 	memory_region *m_nandregion = nullptr;
 	int m_nandcommand[4]{}, m_nandoffset[4]{}, m_nandaddressstep = 0, m_nandaddress[4]{};
@@ -174,7 +176,7 @@ private:
 	void smashdrv_main_port(address_map &map);
 };
 
-void atvtrack_state::logbinary(u32 data,int high=31,int low=0)
+void atvtrack_state::logbinary(u32 data, int high=31, int low=0)
 {
 	u32 s;
 	int z;
@@ -415,7 +417,7 @@ void atvtrack_state::ioport_w(offs_t offset, u64 data)
 				m_slaverun = true;
 		}
 //      logerror("SH4 16bit i/o port write ");
-//      logbinary((u32)data,15,0);
+//      logbinary((u32)data, 15, 0);
 //      logerror("\n");
 	}
 #ifdef SPECIALMODE
@@ -731,6 +733,9 @@ ROM_START( smashdrvb ) // UK Version: 3.3, Version 3D: 1.9, Checksum: 707C
 	// ic21 unpopulated
 ROM_END
 
+} // anonymous namespace
+
+
 GAME( 2002, atvtrack,  0,        atvtrack, atvtrack, atvtrack_state, empty_init, ROT0, "Gaelco",           "ATV Track (set 1)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 2002, atvtracka, atvtrack, atvtrack, atvtrack, atvtrack_state, empty_init, ROT0, "Gaelco",           "ATV Track (set 2)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 2002, gfootbal,  0,        atvtrack, atvtrack, atvtrack_state, empty_init, ROT0, "Gaelco / Zigurat", "Gaelco Football", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )

src/mame/gaelco/bigkarnk_ms.cpp

@@ -294,6 +294,8 @@ Sound Board 9/2
 #include "machine/bankdev.h"
 
 
+namespace {
+
 class bigkarnk_ms_state : public driver_device
 {
 public:
@@ -363,8 +365,6 @@ private:
 	tilemap_t *m_bg_tilemap2 = nullptr;
 	tilemap_t *m_bg_tilemap3 = nullptr;
 
-	uint16_t unknown_0x40000x_r();
-
 	DECLARE_WRITE_LINE_MEMBER(splash_msm5205_int);
 	void splash_adpcm_data_w(uint8_t data);
 	void splash_adpcm_control_w(uint8_t data);
@@ -373,11 +373,6 @@ private:
 	void descramble_16x16tiles(uint8_t* src, int len);
 };
 
-uint16_t bigkarnk_ms_state::unknown_0x40000x_r()
-{
-	return 0xffff;
-}
-
 TILE_GET_INFO_MEMBER(bigkarnk_ms_state::get_tile_info_tilemap1)
 {
 	int tile = m_videoram1[tile_index*2];
@@ -838,4 +833,7 @@ ROM_START( bigkarnkm )
 	ROM_LOAD( "snd_9348_gal16v8-25hb1.ic10", 0, 1, NO_DUMP )
 ROM_END
 
+} // anonymous namespace
+
+
 GAME( 1991, bigkarnkm,  bigkarnk,  bigkarnkm,  bigkarnkm,  bigkarnk_ms_state, init_bigkarnkm, ROT0, "Gaelco", "Big Karnak (Modular System)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )

src/mame/gaelco/gaelco3d_m.h

@@ -5,8 +5,8 @@
     Gaelco 3D serial hardware
 
 ***************************************************************************/
-#ifndef MAME_MACHINE_GAELCO3D_H
-#define MAME_MACHINE_GAELCO3D_H
+#ifndef MAME_GAELCO_GAELCO3D_H
+#define MAME_GAELCO_GAELCO3D_H
 
 #pragma once
 
@@ -105,4 +105,4 @@ private:
 
 DECLARE_DEVICE_TYPE(GAELCO_SERIAL, gaelco_serial_device)
 
-#endif // MAME_MACHINE_GAELCO3D_H
+#endif // MAME_GAELCO_GAELCO3D_H

src/mame/gaelco/gaelco_ds5002fp.h

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
-#ifndef MAME_MACHINE_GAELCO_DS5002FP_H
-#define MAME_MACHINE_GAELCO_DS5002FP_H
+#ifndef MAME_GAELCO_GAELCO_DS5002FP_H
+#define MAME_GAELCO_GAELCO_DS5002FP_H
 
 #pragma once
 
@@ -34,4 +34,4 @@ private:
 	void hostmem_w(offs_t offset, uint8_t data);
 };
 
-#endif // MAME_MACHINE_GAELCO_DS5002FP_H
+#endif // MAME_GAELCO_GAELCO_DS5002FP_H

src/mame/gaelco/gaelco_wrally_sprites.h

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Manuel Abadia, Mike Coates, Nicola Salmoria, Miguel Angel Horna, Luca Elia, David Haywood
-#ifndef MAME_VIDEO_GAELCO_WRALLY_SPRITES_H
-#define MAME_VIDEO_GAELCO_WRALLY_SPRITES_H
+#ifndef MAME_GAELCO_GAELCO_WRALLY_SPRITES_H
+#define MAME_GAELCO_GAELCO_WRALLY_SPRITES_H
 
 #pragma once
 
@@ -45,4 +45,4 @@ protected:
 DECLARE_DEVICE_TYPE(GAELCO_WRALLY_SPRITES, gaelco_wrally_sprites_device)
 DECLARE_DEVICE_TYPE(BLMBYCAR_SPRITES, blmbycar_sprites_device)
 
-#endif // MAME_VIDEO_GAELCO_WRALLY_SPRITES_H
+#endif // MAME_GAELCO_GAELCO_WRALLY_SPRITES_H

src/mame/gaelco/gaelcof3.cpp

@@ -52,6 +52,8 @@
 #include "speaker.h"
 
 
+namespace {
+
 class gaelcof3_state : public driver_device
 {
 public:
@@ -137,6 +139,9 @@ ROM_START( susanita )
 	ROM_LOAD( "susanita.u1", 0x00000, 0x40000, CRC(766868cb) SHA1(eb42dc46b865bc448052d9d67c840e51c49ce49a) )
 ROM_END
 
+} // anonymous namespace
+
+
 GAME( 199?, autopapa,  0, gaelcof3, gaelcof3, gaelcof3_state, empty_init, ROT0, "Gaelco", "El auto feo",     MACHINE_IS_SKELETON_MECHANICAL )
 GAME( 199?, donpepito, 0, gaelcof3, gaelcof3, gaelcof3_state, empty_init, ROT0, "Gaelco", "Hola Don Pepito", MACHINE_IS_SKELETON_MECHANICAL )
 GAME( 199?, susanita,  0, gaelcof3, gaelcof3, gaelcof3_state, empty_init, ROT0, "Gaelco", "Susanita",        MACHINE_IS_SKELETON_MECHANICAL )

src/mame/gaelco/gaelcopc.cpp

@@ -30,6 +30,8 @@ motherboard bioses.
 #include "screen.h"
 
 
+namespace {
+
 class gaelcopc_state : public driver_device
 {
 public:
@@ -135,6 +137,8 @@ ROM_START(tuningrc)
 	DISK_IMAGE( "tuningrc", 0, SHA1(4055cdc0b0c0e99252b90fbfafc48b693b144d67) )
 ROM_END
 
+} // anonymous namespace
+
 
 GAME( 2003, tokyocop,  0,        gaelcopc, gaelcopc, gaelcopc_state, empty_init, ROT0, "Gaelco", "Tokyo Cop (US, dedicated version)",   MACHINE_IS_SKELETON )
 GAME( 2003, tokyocopk, tokyocop, gaelcopc, gaelcopc, gaelcopc_state, empty_init, ROT0, "Gaelco", "Tokyo Cop (US, kit version)",         MACHINE_IS_SKELETON )

src/mame/gaelco/gaelcrpt.h

@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Manuel Abadia
 
-#ifndef MAME_MACHINE_GAELCRPT_H
-#define MAME_MACHINE_GAELCRPT_H
+#ifndef MAME_GAELCO_GAELCRPT_H
+#define MAME_GAELCO_GAELCRPT_H
 
 #pragma once
 
@@ -33,4 +33,4 @@ private:
 	uint16_t m_param2;
 };
 
-#endif // MAME_MACHINE_GAELCRPT_H
+#endif // MAME_GAELCO_GAELCRPT_H

src/mame/gaelco/mastboyo.cpp

@@ -19,6 +19,8 @@
 #include "tilemap.h"
 
 
+namespace {
+
 class mastboyo_state : public driver_device
 {
 public:
@@ -336,6 +338,9 @@ ROM_START( mastboyoc ) // PCB marked 'MMV-1 FABRICADO POR GAELCO'
 	ROM_LOAD( "l_82s129.ic40", 0x000, 0x100, CRC(4d061216) SHA1(1abf9320da75a3fd23c6bdbcc4088d18e133c4e5) )
 ROM_END
 
+} // anonymous namespace
+
+
 GAME( 1987, mastboyo,  0,        mastboyo, mastboyo, mastboyo_state, empty_init, ROT0, "Gaelco (Covielsa license)",    "Master Boy (1987, Z80 hardware, Covielsa, set 1)",    MACHINE_SUPPORTS_SAVE )
 GAME( 1987, mastboyoa, mastboyo, mastboyo, mastboyo, mastboyo_state, empty_init, ROT0, "Gaelco (Covielsa license)",    "Master Boy (1987, Z80 hardware, Covielsa, set 2)",    MACHINE_SUPPORTS_SAVE )
 GAME( 1987, mastboyob, mastboyo, mastboyo, mastboyo, mastboyo_state, empty_init, ROT0, "Gaelco (Ichi-Funtel license)", "Master Boy (1987, Z80 hardware, Ichi-Funtel, set 1)", MACHINE_SUPPORTS_SAVE )

src/mame/gaelco/rollext.cpp

@@ -124,6 +124,9 @@
 #include "machine/eepromser.h"
 #include "screen.h"
 
+
+namespace {
+
 #define BILINEAR 1
 
 struct rollext_polydata
@@ -795,5 +798,7 @@ ROM_START(rollext)
 	ROM_LOAD32_BYTE("roe.ic60", 0x000003, 0x800000, CRC(a64524af) SHA1(31bef17656ab025f90cd222d3d6d0cb62dee29ee))
 ROM_END
 
+} // anonymous namespace
+
 
 GAME( 1999, rollext, 0, rollext, rollext, rollext_state, init_rollext, ROT0, "Gaelco (Namco America license)", "ROLLing eX.tre.me (US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )

src/mame/galaxian/dambustr.cpp

@@ -59,6 +59,8 @@ Stephh's notes (based on the games Z80 code and some tests) :
 #include "speaker.h"
 
 
+namespace {
+
 class dambustr_state : public galaxold_state
 {
 public:
@@ -376,6 +378,8 @@ ROM_START( dambustruk )
 	ROM_LOAD( "mi-7603-5.ic3", 0x0000, 0x0020, CRC(e2a54c47) SHA1(1e08f8e3d0ae0efb2d178ab11ec2bddaeb6d7478) ) /* near DB1 - DB4 */
 ROM_END
 
+} // anonymous namespace
+
 
 GAME( 1981, dambustr,   0,        dambustr, dambustr,   dambustr_state, init_dambustr, ROT90, "South West Research", "Dambusters (US, set 1)", 0 )
 GAME( 1981, dambustra,  dambustr, dambustr, dambustr,   dambustr_state, init_dambustr, ROT90, "South West Research", "Dambusters (US, set 2)", 0 )

src/mame/galaxian/galaxian_a.h

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Aaron Giles
-#ifndef MAME_AUDIO_GALAXIAN_H
-#define MAME_AUDIO_GALAXIAN_H
+#ifndef MAME_GALAXIAN_GALAXIAN_H
+#define MAME_GALAXIAN_GALAXIAN_H
 
 #pragma once
 
@@ -63,4 +63,4 @@ DECLARE_DEVICE_TYPE(GALAXIAN_SOUND, galaxian_sound_device)
 DECLARE_DEVICE_TYPE(MOONCRST_SOUND, mooncrst_sound_device)
 DECLARE_DEVICE_TYPE(SBHOEI_SOUND, sbhoei_sound_device)
 
-#endif // MAME_AUDIO_GALAXIAN_H
+#endif // MAME_GALAXIAN_GALAXIAN_H

src/mame/galaxian/scobra.cpp

@@ -45,6 +45,8 @@ Notes/Tidbits:
 #include "speaker.h"
 
 
+namespace {
+
 class scobra_state : public scramble_state
 {
 public:
@@ -1790,6 +1792,9 @@ ROM_START( mimonkeyug ) // this bootleg has significant hardware changes: no aud
 	ROM_LOAD( "sn74s288n.6l",    0x0000, 0x0020, CRC(4e3caeab) SHA1(a25083c3e36d28afdefe4af6e6d4f3155e303625) )
 ROM_END
 
+} // anonymous namespace
+
+
 GAME( 1981, stratgyx,   0,        stratgyx,   stratgyx,   scobra_state,  init_stratgyx, ROT0,   "Konami",                             "Strategy X", MACHINE_SUPPORTS_SAVE )
 GAME( 1981, stratgys,   stratgyx, stratgyx,   stratgyx,   scobra_state,  init_stratgyx, ROT0,   "Konami (Stern Electronics license)", "Strategy X (Stern Electronics)", MACHINE_SUPPORTS_SAVE )
 GAME( 1982, strongx,    stratgyx, stratgyx,   stratgyx,   scobra_state,  init_stratgyx, ROT0,   "bootleg",                            "Strong X", MACHINE_SUPPORTS_SAVE )

src/mame/gamepark/gp2x.cpp

@@ -26,6 +26,8 @@
 #include "speaker.h"
 
 
+namespace {
+
 class gp2x_state : public driver_device
 {
 public:
@@ -379,6 +381,9 @@ void gp2x_state::gp2x(machine_config &config)
 	SPEAKER(config, "rspeaker").front_right();
 }
 
+} // anonymous namespace
+
+
 ROM_START(gp2x)
 	ROM_REGION( 0x600000, "maincpu", 0 )    // contents of NAND flash
 	ROM_SYSTEM_BIOS(0, "v2", "version 2.0")

src/mame/gameplan/toratora.cpp

@@ -50,6 +50,8 @@ TODO:
 #include "speaker.h"
 
 
+namespace {
+
 class toratora_state : public driver_device
 {
 public:
@@ -512,6 +514,8 @@ ROM_START( toratorab )
 	ROM_LOAD( "1027.u11", 0xf800, 0x0800, CRC(336f6659) SHA1(ea1151db54b68316908874da6983d6de5c94c29e) )
 ROM_END
 
+} // anonymous namespace
+
 
 /*************************************
  *

src/mame/gridcomp/gridkeyb.h

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Vas Crabb, Sergey Svishchev
-#ifndef MAME_MACHINE_GRIDKEYB_H
-#define MAME_MACHINE_GRIDKEYB_H
+#ifndef MAME_GRIDCOMP_GRIDKEYB_H
+#define MAME_GRIDCOMP_GRIDKEYB_H
 
 #pragma once
 
@@ -77,4 +77,4 @@ private:
 	output_delegate m_keyboard_cb;
 };
 
-#endif // MAME_MACHINE_GRIDKEYB_H
+#endif // MAME_GRIDCOMP_GRIDKEYB_H

src/mame/handheld/pensebem.cpp

@@ -111,6 +111,8 @@ Port B, bit 1
 #include "speaker.h"
 
 
+namespace {
+
 class pensebem2017_state : public driver_device
 {
 public:
@@ -313,5 +315,8 @@ ROM_START( pbem2017 )
 	ROM_LOAD("pensebem.svg", 0, 0x42e1a, CRC(7146c0db) SHA1(966e95742acdda05028ee7b0c1352c88abb35041))
 ROM_END
 
+} // anonymous namespace
+
+
 /*   YEAR  NAME    PARENT    COMPAT    MACHINE        INPUT         STATE                INIT         COMPANY    FULLNAME */
 COMP(2017, pbem2017,    0,        0,   pensebem2017,  pensebem2017, pensebem2017_state,  empty_init,  "TecToy",  "Pense Bem (2017)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)

src/mame/hds/hds200_kbd.h

@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_HDS200_KBD_H
-#define MAME_MACHINE_HDS200_KBD_H
+#ifndef MAME_HDS_HDS200_KBD_H
+#define MAME_HDS_HDS200_KBD_H
 
 #pragma once
 
@@ -63,4 +63,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(HDS200_KBD_HLE, hds200_kbd_hle_device)
 
-#endif // MAME_MACHINE_HDS200_KBD_H
+#endif // MAME_HDS_HDS200_KBD_H

src/mame/heathkit/h19.cpp

@@ -61,6 +61,8 @@ Address   Description
 #include "speaker.h"
 
 
+namespace {
+
 // Standard H19 used a 2.048 MHz clock
 #define H19_CLOCK (XTAL(12'288'000) / 6)
 #define MC6845_CLOCK (XTAL(12'288'000) /8)
@@ -628,6 +630,8 @@ ROM_START( ultra19 )
 	ROM_LOAD( "2716_h19_ultra_keyboard.bin", 0x0000, 0x0800, CRC(76130c92) SHA1(ca39c602af48505139d2750a084b5f8f0e662ff7))
 ROM_END
 
+} // anonymous namespace
+
 
 //    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT  CLASS      INIT        COMPANY      FULLNAME                         FLAGS
 COMP( 1979, h19,     0,      0,      h19,     h19,   h19_state, empty_init, "Heath Inc", "Heathkit H-19",                 MACHINE_SUPPORTS_SAVE )

src/mame/heathkit/h8.cpp

@@ -57,6 +57,7 @@ Official test program from pages 4 to 8 of the operator's manual:
 #include "formats/h8_cas.h"
 #include "h8.lh"
 
+namespace {
 
 class h8_state : public driver_device
 {
@@ -407,6 +408,9 @@ ROM_START( h8 )
 	ROMX_LOAD( "2732_444-140_pam37.rom", 0x0000, 0x1000, CRC(53a540db) SHA1(90082d02ffb1d27e8172b11fff465bd24343486e), ROM_BIOS(4) )
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 /*    YEAR  NAME  PARENT  COMPAT  MACHINE  INPUT    CLASS,    INIT          COMPANY           FULLNAME                      FLAGS */

src/mame/heathkit/h89.cpp

@@ -25,6 +25,9 @@
 #include "machine/ins8250.h"
 #include "machine/timer.h"
 
+
+namespace {
+
 #define RS232_TAG "rs232"
 
 class h89_state : public driver_device
@@ -212,6 +215,9 @@ ROM_START( h89 )
 	ROM_LOAD( "2732_mms84a_magnoliamms.bin", 0x0000, 0x1000, CRC(5563f42a) SHA1(1b74cafca8213d5c083f16d8a848933ab56eb43b))
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 /*    YEAR  NAME  PARENT  COMPAT  MACHINE  INPUT  CLASS      INIT        COMPANY      FULLNAME        FLAGS */

src/mame/hegenerglaser/berlin.cpp

@@ -26,6 +26,8 @@ TODO:
 #include "mephisto_berlin.lh"
 
 
+namespace {
+
 class berlin_state : public driver_device
 {
 public:
@@ -192,6 +194,7 @@ ROM_START( berlinpl ) // B500 53CA 3DCE
 	ROM_LOAD("berlin_020_london.u2", 0x00000, 0x40000, CRC(d75e170f) SHA1(ac0ebdaa114abd4fef87361a03df56928768b1ae) )
 ROM_END
 
+} // anonymous namespace
 
 
 /******************************************************************************

src/mame/hegenerglaser/mmboard.h

@@ -6,8 +6,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_MACHINE_MMBOARD_H
-#define MAME_MACHINE_MMBOARD_H
+#ifndef MAME_HEGENERGLASER_MMBOARD_H
+#define MAME_HEGENERGLASER_MMBOARD_H
 
 #pragma once
 
@@ -87,4 +87,4 @@ DECLARE_DEVICE_TYPE(MEPHISTO_SENSORS_BOARD, mephisto_sensors_board_device)
 DECLARE_DEVICE_TYPE(MEPHISTO_BUTTONS_BOARD, mephisto_buttons_board_device)
 
 
-#endif // MAME_MACHINE_MMBOARD_H
+#endif // MAME_HEGENERGLASER_MMBOARD_H

src/mame/hegenerglaser/mmdisplay1.h

@@ -6,8 +6,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_VIDEO_MMDISPLAY1_H
-#define MAME_VIDEO_MMDISPLAY1_H
+#ifndef MAME_HEGENERGLASER_MMDISPLAY1_H
+#define MAME_HEGENERGLASER_MMDISPLAY1_H
 
 #pragma once
 
@@ -42,4 +42,4 @@ private:
 
 DECLARE_DEVICE_TYPE(MEPHISTO_DISPLAY_MODULE1, mephisto_display1_device)
 
-#endif // MAME_VIDEO_MMDISPLAY1_H
+#endif // MAME_HEGENERGLASER_MMDISPLAY1_H

src/mame/hegenerglaser/mmdisplay2.h

@@ -6,8 +6,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_VIDEO_MMDISPLAY2_H
-#define MAME_VIDEO_MMDISPLAY2_H
+#ifndef MAME_HEGENERGLASER_MMDISPLAY2_H
+#define MAME_HEGENERGLASER_MMDISPLAY2_H
 
 #pragma once
 
@@ -49,4 +49,4 @@ private:
 
 DECLARE_DEVICE_TYPE(MEPHISTO_DISPLAY_MODULE2, mephisto_display2_device)
 
-#endif // MAME_VIDEO_MMDISPLAY2_H
+#endif // MAME_HEGENERGLASER_MMDISPLAY2_H

src/mame/heurikon/hk68v10.cpp

@@ -186,6 +186,9 @@
 #define FUNCNAME __PRETTY_FUNCTION__
 #endif
 
+
+namespace {
+
 #define BAUDGEN_CLOCK 19.6608_MHz_XTAL /* Raltron */
 #define SCC_CLOCK (BAUDGEN_CLOCK / 4) /* through a 74LS393 counter */
 
@@ -397,6 +400,9 @@ ROM_START (hk68v10)
 	 */
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 /*    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT    CLASS          INIT        COMPANY                 FULLNAME    FLAGS */
 COMP( 1985, hk68v10, 0,      0,      hk68v10, hk68v10, hk68v10_state, empty_init, "Heurikon Corporation", "HK68/V10", MACHINE_NO_SOUND_HW )

src/mame/hitachi/b16.cpp

@@ -21,6 +21,8 @@
 #include "screen.h"
 
 
+namespace {
+
 class b16_state : public driver_device
 {
 public:
@@ -303,6 +305,9 @@ ROM_START( b16 )
 	ROM_REGION( 0x4000/2, "pcg", ROMREGION_ERASE00 )
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 /*    YEAR  NAME  PARENT  COMPAT  MACHINE  INPUT  CLASS      INIT        COMPANY    FULLNAME  FLAGS */

src/mame/hitachi/bmjr.cpp

@@ -24,6 +24,8 @@
 #include "speaker.h"
 
 
+namespace {
+
 class bmjr_state : public driver_device
 {
 public:
@@ -393,6 +395,9 @@ ROM_START( bmjr )
 	ROM_LOAD( "font.rom", 0x0000, 0x0800, BAD_DUMP CRC(258c6fd7) SHA1(d7c7dd57d6fc3b3d44f14c32182717a48e24587f)) //taken from a JP emulator
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 

src/mame/hitachi/bml3.cpp

@@ -35,6 +35,9 @@
 #include "screen.h"
 #include "speaker.h"
 
+
+namespace {
+
 // System clock definitions, from the MB-6890 servce manual, p.48:
 
 #define MASTER_CLOCK ( 32.256_MHz_XTAL )   // Master clock crystal (X1) frequency, 32.256 MHz.  "fx" in the manual.
@@ -110,8 +113,8 @@ private:
 	void vres_reg_w(u8 data);
 	uint8_t vram_r(offs_t offset);
 	void vram_w(offs_t offset, u8 data);
-	uint8_t psg_latch_r();
-	void psg_latch_w(u8 data);
+	[[maybe_unused]] uint8_t psg_latch_r();
+	[[maybe_unused]] void psg_latch_w(u8 data);
 	uint8_t vram_attr_r();
 	void vram_attr_w(u8 data);
 	uint8_t beep_r();
@@ -130,8 +133,8 @@ private:
 	TIMER_DEVICE_CALLBACK_MEMBER(kansas_r);
 	TIMER_DEVICE_CALLBACK_MEMBER(kansas_w);
 	TIMER_DEVICE_CALLBACK_MEMBER(keyboard_callback);
-	uint8_t ym2203_r();
-	void ym2203_w(u8 data);
+	[[maybe_unused]] uint8_t ym2203_r();
+	[[maybe_unused]] void ym2203_w(u8 data);
 
 	u8 m_hres_reg = 0U;
 	u8 m_crtc_vreg[0x100]{};
@@ -1024,6 +1027,9 @@ ROM_START( bml3mk5 )
 	ROM_LOAD("font.rom", 0x0000, 0x1000, BAD_DUMP CRC(0b6f2f10) SHA1(dc411b447ca414e94843636d8b5f910c954581fb) ) // handcrafted
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 /*    YEAR  NAME     PARENT COMPAT  MACHINE  INPUT  CLASS       INIT        COMPANY    FULLNAME                               FLAGS */

src/mame/homebrew/68ksbc.cpp

@@ -33,6 +33,8 @@
 #include "machine/clock.h"
 
 
+namespace {
+
 class c68ksbc_state : public driver_device
 {
 public:
@@ -87,6 +89,9 @@ ROM_START( 68ksbc )
 	ROM_LOAD( "t68k.bin", 0x0000, 0x2f78, CRC(20a8d0d0) SHA1(544fd8bd8ed017115388c8b0f7a7a59a32253e43) )
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 /*    YEAR  NAME    PARENT  COMPAT  MACHINE  INPUT    CLASS          INIT        COMPANY             FULLNAME                     FLAGS */

src/mame/homebrew/d6809.cpp

@@ -107,6 +107,8 @@ ToDo:
 #include "machine/terminal.h"
 
 
+namespace {
+
 class d6809_state : public driver_device
 {
 public:
@@ -220,6 +222,9 @@ ROM_START( d6809 )
 	ROM_LOAD( "d6809.rom", 0x0000, 0x2000, CRC(2ceb40b8) SHA1(780111541234b4f0f781a118d955df61daa56e7e))
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 //    YEAR  NAME   PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY     FULLNAME         FLAGS

src/mame/homebrew/gigatron.cpp

@@ -17,6 +17,9 @@
 
 #include "gigatron.lh"
 
+
+namespace {
+
 #define MAIN_CLOCK 6250000
 #define VSYNC      0x80
 #define HSYNC      0x40
@@ -254,4 +257,7 @@ ROM_START( gigatron )
 	ROMX_LOAD( "gigrom1.rom",  0x0000, 0x20000, CRC(8ea5a2af) SHA1(e5758d5cc467c3476bd8f992fd45dfcdf06d0430),ROM_BIOS(4))
 ROM_END
 
+} // anonymous namespace
+
+
 COMP(2018, gigatron, 0, 0, gigatron, gigatron, gigatron_state, empty_init, "Marcel van Kervinck / Walter Belgers", "Gigatron TTL Microcomputer", MACHINE_SUPPORTS_SAVE)

src/mame/homebrew/gscpm.cpp

@@ -22,6 +22,9 @@
 #include "machine/clock.h"
 #include "bus/rs232/rs232.h"
 
+
+namespace {
+
 class gscpm_state : public driver_device
 {
 public:
@@ -179,5 +182,8 @@ ROM_START(gscpm)
 	ROM_LOAD("gscpm.bin",   0x0000, 0x4000, CRC(35ae0d43) SHA1(7fae4df419d38a1787a4a97cbef558f402109959))
 ROM_END
 
+} // anonymous namespace
+
+
 //    YEAR  NAME         PARENT    COMPAT  MACHINE   INPUT    CLASS        INIT           COMPANY           FULLNAME                FLAGS
 COMP( 201?, gscpm,       0,        0,      gscpm,    0,       gscpm_state, empty_init,    "Grant Searle",   "Simple CP/M Machine",  MACHINE_NO_SOUND_HW )

src/mame/homebrew/homez80.cpp

@@ -26,6 +26,8 @@ There is next to no error checking, for example the T command
 #include "screen.h"
 
 
+namespace {
+
 class homez80_state : public driver_device
 {
 public:
@@ -316,6 +318,9 @@ ROM_START( homez80 )
 	ROM_LOAD( "chargen.ic12", 0x0000, 0x0800, CRC(93243be3) SHA1(718efc06c131843c15383e50af23f3a5cf44dd9b) ) // 27C256, A11/12/13/14 tied low.
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 /*    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT    CLASS          INIT        COMPANY             FULLNAME                 FLAGS */

src/mame/homebrew/lft_chiptune.cpp

@@ -11,6 +11,9 @@
 #include "sound/dac.h"
 #include "speaker.h"
 
+
+namespace {
+
 #define MASTER_CLOCK    8000000
 
 class lft_chiptune_state : public driver_device
@@ -82,6 +85,9 @@ ROM_START( hwchiptn )
 	ROM_LOAD( "eeprom.raw", 0x0000, 0x0200, CRC(bd7bc39f) SHA1(9d0ac37bb3ec8c95990fd37a962a17a95ce97aa0) )
 ROM_END
 
+} // anonymous namespace
+
+
 /*   YEAR  NAME      PARENT  COMPAT  MACHINE     INPUT        CLASS               INIT        COMPANY                 FULLNAME */
 CONS(2007, hwchiptn, 0,      0,      chiptune,   empty_input, lft_chiptune_state, empty_init, u8"Linus Åkesson / kryo", "The Hardware Chiptune Project", 0)
 CONS(2009, powernin, 0,      0,      chiptune,   empty_input, lft_chiptune_state, empty_init, u8"Linus Åkesson", "Power Ninja Action Challenge", 0)

src/mame/homebrew/lft_craft.cpp

@@ -13,6 +13,9 @@
 #include "emupal.h"
 #include "speaker.h"
 
+
+namespace {
+
 #define MASTER_CLOCK        20000000
 
 #define VISIBLE_CYCLES      480
@@ -223,5 +226,8 @@ ROM_START( craft )
 	ROM_LOAD( "eeprom.raw", 0x0000, 0x0200, CRC(e18a2af9) SHA1(81fc6f2d391edfd3244870214fac37929af0ac0c) )
 ROM_END
 
+} // anonymous namespace
+
+
 /*   YEAR  NAME      PARENT  COMPAT  MACHINE     INPUT        CLASS            INIT        COMPANY            FULLNAME */
 CONS(2008, craft,    0,      0,      craft,      empty_input, lft_craft_state, empty_init, u8"Linus Åkesson", "Craft", MACHINE_IMPERFECT_GRAPHICS)

src/mame/homebrew/lft_phasor.cpp

@@ -13,6 +13,9 @@
 #include "emupal.h"
 #include "speaker.h"
 
+
+namespace {
+
 #define MASTER_CLOCK        17734470
 
 #define SAMPLES_PER_FRAME    (355255)
@@ -225,5 +228,8 @@ ROM_START( phasor )
 	ROM_LOAD( "eeprom.raw", 0x0000, 0x0200, CRC(49036547) SHA1(d98c4d02771e80499c56dd71ad3d07597102f9b7) )
 ROM_END
 
+} // anonymous namespace
+
+
 /*   YEAR  NAME      PARENT  COMPAT  MACHINE     INPUT        CLASS             INIT        COMPANY            FULLNAME */
 CONS(2010, phasor,   0,      0,      phasor,     empty_input, lft_phasor_state, empty_init, u8"Linus Åkesson", "Phasor", MACHINE_IMPERFECT_GRAPHICS)

src/mame/homebrew/minib.cpp

@@ -36,6 +36,8 @@
 #include "bus/bbc/userport/lcd.h"
 
 
+namespace {
+
 class minib_state : public driver_device
 {
 public:
@@ -164,6 +166,8 @@ ROM_START(minib)
 	ROM_LOAD("basic2.rom", 0x14000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281)) // BASIC 2
 ROM_END
 
+} // anonymous namespace
+
 
 //    YEAR  NAME      PARENT  COMPAT  MACHINE  INPUT   CLASS         INIT         COMPANY        FULLNAME           FLAGS
 COMP (2002, minib,    0,      0,      minib,   0,      minib_state,  empty_init,  "Sprow",       "MiniB Computer",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)

src/mame/homebrew/mk1forth.cpp

@@ -30,6 +30,9 @@
 #include "machine/input_merger.h"
 #include "machine/i8251.h"
 
+
+namespace {
+
 class mk1forth_state : public driver_device
 {
 public:
@@ -98,4 +101,7 @@ ROM_START(mk1forth)
 	ROM_LOAD("forth.bin", 0x0000, 0x2000, CRC(8b2863fa) SHA1(cc1d0662f10cf767f3f2581270ca2b4711121ffc))
 ROM_END
 
+} // anonymous namespace
+
+
 COMP(2003, mk1forth, 0, 0, mk1forth, 0, mk1forth_state, empty_init, "Andrew Holme", "Mark 1 FORTH Computer", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE)

src/mame/homebrew/p112.cpp

@@ -39,6 +39,8 @@ Some of the parts:
 #include "screen.h"
 
 
+namespace {
+
 class p112_state : public driver_device
 {
 public:
@@ -129,6 +131,8 @@ ROM_START( p112 )
 	ROMX_LOAD( "romv5b1.bin", 0x00000, 0x8000, CRC(047296f7) SHA1(380f8e4237525636c605b7e37d989ace8437beb4), ROM_BIOS(7))
 ROM_END
 
+} // anonymous namespace
+
 
 /* Driver */
 

src/mame/homebrew/phunsy.cpp

@@ -37,6 +37,8 @@ Rom banking (in U bank):
 #include "speaker.h"
 
 
+namespace {
+
 #define LOG 1
 
 class phunsy_state : public driver_device
@@ -397,6 +399,9 @@ ROM_START( phunsy )
 	ROM_REGION( 0x40000, "ram_4000", ROMREGION_ERASEFF )
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 /*    YEAR  NAME    PARENT  COMPAT  MACHINE  INPUT   CLASS         INIT         COMPANY            FULLNAME  FLAGS */

src/mame/homebrew/ravens.cpp

@@ -80,6 +80,8 @@ ToDo:
 #include "ravens.lh"
 
 
+namespace {
+
 class ravens_base : public driver_device
 {
 public:
@@ -431,6 +433,9 @@ ROM_START( ravens2 )
 	ROM_LOAD( "mon_v2.0.bin", 0x0000, 0x0800, CRC(bcd47c58) SHA1(f261a3f128fbedbf59a8b5480758fff4d7f76de1))
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 /*    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT   CLASS          INIT        COMPANY                            FULLNAME                               FLAGS */

src/mame/homebrew/sbc6510.cpp

@@ -62,6 +62,8 @@ ToDo:
 #include "speaker.h"
 
 
+namespace {
+
 class sbc6510_state : public driver_device
 {
 public:
@@ -321,6 +323,9 @@ ROM_START( sbc6510 )
 	ROM_REGION( 0x2000, "eeprom", ROMREGION_ERASEFF )
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 /*    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT    CLASS          INIT        COMPANY            FULLNAME   FLAGS */

src/mame/homebrew/test_t400.cpp

@@ -11,6 +11,9 @@
 #include "emu.h"
 #include "cpu/cop400/cop400.h"
 
+
+namespace {
+
 class t400_test_suite_state : public driver_device
 {
 public:
@@ -55,5 +58,8 @@ ROM_START( test420 )
 	ROM_LOAD( "rom_42x.bin", 0x000, 0x400, BAD_DUMP CRC(e4e80001) SHA1(8fdca9d08de1cc83387a7d141f6b254117902442) )
 ROM_END
 
+} // anonymous namespace
+
+
 COMP( 2008, test410, 0,       0, test_t410, 0, t400_test_suite_state, empty_init, "T400 uController project", "T410 test suite", MACHINE_NO_SOUND_HW )
 COMP( 2008, test420, test410, 0, test_t420, 0, t400_test_suite_state, empty_init, "T400 uController project", "T420 test suite", MACHINE_NO_SOUND_HW )

src/mame/homebrew/uzebox.cpp

@@ -25,6 +25,9 @@
 #include "softlist_dev.h"
 #include "speaker.h"
 
+
+namespace {
+
 // overclocked to 8 * NTSC burst frequency
 #define MASTER_CLOCK 28618180
 
@@ -318,5 +321,8 @@ ROM_START( uzebox )
 	ROM_REGION( 0x800, "eeprom", ROMREGION_ERASE00 )  /* on-die eeprom */
 ROM_END
 
+} // anonymous namespace
+
+
 /*   YEAR  NAME    PARENT  COMPAT  MACHINE  INPUT   CLASS         INIT        COMPANY    FULLNAME */
 CONS(2010, uzebox, 0,      0,      uzebox,  uzebox, uzebox_state, empty_init, "Belogic", "Uzebox", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING)

src/mame/homebrew/z80dev.cpp

@@ -25,6 +25,8 @@ Press the up-arrow key to confirm data has been entered.
 #include "cpu/z80/z80.h"
 #include "z80dev.lh"
 
+namespace {
+
 class z80dev_state : public driver_device
 {
 public:
@@ -140,6 +142,9 @@ ROM_START( z80dev )
 	ROM_LOAD( "z80dev.bin", 0x0000, 0x0800, CRC(dd5b9cd9) SHA1(97c176fcb63674f0592851b7858cb706886b5857))
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 /*    YEAR  NAME    PARENT  COMPAT  MACHINE  INPUT   CLASS         INIT        COMPANY      FULLNAME         FLAGS */

src/mame/homebrew/zexall.cpp

@@ -28,6 +28,9 @@
 #include "cpu/z80/z80.h"
 #include "machine/terminal.h"
 
+
+namespace {
+
 class zexall_state : public driver_device
 {
 public:
@@ -179,6 +182,8 @@ ROM_START( zexall )
 	ROM_LOAD( "zexall.bin",    0x0100, 0x2189, CRC(b6f869c3) SHA1(14021f75c1bc9f26688969581065a0efff3af59c) )
 ROM_END
 
+} // anonymous namespace
+
 
 /******************************************************************************
  Drivers

src/mame/homelab/braiplus.cpp

@@ -30,6 +30,9 @@ Floppy disk holds 792kb (formatted).
 #include "machine/wd_fdc.h"
 #include "machine/z80pio.h"
 
+
+namespace {
+
 class braiplus_state : public driver_device
 {
 public:
@@ -259,4 +262,7 @@ ROM_START( braiplus )
 	ROM_LOAD( "hl4.chr",   0x0000, 0x0800, BAD_DUMP CRC(f58ee39b) SHA1(49399c42d60a11b218a225856da86a9f3975a78a))
 ROM_END
 
+} // anonymous namespace
+
+
 COMP( 1988, braiplus, 0, 0, braiplus, braiplus, braiplus_state, empty_init, "Jozsef and Endre Lukacs", "BraiLab Plus", MACHINE_IS_SKELETON )

src/mame/hp/hp16500.cpp

@@ -58,6 +58,9 @@
 #include "screen.h"
 #include "speaker.h"
 
+
+namespace {
+
 class hp16500_state : public driver_device
 {
 public:
@@ -75,7 +78,7 @@ public:
 private:
 	virtual void video_start() override;
 	uint32_t screen_update_hp16500(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-	uint32_t screen_update_hp16500a(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+	[[maybe_unused]] uint32_t screen_update_hp16500a(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 
 	required_device<cpu_device> m_maincpu;
 	optional_device<hp_hil_mlc_device> m_mlc;
@@ -539,6 +542,9 @@ ROM_START( hp16500b )
 	ROM_LOAD32_BYTE( "16500-80017.bin", 0x000003, 0x008000, CRC(e0b1096b) SHA1(426bb9a4756d8087bded4f6b61365d733ffbb09a) )
 ROM_END
 
+} // anonymous namespace
+
+
 COMP( 1989, hp1650b,  0, 0, hp1650,   hp16500, hp16500_state, empty_init, "Hewlett Packard", "HP 1650b",  MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
 COMP( 1989, hp1651b,  0, 0, hp1651,   hp16500, hp16500_state, empty_init, "Hewlett Packard", "HP 1651b",  MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
 COMP( 1991, hp165ka0, 0, 0, hp16500a, hp16500, hp16500_state, empty_init, "Hewlett Packard", "HP 16500a", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)

src/mame/hp/hp2100.cpp

@@ -233,6 +233,9 @@ Recommended For User Microprogramming + 46           27000-27377  yes
 
 #include "emu.h"
 
+
+namespace {
+
 class hp2100_state : public driver_device
 {
 public:
@@ -342,4 +345,7 @@ ROM_START( hp2100 )
 	ROM_LOAD( "92835-80003.bin", 0x000000, 0x000400, CRC(1df52f66) SHA1(84fd048d50f6fde9a79e8df618b5a3435a087f85) )
 ROM_END
 
+} // anonymous namespace
+
+
 COMP( 1966, hp2100, 0, 0, hp2100, hp2100, hp2100_state, empty_init, "Hewlett-Packard", "HP 2100", MACHINE_IS_SKELETON )

src/mame/hp/hp2620.cpp

@@ -18,6 +18,9 @@ Skeleton driver for HP-2620 series display terminals.
 #include "screen.h"
 #include "speaker.h"
 
+
+namespace {
+
 class hp2620_state : public driver_device
 {
 public:
@@ -242,4 +245,7 @@ ROM_START( hp2622a )
 	ROM_LOAD( "1818-1489.xu311", 0x0000, 0x2000, CRC(9879b153) SHA1(fc1705d6de38eb6d3a67f1ae439e359e5124d028) )
 ROM_END
 
+} // anonymous namespace
+
+
 COMP(1982, hp2622a, 0, 0, hp2622, hp2622, hp2620_state, empty_init, "HP", "HP-2622A", MACHINE_NOT_WORKING)

src/mame/hp/hp2640_tape.h

@@ -8,8 +8,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_MACHINE_HP2640_TAPE_H
-#define MAME_MACHINE_HP2640_TAPE_H
+#ifndef MAME_HP_HP2640_TAPE_H
+#define MAME_HP_HP2640_TAPE_H
 
 #pragma once
 
@@ -95,4 +95,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(HP2640_TAPE, hp2640_tape_device)
 
-#endif /* MAME_MACHINE_HP2640_TAPE_H */
+#endif /* MAME_HP_HP2640_TAPE_H */

src/mame/hp/hp48_port.h

@@ -7,8 +7,8 @@
    Hewlett Packard HP48 S/SX & G/GX and HP49 G
 
 **********************************************************************/
-#ifndef MAME_MACHINE_HP84_PORT_H
-#define MAME_MACHINE_HP84_PORT_H
+#ifndef MAME_HP_HP84_PORT_H
+#define MAME_HP_HP84_PORT_H
 
 #pragma once
 
@@ -72,4 +72,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(HP48_PORT, hp48_port_image_device)
 
-#endif // MAME_MACHINE_HP84_PORT_H
+#endif // MAME_HP_HP84_PORT_H

src/mame/hp/hp49gp.cpp

@@ -13,6 +13,9 @@
 
 #include <cstdarg>
 
+
+namespace {
+
 #define VERBOSE_LEVEL ( 0 )
 
 struct lcd_spi_t
@@ -343,4 +346,7 @@ ROM_START( hp49gp )
 	ROMX_LOAD( "31504.bin", 0x0000, 0x4000, CRC(9c71825e) SHA1(0a12b2b70a8573bc90ab5be06e6b2f814b8544ae), ROM_BIOS(1) )
 ROM_END
 
+} // anonymous namespace
+
+
 COMP(2009, hp49gp, 0, 0, hp49gp, hp49gp, hp49gp_state, init_hp49gp, "Hewlett Packard", "HP49G+", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)

src/mame/hp/hp64k.cpp

@@ -164,6 +164,9 @@
 #include "machine/phi.h"
 #include "bus/ieee488/ieee488.h"
 
+
+namespace {
+
 #define BIT_MASK(n) (1U << (n))
 
 // Macros to clear/set single bits
@@ -1491,5 +1494,8 @@ ROM_START(hp64k)
 	ROM_LOAD("1816_1496_82s191.bin" , 0 , 0x800 , CRC(32a52664) SHA1(8b2a49a32510103ff424e8481d5ed9887f609f2f))
 ROM_END
 
+} // anonymous namespace
+
+
 /*    YEAR  NAME   PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY  FULLNAME */
 COMP( 1979, hp64k, 0,      0,      hp64k,   hp64k, hp64k_state, empty_init, "HP",    "HP 64000" , 0)

src/mame/hp/hp700.cpp

@@ -11,6 +11,9 @@ Skeleton driver for HP-700 series terminals.
 #include "machine/mc68681.h"
 #include "machine/nvram.h"
 
+
+namespace {
+
 class hp700_state : public driver_device
 {
 public:
@@ -138,5 +141,8 @@ ROM_START(hp700_70)
 	ROM_LOAD("c1093-80009.u817", 0x20000, 0x20000, CRC(369e6855) SHA1(938ac9cd120d0aa7c76011d1a5e91244a142b397)) // "CKSM 7B6B"
 ROM_END
 
+} // anonymous namespace
+
+
 COMP(1987, hp700_92, 0, 0, hp700_92, hp700_92, hp700_state, empty_init, "Hewlett-Packard", "HP 700/92 Display Terminal", MACHINE_IS_SKELETON)
 COMP(1994, hp700_70, 0, 0, hp700_70, hp700_92, hp700_state, empty_init, "Hewlett-Packard", "HP 700/70 Windowing Terminal", MACHINE_IS_SKELETON)

src/mame/hp/hp80.cpp

@@ -125,6 +125,9 @@ namespace {
 	}
 }
 
+
+namespace {
+
 // **** Constants ****
 static constexpr unsigned CPU_CLOCK = 613000;
 // Time taken by hw timer updating (semi-made up) (in µsec)
@@ -2438,6 +2441,9 @@ ROM_START(hp86b_004)
 	ROM_LOAD("chrgen.bin" , 0 , 0x500 , CRC(c7d04292) SHA1(b86ed801ee9f7a57b259374b8a9810572cb03230))
 ROM_END
 
+} // anonymous namespace
+
+
 COMP( 1980, hp85,      0,     0, hp85, hp85,     hp85_state,     empty_init, "HP", "HP 85", 0)
 COMP( 1983, hp86b,     0,     0, hp86, hp86,     hp86_state,     empty_init, "HP", "HP 86B",0)
 COMP( 1983, hp86b_001, hp86b, 0, hp86, hp86_001, hp86_int_state, empty_init, "HP", "HP 86B Opt 001",0)

src/mame/hp/hp80_optrom.h

@@ -8,8 +8,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_MACHINE_HP80_OPTROM_H
-#define MAME_MACHINE_HP80_OPTROM_H
+#ifndef MAME_HP_HP80_OPTROM_H
+#define MAME_HP_HP80_OPTROM_H
 
 #pragma once
 
@@ -51,4 +51,4 @@ protected:
 // device type definition
 DECLARE_DEVICE_TYPE(HP80_OPTROM, hp80_optrom_device)
 
-#endif // MAME_MACHINE_HP80_OPTROM_H
+#endif // MAME_HP_HP80_OPTROM_H

src/mame/hp/hp95lx.cpp

@@ -88,6 +88,8 @@
 #define LOGDBG(...) LOGMASKED(LOG_DEBUG, __VA_ARGS__)
 
 
+namespace {
+
 class hp95lx_state : public driver_device
 {
 public:
@@ -153,7 +155,7 @@ private:
 	void video_address_w(uint8_t data);
 	uint8_t video_register_r();
 	void video_register_w(uint8_t data);
-	void debug_w(offs_t offset, uint8_t data);
+	[[maybe_unused]] void debug_w(offs_t offset, uint8_t data);
 
 	void hp95lx_io(address_map &map);
 	void hp95lx_map(address_map &map);
@@ -772,6 +774,8 @@ ROM_START( hp95lx )
 	ROM_REGION(0x800,"gfx1", ROMREGION_ERASE00)
 ROM_END
 
+} // anonymous namespace
+
 
 //    YEAR  NAME     PARENT   COMPAT  MACHINE  INPUT  CLASS          INIT         COMPANY             FULLNAME    FLAGS
 COMP( 1991, hp95lx,  0,       0,      hp95lx,  0,     hp95lx_state,  empty_init,  "Hewlett-Packard",  "HP 95LX",  MACHINE_NOT_WORKING|MACHINE_NO_SOUND )

src/mame/hp/hp9825_optrom.h

@@ -7,8 +7,8 @@
     Optional ROMs for HP9825 systems
 
 *********************************************************************/
-#ifndef MAME_MACHINE_HP9825_OPTROM_H
-#define MAME_MACHINE_HP9825_OPTROM_H
+#ifndef MAME_HP_HP9825_OPTROM_H
+#define MAME_HP_HP9825_OPTROM_H
 
 #pragma once
 
@@ -50,4 +50,4 @@ protected:
 // device type definition
 DECLARE_DEVICE_TYPE(HP9825_OPTROM, hp9825_optrom_device)
 
-#endif /* MAME_MACHINE_HP9825_OPTROM_H */
+#endif /* MAME_HP_HP9825_OPTROM_H */

src/mame/hp/hp9825_tape.h

@@ -8,8 +8,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_MACHINE_HP9825_TAPE_H
-#define MAME_MACHINE_HP9825_TAPE_H
+#ifndef MAME_HP_HP9825_TAPE_H
+#define MAME_HP_HP9825_TAPE_H
 
 #pragma once
 
@@ -91,4 +91,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(HP9825_TAPE, hp9825_tape_device)
 
-#endif // MAME_MACHINE_HP9825_TAPE_H
+#endif // MAME_HP_HP9825_TAPE_H

src/mame/hp/hp9845_optrom.h

@@ -8,8 +8,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_MACHINE_HP9845_OPTROM_H
-#define MAME_MACHINE_HP9845_OPTROM_H
+#ifndef MAME_HP_HP9845_OPTROM_H
+#define MAME_HP_HP9845_OPTROM_H
 
 #pragma once
 
@@ -42,4 +42,4 @@ protected:
 // device type definition
 DECLARE_DEVICE_TYPE(HP9845_OPTROM, hp9845_optrom_device)
 
-#endif // MAME_MACHINE_HP9845_OPTROM_H
+#endif // MAME_HP_HP9845_OPTROM_H

src/mame/hp/hp9845_printer.h

@@ -8,8 +8,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_MACHINE_HP9845_PRINTER_H
-#define MAME_MACHINE_HP9845_PRINTER_H
+#ifndef MAME_HP_HP9845_PRINTER_H
+#define MAME_HP_HP9845_PRINTER_H
 
 #pragma once
 
@@ -123,4 +123,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(HP9845_PRINTER, hp9845_printer_device)
 
-#endif // MAME_MACHINE_HP9845_PRINTER_H
+#endif // MAME_HP_HP9845_PRINTER_H

src/mame/hp/hp98x5_io_sys.h

@@ -8,8 +8,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_MACHINE_HP98X5_IO_SYS_H
-#define MAME_MACHINE_HP98X5_IO_SYS_H
+#ifndef MAME_HP_HP98X5_IO_SYS_H
+#define MAME_HP_HP98X5_IO_SYS_H
 
 #pragma once
 
@@ -64,4 +64,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(HP98X5_IO_SYS, hp98x5_io_sys_device)
 
-#endif // MAME_MACHINE_HP98X5_IO_SYS_H
+#endif // MAME_HP_HP98X5_IO_SYS_H

src/mame/hp/hp9k.cpp

@@ -44,6 +44,9 @@ TODO: boot tests fail
 #include "emupal.h"
 #include "screen.h"
 
+
+namespace {
+
 #define HP9816_CHDIMX 8
 #define HP9816_CHDIMY 16
 #define HP9816_ROWX 80
@@ -161,7 +164,7 @@ private:
 	uint16_t leds_r(offs_t offset, uint16_t mem_mask = ~0);
 	void leds_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
 
-	void kbd_put(uint8_t data);
+	[[maybe_unused]] void kbd_put(uint8_t data);
 
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
@@ -430,6 +433,9 @@ ROM_START( hp9816 )
 
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 /*    YEAR  NAME    PARENT  COMPAT  MACHINE  INPUT  CLASS       INIT       COMPANY            FULLNAME   FLAGS */

src/mame/hp/hp_ipc_optrom.h

@@ -8,8 +8,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_MACHINE_HP_IPC_OPTROM_H
-#define MAME_MACHINE_HP_IPC_OPTROM_H
+#ifndef MAME_HP_HP_IPC_OPTROM_H
+#define MAME_HP_HP_IPC_OPTROM_H
 
 #pragma once
 
@@ -49,4 +49,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(HP_IPC_OPTROM, hp_ipc_optrom_device)
 
-#endif // MAME_MACHINE_HP_IPC_OPTROM_H
+#endif // MAME_HP_HP_IPC_OPTROM_H

src/mame/hp/hpz80unk.cpp

@@ -48,6 +48,8 @@ Z nothing
 #include "bus/rs232/rs232.h"
 
 
+namespace {
+
 class hpz80unk_state : public driver_device
 {
 public:
@@ -226,6 +228,9 @@ ROM_START( hpz80unk )
 	ROM_LOAD( "u16",       0x7800, 0x0800, CRC(c03fdcab) SHA1(1081d787085add489c6e2a1d450e1a5790d18885) )
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 //    YEAR  NAME      PARENT  COMPAT  MACHINE   INPUT     CLASS           INIT        COMPANY            FULLNAME                       FLAGS

src/mame/husky/hawk.cpp

@@ -23,6 +23,8 @@
 #include "speaker.h"
 
 
+namespace {
+
 class hawk_state : public driver_device
 {
 public:
@@ -149,5 +151,8 @@ ROM_START(hawk)
 	ROMX_LOAD("hawk-v1.01-2.rom", 0x10000, 0x08000, CRC(982ed053) SHA1(ab0a860f1204f36f490fdfadfefe2ee4a82ed3be), ROM_BIOS(3))
 ROM_END
 
+} // anonymous namespace
+
+
 //    YEAR  NAME     PARENT   COMPAT  MACHINE  INPUT  CLASS       INIT       COMPANY                FULLNAME      FLAGS
 COMP( 1987, hawk,    0,       0,      hawk,    hawk,  hawk_state, init_hawk, "Husky Computers Ltd", "Husky Hawk", MACHINE_IS_SKELETON )

src/mame/husky/hunter16.cpp

@@ -21,6 +21,9 @@
 #include "screen.h"
 #include "emupal.h"
 
+
+namespace {
+
 class hunter16_state : public driver_device
 {
 public:
@@ -267,6 +270,9 @@ ROM_START( hunter1680 )
 	ROM_LOAD( "v4.05.bin", 0x0000, 0x20000, CRC(e0cfabf4) SHA1(183d5bf7553404302697ac89eed25f2a8bb7695c) )
 ROM_END
 
+} // anonymous namespace
+
+
 /*    YEAR  NAME        PARENT    COMPAT  MACHINE     INPUT     CLASS           INIT        COMPANY                FULLNAME              FLAGS */
 COMP( 1989, hunter16,   0,        0,      hunter16,   hunter16, hunter16_state, empty_init, "Husky Computers Ltd", "Husky Hunter 16",    MACHINE_IS_SKELETON )
 COMP( 1990, hunter216,  hunter16, 0,      hunter16,   hunter2,  hunter16_state, empty_init, "Husky Computers Ltd", "Husky Hunter 2/16",  MACHINE_IS_SKELETON )

src/mame/husky/hunter2.cpp

@@ -44,6 +44,8 @@
 #include "speaker.h"
 
 
+namespace {
+
 class hunter2_state : public driver_device
 {
 public:
@@ -499,6 +501,9 @@ ROM_START( hunter2 )
 	ROMX_LOAD( "tr032kx8mrom1.ic51", 0x8000, 0x8000, CRC(82901642) SHA1(d84f2bbd2e9e052bd161a313c240a67918f774ad), ROM_BIOS(0) )
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 //    YEAR  NAME     PARENT   COMPAT  MACHINE  INPUT    CLASS          INIT          COMPANY                FULLNAME          FLAGS

src/mame/husky/husky.cpp

@@ -31,6 +31,8 @@
 #include "speaker.h"
 
 
+namespace {
+
 class husky_state : public driver_device
 {
 public:
@@ -533,5 +535,8 @@ ROM_START( husky )
 	ROM_RELOAD(                  0xe000, 0x2000)
 ROM_END
 
+} // anonymous namespace
+
+
 //    YEAR  NAME   PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY                 FULLNAME  FLAGS
 COMP( 1981, husky, 0,      0,      husky,   husky, husky_state, init_husky, "DVW Microelectronics", "Husky",  0 )

src/mame/ibm/ibm3153.cpp

@@ -43,6 +43,8 @@ ToDo:
 #include "screen.h"
 
 
+namespace {
+
 class ibm3153_state : public driver_device
 {
 public:
@@ -129,6 +131,9 @@ ROM_START( ibm3153 )
 	ROM_LOAD( "char.bin", 0x0000, 0x2000, NO_DUMP ) // probably inside the video processor
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 //    YEAR   NAME     PARENT  COMPAT  MACHINE  INPUT    CLASS          INIT        COMPANY  FULLNAME             FLAGS

src/mame/ibm/ibm6580_fdc.h

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Sergey Svishchev
-#ifndef MAME_MACHINE_IBM6580_FDC_H
-#define MAME_MACHINE_IBM6580_FDC_H
+#ifndef MAME_IBM_IBM6580_FDC_H
+#define MAME_IBM_IBM6580_FDC_H
 
 #pragma once
 
@@ -51,4 +51,4 @@ private:
 
 DECLARE_DEVICE_TYPE(DW_FDC, dw_fdc_device)
 
-#endif // MAME_MACHINE_IBM6580_FDC_H
+#endif // MAME_IBM_IBM6580_FDC_H

src/mame/ibm/ibm6580_kbd.h

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Sergey Svishchev
-#ifndef MAME_MACHINE_IBM6580_KBD_H
-#define MAME_MACHINE_IBM6580_KBD_H
+#ifndef MAME_IBM_IBM6580_KBD_H
+#define MAME_IBM_IBM6580_KBD_H
 
 #pragma once
 
@@ -48,4 +48,4 @@ private:
 
 DECLARE_DEVICE_TYPE(DW_KEYBOARD, dw_keyboard_device)
 
-#endif // MAME_MACHINE_IBM6580_KBD_H
+#endif // MAME_IBM_IBM6580_KBD_H

src/mame/ibm/rosetta.h

@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Patrick Mackinlay
 
-#ifndef MAME_MACHINE_ROSETTA_H
-#define MAME_MACHINE_ROSETTA_H
+#ifndef MAME_IBM_ROSETTA_H
+#define MAME_IBM_ROSETTA_H
 
 #pragma once
 
@@ -188,4 +188,4 @@ private:
 
 DECLARE_DEVICE_TYPE(ROSETTA, rosetta_device)
 
-#endif // MAME_MACHINE_ROSETTA_H
+#endif // MAME_IBM_ROSETTA_H

src/mame/ibm/rtpc_iocc.h

@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Patrick Mackinlay
 
-#ifndef MAME_MACHINE_RTPC_IOCC_H
-#define MAME_MACHINE_RTPC_IOCC_H
+#ifndef MAME_IBM_RTPC_IOCC_H
+#define MAME_IBM_RTPC_IOCC_H
 
 #pragma once
 
@@ -172,4 +172,4 @@ private:
 
 DECLARE_DEVICE_TYPE(RTPC_IOCC, rtpc_iocc_device)
 
-#endif // MAME_MACHINE_RTPC_IOCC_H
+#endif // MAME_IBM_RTPC_IOCC_H

src/mame/ice/ice_bozopail.cpp

@@ -21,6 +21,9 @@ http://www.highwaygames.com/arcade-machines/bozo-s-grand-prize-game-6751/
 #include "cpu/mc68hc11/mc68hc11.h"
 #include "speaker.h"
 
+
+namespace {
+
 class ice_bozopail_state : public driver_device
 {
 public:
@@ -76,4 +79,7 @@ ROM_START( ice_bozo )
 	ROM_LOAD( "ice-bozo.u9",  0x100000, 0x100000, CRC(26fd9d60) SHA1(41fe8d42db1eb16b413bd5a0f16bf0d081c3cc97) )
 ROM_END
 
+} // anonymous namespace
+
+
 GAME( 1997?, ice_bozo, 0, ice_bozo, ice_bozo, ice_bozopail_state, empty_init, ROT0, "Innovative Creations in Entertainment", "Bozo's Pail Toss (v2.07)", MACHINE_IS_SKELETON_MECHANICAL )

src/mame/ice/ice_tbd.cpp

@@ -21,6 +21,9 @@ not sure what the actual inputs / outputs would be on this, maybe just track pos
 #include "cpu/z80/z80.h"
 #include "machine/i8255.h"
 
+
+namespace {
+
 class ice_tbd_state : public driver_device
 {
 public:
@@ -85,5 +88,7 @@ ROM_START( ice_tbd )
 	ROM_LOAD( "turbo-dr.ive", 0x0000, 0x4000, CRC(d7c79ac4) SHA1(a01d93411e604e36a3ced58063f2ab81e431b82a) )
 ROM_END
 
+} // anonymous namespace
+
 
 GAME( 1988, ice_tbd, 0, ice_tbd, ice_tbd, ice_tbd_state, empty_init, ROT0, "Innovative Creations in Entertainment", "Turbo Drive (ICE)", MACHINE_IS_SKELETON_MECHANICAL )

src/mame/ice/vp101.cpp

@@ -109,6 +109,9 @@ Small outline design for easy kit retrofitting of existing cabinets.
 #define VERBOSE (0)
 #include "logmacro.h"
 
+
+namespace {
+
 class vp10x_state : public driver_device
 {
 public:
@@ -655,6 +658,9 @@ ROM_START(rhnation)
 	DISK_IMAGE_READONLY("rhn010104", 0, SHA1(5bc2e5817b29bf42ec483414242795fd76d749d9) )
 ROM_END
 
+} // anonymous namespace
+
+
 GAME( 2002,  specfrce,  0,          vp101,  specfrce, vp10x_state, empty_init, ROT0, "ICE/Play Mechanix",    "Special Forces Elite Training (v01.02.00)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 2002,  specfrceo, specfrce,   vp101,  specfrce, vp10x_state, empty_init, ROT0, "ICE/Play Mechanix",    "Special Forces Elite Training (v01.01.01)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 2003,  rhnation,  0,          vp50,   vp50,     vp10x_state, empty_init, ROT0, "ICE/Play Mechanix",    "Rhythm Nation (v01.00.04, boot v3.1.5)",    MACHINE_NOT_WORKING | MACHINE_NO_SOUND)

src/mame/igs/cabaret.cpp

@@ -33,6 +33,8 @@ are the same of IGS.  AMT may be previous IGS name.
 #include "tilemap.h"
 
 
+namespace {
+
 class cabaret_state : public driver_device
 {
 public:
@@ -448,4 +450,7 @@ ROM_START( cabaret )
 	ROM_LOAD( "cg-7.u98",  0x0000, 0x8000, CRC(b93ae6f8) SHA1(accb87045c278d5d79fff65bb763aa6e8025a945) )   /* background maps, read by the CPU */
 ROM_END
 
+} // anonymous namespace
+
+
 GAME( 1992, cabaret, 0, cabaret, cabaret, cabaret_state, init_cabaret, ROT0, "AMT Co. Ltd.", "Cabaret Show", MACHINE_NOT_WORKING )

src/mame/igs/dunhuang.cpp

@@ -64,6 +64,8 @@ Notes:
 #include "tilemap.h"
 
 
+namespace {
+
 #define DUNHUANG_DEBUG  0
 
 
@@ -864,4 +866,7 @@ ROM_START( dunhuang )
 	ROM_LOAD( "rom6.u1", 0x00000, 0x20000, CRC(31cfdc29) SHA1(725249eae9227eadf05418b799e0da0254bb2f51) )
 ROM_END
 
+} // anonymous namespace
+
+
 GAME( 1995, dunhuang, 0, dunhuang, dunhuang, dunhuang_state, empty_init, ROT0, "Spirit", "Mahjong Dunhuang", MACHINE_SUPPORTS_SAVE )