diff --git a/src/mame/f32/silvmil.cpp b/src/mame/f32/silvmil.cpp
index eaa79846d8b..b7e087bd087 100644
--- a/src/mame/f32/silvmil.cpp
+++ b/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 )
diff --git a/src/mame/facit/facit4440.cpp b/src/mame/facit/facit4440.cpp
index 3383577ff73..3f701d57cc0 100644
--- a/src/mame/facit/facit4440.cpp
+++ b/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)
diff --git a/src/mame/fairchild/channelf_a.h b/src/mame/fairchild/channelf_a.h
index ce1231c3951..e6354f982d1 100644
--- a/src/mame/fairchild/channelf_a.h
+++ b/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
diff --git a/src/mame/fairchild/f387x.cpp b/src/mame/fairchild/f387x.cpp
index 6563128ff5b..f2d02b9b292 100644
--- a/src/mame/fairchild/f387x.cpp
+++ b/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)
diff --git a/src/mame/fairlight/cmi.cpp b/src/mame/fairlight/cmi.cpp
index 9773e806a68..70c85c3a235 100644
--- a/src/mame/fairlight/cmi.cpp
+++ b/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 )
diff --git a/src/mame/fairlight/cmi01a.h b/src/mame/fairlight/cmi01a.h
index 84179ece3f7..e24518a080b 100644
--- a/src/mame/fairlight/cmi01a.h
+++ b/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
diff --git a/src/mame/fairlight/cmi_ankbd.h b/src/mame/fairlight/cmi_ankbd.h
index c4515f704e7..c931007d220 100644
--- a/src/mame/fairlight/cmi_ankbd.h
+++ b/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
diff --git a/src/mame/fairlight/cmi_mkbd.h b/src/mame/fairlight/cmi_mkbd.h
index 5f8c76e3eab..6edfa4d4ca2 100644
--- a/src/mame/fairlight/cmi_mkbd.h
+++ b/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
diff --git a/src/mame/falco/f5220_kbd.h b/src/mame/falco/f5220_kbd.h
index 3cf1c050cbc..55cfaec1624 100644
--- a/src/mame/falco/f5220_kbd.h
+++ b/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
diff --git a/src/mame/falco/falcots.cpp b/src/mame/falco/falcots.cpp
index c6ee6196427..1818d0af3e4 100644
--- a/src/mame/falco/falcots.cpp
+++ b/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)
diff --git a/src/mame/fidelity/clockdiv.h b/src/mame/fidelity/clockdiv.h
index c52e33c52c7..93cf327b0de 100644
--- a/src/mame/fidelity/clockdiv.h
+++ b/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
diff --git a/src/mame/force/fccpu20.cpp b/src/mame/force/fccpu20.cpp
index df443f4841f..126334a1148 100644
--- a/src/mame/force/fccpu20.cpp
+++ b/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 )
diff --git a/src/mame/force/fccpu30.cpp b/src/mame/force/fccpu30.cpp
index 53a23b15dd7..bae294d0a72 100644
--- a/src/mame/force/fccpu30.cpp
+++ b/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 )
diff --git a/src/mame/force/force68k.cpp b/src/mame/force/force68k.cpp
index f84ace19d75..7e4068bc239 100644
--- a/src/mame/force/force68k.cpp
+++ b/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 )
diff --git a/src/mame/force/miniforce.cpp b/src/mame/force/miniforce.cpp
index 8c2283a2a11..b247d04c48f 100644
--- a/src/mame/force/miniforce.cpp
+++ b/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 )
diff --git a/src/mame/fujitsu/fmt_icmem.h b/src/mame/fujitsu/fmt_icmem.h
index 9f45ebcfe18..3f6afead325 100644
--- a/src/mame/fujitsu/fmt_icmem.h
+++ b/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
diff --git a/src/mame/funtech/acan.h b/src/mame/funtech/acan.h
index f3cbe74b1f4..8828768219e 100644
--- a/src/mame/funtech/acan.h
+++ b/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
diff --git a/src/mame/funworld/4roses.cpp b/src/mame/funworld/4roses.cpp
index 0bf5d11161d..bf31dec3445 100644
--- a/src/mame/funworld/4roses.cpp
+++ b/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      *
diff --git a/src/mame/fuuki/fuukifg.h b/src/mame/fuuki/fuukifg.h
index 2fb522e257f..e53e40c1ac4 100644
--- a/src/mame/fuuki/fuukifg.h
+++ b/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
diff --git a/src/mame/gaelco/atvtrack.cpp b/src/mame/gaelco/atvtrack.cpp
index bbfa0b1c212..7507d2bb28b 100644
--- a/src/mame/gaelco/atvtrack.cpp
+++ b/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 )
diff --git a/src/mame/gaelco/bigkarnk_ms.cpp b/src/mame/gaelco/bigkarnk_ms.cpp
index bdc6d668cf8..b42a08ff572 100644
--- a/src/mame/gaelco/bigkarnk_ms.cpp
+++ b/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 )
diff --git a/src/mame/gaelco/gaelco3d_m.h b/src/mame/gaelco/gaelco3d_m.h
index b30856e6bf9..b395ed80792 100644
--- a/src/mame/gaelco/gaelco3d_m.h
+++ b/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
diff --git a/src/mame/gaelco/gaelco_ds5002fp.h b/src/mame/gaelco/gaelco_ds5002fp.h
index 5ab7f31da21..ddec7584315 100644
--- a/src/mame/gaelco/gaelco_ds5002fp.h
+++ b/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
diff --git a/src/mame/gaelco/gaelco_wrally_sprites.h b/src/mame/gaelco/gaelco_wrally_sprites.h
index 19b450d8217..8f6a082e550 100644
--- a/src/mame/gaelco/gaelco_wrally_sprites.h
+++ b/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
diff --git a/src/mame/gaelco/gaelcof3.cpp b/src/mame/gaelco/gaelcof3.cpp
index 379ad789beb..68e39965709 100644
--- a/src/mame/gaelco/gaelcof3.cpp
+++ b/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 )
diff --git a/src/mame/gaelco/gaelcopc.cpp b/src/mame/gaelco/gaelcopc.cpp
index b3762621ec1..fb87802e54e 100644
--- a/src/mame/gaelco/gaelcopc.cpp
+++ b/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 )
diff --git a/src/mame/gaelco/gaelcrpt.h b/src/mame/gaelco/gaelcrpt.h
index a6c987a3709..47a18cf2125 100644
--- a/src/mame/gaelco/gaelcrpt.h
+++ b/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
diff --git a/src/mame/gaelco/mastboyo.cpp b/src/mame/gaelco/mastboyo.cpp
index 92e7bb9c0fa..7451736441b 100644
--- a/src/mame/gaelco/mastboyo.cpp
+++ b/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 )
diff --git a/src/mame/gaelco/rollext.cpp b/src/mame/gaelco/rollext.cpp
index 2946ac217c3..ceb801f023a 100644
--- a/src/mame/gaelco/rollext.cpp
+++ b/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 )
diff --git a/src/mame/galaxian/dambustr.cpp b/src/mame/galaxian/dambustr.cpp
index 7efb12fa2fe..f5f7bbe0332 100644
--- a/src/mame/galaxian/dambustr.cpp
+++ b/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 )
diff --git a/src/mame/galaxian/galaxian_a.h b/src/mame/galaxian/galaxian_a.h
index e64bb8bef7e..85ee8561f17 100644
--- a/src/mame/galaxian/galaxian_a.h
+++ b/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
diff --git a/src/mame/galaxian/scobra.cpp b/src/mame/galaxian/scobra.cpp
index 0c94f0e1a51..374ec133881 100644
--- a/src/mame/galaxian/scobra.cpp
+++ b/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 )
diff --git a/src/mame/gamepark/gp2x.cpp b/src/mame/gamepark/gp2x.cpp
index 9a422e0dc9d..cf421d4d77d 100644
--- a/src/mame/gamepark/gp2x.cpp
+++ b/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")
diff --git a/src/mame/gameplan/toratora.cpp b/src/mame/gameplan/toratora.cpp
index 2dfe83ea579..3932871c1d1 100644
--- a/src/mame/gameplan/toratora.cpp
+++ b/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
+
 
 /*************************************
  *
diff --git a/src/mame/gridcomp/gridkeyb.h b/src/mame/gridcomp/gridkeyb.h
index e0072d7ea38..9f0398a2261 100644
--- a/src/mame/gridcomp/gridkeyb.h
+++ b/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
diff --git a/src/mame/handheld/pensebem.cpp b/src/mame/handheld/pensebem.cpp
index 9370c009ea3..86a1b6ab0d1 100644
--- a/src/mame/handheld/pensebem.cpp
+++ b/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)
diff --git a/src/mame/hds/hds200_kbd.h b/src/mame/hds/hds200_kbd.h
index bce33e96241..ff2cb782a0d 100644
--- a/src/mame/hds/hds200_kbd.h
+++ b/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
diff --git a/src/mame/heathkit/h19.cpp b/src/mame/heathkit/h19.cpp
index 8fdf9a97109..14faf7851a9 100644
--- a/src/mame/heathkit/h19.cpp
+++ b/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 )
diff --git a/src/mame/heathkit/h8.cpp b/src/mame/heathkit/h8.cpp
index 8f781cc4c51..f4eb2532c4d 100644
--- a/src/mame/heathkit/h8.cpp
+++ b/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 */
diff --git a/src/mame/heathkit/h89.cpp b/src/mame/heathkit/h89.cpp
index 0b4ac5edb5b..47475ca9d01 100644
--- a/src/mame/heathkit/h89.cpp
+++ b/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 */
diff --git a/src/mame/hegenerglaser/berlin.cpp b/src/mame/hegenerglaser/berlin.cpp
index ed93e6acdad..3a85ebdfde5 100644
--- a/src/mame/hegenerglaser/berlin.cpp
+++ b/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
 
 
 /******************************************************************************
diff --git a/src/mame/hegenerglaser/mmboard.h b/src/mame/hegenerglaser/mmboard.h
index 0dd69194e51..0e260a25467 100644
--- a/src/mame/hegenerglaser/mmboard.h
+++ b/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
diff --git a/src/mame/hegenerglaser/mmdisplay1.h b/src/mame/hegenerglaser/mmdisplay1.h
index 135bc317daa..279923a7e8d 100644
--- a/src/mame/hegenerglaser/mmdisplay1.h
+++ b/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
diff --git a/src/mame/hegenerglaser/mmdisplay2.h b/src/mame/hegenerglaser/mmdisplay2.h
index b3a1c418d4b..61d28eaa3b3 100644
--- a/src/mame/hegenerglaser/mmdisplay2.h
+++ b/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
diff --git a/src/mame/heurikon/hk68v10.cpp b/src/mame/heurikon/hk68v10.cpp
index 3e2c614b222..2ab85d44cde 100644
--- a/src/mame/heurikon/hk68v10.cpp
+++ b/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 )
diff --git a/src/mame/hitachi/b16.cpp b/src/mame/hitachi/b16.cpp
index f4a573da7cc..e18dcfafa5f 100644
--- a/src/mame/hitachi/b16.cpp
+++ b/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 */
diff --git a/src/mame/hitachi/bmjr.cpp b/src/mame/hitachi/bmjr.cpp
index 28809861c8e..fcae158cdf8 100644
--- a/src/mame/hitachi/bmjr.cpp
+++ b/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 */
 
 
diff --git a/src/mame/hitachi/bml3.cpp b/src/mame/hitachi/bml3.cpp
index c2ab639cc15..96b91753a6d 100644
--- a/src/mame/hitachi/bml3.cpp
+++ b/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 */
diff --git a/src/mame/homebrew/68ksbc.cpp b/src/mame/homebrew/68ksbc.cpp
index 8985da41479..ecc930af413 100644
--- a/src/mame/homebrew/68ksbc.cpp
+++ b/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 */
diff --git a/src/mame/homebrew/d6809.cpp b/src/mame/homebrew/d6809.cpp
index 72517bf69f5..8509e92233d 100644
--- a/src/mame/homebrew/d6809.cpp
+++ b/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
diff --git a/src/mame/homebrew/gigatron.cpp b/src/mame/homebrew/gigatron.cpp
index b3ea0db7ac6..57f414fba44 100644
--- a/src/mame/homebrew/gigatron.cpp
+++ b/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)
diff --git a/src/mame/homebrew/gscpm.cpp b/src/mame/homebrew/gscpm.cpp
index f60da754fea..9ffa2aa7480 100644
--- a/src/mame/homebrew/gscpm.cpp
+++ b/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 )
diff --git a/src/mame/homebrew/homez80.cpp b/src/mame/homebrew/homez80.cpp
index 53b423d53d5..6ab6430606c 100644
--- a/src/mame/homebrew/homez80.cpp
+++ b/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 */
diff --git a/src/mame/homebrew/lft_chiptune.cpp b/src/mame/homebrew/lft_chiptune.cpp
index 24cdc3da429..d4a6ab6fbb4 100644
--- a/src/mame/homebrew/lft_chiptune.cpp
+++ b/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)
diff --git a/src/mame/homebrew/lft_craft.cpp b/src/mame/homebrew/lft_craft.cpp
index b4ae014bd4c..a2f75e6fa0c 100644
--- a/src/mame/homebrew/lft_craft.cpp
+++ b/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)
diff --git a/src/mame/homebrew/lft_phasor.cpp b/src/mame/homebrew/lft_phasor.cpp
index 46ed2a47b5e..dca92169c84 100644
--- a/src/mame/homebrew/lft_phasor.cpp
+++ b/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)
diff --git a/src/mame/homebrew/minib.cpp b/src/mame/homebrew/minib.cpp
index f104c206cd6..386d467d695 100644
--- a/src/mame/homebrew/minib.cpp
+++ b/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)
diff --git a/src/mame/homebrew/mk1forth.cpp b/src/mame/homebrew/mk1forth.cpp
index 652b2bd0e46..d5bd2023d15 100644
--- a/src/mame/homebrew/mk1forth.cpp
+++ b/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)
diff --git a/src/mame/homebrew/p112.cpp b/src/mame/homebrew/p112.cpp
index c11320c11a0..146d0a8aea2 100644
--- a/src/mame/homebrew/p112.cpp
+++ b/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 */
 
diff --git a/src/mame/homebrew/phunsy.cpp b/src/mame/homebrew/phunsy.cpp
index 336b2297aca..cdd5f55e7ec 100644
--- a/src/mame/homebrew/phunsy.cpp
+++ b/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 */
diff --git a/src/mame/homebrew/ravens.cpp b/src/mame/homebrew/ravens.cpp
index 8f89b2fbc8f..6ffcac24b3a 100644
--- a/src/mame/homebrew/ravens.cpp
+++ b/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 */
diff --git a/src/mame/homebrew/sbc6510.cpp b/src/mame/homebrew/sbc6510.cpp
index 740629632d7..3f466eef213 100644
--- a/src/mame/homebrew/sbc6510.cpp
+++ b/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 */
diff --git a/src/mame/homebrew/test_t400.cpp b/src/mame/homebrew/test_t400.cpp
index 05c3a907066..e6cc4cc60ed 100644
--- a/src/mame/homebrew/test_t400.cpp
+++ b/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 )
diff --git a/src/mame/homebrew/uzebox.cpp b/src/mame/homebrew/uzebox.cpp
index 28d5039afb3..ebc5a0ff72a 100644
--- a/src/mame/homebrew/uzebox.cpp
+++ b/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)
diff --git a/src/mame/homebrew/z80dev.cpp b/src/mame/homebrew/z80dev.cpp
index 0a9defc0d11..6fe360041a9 100644
--- a/src/mame/homebrew/z80dev.cpp
+++ b/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 */
diff --git a/src/mame/homebrew/zexall.cpp b/src/mame/homebrew/zexall.cpp
index 1bc14a11b01..417a93c8aa2 100644
--- a/src/mame/homebrew/zexall.cpp
+++ b/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
diff --git a/src/mame/homelab/braiplus.cpp b/src/mame/homelab/braiplus.cpp
index b7d7c9437ec..67b0f8d8307 100644
--- a/src/mame/homelab/braiplus.cpp
+++ b/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 )
diff --git a/src/mame/hp/hp16500.cpp b/src/mame/hp/hp16500.cpp
index be286cdd6f2..ac4191f33a6 100644
--- a/src/mame/hp/hp16500.cpp
+++ b/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)
diff --git a/src/mame/hp/hp2100.cpp b/src/mame/hp/hp2100.cpp
index 2ea6920c822..fe521d560ae 100644
--- a/src/mame/hp/hp2100.cpp
+++ b/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 )
diff --git a/src/mame/hp/hp2620.cpp b/src/mame/hp/hp2620.cpp
index 915102795a6..853994f3f93 100644
--- a/src/mame/hp/hp2620.cpp
+++ b/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)
diff --git a/src/mame/hp/hp2640_tape.h b/src/mame/hp/hp2640_tape.h
index 30c511c4a8f..89ecbb95203 100644
--- a/src/mame/hp/hp2640_tape.h
+++ b/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 */
diff --git a/src/mame/hp/hp48_port.h b/src/mame/hp/hp48_port.h
index c98391198b2..aae56b7f964 100644
--- a/src/mame/hp/hp48_port.h
+++ b/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
diff --git a/src/mame/hp/hp49gp.cpp b/src/mame/hp/hp49gp.cpp
index b19ea48ddaf..c0f9ad02852 100644
--- a/src/mame/hp/hp49gp.cpp
+++ b/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)
diff --git a/src/mame/hp/hp64k.cpp b/src/mame/hp/hp64k.cpp
index 5657dae50b8..695464a4a5e 100644
--- a/src/mame/hp/hp64k.cpp
+++ b/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)
diff --git a/src/mame/hp/hp700.cpp b/src/mame/hp/hp700.cpp
index 7dea387a8ac..02538f319d7 100644
--- a/src/mame/hp/hp700.cpp
+++ b/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)
diff --git a/src/mame/hp/hp80.cpp b/src/mame/hp/hp80.cpp
index 3ad33da5af9..916029371a0 100644
--- a/src/mame/hp/hp80.cpp
+++ b/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)
diff --git a/src/mame/hp/hp80_optrom.h b/src/mame/hp/hp80_optrom.h
index 2f4f6cd7250..43bab5bf2fc 100644
--- a/src/mame/hp/hp80_optrom.h
+++ b/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
diff --git a/src/mame/hp/hp95lx.cpp b/src/mame/hp/hp95lx.cpp
index 384bf4979c7..08faa3f0423 100644
--- a/src/mame/hp/hp95lx.cpp
+++ b/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 )
diff --git a/src/mame/hp/hp9825_optrom.h b/src/mame/hp/hp9825_optrom.h
index 494f2ffda20..f9db1db1323 100644
--- a/src/mame/hp/hp9825_optrom.h
+++ b/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 */
diff --git a/src/mame/hp/hp9825_tape.h b/src/mame/hp/hp9825_tape.h
index 768a29fde7a..6818f978fa5 100644
--- a/src/mame/hp/hp9825_tape.h
+++ b/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
diff --git a/src/mame/hp/hp9845_optrom.h b/src/mame/hp/hp9845_optrom.h
index 0f972da3427..193858faa1b 100644
--- a/src/mame/hp/hp9845_optrom.h
+++ b/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
diff --git a/src/mame/hp/hp9845_printer.h b/src/mame/hp/hp9845_printer.h
index b3da40da833..4559babd490 100644
--- a/src/mame/hp/hp9845_printer.h
+++ b/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
diff --git a/src/mame/hp/hp98x5_io_sys.h b/src/mame/hp/hp98x5_io_sys.h
index e83f6432b24..1edff26e00e 100644
--- a/src/mame/hp/hp98x5_io_sys.h
+++ b/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
diff --git a/src/mame/hp/hp9k.cpp b/src/mame/hp/hp9k.cpp
index ca89fd2a7bd..c267d70f1dd 100644
--- a/src/mame/hp/hp9k.cpp
+++ b/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 */
diff --git a/src/mame/hp/hp_ipc_optrom.h b/src/mame/hp/hp_ipc_optrom.h
index bf7d62e6920..c41d8e2391b 100644
--- a/src/mame/hp/hp_ipc_optrom.h
+++ b/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
diff --git a/src/mame/hp/hpz80unk.cpp b/src/mame/hp/hpz80unk.cpp
index 4147444ed03..7ab251fafe7 100644
--- a/src/mame/hp/hpz80unk.cpp
+++ b/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
diff --git a/src/mame/husky/hawk.cpp b/src/mame/husky/hawk.cpp
index d7fc679c98a..c3622750c8b 100644
--- a/src/mame/husky/hawk.cpp
+++ b/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 )
diff --git a/src/mame/husky/hunter16.cpp b/src/mame/husky/hunter16.cpp
index 8d945f59a5f..7821c4b306f 100644
--- a/src/mame/husky/hunter16.cpp
+++ b/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 )
diff --git a/src/mame/husky/hunter2.cpp b/src/mame/husky/hunter2.cpp
index 41bd0941666..e0066f35bc0 100644
--- a/src/mame/husky/hunter2.cpp
+++ b/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
diff --git a/src/mame/husky/husky.cpp b/src/mame/husky/husky.cpp
index 84084b366cb..dcf67ff9083 100644
--- a/src/mame/husky/husky.cpp
+++ b/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 )
diff --git a/src/mame/ibm/ibm3153.cpp b/src/mame/ibm/ibm3153.cpp
index 385c5444429..509bcfc69c0 100644
--- a/src/mame/ibm/ibm3153.cpp
+++ b/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
diff --git a/src/mame/ibm/ibm6580_fdc.h b/src/mame/ibm/ibm6580_fdc.h
index 64dcb85ffa7..c36e34cd465 100644
--- a/src/mame/ibm/ibm6580_fdc.h
+++ b/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
diff --git a/src/mame/ibm/ibm6580_kbd.h b/src/mame/ibm/ibm6580_kbd.h
index 8de7a2f358c..afc4c28ceb2 100644
--- a/src/mame/ibm/ibm6580_kbd.h
+++ b/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
diff --git a/src/mame/ibm/rosetta.h b/src/mame/ibm/rosetta.h
index f93c2050862..92e5305ef4e 100644
--- a/src/mame/ibm/rosetta.h
+++ b/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
diff --git a/src/mame/ibm/rtpc_iocc.h b/src/mame/ibm/rtpc_iocc.h
index 8621a50378f..a93bb29b370 100644
--- a/src/mame/ibm/rtpc_iocc.h
+++ b/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
diff --git a/src/mame/ice/ice_bozopail.cpp b/src/mame/ice/ice_bozopail.cpp
index d9ba63da518..eb3da8435e1 100644
--- a/src/mame/ice/ice_bozopail.cpp
+++ b/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 )
diff --git a/src/mame/ice/ice_tbd.cpp b/src/mame/ice/ice_tbd.cpp
index 33922745ace..c78c0163018 100644
--- a/src/mame/ice/ice_tbd.cpp
+++ b/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 )
diff --git a/src/mame/ice/vp101.cpp b/src/mame/ice/vp101.cpp
index 8a88b3a9431..8b15c081a13 100644
--- a/src/mame/ice/vp101.cpp
+++ b/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)
diff --git a/src/mame/igs/cabaret.cpp b/src/mame/igs/cabaret.cpp
index 03ee5ca353d..5f4c6261519 100644
--- a/src/mame/igs/cabaret.cpp
+++ b/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 )
diff --git a/src/mame/igs/dunhuang.cpp b/src/mame/igs/dunhuang.cpp
index 744efc8e469..d6adf67bf66 100644
--- a/src/mame/igs/dunhuang.cpp
+++ b/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 )
diff --git a/src/mame/igs/funtech.cpp b/src/mame/igs/funtech.cpp
index f92e74bae27..9bb6b0cea9f 100644
--- a/src/mame/igs/funtech.cpp
+++ b/src/mame/igs/funtech.cpp
@@ -34,6 +34,7 @@ and an unpopulated position for a YM2413 or UM3567
 #include "fts2in1.lh"
 
 
+namespace {
 
 class fun_tech_corp_state : public driver_device
 {
@@ -487,4 +488,7 @@ ROM_START( fts2in1 )
 	ROM_LOAD16_BYTE( "u30.bin", 0x00001, 0x20000, CRC(d572bddc) SHA1(06499aeb47085a02af9eb4987ed987f9a3a397f7) )
 ROM_END
 
+} // anonymous namespace
+
+
 GAMEL( 1993, fts2in1, 0, funtech, funtech, fun_tech_corp_state, empty_init, ROT0, "Fun Tech Corporation", "Super Two In One", MACHINE_SUPPORTS_SAVE, layout_fts2in1 )
diff --git a/src/mame/igs/igs009.cpp b/src/mame/igs/igs009.cpp
index 858bb86d6da..de076245f73 100644
--- a/src/mame/igs/igs009.cpp
+++ b/src/mame/igs/igs009.cpp
@@ -40,6 +40,8 @@ Year  Game                         Manufacturer    Notes
 #include "tilemap.h"
 
 
+namespace {
+
 class igs009_state : public driver_device
 {
 public:
@@ -1075,6 +1077,8 @@ ROM_START( gp98 )
 	// no OKI on this
 ROM_END
 
+} // anonymous namespace
+
 
 /*    YEAR   NAME       PARENT    MACHINE   INPUT     STATE          INIT            ROT   COMPANY           FULLNAME                      FLAGS  */
 GAME( 1997,  jingbell,  0,        jingbell, jingbell, igs009_state,  init_jingbell,  ROT0, "IGS",            "Jingle Bell (US, V157US)",   MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/igs/igs017_igs031.h b/src/mame/igs/igs017_igs031.h
index 6129e236a88..4776d58bcc8 100644
--- a/src/mame/igs/igs017_igs031.h
+++ b/src/mame/igs/igs017_igs031.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Pierpaolo Prazzoli, Luca Elia
-#ifndef MAME_VIDEO_IGS017_IGS031_H
-#define MAME_VIDEO_IGS017_IGS031_H
+#ifndef MAME_IGS_IGS017_IGS031_H
+#define MAME_IGS_IGS017_IGS031_H
 
 #pragma once
 
@@ -97,4 +97,4 @@ private:
 
 DECLARE_DEVICE_TYPE(IGS017_IGS031, igs017_igs031_device)
 
-#endif // MAME_VIDEO_IGS017_IGS031_H
+#endif // MAME_IGS_IGS017_IGS031_H
diff --git a/src/mame/igs/igs022.h b/src/mame/igs/igs022.h
index 5fb2bd9115c..5e6fed9d26a 100644
--- a/src/mame/igs/igs022.h
+++ b/src/mame/igs/igs022.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood, ElSemi
-#ifndef MAME_MACHINE_IGS022_H
-#define MAME_MACHINE_IGS022_H
+#ifndef MAME_IGS_IGS022_H
+#define MAME_IGS_IGS022_H
 
 #pragma once
 
@@ -40,4 +40,4 @@ private:
 
 DECLARE_DEVICE_TYPE(IGS022, igs022_device)
 
-#endif // MAME_MACHINE_IGS022_H
+#endif // MAME_IGS_IGS022_H
diff --git a/src/mame/igs/igs025.h b/src/mame/igs/igs025.h
index c57628d7464..6ea21f03388 100644
--- a/src/mame/igs/igs025.h
+++ b/src/mame/igs/igs025.h
@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood, ElSemi
 
-#ifndef MAME_MACHINE_IGS025_H
-#define MAME_MACHINE_IGS025_H
+#ifndef MAME_IGS_IGS025_H
+#define MAME_IGS_IGS025_H
 
 #pragma once
 
@@ -56,4 +56,4 @@ protected:
 
 DECLARE_DEVICE_TYPE(IGS025, igs025_device)
 
-#endif // MAME_MACHINE_IGS025_H
+#endif // MAME_IGS_IGS025_H
diff --git a/src/mame/igs/igs028.h b/src/mame/igs/igs028.h
index 9198afd1503..de18faa4114 100644
--- a/src/mame/igs/igs028.h
+++ b/src/mame/igs/igs028.h
@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood, ElSemi
 /* IGS 028 */
-#ifndef MAME_MACHINE_IGS028_H
-#define MAME_MACHINE_IGS028_H
+#ifndef MAME_IGS_IGS028_H
+#define MAME_IGS_IGS028_H
 
 #pragma once
 
@@ -29,4 +29,4 @@ protected:
 
 DECLARE_DEVICE_TYPE(IGS028, igs028_device)
 
-#endif // MAME_MACHINE_IGS028_H
+#endif // MAME_IGS_IGS028_H
diff --git a/src/mame/igs/igs_fear.cpp b/src/mame/igs/igs_fear.cpp
index 00761ceef06..56b32a6e025 100644
--- a/src/mame/igs/igs_fear.cpp
+++ b/src/mame/igs/igs_fear.cpp
@@ -12,6 +12,8 @@
 #include "speaker.h"
 
 
+namespace {
+
 class igs_fear_state : public driver_device
 {
 public:
@@ -170,4 +172,7 @@ void igs_fear_state::init_igs_fear()
 	pgm_create_dummy_internal_arm_region();
 }
 
+} // anonymous namespace
+
+
 GAME( 2006, fearless, 0, igs_fear, fear, igs_fear_state, init_igs_fear, ROT0, "IGS", "Fearless Pinocchio (V101US)",   MACHINE_IS_SKELETON )
diff --git a/src/mame/igs/igs_m036.cpp b/src/mame/igs/igs_m036.cpp
index 8fe3f5bca20..a33c27879e1 100644
--- a/src/mame/igs/igs_m036.cpp
+++ b/src/mame/igs/igs_m036.cpp
@@ -65,6 +65,8 @@ check more info and photo from cjdh2.zip!!!
 #include "screen.h"
 
 
+namespace {
+
 class igs_m036_state : public driver_device
 {
 public:
@@ -358,6 +360,9 @@ void igs_m036_state::init_igsm312()
 	decrypter.decrypter_rom((uint16_t*)memregion("user1")->base(), memregion("user1")->bytes(), 0);
 }
 
+} // anonymous namespace
+
+
 /***************************************************************************
 
     Game Drivers
diff --git a/src/mame/igs/jackie.cpp b/src/mame/igs/jackie.cpp
index 61832a719de..ff2425b6feb 100644
--- a/src/mame/igs/jackie.cpp
+++ b/src/mame/igs/jackie.cpp
@@ -57,6 +57,8 @@ Note
 #include "tilemap.h"
 
 
+namespace {
+
 class jackie_state : public driver_device
 {
 public:
@@ -611,5 +613,7 @@ ROM_START( jackie )
 	ROM_LOAD( "18cv8.u9",   0x0000, 0x155, NO_DUMP )
 ROM_END
 
+} // anonymous namespace
+
 
 GAME( 1993, jackie, 0, jackie, jackie, jackie_state, init_jackie, ROT0, "IGS", "Happy Jackie (v110U)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/igs/pgm2_memcard.h b/src/mame/igs/pgm2_memcard.h
index 861fd0d1b3c..3403e91694c 100644
--- a/src/mame/igs/pgm2_memcard.h
+++ b/src/mame/igs/pgm2_memcard.h
@@ -8,8 +8,8 @@
     (based on ng_memcard.h)
 
 *********************************************************************/
-#ifndef MAME_MACHINE_PGM2_MEMCARD_H
-#define MAME_MACHINE_PGM2_MEMCARD_H
+#ifndef MAME_IGS_PGM2_MEMCARD_H
+#define MAME_IGS_PGM2_MEMCARD_H
 
 #pragma once
 
@@ -61,4 +61,4 @@ private:
 DECLARE_DEVICE_TYPE(PGM2_MEMCARD, pgm2_memcard_device)
 
 
-#endif // MAME_MACHINE_PGM2_MEMCARD_H
+#endif // MAME_IGS_PGM2_MEMCARD_H
diff --git a/src/mame/igs/pgm3.cpp b/src/mame/igs/pgm3.cpp
index ba95a80a902..e40cb24d8fc 100644
--- a/src/mame/igs/pgm3.cpp
+++ b/src/mame/igs/pgm3.cpp
@@ -53,6 +53,8 @@
 #include "screen.h"
 
 
+namespace {
+
 class pgm3_state : public driver_device
 {
 public:
@@ -170,6 +172,8 @@ void pgm3_state::init_kov3hd()
 {
 }
 
+} // anonymous namespace
+
 
 // all dumped sets might be China region, unless region info comes from elsewhere
 GAME( 2011, kov3hd,     0,      pgm3,    pgm3, pgm3_state, init_kov3hd, ROT0, "IGS", "Knights of Valour 3 HD (M-105CN 13-07-04 18:54:01)", MACHINE_IS_SKELETON )
diff --git a/src/mame/igt/gkigt.cpp b/src/mame/igt/gkigt.cpp
index 263261201af..89e505f5608 100644
--- a/src/mame/igt/gkigt.cpp
+++ b/src/mame/igt/gkigt.cpp
@@ -102,6 +102,8 @@ More chips (from eBay auction):
 #include "speaker.h"
 
 
+namespace {
+
 class igt_gameking_state : public driver_device
 {
 public:
@@ -902,6 +904,9 @@ ROM_START( gkkey )
 	ROM_REGION32_LE( 0x200000, "snd", ROMREGION_ERASEFF )
 ROM_END
 
+} // anonymous namespace
+
+
 GAME( 1994, ms3,       0,      igt_gameking, igt_gameking, igt_gameking_state, empty_init, ROT0, "IGT", "Multistar 3",                  MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 1994, ms72c,     0,      igt_ms72c,    igt_gameking, igt_gameking_state, empty_init, ROT0, "IGT", "Multistar 7 2c",               MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME( 2003, gkigt4,    0,      igt_gameking, igt_gameking, igt_gameking_state, empty_init, ROT0, "IGT", "Game King (v4.x)",             MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/igt/splus.cpp b/src/mame/igt/splus.cpp
index ddc1f535fba..562e0333eb1 100644
--- a/src/mame/igt/splus.cpp
+++ b/src/mame/igt/splus.cpp
@@ -33,6 +33,8 @@
 #include "splus.lh"
 
 
+namespace {
+
 #define DEBUG_OUTPUT 0
 
 class splus_state : public driver_device
@@ -737,6 +739,9 @@ ROM_START( spss4240 ) /* Coral Reef (SS4240) */
 	ROM_LOAD( "ss4240.u53",   0x00000, 0x02000, CRC(c5715b9b) SHA1(8b0ca15b520a5c8e1ebec13e3a1dc304fb40aea0) )
 ROM_END
 
+} // anonymous namespace
+
+
 /*************************
 *      Game Drivers      *
 *************************/
diff --git a/src/mame/informer/informer_207_100.cpp b/src/mame/informer/informer_207_100.cpp
index 932eeccd41a..06351c884e9 100644
--- a/src/mame/informer/informer_207_100.cpp
+++ b/src/mame/informer/informer_207_100.cpp
@@ -30,6 +30,8 @@
 #include "screen.h"
 
 
+namespace {
+
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
@@ -212,6 +214,8 @@ ROM_START( in207100 )
 	ROM_LOAD("79496.bin", 0x0000, 0x1000, CRC(930ac23a) SHA1(74e6bf81b60e3504cb2b9f14a33e7c3e367dc825))
 ROM_END
 
+} // anonymous namespace
+
 
 //**************************************************************************
 //  SYSTEM DRIVERS
diff --git a/src/mame/informer/informer_207_376.cpp b/src/mame/informer/informer_207_376.cpp
index 5f99eaeec62..fe429e6e46c 100644
--- a/src/mame/informer/informer_207_376.cpp
+++ b/src/mame/informer/informer_207_376.cpp
@@ -44,6 +44,8 @@
 #include "speaker.h"
 
 
+namespace {
+
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
@@ -334,6 +336,8 @@ ROM_START( in207376 )
 	ROM_LOAD("79573-001.z6", 0x0000, 0x1000, CRC(f704b827) SHA1(bcc56eeb8681c2bebe3a9f4b6b78c0373c06d875))
 ROM_END
 
+} // anonymous namespace
+
 
 //**************************************************************************
 //  SYSTEM DRIVERS
diff --git a/src/mame/informer/informer_207_376_kbd.h b/src/mame/informer/informer_207_376_kbd.h
index a855b8f9d44..d54687ff127 100644
--- a/src/mame/informer/informer_207_376_kbd.h
+++ b/src/mame/informer/informer_207_376_kbd.h
@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_INFORMER_207_376_KBD_H
-#define MAME_MACHINE_INFORMER_207_376_KBD_H
+#ifndef MAME_INFORMER_INFORMER_207_376_KBD_H
+#define MAME_INFORMER_INFORMER_207_376_KBD_H
 
 #pragma once
 
@@ -57,4 +57,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(INFORMER_207_376_KBD_HLE, informer_207_376_kbd_hle_device)
 
-#endif // MAME_MACHINE_INFORMER_207_376_KBD_H
+#endif // MAME_INFORMER_INFORMER_207_376_KBD_H
diff --git a/src/mame/informer/informer_213.cpp b/src/mame/informer/informer_213.cpp
index cc2aefdc3c9..1b188cfe532 100644
--- a/src/mame/informer/informer_213.cpp
+++ b/src/mame/informer/informer_213.cpp
@@ -31,6 +31,8 @@
 #include "speaker.h"
 
 
+namespace {
+
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
@@ -479,6 +481,8 @@ ROM_START( in213ae )
 	ROM_LOAD("79747-002.bin", 0x0000, 0x4000, CRC(7425327f) SHA1(e3e67305b3b8936683724d1347a451fffe96bf0e))
 ROM_END
 
+} // anonymous namespace
+
 
 //**************************************************************************
 //  SYSTEM DRIVERS
diff --git a/src/mame/informer/informer_213_kbd.h b/src/mame/informer/informer_213_kbd.h
index 915e3a96c6c..0624f11005b 100644
--- a/src/mame/informer/informer_213_kbd.h
+++ b/src/mame/informer/informer_213_kbd.h
@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_INFORMER_213_KBD_H
-#define MAME_MACHINE_INFORMER_213_KBD_H
+#ifndef MAME_INFORMER_INFORMER_213_KBD_H
+#define MAME_INFORMER_INFORMER_213_KBD_H
 
 #pragma once
 
@@ -55,4 +55,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(INFORMER_213_KBD_HLE, informer_213_kbd_hle_device)
 
-#endif // MAME_MACHINE_INFORMER_213_KBD_H
+#endif // MAME_INFORMER_INFORMER_213_KBD_H
diff --git a/src/mame/intel/basic52.cpp b/src/mame/intel/basic52.cpp
index 7d84ef082aa..f7409575321 100644
--- a/src/mame/intel/basic52.cpp
+++ b/src/mame/intel/basic52.cpp
@@ -41,6 +41,8 @@ Sound: BASIC-31 has sound, and BASIC-52 doesn't. The sound command is PWM.
 #include "speaker.h"
 
 
+namespace {
+
 class basic52_state : public driver_device
 {
 public:
@@ -172,6 +174,9 @@ ROM_START( basic31 )
 	ROMX_LOAD( "mcs-51-12a.bin", 0x0000, 0x2000, CRC(225bb2f0) SHA1(46e97643a7a5cb4c278f9e3c73d18cd93209f8bf), ROM_BIOS(1))
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 /*    YEAR  NAME     PARENT   COMPAT  MACHINE  INPUT    CLASS          INIT        COMPANY  FULLNAME        FLAGS */
 COMP( 1985, basic52, 0,       0,      basic52, basic52, basic52_state, empty_init, "Intel", "MCS BASIC 52", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/intel/imds2.cpp b/src/mame/intel/imds2.cpp
index 112b68403d0..3f472378003 100644
--- a/src/mame/intel/imds2.cpp
+++ b/src/mame/intel/imds2.cpp
@@ -90,6 +90,9 @@
 #include "bus/multibus/multibus.h"
 #include "bus/multibus/isbc202.h"
 
+
+namespace {
+
 // CPU oscillator of IPC board: 8 MHz
 #define IPC_XTAL_Y2     8_MHz_XTAL
 
@@ -340,5 +343,8 @@ ROM_START(imds2)
 	ROMX_LOAD("ipc11_a48.bin", 0x0800, 0x0800, CRC(3696ff28) SHA1(38b435e10a81629430275aec051fb0a55ec1f6fd), ROM_BIOS(2))
 ROM_END
 
+} // anonymous namespace
+
+
 /*    YEAR  NAME   PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY  FULLNAME */
 COMP( 1979, imds2, 0,      0,      imds2,   imds2, imds2_state, empty_init, "Intel", "Intellec MDS-II", 0)
diff --git a/src/mame/intel/imds2ioc.h b/src/mame/intel/imds2ioc.h
index 55dc40f5990..a0665a0b15c 100644
--- a/src/mame/intel/imds2ioc.h
+++ b/src/mame/intel/imds2ioc.h
@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:F. Ulivi
 
-#ifndef MAME_MACHINE_IMDS2IOC_H
-#define MAME_MACHINE_IMDS2IOC_H
+#ifndef MAME_INTEL_IMDS2IOC_H
+#define MAME_INTEL_IMDS2IOC_H
 
 #include "cpu/i8085/i8085.h"
 #include "cpu/mcs48/mcs48.h"
@@ -127,4 +127,4 @@ private:
 
 DECLARE_DEVICE_TYPE(IMDS2IOC, imds2ioc_device)
 
-#endif // MAME_MACHINE_IMDS2IOC_H
+#endif // MAME_INTEL_IMDS2IOC_H
diff --git a/src/mame/intel/imm6_76.h b/src/mame/intel/imm6_76.h
index cef6df9ba81..88e0fc44048 100644
--- a/src/mame/intel/imm6_76.h
+++ b/src/mame/intel/imm6_76.h
@@ -140,8 +140,8 @@ to a 1602 or 1702 PROM (150 millisecond cycle time).
 When pulled low, RW A initiates a 20% programming duty cycle for writing
 to a 1602A or 1702A PROM (15 millisecond cycle time).
 */
-#ifndef MAME_MACHINE_IMM6_76_H
-#define MAME_MACHINE_IMM6_76_H
+#ifndef MAME_INTEL_IMM6_76_H
+#define MAME_INTEL_IMM6_76_H
 
 #pragma once
 
@@ -199,4 +199,4 @@ private:
 
 DECLARE_DEVICE_TYPE(INTEL_IMM6_76, intel_imm6_76_device)
 
-#endif // MAME_MACHINE_IMM6_76_H
+#endif // MAME_INTEL_IMM6_76_H
diff --git a/src/mame/intel/ipc.cpp b/src/mame/intel/ipc.cpp
index d5918bd0dfd..ced2d9d3f89 100644
--- a/src/mame/intel/ipc.cpp
+++ b/src/mame/intel/ipc.cpp
@@ -46,6 +46,8 @@
 #include "bus/rs232/rs232.h"
 
 
+namespace {
+
 class ipc_state : public driver_device
 {
 public:
@@ -142,6 +144,9 @@ ROM_START( ipc )
 	ROM_LOAD( "ipc_f8_v1.3.bin", 0x1000, 0x0800, NO_DUMP )   // rom name unknown
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 /*    YEAR  NAME  PARENT  COMPAT  MACHINE  INPUT  CLASS      INIT        COMPANY  FULLNAME  FLAGS */
diff --git a/src/mame/intel/ipds.cpp b/src/mame/intel/ipds.cpp
index 0d7c7bdca24..c0b08c1d196 100644
--- a/src/mame/intel/ipds.cpp
+++ b/src/mame/intel/ipds.cpp
@@ -16,6 +16,8 @@
 #include "screen.h"
 
 
+namespace {
+
 class ipds_state : public driver_device
 {
 public:
@@ -174,6 +176,9 @@ ROM_START( ipds )
 	ROM_LOAD( "163775-001.u8",  0x0800, 0x0800, CRC(0442163e) SHA1(737732adcfe22823db37112e28758464f5d9af7b) )
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 /*    YEAR  NAME  PARENT  COMPAT  MACHINE  INPUT  CLASS       INIT        COMPANY  FULLNAME  FLAGS */
diff --git a/src/mame/intel/isbc.cpp b/src/mame/intel/isbc.cpp
index d64c9e5293c..e520300d6c7 100644
--- a/src/mame/intel/isbc.cpp
+++ b/src/mame/intel/isbc.cpp
@@ -31,6 +31,9 @@ able to deal with 256byte sectors so fails to load the irmx 512byte sector image
 #include "isbc_215g.h"
 #include "isbc_208.h"
 
+
+namespace {
+
 class isbc_state : public driver_device
 {
 public:
@@ -705,6 +708,9 @@ ROM_START( sm1810 )
 	ROM_LOAD16_BYTE( "sm1810.42-1.06-3.bin", 0x4001, 0x2000, CRC(9741a51a) SHA1(c9d3a6a5c51fe9814986517b0f4cbeae8200babc))
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 /*    YEAR  NAME       PARENT  COMPAT  MACHINE   INPUT  CLASS       INIT        COMPANY  FULLNAME       FLAGS */
diff --git a/src/mame/intel/isbc8010.cpp b/src/mame/intel/isbc8010.cpp
index c68cb41c9c2..5c6968faf4c 100644
--- a/src/mame/intel/isbc8010.cpp
+++ b/src/mame/intel/isbc8010.cpp
@@ -33,6 +33,9 @@ No known manual or schematic of the video board.
 #include "bus/rs232/rs232.h"
 //#include "machine/ay31015.h"
 
+
+namespace {
+
 #define I8255A_1_TAG    "ppi8255_1"
 #define I8255A_2_TAG    "ppi8255_2"
 #define I8251A_TAG      "usart"
@@ -59,7 +62,7 @@ public:
 	void isbc8010(machine_config &config);
 
 private:
-	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	[[maybe_unused]] uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
 	DECLARE_WRITE_LINE_MEMBER( usart_clock_tick );
 
@@ -278,6 +281,9 @@ ROM_END
 #define rom_isbc8010a rom_isbc8010
 #define rom_isbc8010b rom_isbc8010
 
+} // anonymous namespace
+
+
 /*    YEAR  NAME       PARENT    COMPAT  MACHINE    INPUT     CLASS           INIT        COMPANY  FULLNAME       FLAGS */
 COMP( 1975, isbc8010,  0,        0,      isbc8010,  isbc8010, isbc8010_state, empty_init, "Intel", "iSBC 80/10",  MACHINE_NO_SOUND_HW )
 COMP( 1977, isbc8010a, isbc8010, 0,      isbc8010a, isbc8010, isbc8010_state, empty_init, "Intel", "iSBC 80/10A", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/intel/isbc8030.cpp b/src/mame/intel/isbc8030.cpp
index b0a7188e509..9b838ecf16d 100644
--- a/src/mame/intel/isbc8030.cpp
+++ b/src/mame/intel/isbc8030.cpp
@@ -38,6 +38,8 @@ X  Examine and modify CPU registers
 #include "bus/rs232/rs232.h"
 
 
+namespace {
+
 class isbc8030_state : public driver_device
 {
 public:
@@ -122,5 +124,8 @@ ROM_START( isbc8030 )
 	ROM_LOAD( "mon830.bin", 0x0000, 0x0800, CRC(cda15115) SHA1(242dad14a919568178b363c3e27f22ec0a5849b3))
 ROM_END
 
+} // anonymous namespace
+
+
 /*    YEAR  NAME      PARENT  COMPAT  MACHINE   INPUT     CLASS           INIT        COMPANY  FULLNAME      FLAGS */
 COMP( 1978, isbc8030, 0,      0,      isbc8030, isbc8030, isbc8030_state, empty_init, "Intel", "iSBC 80/30", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/intel/isbc_208.h b/src/mame/intel/isbc_208.h
index 93383fe4ee7..aed6ba9c004 100644
--- a/src/mame/intel/isbc_208.h
+++ b/src/mame/intel/isbc_208.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Carl
-#ifndef MAME_MACHINE_ISBC_208_H
-#define MAME_MACHINE_ISBC_208_H
+#ifndef MAME_INTEL_ISBC_208_H
+#define MAME_INTEL_ISBC_208_H
 
 #pragma once
 
@@ -51,4 +51,4 @@ private:
 
 DECLARE_DEVICE_TYPE(ISBC_208, isbc_208_device)
 
-#endif // MAME_MACHINE_ISBC_208_H
+#endif // MAME_INTEL_ISBC_208_H
diff --git a/src/mame/intel/rex6000.cpp b/src/mame/intel/rex6000.cpp
index 510860aa2bb..8db67bc115d 100644
--- a/src/mame/intel/rex6000.cpp
+++ b/src/mame/intel/rex6000.cpp
@@ -42,6 +42,8 @@
 #include "speaker.h"
 
 
+namespace {
+
 #define MAKE_BANK(lo, hi)       ((lo) | ((hi)<<8))
 
 //irq flag/mask bits
@@ -1052,6 +1054,9 @@ ROM_START( oz750 )
 	ROM_LOAD( "oz750_1.bin", 0x0000, 0x100000, CRC(d74e97d7) SHA1(19d17393a9af85e07773feaf1aed5e2cfa80f7cc))
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 /*    YEAR  NAME     PARENT   COMPAT  MACHINE  INPUT    CLASS          INIT        COMPANY           FULLNAME         FLAGS */
diff --git a/src/mame/intel/sdk51.cpp b/src/mame/intel/sdk51.cpp
index 66a0b59939b..7558216205b 100644
--- a/src/mame/intel/sdk51.cpp
+++ b/src/mame/intel/sdk51.cpp
@@ -16,6 +16,9 @@
 #include "machine/i8243.h"
 #include "machine/i8251.h"
 
+
+namespace {
+
 class sdk51_state : public driver_device
 {
 public:
@@ -318,4 +321,7 @@ ROM_START(sdk51)
 	ROM_LOAD("u63-3622a.bin", 0x000, 0x200, CRC(85cbd498) SHA1(f0214b6d02d6d153b5fafd9adf5a23013373c9c4)) // pin 9 output stuck high but not used
 ROM_END
 
+} // anonymous namespace
+
+
 COMP(1981, sdk51, 0, 0, sdk51, sdk51, sdk51_state, empty_init, "Intel", "MCS-51 System Design Kit", MACHINE_IS_SKELETON)
diff --git a/src/mame/intel/sdk80.cpp b/src/mame/intel/sdk80.cpp
index 02ec7cbabde..342305164e6 100644
--- a/src/mame/intel/sdk80.cpp
+++ b/src/mame/intel/sdk80.cpp
@@ -30,6 +30,9 @@ X<register identifier>                       Examine and modify registers
 #include "machine/clock.h"
 #include "bus/rs232/rs232.h"
 
+
+namespace {
+
 #define I8255A_0_TAG    "ppi8255_0"
 #define I8255A_1_TAG    "ppi8255_1"
 #define I8251A_TAG      "usart"
@@ -152,5 +155,8 @@ ROM_START( sdk80 )
 	ROM_LOAD( "mcs80.a14", 0x0000, 0x0400, BAD_DUMP CRC(9bb1c268) SHA1(e84e358f81f181f40f4f8d4c4f76370b7d82e615) ) // Compiled from corrected listing - see issue #6324
 ROM_END
 
+} // anonymous namespace
+
+
 /*    YEAR  NAME   PARENT  COMPAT  MACHINE  INPUT   CLASS        INIT        COMPANY   FULLNAME     FLAGS */
 COMP( 1975, sdk80, 0,      0,      sdk80,   sdk80,  sdk80_state, empty_init, "Intel",  "SDK-80",    MACHINE_NO_SOUND_HW )
diff --git a/src/mame/intel/sdk85.cpp b/src/mame/intel/sdk85.cpp
index 211c7ad9231..a6f69b34999 100644
--- a/src/mame/intel/sdk85.cpp
+++ b/src/mame/intel/sdk85.cpp
@@ -54,6 +54,8 @@ Press 0 to restart.
 #include "sdk85.lh"
 
 
+namespace {
+
 class sdk85_state : public driver_device
 {
 public:
@@ -266,6 +268,9 @@ ROM_START( sdk85 )
 	ROMX_LOAD( "mastermind.a14", 0x0000, 0x0800, CRC(36b694ae) SHA1(4d8a5ae5d10e8f72a6e349c7eeaf1aa00c4e45e1), ROM_BIOS(1) )
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 /*    YEAR  NAME   PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY  FULLNAME  FLAGS */
diff --git a/src/mame/intel/sdk86.cpp b/src/mame/intel/sdk86.cpp
index 23f538d8fde..f5b02c6074f 100644
--- a/src/mame/intel/sdk86.cpp
+++ b/src/mame/intel/sdk86.cpp
@@ -33,6 +33,9 @@ ToDo:
 #include "machine/i8279.h"
 #include "sdk86.lh"
 
+
+namespace {
+
 class sdk86_state : public driver_device
 {
 public:
@@ -249,6 +252,9 @@ ROM_START( sdk86 )
 	ROM_LOAD( "0038_101995-001.a29", 0x0C00, 0x0400, CRC(3d2c18bc) SHA1(5e1935cd07fef26b2cf3d8fa7612fe0d8e678c06)) /* Label: "iD3625A 0038 // 8142 // 101995-001" */
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 /*    YEAR  NAME   PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY   FULLNAME  FLAGS */
diff --git a/src/mame/intergraph/interpro_arbga.h b/src/mame/intergraph/interpro_arbga.h
index f5b95fd7704..d0c20649f40 100644
--- a/src/mame/intergraph/interpro_arbga.h
+++ b/src/mame/intergraph/interpro_arbga.h
@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Patrick Mackinlay
 
-#ifndef MAME_MACHINE_INTERPRO_ARBGA_H
-#define MAME_MACHINE_INTERPRO_ARBGA_H
+#ifndef MAME_INTERGRAPH_INTERPRO_ARBGA_H
+#define MAME_INTERGRAPH_INTERPRO_ARBGA_H
 
 #pragma once
 
@@ -87,4 +87,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(INTERPRO_ARBGA, interpro_arbga_device)
 
-#endif // MAME_MACHINE_INTERPRO_ARBGA_H
+#endif // MAME_INTERGRAPH_INTERPRO_ARBGA_H
diff --git a/src/mame/intergraph/interpro_ioga.h b/src/mame/intergraph/interpro_ioga.h
index 90a63f17013..bad186cb0f0 100644
--- a/src/mame/intergraph/interpro_ioga.h
+++ b/src/mame/intergraph/interpro_ioga.h
@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Patrick Mackinlay
 
-#ifndef MAME_MACHINE_INTERPRO_IOGA_H
-#define MAME_MACHINE_INTERPRO_IOGA_H
+#ifndef MAME_INTERGRAPH_INTERPRO_IOGA_H
+#define MAME_INTERGRAPH_INTERPRO_IOGA_H
 
 #pragma once
 
@@ -568,4 +568,4 @@ DECLARE_DEVICE_TYPE(EMERALD_IOGA, emerald_ioga_device)
 DECLARE_DEVICE_TYPE(TURQUOISE_IOGA, turquoise_ioga_device)
 DECLARE_DEVICE_TYPE(SAPPHIRE_IOGA, sapphire_ioga_device)
 
-#endif // MAME_MACHINE_INTERPRO_IOGA_H
+#endif // MAME_INTERGRAPH_INTERPRO_IOGA_H
diff --git a/src/mame/intergraph/interpro_mcga.h b/src/mame/intergraph/interpro_mcga.h
index 9818d4d81c1..ca5f06d8cf7 100644
--- a/src/mame/intergraph/interpro_mcga.h
+++ b/src/mame/intergraph/interpro_mcga.h
@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Patrick Mackinlay
 
-#ifndef MAME_MACHINE_INTERPRO_MCGA_H
-#define MAME_MACHINE_INTERPRO_MCGA_H
+#ifndef MAME_INTERGRAPH_INTERPRO_MCGA_H
+#define MAME_INTERGRAPH_INTERPRO_MCGA_H
 
 #pragma once
 
@@ -123,4 +123,4 @@ private:
 DECLARE_DEVICE_TYPE(INTERPRO_MCGA, interpro_mcga_device)
 DECLARE_DEVICE_TYPE(INTERPRO_FMCC, interpro_fmcc_device)
 
-#endif // MAME_MACHINE_INTERPRO_MCGA_H
+#endif // MAME_INTERGRAPH_INTERPRO_MCGA_H
diff --git a/src/mame/intergraph/interpro_sga.h b/src/mame/intergraph/interpro_sga.h
index 5813e1f22ba..d3ff6f4ade6 100644
--- a/src/mame/intergraph/interpro_sga.h
+++ b/src/mame/intergraph/interpro_sga.h
@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Patrick Mackinlay
 
-#ifndef MAME_MACHINE_INTERPRO_SGA_H
-#define MAME_MACHINE_INTERPRO_SGA_H
+#ifndef MAME_INTERGRAPH_INTERPRO_SGA_H
+#define MAME_INTERGRAPH_INTERPRO_SGA_H
 
 #pragma once
 
@@ -188,4 +188,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(INTERPRO_SGA, interpro_sga_device)
 
-#endif // MAME_MACHINE_INTERPRO_SGA_H
+#endif // MAME_INTERGRAPH_INTERPRO_SGA_H
diff --git a/src/mame/interton/vc4000_a.h b/src/mame/interton/vc4000_a.h
index 2dad7a87d27..41010fe731c 100644
--- a/src/mame/interton/vc4000_a.h
+++ b/src/mame/interton/vc4000_a.h
@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef MAME_AUDIO_VC4000_H
-#define MAME_AUDIO_VC4000_H
+#ifndef MAME_INTERTON_VC4000_H
+#define MAME_INTERTON_VC4000_H
 
 #pragma once
 
@@ -43,4 +43,4 @@ private:
 
 DECLARE_DEVICE_TYPE(VC4000_SND, vc4000_sound_device)
 
-#endif // MAME_AUDIO_VC4000_H
+#endif // MAME_INTERTON_VC4000_H
diff --git a/src/mame/irem/irem.h b/src/mame/irem/irem.h
index 78e52f0ece7..106c9661953 100644
--- a/src/mame/irem/irem.h
+++ b/src/mame/irem/irem.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Couriersud
-#ifndef MAME_AUDIO_IREM_H
-#define MAME_AUDIO_IREM_H
+#ifndef MAME_IREM_IREM_H
+#define MAME_IREM_IREM_H
 
 #pragma once
 
@@ -91,4 +91,4 @@ DECLARE_DEVICE_TYPE(IREM_M62_AUDIO,        m62_audio_device)
 DECLARE_DEVICE_TYPE(IREM_M52_SOUNDC_AUDIO, m52_soundc_audio_device)
 DECLARE_DEVICE_TYPE(IREM_M52_LARGE_AUDIO,  m52_large_audio_device)
 
-#endif // MAME_AUDIO_IREM_H
+#endif // MAME_IREM_IREM_H
diff --git a/src/mame/irem/m14.cpp b/src/mame/irem/m14.cpp
index bdd2165358a..cc61127ad8c 100644
--- a/src/mame/irem/m14.cpp
+++ b/src/mame/irem/m14.cpp
@@ -57,6 +57,8 @@ Dumped by Chackn
 #include "tilemap.h"
 
 
+namespace {
+
 class m14_state : public driver_device
 {
 public:
@@ -469,4 +471,7 @@ ROM_START( ptrmj )
 	ROM_LOAD( "mgpa10.bin",  0x0400, 0x0400, CRC(e1a4ebdc) SHA1(d9df42424ede17f0634d8d0a56c0374a33c55333) )
 ROM_END
 
+} // anonymous namespace
+
+
 GAME( 1979, ptrmj, 0, m14, m14, m14_state, empty_init, ROT0, "Irem", "PT Reach Mahjong (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // was already Irem according to the official flyer
diff --git a/src/mame/irem/m62_bkungfu.cpp b/src/mame/irem/m62_bkungfu.cpp
index e78c7e0466c..62b411069d8 100644
--- a/src/mame/irem/m62_bkungfu.cpp
+++ b/src/mame/irem/m62_bkungfu.cpp
@@ -16,6 +16,9 @@ TODO:
 #include "m62.h"
 #include "iremipt.h"
 
+
+namespace {
+
 class m62_bkungfu_state : public m62_state
 {
 public:
@@ -277,6 +280,7 @@ ROM_START( bkungfu )
 	ROM_LOAD( "km-b.6f", 0x0000, 0x0100, CRC(82c20d12) SHA1(268903f7d9be58a70d030b02bf31a2d6b5b6e249) )
 ROM_END
 
+} // anonymous namespace
 
 
 /*******************************************************************************
diff --git a/src/mame/irem/m72_a.h b/src/mame/irem/m72_a.h
index 688b8a40285..d8c551a4a93 100644
--- a/src/mame/irem/m72_a.h
+++ b/src/mame/irem/m72_a.h
@@ -5,8 +5,8 @@
     M72 audio interface
 
 ****************************************************************************/
-#ifndef MAME_AUDIO_M72_H
-#define MAME_AUDIO_M72_H
+#ifndef MAME_IREM_M72_H
+#define MAME_IREM_M72_H
 
 #pragma once
 
@@ -44,4 +44,4 @@ private:
 
 DECLARE_DEVICE_TYPE(IREM_M72_AUDIO, m72_audio_device)
 
-#endif // MAME_AUDIO_M72_H
+#endif // MAME_IREM_M72_H
diff --git a/src/mame/irem/redalert_a.h b/src/mame/irem/redalert_a.h
index 2d92df74e22..ff3fa7d8bed 100644
--- a/src/mame/irem/redalert_a.h
+++ b/src/mame/irem/redalert_a.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Mike Balfour
-#ifndef MAME_AUDIO_REDALERT_H
-#define MAME_AUDIO_REDALERT_H
+#ifndef MAME_IREM_REDALERT_H
+#define MAME_IREM_REDALERT_H
 
 #pragma once
 
@@ -124,4 +124,4 @@ private:
 	uint8_t m_ay8910_latch_2 = 0;
 };
 
-#endif // MAME_AUDIO_REDALERT_H
+#endif // MAME_IREM_REDALERT_H
diff --git a/src/mame/irem/spartanxtec.cpp b/src/mame/irem/spartanxtec.cpp
index 09be88b1ecf..d0b2333e2aa 100644
--- a/src/mame/irem/spartanxtec.cpp
+++ b/src/mame/irem/spartanxtec.cpp
@@ -31,6 +31,8 @@ probably an original bug?
 #include "tilemap.h"
 
 
+namespace {
+
 class spartanxtec_state : public driver_device
 {
 public:
@@ -448,6 +450,7 @@ ROM_START( spartanxtec )
 
 ROM_END
 
+} // anonymous namespace
 
 
 GAME( 1987, spartanxtec,  kungfum,    spartanxtec, spartanxtec, spartanxtec_state, empty_init, ROT0, "bootleg (Tecfri)", "Spartan X (Tecfri hardware bootleg)", 0 )
diff --git a/src/mame/isc/compucolor.cpp b/src/mame/isc/compucolor.cpp
index f355adff500..594c4475a2e 100644
--- a/src/mame/isc/compucolor.cpp
+++ b/src/mame/isc/compucolor.cpp
@@ -33,6 +33,9 @@
 #include "softlist_dev.h"
 #include "utf8.h"
 
+
+namespace {
+
 #define I8080_TAG   "ua2"
 #define TMS5501_TAG "ud2"
 #define CRT5027_TAG "uf9"
@@ -466,4 +469,7 @@ ROM_START( compclr2 )
 	ROM_LOAD( "82s129.ug5", 0x00, 0x20, NO_DUMP ) // Color PROM
 ROM_END
 
+} // anonymous namespace
+
+
 COMP( 1977, compclr2, 0, 0, compucolor2, compucolor2, compucolor2_state, empty_init, "Intelligent Systems Corporation", "Compucolor II", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/itech/iteagle.cpp b/src/mame/itech/iteagle.cpp
index efd0a2f2051..084973f0b81 100644
--- a/src/mame/itech/iteagle.cpp
+++ b/src/mame/itech/iteagle.cpp
@@ -112,6 +112,8 @@ www.multitech.com
 #include "screen.h"
 
 
+namespace {
+
 //*************************************
 // Main iteagle driver
 //*************************************
@@ -701,6 +703,9 @@ ROM_START( bbhcotw ) /* This version is meant for 8meg GREEN board PCBs */
 	DISK_IMAGE( "bbhcotw_v3.02.05_cf", 0, SHA1(b1fcaab3a5aa51821673a914333c8868d36f77ae) ) /* Build 21:00:39, Sep 10 2006 - 4gb Compact Flash conversion  */
 ROM_END
 
+} // anonymous namespace
+
+
 /*************************************
  *
  *  Game driver(s)
diff --git a/src/mame/itech/iteagle_fpga.h b/src/mame/itech/iteagle_fpga.h
index e7d4ead2a82..0ef8e8ec436 100644
--- a/src/mame/itech/iteagle_fpga.h
+++ b/src/mame/itech/iteagle_fpga.h
@@ -3,8 +3,8 @@
 //*************************************
 // iteagle fpga device
 //*************************************
-#ifndef MAME_MACHINE_ITEAGLE_FPGA_H
-#define MAME_MACHINE_ITEAGLE_FPGA_H
+#ifndef MAME_ITECH_ITEAGLE_FPGA_H
+#define MAME_ITECH_ITEAGLE_FPGA_H
 
 #include "machine/pci.h"
 #include "machine/nvram.h"
@@ -176,4 +176,4 @@ DECLARE_DEVICE_TYPE(ITEAGLE_FPGA, iteagle_fpga_device)
 DECLARE_DEVICE_TYPE(ITEAGLE_EEPROM, iteagle_eeprom_device)
 DECLARE_DEVICE_TYPE(ITEAGLE_PERIPH, iteagle_periph_device)
 
-#endif // MAME_MACHINE_ITEAGLE_FPGA_H
+#endif // MAME_ITECH_ITEAGLE_FPGA_H
diff --git a/src/mame/jaleco/bestleag.cpp b/src/mame/jaleco/bestleag.cpp
index f055dd87ca9..7a66d50b568 100644
--- a/src/mame/jaleco/bestleag.cpp
+++ b/src/mame/jaleco/bestleag.cpp
@@ -29,6 +29,8 @@ Dip Locations added according to Service Mode
 #include "tilemap.h"
 
 
+namespace {
+
 class bestleag_state : public driver_device
 {
 public:
@@ -473,6 +475,9 @@ ROM_START( bestleaw )
 	ROM_LOAD( "palce20v8h-15pc-4.u38", 0x1000, 0x0157, NO_DUMP ) /* Protected */
 ROM_END
 
+} // anonymous namespace
+
+
 /* GAME drivers */
 
 GAME( 1993, bestleag, bigstrik, bestleag, bestleag, bestleag_state, empty_init, ROT0, "bootleg", "Best League (bootleg of Big Striker, Italian Serie A)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/jaleco/bnstars.cpp b/src/mame/jaleco/bnstars.cpp
index d3b6128478c..a9dda513c6d 100644
--- a/src/mame/jaleco/bnstars.cpp
+++ b/src/mame/jaleco/bnstars.cpp
@@ -99,6 +99,8 @@ ROMs    : MR96004-10.1  [125661cd] (IC5 - Samples)
 #include "tilemap.h"
 
 
+namespace {
+
 class ms32_bnstars_state : public ms32_base_state
 {
 public:
@@ -801,4 +803,7 @@ void ms32_bnstars_state::init_bnstars()
 	configure_banks();
 }
 
+} // anonymous namespace
+
+
 GAME( 1997, bnstars1, 0, bnstars, bnstars, ms32_bnstars_state, init_bnstars, ROT0, "Jaleco", "Vs. Janshi Brandnew Stars", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/jaleco/ddayjlc.cpp b/src/mame/jaleco/ddayjlc.cpp
index d15f99b9e6a..ac36bb61763 100644
--- a/src/mame/jaleco/ddayjlc.cpp
+++ b/src/mame/jaleco/ddayjlc.cpp
@@ -69,6 +69,8 @@ $842f = lives
 #include "tilemap.h"
 
 
+namespace {
+
 class ddayjlc_state : public driver_device
 {
 public:
@@ -732,5 +734,8 @@ void ddayjlc_state::init_ddayjlc()
 	membank("bank1")->set_entry(0);
 }
 
+} // anonymous namespace
+
+
 GAME( 1984, ddayjlc,  0,       ddayjlc, ddayjlc, ddayjlc_state, init_ddayjlc, ROT90, "Jaleco", "D-Day (Jaleco set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 1984, ddayjlca, ddayjlc, ddayjlc, ddayjlc, ddayjlc_state, init_ddayjlc, ROT90, "Jaleco", "D-Day (Jaleco set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/jaleco/jalblend.h b/src/mame/jaleco/jalblend.h
index 2b960ff5fab..da0f4140b45 100644
--- a/src/mame/jaleco/jalblend.h
+++ b/src/mame/jaleco/jalblend.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood, Luca Elia
-#ifndef MAME_VIDEO_JALBLEND_H
-#define MAME_VIDEO_JALBLEND_H
+#ifndef MAME_JALECO_JALBLEND_H
+#define MAME_JALECO_JALBLEND_H
 
 #pragma once
 
@@ -36,4 +36,4 @@ private:
 
 DECLARE_DEVICE_TYPE(JALECO_BLEND, jaleco_blend_device)
 
-#endif // MAME_VIDEO_JALBLEND_H
+#endif // MAME_JALECO_JALBLEND_H
diff --git a/src/mame/jaleco/jaleco_ms32_sysctrl.h b/src/mame/jaleco/jaleco_ms32_sysctrl.h
index 8a303747ffe..8a203bd82f8 100644
--- a/src/mame/jaleco/jaleco_ms32_sysctrl.h
+++ b/src/mame/jaleco/jaleco_ms32_sysctrl.h
@@ -6,8 +6,8 @@ Jaleco MS32 System Control Unit
 
 ******************************************************************************/
 
-#ifndef MAME_MACHINE_JALECO_MS32_SYSCTRL_H
-#define MAME_MACHINE_JALECO_MS32_SYSCTRL_H
+#ifndef MAME_JALECO_JALECO_MS32_SYSCTRL_H
+#define MAME_JALECO_JALECO_MS32_SYSCTRL_H
 
 #pragma once
 
@@ -112,4 +112,4 @@ DECLARE_DEVICE_TYPE(JALECO_MS32_SYSCTRL, jaleco_ms32_sysctrl_device)
 //**************************************************************************
 
 
-#endif // MAME_MACHINE_JALECO_MS32_SYSCTRL_H
+#endif // MAME_JALECO_JALECO_MS32_SYSCTRL_H
diff --git a/src/mame/jaleco/ms1_tmap.h b/src/mame/jaleco/ms1_tmap.h
index e50230674a4..b84a3bf80d0 100644
--- a/src/mame/jaleco/ms1_tmap.h
+++ b/src/mame/jaleco/ms1_tmap.h
@@ -8,8 +8,8 @@
     and mahjong games from the same period.
 
 ***************************************************************************/
-#ifndef MAME_VIDEO_MS1_TMAP_H
-#define MAME_VIDEO_MS1_TMAP_H
+#ifndef MAME_JALECO_MS1_TMAP_H
+#define MAME_JALECO_MS1_TMAP_H
 
 #pragma once
 
@@ -90,4 +90,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(MEGASYS1_TILEMAP, megasys1_tilemap_device)
 
-#endif  // MAME_VIDEO_MS1_TMAP_H
+#endif  // MAME_JALECO_MS1_TMAP_H
diff --git a/src/mame/jaleco/ms32_sprite.h b/src/mame/jaleco/ms32_sprite.h
index afd53f70d47..3a40d5f57bd 100644
--- a/src/mame/jaleco/ms32_sprite.h
+++ b/src/mame/jaleco/ms32_sprite.h
@@ -4,8 +4,8 @@
     Jaleco Megasystem 32 sprite hardware
 */
 
-#ifndef MAME_VIDEO_MS32_SPRITE_H
-#define MAME_VIDEO_MS32_SPRITE_H
+#ifndef MAME_JALECO_MS32_SPRITE_H
+#define MAME_JALECO_MS32_SPRITE_H
 
 #pragma once
 
@@ -91,4 +91,4 @@ private:
 
 DECLARE_DEVICE_TYPE(JALECO_MEGASYSTEM32_SPRITE, ms32_sprite_device)
 
-#endif  // MAME_VIDEO_MS32_SPRITE_H
+#endif  // MAME_JALECO_MS32_SPRITE_H
diff --git a/src/mame/jpm/guab.cpp b/src/mame/jpm/guab.cpp
index 880f8975ec3..3adc8ccef20 100644
--- a/src/mame/jpm/guab.cpp
+++ b/src/mame/jpm/guab.cpp
@@ -57,6 +57,8 @@
 #include "guab.lh"
 
 
+namespace {
+
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
@@ -557,6 +559,8 @@ ROM_START( tenup )
 	ROM_LOAD16_BYTE( "tu-14.bin", 0x10001, 0x8000, CRC(fd8a0c3c) SHA1(f87289ce6f0d2bc9b7d3a0b6deff38ba3aadf391) )
 ROM_END
 
+} // anonymous namespace
+
 
 //**************************************************************************
 //  SYSTEM DRIVERS
diff --git a/src/mame/jpm/jpmmps.cpp b/src/mame/jpm/jpmmps.cpp
index b1917031766..d57162dc6d2 100644
--- a/src/mame/jpm/jpmmps.cpp
+++ b/src/mame/jpm/jpmmps.cpp
@@ -132,6 +132,9 @@
 #include "j2trail.lh"
 #include "j2tstplt.lh"
 
+
+namespace {
+
 #define UART_IC5 "tms9902_ic5"
 #define UART_IC10 "tms9902_ic10"
 
@@ -2126,6 +2129,7 @@ ROM_START( j2sset )
 	ROM_LOAD( "sunset_strip_v2_0.bin", 0x0000, 0x008000, CRC(cbd2adea) SHA1(5c7d324d690a2ef0b85f3db323a0b4608b9e59b6) )
 ROM_END
 
+} // anonymous namespace
 
 
 GAMEL( 198?, j2adnote,  0,        jpmmps, jpmmps, jpmmps_state, empty_init, ROT0, "JPM","Add A Note (JPM) (MPS, set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2adnote )
diff --git a/src/mame/jpm/jpms80.cpp b/src/mame/jpm/jpms80.cpp
index daba0d7c8ea..2f0621b179c 100644
--- a/src/mame/jpm/jpms80.cpp
+++ b/src/mame/jpm/jpms80.cpp
@@ -47,6 +47,8 @@ System80 is based on the SRU platform, but with more outputs and finally a separ
 #include "j80wsprt2.lh"
 
 
+namespace {
+
 class jpms80_state : public driver_device
 {
 public:
@@ -354,6 +356,7 @@ ROM_START( j80plsnd )
 	ROM_LOAD( "plus_p5.bin", 0x1000, 0x000400, CRC(d111b2c6) SHA1(c0182a4b163e4dbb67f1c98251b93fa878bff2e2) )
 ROM_END
 
+} // anonymous namespace
 
 
 GAMEL( 198?, j80bac,    0,        jpms80,jpms80, jpms80_state, init_jpms80, ROT0, "JPM", "Bank A Coin (JPM) (SYSTEM80)", MACHINE_IS_SKELETON_MECHANICAL, layout_j80bac )
diff --git a/src/mame/jpm/jpmsys7.cpp b/src/mame/jpm/jpmsys7.cpp
index 59429c4396f..a9fcca9959c 100644
--- a/src/mame/jpm/jpmsys7.cpp
+++ b/src/mame/jpm/jpmsys7.cpp
@@ -25,6 +25,8 @@ Pluto 8: ColdFire 5475
 #include "speaker.h"
 
 
+namespace {
+
 class jpmsys7_state : public driver_device
 {
 public:
@@ -230,6 +232,8 @@ ROM_START( j7bullio )
 	ROM_LOAD16_BYTE( "04c2", 0x0000, 0x100000, CRC(74d43f1d) SHA1(a75c41928727c2752bfa6f04460fa003441ca0a6) )
 ROM_END
 
+} // anonymous namespace
+
 
 GAME( 200?, j7bmagic,  0,         jpmsys7, jpmsys7, jpmsys7_state, empty_init, ROT0, "JPM","Black Magic (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
 GAME( 200?, j7cexprs,  0,         jpmsys7, jpmsys7, jpmsys7_state, empty_init, ROT0, "JPM","Cash Xpress (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/jpm/nl_jpmsru.h b/src/mame/jpm/nl_jpmsru.h
index 13f728f6bdb..8c4f064ce96 100644
--- a/src/mame/jpm/nl_jpmsru.h
+++ b/src/mame/jpm/nl_jpmsru.h
@@ -1,7 +1,7 @@
 // license:CC0-1.0
 // copyright-holders:SomeRandomGuyIdk
-#ifndef MAME_AUDIO_NL_JPMSRU_H
-#define MAME_AUDIO_NL_JPMSRU_H
+#ifndef MAME_JPM_NL_JPMSRU_H
+#define MAME_JPM_NL_JPMSRU_H
 
 #pragma once
 
@@ -9,4 +9,4 @@
 
 NETLIST_EXTERNAL(jpmsru)
 
-#endif // MAME_AUDIO_NL_JPMSRU_H
+#endif // MAME_JPM_NL_JPMSRU_H
diff --git a/src/mame/jpm/pluto5.cpp b/src/mame/jpm/pluto5.cpp
index c878d697d90..b630fbd30b9 100644
--- a/src/mame/jpm/pluto5.cpp
+++ b/src/mame/jpm/pluto5.cpp
@@ -188,6 +188,9 @@
 #include "machine/68340.h"
 #include "speaker.h"
 
+
+namespace {
+
 class pluto5_state : public driver_device
 {
 public:
@@ -930,6 +933,9 @@ void pluto5_state::init_hb()
 	#endif
 }
 
+} // anonymous namespace
+
+
 GAME( 2003, hb_junglet, 0,         pluto5, pluto5, pluto5_state, init_hb, ROT0, "Sega", "Jungle Treasures", MACHINE_IS_SKELETON_MECHANICAL )
 
 GAME( 200?, hb_cr,      0,         pluto5, pluto5, pluto5_state, init_hb, ROT0, "Qps", "Cash Raker (Qps) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/kaneko/galpani3.cpp b/src/mame/kaneko/galpani3.cpp
index 3d79147468f..1038be81896 100644
--- a/src/mame/kaneko/galpani3.cpp
+++ b/src/mame/kaneko/galpani3.cpp
@@ -76,6 +76,9 @@ Dumped by Uki
 #include "screen.h"
 #include "speaker.h"
 
+
+namespace {
+
 class galpani3_state : public driver_device
 {
 public:
@@ -582,6 +585,8 @@ ROM_START( galpani3k ) /* Some game text in Korean, but no "For use in Korea" ty
 	ROM_LOAD16_WORD_SWAP( "g3d0x0.134", 0x000000, 0x020000, CRC(4ace10f9) SHA1(d19e4540d535ce10d23cb0844be03a3239b3402e) )
 ROM_END
 
+} // anonymous namespace
+
 
 GAME( 1995, galpani3,  0,        galpani3, galpani3, galpani3_state, empty_init, ROT90, "Kaneko", "Gals Panic 3 (Euro)",      MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
 GAME( 1995, galpani3j, galpani3, galpani3, galpani3, galpani3_state, empty_init, ROT90, "Kaneko", "Gals Panic 3 (Japan)",     MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/kaneko/galpanic_ms.cpp b/src/mame/kaneko/galpanic_ms.cpp
index 901355dc20a..bfa289a2138 100644
--- a/src/mame/kaneko/galpanic_ms.cpp
+++ b/src/mame/kaneko/galpanic_ms.cpp
@@ -36,6 +36,9 @@
 #include "machine/bankdev.h"
 #include "sound/msm5205.h"
 
+
+namespace {
+
 class galspanic_ms_state : public driver_device
 {
 public:
@@ -108,8 +111,8 @@ private:
 	tilemap_t *m_bg_tilemap2 = nullptr;
 
 	DECLARE_WRITE_LINE_MEMBER(splash_msm5205_int);
-	void splash_adpcm_data_w(uint8_t data);
-	void splash_adpcm_control_w(uint8_t data);
+	[[maybe_unused]] void splash_adpcm_data_w(uint8_t data);
+	[[maybe_unused]] void splash_adpcm_control_w(uint8_t data);
 	int m_adpcm_data = 0;
 
 	void descramble_16x16tiles(uint8_t* src, int len);
@@ -581,6 +584,7 @@ void galspanic_ms_state::init_galpanicms()
 	descramble_16x16tiles(memregion("bgtile")->base(), memregion("bgtile")->bytes());
 }
 
+} // anonymous namespace
 
 
 GAME( 1991, galpanicms,  galsnew,  newquiz,  newquiz,  galspanic_ms_state, init_galpanicms, ROT90, "bootleg (Kaenko)", "New Quiz (Modular System bootleg of Gals Panic)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/kaneko/hvyunit.cpp b/src/mame/kaneko/hvyunit.cpp
index 2e3fcf7db8b..0934e647f4b 100644
--- a/src/mame/kaneko/hvyunit.cpp
+++ b/src/mame/kaneko/hvyunit.cpp
@@ -75,6 +75,7 @@ To Do:
 #include "tilemap.h"
 
 
+namespace {
 
 /*************************************
  *
@@ -810,6 +811,8 @@ ROM_START( hvyunitu )
 	ROM_LOAD( "b73_09.2p",  0x000000, 0x080000, CRC(537c647f) SHA1(941c0f4e251bc68e53d62e70b033a3a6c145bb7e) )
 ROM_END
 
+} // anonymous namespace
+
 
 /*************************************
  *
diff --git a/src/mame/kaneko/jchan.cpp b/src/mame/kaneko/jchan.cpp
index 916b2758e05..f018f115e16 100644
--- a/src/mame/kaneko/jchan.cpp
+++ b/src/mame/kaneko/jchan.cpp
@@ -167,6 +167,9 @@ JC-301-00  W11 9510K7059    23C16000        U85
 #include "screen.h"
 #include "speaker.h"
 
+
+namespace {
+
 class jchan_state : public driver_device
 {
 public:
@@ -753,6 +756,8 @@ void jchan_state::init_jchan()
 	m_subcpu->space(AS_PROGRAM).install_write_handler(0x400000, 0x400001, write16s_delegate(*this, FUNC(jchan_state::sub2main_cmd_w)));
 }
 
+} // anonymous namespace
+
 
 /* game drivers */
 GAME( 1995, jchan,      0, jchan, jchan,  jchan_state, init_jchan, ROT0, "Kaneko", "Jackie Chan - The Kung-Fu Master (rev 4?)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/kaneko/kaneko_spr.h b/src/mame/kaneko/kaneko_spr.h
index 342eca6b6bb..31ae6a8d6c8 100644
--- a/src/mame/kaneko/kaneko_spr.h
+++ b/src/mame/kaneko/kaneko_spr.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Luca Elia, David Haywood
-#ifndef MAME_VIDEO_KANEKO_SPR_H
-#define MAME_VIDEO_KANEKO_SPR_H
+#ifndef MAME_KANEKO_KANEKO_SPR_H
+#define MAME_KANEKO_KANEKO_SPR_H
 
 #pragma once
 
@@ -151,4 +151,4 @@ protected:
 
 DECLARE_DEVICE_TYPE(KANEKO_KC002_SPRITE, kaneko_kc002_sprite_device)
 
-#endif // MAME_VIDEO_KANEKO_SPR_H
+#endif // MAME_KANEKO_KANEKO_SPR_H
diff --git a/src/mame/kaneko/kaneko_tmap.h b/src/mame/kaneko/kaneko_tmap.h
index 56ff7ffd9e8..422c7a76eeb 100644
--- a/src/mame/kaneko/kaneko_tmap.h
+++ b/src/mame/kaneko/kaneko_tmap.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Luca Elia, David Haywood
-#ifndef MAME_VIDEO_KANEKO_TMAP_H
-#define MAME_VIDEO_KANEKO_TMAP_H
+#ifndef MAME_KANEKO_KANEKO_TMAP_H
+#define MAME_KANEKO_KANEKO_TMAP_H
 
 #pragma once
 
@@ -93,4 +93,4 @@ private:
 
 DECLARE_DEVICE_TYPE(KANEKO_TMAP, kaneko_view2_tilemap_device)
 
-#endif // MAME_VIDEO_KANEKO_TMAP_H
+#endif // MAME_KANEKO_KANEKO_TMAP_H
diff --git a/src/mame/kaneko/kaneko_toybox.h b/src/mame/kaneko/kaneko_toybox.h
index 64e864d14ac..5f3a1d62290 100644
--- a/src/mame/kaneko/kaneko_toybox.h
+++ b/src/mame/kaneko/kaneko_toybox.h
@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood, Luca Elia, Sebastien Volpe
 /* Kaneko Toybox */
-#ifndef MAME_MACHINE_KANEKO_TOYBOX_H
-#define MAME_MACHINE_KANEKO_TOYBOX_H
+#ifndef MAME_KANEKO_KANEKO_TOYBOX_H
+#define MAME_KANEKO_KANEKO_TOYBOX_H
 
 #pragma once
 
@@ -61,4 +61,4 @@ private:
 
 DECLARE_DEVICE_TYPE(KANEKO_TOYBOX, kaneko_toybox_device)
 
-#endif // MAME_MACHINE_KANEKO_TOYBOX_H
+#endif // MAME_KANEKO_KANEKO_TOYBOX_H
diff --git a/src/mame/kaneko/sandscrp.cpp b/src/mame/kaneko/sandscrp.cpp
index 70a832b3d1a..93351564430 100644
--- a/src/mame/kaneko/sandscrp.cpp
+++ b/src/mame/kaneko/sandscrp.cpp
@@ -90,6 +90,8 @@ Is there another alt program rom set labeled 9 & 10?
 #include "speaker.h"
 
 
+namespace {
+
 class sandscrp_state : public driver_device
 {
 public:
@@ -549,6 +551,8 @@ ROM_START( sandscrpb ) /* Different rev PCB */
 	ROM_LOAD( "7.ic55", 0x000000, 0x040000, CRC(9870ab12) SHA1(5ea3412cbc57bfaa32a1e2552b2eb46f4ceb5fa8) )
 ROM_END
 
+} // anonymous namespace
+
 
 GAME( 1992, sandscrp,  0,        sandscrp, sandscrp, sandscrp_state, empty_init, ROT90, "Face",   "Sand Scorpion", MACHINE_SUPPORTS_SAVE )
 GAME( 1992, sandscrpa, sandscrp, sandscrp, sandscrp, sandscrp_state, empty_init, ROT90, "Face",   "Sand Scorpion (Earlier)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/kaneko/sknsspr.h b/src/mame/kaneko/sknsspr.h
index 20dc8301b2b..20a9c78f901 100644
--- a/src/mame/kaneko/sknsspr.h
+++ b/src/mame/kaneko/sknsspr.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
-#ifndef MAME_VIDEO_SKNSSPR_H
-#define MAME_VIDEO_SKNSSPR_H
+#ifndef MAME_KANEKO_SKNSSPR_H
+#define MAME_KANEKO_SKNSSPR_H
 
 #pragma once
 
@@ -29,4 +29,4 @@ private:
 
 DECLARE_DEVICE_TYPE(SKNS_SPRITE, sknsspr_device)
 
-#endif // MAME_VIDEO_SKNSSPR_H
+#endif // MAME_KANEKO_SKNSSPR_H
diff --git a/src/mame/kawai/k1.cpp b/src/mame/kawai/k1.cpp
index 61da134b5fa..aa3de7e1de0 100644
--- a/src/mame/kawai/k1.cpp
+++ b/src/mame/kawai/k1.cpp
@@ -11,6 +11,9 @@
 #include "cpu/upd78k/upd78k3.h"
 #include "machine/nvram.h"
 
+
+namespace {
+
 class kawai_k1_state : public driver_device
 {
 public:
@@ -106,6 +109,9 @@ ROM_START(k1rii)
 	ROM_LOAD("p106.bin", 0x00000, 0x80000, NO_DUMP)
 ROM_END
 
+} // anonymous namespace
+
+
 SYST(1988, k1,  0,  0, k1,  k1, kawai_k1_state, empty_init, "Kawai Musical Instrument Manufacturing", "K1 Digital Multi-Dimensional Synthesizer",         MACHINE_IS_SKELETON)
 SYST(1988, k1m, k1, 0, k1m, k1, kawai_k1_state, empty_init, "Kawai Musical Instrument Manufacturing", "K1m Digital Multi-Dimensional Synthesizer Module", MACHINE_IS_SKELETON)
 SYST(1988, k1r, k1, 0, k1m, k1, kawai_k1_state, empty_init, "Kawai Musical Instrument Manufacturing", "K1r Digital Multi-Dimensional Synthesizer Module", MACHINE_IS_SKELETON)
diff --git a/src/mame/kawai/k4.cpp b/src/mame/kawai/k4.cpp
index c23f30d9084..eaffed4882a 100644
--- a/src/mame/kawai/k4.cpp
+++ b/src/mame/kawai/k4.cpp
@@ -10,6 +10,9 @@
 #include "cpu/upd78k/upd78k3.h"
 //#include "machine/nvram.h"
 
+
+namespace {
+
 class kawai_k4_state : public driver_device
 {
 public:
@@ -76,5 +79,8 @@ ROM_START(k4r)
 	ROM_LOAD("d943_p204-m8dw.u38", 0x100000, 0x80000, NO_DUMP) // TC534000P
 ROM_END
 
+} // anonymous namespace
+
+
 SYST(1989, k4,  0,  0, k4, k4, kawai_k4_state, empty_init, "Kawai Musical Instrument Manufacturing", "K4 16-bit Digital Synthesizer",         MACHINE_IS_SKELETON)
 SYST(1989, k4r, k4, 0, k4, k4, kawai_k4_state, empty_init, "Kawai Musical Instrument Manufacturing", "K4r 16-bit Digital Synthesizer Module", MACHINE_IS_SKELETON)
diff --git a/src/mame/kawai/k5.cpp b/src/mame/kawai/k5.cpp
index 815ac703fd8..87c69c194dc 100644
--- a/src/mame/kawai/k5.cpp
+++ b/src/mame/kawai/k5.cpp
@@ -10,6 +10,9 @@
 #include "cpu/nec/v5x.h"
 #include "video/t6963c.h"
 
+
+namespace {
+
 class kawai_k5_state : public driver_device
 {
 public:
@@ -75,5 +78,8 @@ ROM_START(k5m)
 	ROM_REGION(0x400, "lcdc:cgrom", ROMREGION_ERASE00)
 ROM_END
 
+} // anonymous namespace
+
+
 SYST(1987, k5,  0,  0, k5, k5, kawai_k5_state, empty_init, "Kawai Musical Instrument Manufacturing", "K5 Digital Multi-Dimensional Synthesizer",         MACHINE_IS_SKELETON)
 SYST(1987, k5m, k5, 0, k5, k5, kawai_k5_state, empty_init, "Kawai Musical Instrument Manufacturing", "K5m Digital Multi-Dimensional Synthesizer Module", MACHINE_IS_SKELETON)
diff --git a/src/mame/kawai/ksp10.cpp b/src/mame/kawai/ksp10.cpp
index ce117e7a229..07e854e21a2 100644
--- a/src/mame/kawai/ksp10.cpp
+++ b/src/mame/kawai/ksp10.cpp
@@ -9,6 +9,9 @@
 #include "emu.h"
 #include "cpu/tlcs900/tmp96c141.h"
 
+
+namespace {
+
 class kawai_ksp10_state : public driver_device
 {
 public:
@@ -51,4 +54,7 @@ ROM_START(ksp10)
 	ROM_LOAD("u21_hp042a_e7dp_mbm27c2048.bin", 0x00000, 0x40000, CRC(e21b1141) SHA1(181c2beed18da2efa2f0e45cb3233adf6b932127))
 ROM_END
 
+} // anonymous namespace
+
+
 SYST(199?, ksp10, 0, 0, ksp10, ksp10, kawai_ksp10_state, empty_init, "Kawai Musical Instruments Manufacturing", "KSP10 Digital Piano", MACHINE_IS_SKELETON)
diff --git a/src/mame/kawai/mb63h158.h b/src/mame/kawai/mb63h158.h
index 48c1166beef..abacad27925 100644
--- a/src/mame/kawai/mb63h158.h
+++ b/src/mame/kawai/mb63h158.h
@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_MB63H158_H
-#define MAME_MACHINE_MB63H158_H
+#ifndef MAME_KAWAI_MB63H158_H
+#define MAME_KAWAI_MB63H158_H
 
 #pragma once
 
@@ -39,4 +39,4 @@ private:
 // device type declaration
 DECLARE_DEVICE_TYPE(MB63H158, mb63h158_device)
 
-#endif // MAME_MACHINE_MB63H158_H
+#endif // MAME_KAWAI_MB63H158_H
diff --git a/src/mame/kawai/r100.cpp b/src/mame/kawai/r100.cpp
index 2343a942a2e..72af946e462 100644
--- a/src/mame/kawai/r100.cpp
+++ b/src/mame/kawai/r100.cpp
@@ -14,6 +14,9 @@
 #include "emupal.h"
 #include "screen.h"
 
+
+namespace {
+
 class kawai_r100_state : public driver_device
 {
 public:
@@ -147,4 +150,7 @@ ROM_START(r100)
 	ROM_LOAD("kawai_mn234001kaa.u20", 0x00000, 0x80000, CRC(aaf1805e) SHA1(5894b4cb03e17a5aa8c2b0c9b1b3d9285009a1c3))
 ROM_END
 
+} // anonymous namespace
+
+
 SYST(1987, r100, 0, 0, r100, r100, kawai_r100_state, empty_init, "Kawai Musical Instrument Manufacturing", "R-100 Digital Drum Machine", MACHINE_IS_SKELETON)
diff --git a/src/mame/kawai/sx240.cpp b/src/mame/kawai/sx240.cpp
index d92df21a4ea..66d7952aac2 100644
--- a/src/mame/kawai/sx240.cpp
+++ b/src/mame/kawai/sx240.cpp
@@ -11,6 +11,9 @@
 #include "machine/nvram.h"
 #include "machine/pit8253.h"
 
+
+namespace {
+
 class kawai_sx240_state : public driver_device
 {
 public:
@@ -135,4 +138,7 @@ ROM_START(sx240)
 	ROM_LOAD("sx240slv.i38", 0x0000, 0x2000, CRC(c6bc6439) SHA1(4d51d8c5a198ff139956cb0b07225448357d17ef))
 ROM_END
 
+} // anonymous namespace
+
+
 SYST(1984, sx240, 0, 0, sx240, sx240, kawai_sx240_state, empty_init, "Kawai Musical Instrument Manufacturing", "SX-240 8-Voice Programmable Polyphonic Synthesizer", MACHINE_IS_SKELETON)
diff --git a/src/mame/kaypro/kay_kbd.h b/src/mame/kaypro/kay_kbd.h
index 6ceea75dce4..12f3d0bd039 100644
--- a/src/mame/kaypro/kay_kbd.h
+++ b/src/mame/kaypro/kay_kbd.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Vas Crabb
-#ifndef MAME_MACHINE_KAY_KBD_H
-#define MAME_MACHINE_KAY_KBD_H
+#ifndef MAME_KAYPRO_KAY_KBD_H
+#define MAME_KAYPRO_KAY_KBD_H
 
 #pragma once
 
@@ -48,4 +48,4 @@ private:
 
 DECLARE_DEVICE_TYPE(KAYPRO_10_KEYBOARD, kaypro_10_keyboard_device)
 
-#endif // MAME_MACHINE_KAY_KBD_H
+#endif // MAME_KAYPRO_KAY_KBD_H
diff --git a/src/mame/kiwako/koikoi.cpp b/src/mame/kiwako/koikoi.cpp
index 7782130e292..a6664035166 100644
--- a/src/mame/kiwako/koikoi.cpp
+++ b/src/mame/kiwako/koikoi.cpp
@@ -47,6 +47,9 @@ to prevent disabling inputs.
 #include "speaker.h"
 #include "tilemap.h"
 
+
+namespace {
+
 #define KOIKOI_CRYSTAL 15468000
 
 static constexpr int input_tab[] = { 0x22, 0x64, 0x44, 0x68, 0x30, 0x50, 0x70, 0x48, 0x28, 0x21, 0x41, 0x82, 0x81, 0x42 };
@@ -432,6 +435,9 @@ ROM_START( koikoi )
 	ROM_LOAD( "pal16r8a_red.ic10",     0x0800, 0x0104, CRC(027ad661) SHA1(fa5aafe6deb3a9865498152b92dd3776ea10a51d) )
 ROM_END
 
+} // anonymous namespace
+
+
 /*************************************
  *
  *  Game driver(s)
diff --git a/src/mame/koei/pasogo.cpp b/src/mame/koei/pasogo.cpp
index 9ed0c9a1615..bdff84f6ae3 100644
--- a/src/mame/koei/pasogo.cpp
+++ b/src/mame/koei/pasogo.cpp
@@ -118,6 +118,8 @@ TODO:
  */
 
 
+namespace {
+
 class pasogo_state : public driver_device
 {
 public:
@@ -583,5 +585,8 @@ ROM_START( pasogo )
 	ROM_REGION( 0x10000, "empty", ROMREGION_ERASEFF )
 ROM_END
 
+} // anonymous namespace
+
+
 //    YEAR  NAME    PARENT  COMPAT  MACHINE  INPUT   CLASS         INIT        COMPANY  FULLNAME  FLAGS
 CONS( 1996, pasogo, 0,      0,      pasogo,  pasogo, pasogo_state, empty_init, "KOEI",  "PasoGo", MACHINE_NO_SOUND|MACHINE_NOT_WORKING)
diff --git a/src/mame/konami/3dom2.h b/src/mame/konami/3dom2.h
index e043cc31db1..2a1f5bc10d9 100644
--- a/src/mame/konami/3dom2.h
+++ b/src/mame/konami/3dom2.h
@@ -8,8 +8,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_3DOM2_H
-#define MAME_MACHINE_3DOM2_H
+#ifndef MAME_KONAMI_3DOM2_H
+#define MAME_KONAMI_3DOM2_H
 
 #pragma once
 
@@ -726,4 +726,4 @@ DECLARE_DEVICE_TYPE(M2_CTRLPORT, m2_ctrlport_device)
 DECLARE_DEVICE_TYPE(M2_MPEG, m2_mpeg_device)
 DECLARE_DEVICE_TYPE(M2_CDE, m2_cde_device)
 
-#endif // MAME_MACHINE_3DOM2_H
+#endif // MAME_KONAMI_3DOM2_H
diff --git a/src/mame/konami/3dom2_te.h b/src/mame/konami/3dom2_te.h
index 4f20d9de67c..500496b051f 100644
--- a/src/mame/konami/3dom2_te.h
+++ b/src/mame/konami/3dom2_te.h
@@ -5,8 +5,8 @@
     3DO M2 BDA Triangle Engine
 
 ***************************************************************************/
-#ifndef MAME_VIDEO_3DOM2_TE_H
-#define MAME_VIDEO_3DOM2_TE_H
+#ifndef MAME_KONAMI_3DOM2_TE_H
+#define MAME_KONAMI_3DOM2_TE_H
 
 #pragma once
 
@@ -415,4 +415,4 @@ private:
 
 DECLARE_DEVICE_TYPE(M2_TE, m2_te_device)
 
-#endif // MAME_VIDEO_3DOM2_TE_H
+#endif // MAME_KONAMI_3DOM2_TE_H
diff --git a/src/mame/konami/blockhl.cpp b/src/mame/konami/blockhl.cpp
index 9a057d93d33..56e2656b71d 100644
--- a/src/mame/konami/blockhl.cpp
+++ b/src/mame/konami/blockhl.cpp
@@ -33,6 +33,8 @@
 #include "speaker.h"
 
 
+namespace {
+
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
@@ -373,6 +375,8 @@ ROM_START( quarth )
 	ROM_LOAD( "973a11.h10", 0x0000, 0x0100, CRC(46d28fe9) SHA1(9d0811a928c8907785ef483bfbee5445506b3ec8) )
 ROM_END
 
+} // anonymous namespace
+
 
 //**************************************************************************
 //  GAME DRIVERS
diff --git a/src/mame/konami/cobra.cpp b/src/mame/konami/cobra.cpp
index 99675d67011..40fbad17c69 100644
--- a/src/mame/konami/cobra.cpp
+++ b/src/mame/konami/cobra.cpp
@@ -334,6 +334,9 @@
 #include "screen.h"
 #include "speaker.h"
 
+
+namespace {
+
 #define GFXFIFO_IN_VERBOSE          0
 #define GFXFIFO_OUT_VERBOSE         0
 #define M2SFIFO_VERBOSE             0
@@ -3282,6 +3285,9 @@ ROM_START(racjamdx)
 	DISK_IMAGE_READONLY( "676a04", 0, SHA1(8e89d3e5099e871b99fccba13adaa3cf8a6b71f0) )
 ROM_END
 
+} // anonymous namespace
+
+
 /*************************************************************************/
 
 GAME( 1997, bujutsu,  0, bujutsu, cobra, cobra_state, init_bujutsu,  ROT0, "Konami", "Fighting Wu-Shu 2nd! (ver JAA)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_TIMING )
diff --git a/src/mame/konami/giclassic.cpp b/src/mame/konami/giclassic.cpp
index 4ec9ec38f21..b79ad62867a 100644
--- a/src/mame/konami/giclassic.cpp
+++ b/src/mame/konami/giclassic.cpp
@@ -54,6 +54,9 @@
 #include "screen.h"
 #include "speaker.h"
 
+
+namespace {
+
 class giclassic_state : public driver_device
 {
 public:
@@ -374,5 +377,8 @@ ROM_START( giclassvr )
 	ROM_LOAD32_WORD( "gsgu_760_ad02.34k", 0x000002, 0x080000, CRC(8057a417) SHA1(82d4a1d84729e9f0a8aff4c219a19601b89caf15) )
 ROM_END
 
+} // anonymous namespace
+
+
 GAME( 1998, giclasex, 0, giclassic, giclassic, giclassic_state,    empty_init, 0, "Konami", "GI-Classic EX (satellite terminal)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND_HW)
 GAME( 1998, giclassvr,0, giclassvr, giclassvr, giclassicsvr_state, empty_init, 0, "Konami", "GI-Classic EX (server)",             MACHINE_NOT_WORKING|MACHINE_NO_SOUND_HW)
diff --git a/src/mame/konami/hyprolyb.h b/src/mame/konami/hyprolyb.h
index 5d9ce541551..05f4f07ec41 100644
--- a/src/mame/konami/hyprolyb.h
+++ b/src/mame/konami/hyprolyb.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Chris Hardy
-#ifndef MAME_AUDIO_HYPROLYB_H
-#define MAME_AUDIO_HYPROLYB_H
+#ifndef MAME_KONAMI_HYPROLYB_H
+#define MAME_KONAMI_HYPROLYB_H
 
 #pragma once
 
@@ -39,4 +39,4 @@ protected:
 
 DECLARE_DEVICE_TYPE(HYPROLYB_ADPCM, hyprolyb_adpcm_device)
 
-#endif // MAME_AUDIO_HYPROLYB_H
+#endif // MAME_KONAMI_HYPROLYB_H
diff --git a/src/mame/konami/k001005.h b/src/mame/konami/k001005.h
index 1a2e39ea451..c331a0edca9 100644
--- a/src/mame/konami/k001005.h
+++ b/src/mame/konami/k001005.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
-#ifndef MAME_VIDEO_K001005_H
-#define MAME_VIDEO_K001005_H
+#ifndef MAME_KONAMI_K001005_H
+#define MAME_KONAMI_K001005_H
 
 #pragma once
 
@@ -140,4 +140,4 @@ private:
 
 DECLARE_DEVICE_TYPE(K001005, k001005_device)
 
-#endif // MAME_VIDEO_K001005_H
+#endif // MAME_KONAMI_K001005_H
diff --git a/src/mame/konami/k001006.h b/src/mame/konami/k001006.h
index e74a8350a1a..c7c2283a599 100644
--- a/src/mame/konami/k001006.h
+++ b/src/mame/konami/k001006.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
-#ifndef MAME_VIDEO_K001006_H
-#define MAME_VIDEO_K001006_H
+#ifndef MAME_KONAMI_K001006_H
+#define MAME_KONAMI_K001006_H
 
 #pragma once
 
@@ -47,4 +47,4 @@ private:
 
 DECLARE_DEVICE_TYPE(K001006, k001006_device)
 
-#endif // MAME_VIDEO_K001006_H
+#endif // MAME_KONAMI_K001006_H
diff --git a/src/mame/konami/k001604.h b/src/mame/konami/k001604.h
index 7f2ee10698f..fe58e440d12 100644
--- a/src/mame/konami/k001604.h
+++ b/src/mame/konami/k001604.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
-#ifndef MAME_VIDEO_K001604_H
-#define MAME_VIDEO_K001604_H
+#ifndef MAME_KONAMI_K001604_H
+#define MAME_KONAMI_K001604_H
 
 #pragma once
 
@@ -50,4 +50,4 @@ private:
 
 DECLARE_DEVICE_TYPE(K001604, k001604_device)
 
-#endif // MAME_VIDEO_K001604_H
+#endif // MAME_KONAMI_K001604_H
diff --git a/src/mame/konami/k007121.h b/src/mame/konami/k007121.h
index a7b3993d337..0ccbb607b25 100644
--- a/src/mame/konami/k007121.h
+++ b/src/mame/konami/k007121.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Fabio Priuli,Acho A. Tang, R. Belmont
-#ifndef MAME_VIDEO_K007121_H
-#define MAME_VIDEO_K007121_H
+#ifndef MAME_KONAMI_K007121_H
+#define MAME_KONAMI_K007121_H
 
 #pragma once
 
@@ -36,4 +36,4 @@ private:
 
 DECLARE_DEVICE_TYPE(K007121, k007121_device)
 
-#endif // MAME_VIDEO_K007121_H
+#endif // MAME_KONAMI_K007121_H
diff --git a/src/mame/konami/k007342.h b/src/mame/konami/k007342.h
index e8daa2ced7e..d31bbcf0d65 100644
--- a/src/mame/konami/k007342.h
+++ b/src/mame/konami/k007342.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Fabio Priuli,Acho A. Tang, R. Belmont
-#ifndef MAME_VIDEO_K007342_H
-#define MAME_VIDEO_K007342_H
+#ifndef MAME_KONAMI_K007342_H
+#define MAME_KONAMI_K007342_H
 
 #pragma once
 
@@ -63,4 +63,4 @@ DECLARE_DEVICE_TYPE(K007342, k007342_device)
 // function definition for a callback
 #define K007342_CALLBACK_MEMBER(_name)     void _name(int layer, int bank, int *code, int *color, int *flags)
 
-#endif // MAME_VIDEO_K007342_H
+#endif // MAME_KONAMI_K007342_H
diff --git a/src/mame/konami/k007420.h b/src/mame/konami/k007420.h
index d9d228bfcec..fd5bc3c9ac9 100644
--- a/src/mame/konami/k007420.h
+++ b/src/mame/konami/k007420.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Fabio Priuli,Acho A. Tang, R. Belmont
-#ifndef MAME_VIDEO_K007420_H
-#define MAME_VIDEO_K007420_H
+#ifndef MAME_KONAMI_K007420_H
+#define MAME_KONAMI_K007420_H
 
 #pragma once
 
@@ -44,4 +44,4 @@ DECLARE_DEVICE_TYPE(K007420, k007420_device)
 #define K007420_CALLBACK_MEMBER(_name)     void _name(int *code, int *color)
 
 
-#endif // MAME_VIDEO_K007420_H
+#endif // MAME_KONAMI_K007420_H
diff --git a/src/mame/konami/k007452.h b/src/mame/konami/k007452.h
index b294ee83c4d..31747ba469a 100644
--- a/src/mame/konami/k007452.h
+++ b/src/mame/konami/k007452.h
@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_K007452_H
-#define MAME_MACHINE_K007452_H
+#ifndef MAME_KONAMI_K007452_H
+#define MAME_KONAMI_K007452_H
 
 #pragma once
 
@@ -43,4 +43,4 @@ private:
 // device type declaration
 DECLARE_DEVICE_TYPE(KONAMI_007452_MATH, k007452_device)
 
-#endif // MAME_MACHINE_K007452_H
+#endif // MAME_KONAMI_K007452_H
diff --git a/src/mame/konami/k037122.h b/src/mame/konami/k037122.h
index ac83989968d..c8df0cde504 100644
--- a/src/mame/konami/k037122.h
+++ b/src/mame/konami/k037122.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Fabio Priuli, Acho A. Tang, R. Belmont
-#ifndef MAME_VIDEO_K037122_H
-#define MAME_VIDEO_K037122_H
+#ifndef MAME_KONAMI_K037122_H
+#define MAME_KONAMI_K037122_H
 #pragma once
 
 #include "tilemap.h"
@@ -50,4 +50,4 @@ private:
 
 DECLARE_DEVICE_TYPE(K037122, k037122_device)
 
-#endif // MAME_VIDEO_K037122_H
+#endif // MAME_KONAMI_K037122_H
diff --git a/src/mame/konami/k051733.h b/src/mame/konami/k051733.h
index cf749d3d93b..5cceaedff67 100644
--- a/src/mame/konami/k051733.h
+++ b/src/mame/konami/k051733.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Fabio Priuli,Acho A. Tang, R. Belmont
-#ifndef MAME_VIDEO_K051733_H
-#define MAME_VIDEO_K051733_H
+#ifndef MAME_KONAMI_K051733_H
+#define MAME_KONAMI_K051733_H
 
 #pragma once
 
@@ -26,4 +26,4 @@ private:
 
 DECLARE_DEVICE_TYPE(K051733, k051733_device)
 
-#endif // MAME_VIDEO_K051733_H
+#endif // MAME_KONAMI_K051733_H
diff --git a/src/mame/konami/k051960.h b/src/mame/konami/k051960.h
index 91a4f62ce4b..e3e6b3076e6 100644
--- a/src/mame/konami/k051960.h
+++ b/src/mame/konami/k051960.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Fabio Priuli,Acho A. Tang, R. Belmont
-#ifndef MAME_VIDEO_K051960_H
-#define MAME_VIDEO_K051960_H
+#ifndef MAME_KONAMI_K051960_H
+#define MAME_KONAMI_K051960_H
 
 #pragma once
 
@@ -96,4 +96,4 @@ private:
 
 DECLARE_DEVICE_TYPE(K051960, k051960_device)
 
-#endif // MAME_VIDEO_K051960_H
+#endif // MAME_KONAMI_K051960_H
diff --git a/src/mame/konami/k052109.h b/src/mame/konami/k052109.h
index 0dc28c7651c..d7443ab3b95 100644
--- a/src/mame/konami/k052109.h
+++ b/src/mame/konami/k052109.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Fabio Priuli,Acho A. Tang, R. Belmont
-#ifndef MAME_VIDEO_K052109_H
-#define MAME_VIDEO_K052109_H
+#ifndef MAME_KONAMI_K052109_H
+#define MAME_KONAMI_K052109_H
 
 #pragma once
 
@@ -108,4 +108,4 @@ private:
 
 DECLARE_DEVICE_TYPE(K052109, k052109_device)
 
-#endif // MAME_VIDEO_K052109_H
+#endif // MAME_KONAMI_K052109_H
diff --git a/src/mame/konami/k053244_k053245.h b/src/mame/konami/k053244_k053245.h
index bc534d7a2df..6d24c6020c8 100644
--- a/src/mame/konami/k053244_k053245.h
+++ b/src/mame/konami/k053244_k053245.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
-#ifndef MAME_VIDEO_K053244_K053245_H
-#define MAME_VIDEO_K053244_K053245_H
+#ifndef MAME_KONAMI_K053244_K053245_H
+#define MAME_KONAMI_K053244_K053245_H
 
 #pragma once
 
@@ -66,4 +66,4 @@ private:
 DECLARE_DEVICE_TYPE(K053244, k05324x_device)
 static auto &K053245 = K053244;
 
-#endif // MAME_VIDEO_K053244_K053245_H
+#endif // MAME_KONAMI_K053244_K053245_H
diff --git a/src/mame/konami/k053250.h b/src/mame/konami/k053250.h
index dbaeb60a125..b52e8c1bcd7 100644
--- a/src/mame/konami/k053250.h
+++ b/src/mame/konami/k053250.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Olivier Galibert
-#ifndef MAME_VIDEO_K053250_H
-#define MAME_VIDEO_K053250_H
+#ifndef MAME_KONAMI_K053250_H
+#define MAME_KONAMI_K053250_H
 
 #pragma once
 
@@ -67,4 +67,4 @@ private:
 
 DECLARE_DEVICE_TYPE(K053250, k053250_device)
 
-#endif // MAME_VIDEO_K053250_H
+#endif // MAME_KONAMI_K053250_H
diff --git a/src/mame/konami/k053250_ps.h b/src/mame/konami/k053250_ps.h
index 10f61e936e7..3e599bb8531 100644
--- a/src/mame/konami/k053250_ps.h
+++ b/src/mame/konami/k053250_ps.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Olivier Galibert
-#ifndef MAME_VIDEO_K053250PS_H
-#define MAME_VIDEO_K053250PS_H
+#ifndef MAME_KONAMI_K053250PS_H
+#define MAME_KONAMI_K053250PS_H
 
 #pragma once
 
@@ -84,4 +84,4 @@ private:
 
 DECLARE_DEVICE_TYPE(K053250PS, k053250ps_device)
 
-#endif // MAME_VIDEO_K053250PS_H
+#endif // MAME_KONAMI_K053250PS_H
diff --git a/src/mame/konami/k053251.h b/src/mame/konami/k053251.h
index 185bbbb1ada..6fc7783c60e 100644
--- a/src/mame/konami/k053251.h
+++ b/src/mame/konami/k053251.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Fabio Priuli, Acho A. Tang, R. Belmont
-#ifndef MAME_VIDEO_K053251_H
-#define MAME_VIDEO_K053251_H
+#ifndef MAME_KONAMI_K053251_H
+#define MAME_KONAMI_K053251_H
 
 class k053251_device : public device_t
 {
@@ -51,4 +51,4 @@ private:
 DECLARE_DEVICE_TYPE(K053251, k053251_device)
 
 
-#endif // MAME_VIDEO_K053251_H
+#endif // MAME_KONAMI_K053251_H
diff --git a/src/mame/konami/k054000.h b/src/mame/konami/k054000.h
index 8f434982783..b073946130e 100644
--- a/src/mame/konami/k054000.h
+++ b/src/mame/konami/k054000.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood, Angelo Salese
-#ifndef MAME_VIDEO_K054000_H
-#define MAME_VIDEO_K054000_H
+#ifndef MAME_KONAMI_K054000_H
+#define MAME_KONAMI_K054000_H
 
 #pragma once
 
@@ -39,4 +39,4 @@ private:
 
 DECLARE_DEVICE_TYPE(K054000, k054000_device)
 
-#endif // MAME_VIDEO_K054000_H
+#endif // MAME_KONAMI_K054000_H
diff --git a/src/mame/konami/k054156_k054157_k056832.h b/src/mame/konami/k054156_k054157_k056832.h
index 8645b6af628..1f1163e7b98 100644
--- a/src/mame/konami/k054156_k054157_k056832.h
+++ b/src/mame/konami/k054156_k054157_k056832.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
-#ifndef MAME_VIDEO_K054156_K054157_K056832_H
-#define MAME_VIDEO_K054156_K054157_K056832_H
+#ifndef MAME_KONAMI_K054156_K054157_K056832_H
+#define MAME_KONAMI_K054156_K054157_K056832_H
 
 #pragma once
 
@@ -205,5 +205,5 @@ private:
 
 DECLARE_DEVICE_TYPE(K056832, k056832_device)
 
-#endif // MAME_VIDEO_K054156_K054157_K056832_H
+#endif // MAME_KONAMI_K054156_K054157_K056832_H
 
diff --git a/src/mame/konami/k054338.h b/src/mame/konami/k054338.h
index f9a011eb4e1..0e23dcb1323 100644
--- a/src/mame/konami/k054338.h
+++ b/src/mame/konami/k054338.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
-#ifndef MAME_VIDEO_K054338_H
-#define MAME_VIDEO_K054338_H
+#ifndef MAME_KONAMI_K054338_H
+#define MAME_KONAMI_K054338_H
 
 #pragma once
 
@@ -64,4 +64,4 @@ private:
 
 DECLARE_DEVICE_TYPE(K054338, k054338_device)
 
-#endif // MAME_VIDEO_K054338_H
+#endif // MAME_KONAMI_K054338_H
diff --git a/src/mame/konami/k055555.h b/src/mame/konami/k055555.h
index 0b94decc061..47cb27513aa 100644
--- a/src/mame/konami/k055555.h
+++ b/src/mame/konami/k055555.h
@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
 /* */
-#ifndef MAME_MACHINE_K055555_H
-#define MAME_MACHINE_K055555_H
+#ifndef MAME_KONAMI_K055555_H
+#define MAME_KONAMI_K055555_H
 
 #pragma once
 
@@ -99,4 +99,4 @@ private:
 DECLARE_DEVICE_TYPE(K055555, k055555_device)
 
 
-#endif // MAME_MACHINE_K055555_H
+#endif // MAME_KONAMI_K055555_H
diff --git a/src/mame/konami/k057714.h b/src/mame/konami/k057714.h
index 5e6565f5ff8..2db910cdfef 100644
--- a/src/mame/konami/k057714.h
+++ b/src/mame/konami/k057714.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Ville Linde
-#ifndef MAME_MACHINE_K057714_H
-#define MAME_MACHINE_K057714_H
+#ifndef MAME_KONAMI_K057714_H
+#define MAME_KONAMI_K057714_H
 
 #pragma once
 
@@ -93,4 +93,4 @@ private:
 DECLARE_DEVICE_TYPE(K057714, k057714_device)
 
 
-#endif // MAME_MACHINE_K057714_H
+#endif // MAME_KONAMI_K057714_H
diff --git a/src/mame/konami/k573cass.h b/src/mame/konami/k573cass.h
index 1c5285851df..59fbdbda78b 100644
--- a/src/mame/konami/k573cass.h
+++ b/src/mame/konami/k573cass.h
@@ -4,8 +4,8 @@
  * Konami 573 Security Cassette
  *
  */
-#ifndef MAME_MACHINE_K573CASS_H
-#define MAME_MACHINE_K573CASS_H
+#ifndef MAME_KONAMI_K573CASS_H
+#define MAME_KONAMI_K573CASS_H
 
 #pragma once
 
@@ -223,4 +223,4 @@ private:
 };
 
 
-#endif // MAME_MACHINE_K573CASS_H
+#endif // MAME_KONAMI_K573CASS_H
diff --git a/src/mame/konami/k573dio.h b/src/mame/konami/k573dio.h
index 9b89fe4e708..08b1e947270 100644
--- a/src/mame/konami/k573dio.h
+++ b/src/mame/konami/k573dio.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:smf
-#ifndef MAME_MACHINE_K573DIO_H
-#define MAME_MACHINE_K573DIO_H
+#ifndef MAME_KONAMI_K573DIO_H
+#define MAME_KONAMI_K573DIO_H
 
 #pragma once
 
@@ -96,4 +96,4 @@ private:
 
 DECLARE_DEVICE_TYPE(KONAMI_573_DIGITAL_IO_BOARD, k573dio_device)
 
-#endif // MAME_MACHINE_K573DIO_H
+#endif // MAME_KONAMI_K573DIO_H
diff --git a/src/mame/konami/k573fpga.h b/src/mame/konami/k573fpga.h
index 5fe76bb0e44..1330203b05c 100644
--- a/src/mame/konami/k573fpga.h
+++ b/src/mame/konami/k573fpga.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:windyfairy
-#ifndef MAME_MACHINE_K573FPGA_H
-#define MAME_MACHINE_K573FPGA_H
+#ifndef MAME_KONAMI_K573FPGA_H
+#define MAME_KONAMI_K573FPGA_H
 
 #pragma once
 
@@ -108,4 +108,4 @@ private:
 	double counter_value;
 };
 
-#endif // MAME_MACHINE_K573FPGA_H
+#endif // MAME_KONAMI_K573FPGA_H
diff --git a/src/mame/konami/k573kara.h b/src/mame/konami/k573kara.h
index fb8d3e64865..665d1cb550f 100644
--- a/src/mame/konami/k573kara.h
+++ b/src/mame/konami/k573kara.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:windyfairy
-#ifndef MAME_MACHINE_K573KARA_H
-#define MAME_MACHINE_K573KARA_H
+#ifndef MAME_KONAMI_K573KARA_H
+#define MAME_KONAMI_K573KARA_H
 
 #pragma once
 
@@ -46,4 +46,4 @@ private:
 
 DECLARE_DEVICE_TYPE(KONAMI_573_KARAOKE_IO_BOARD, k573kara_device)
 
-#endif // MAME_MACHINE_K573KARA_H
+#endif // MAME_KONAMI_K573KARA_H
diff --git a/src/mame/konami/k573msu.h b/src/mame/konami/k573msu.h
index e32121a1c14..d49280b6021 100644
--- a/src/mame/konami/k573msu.h
+++ b/src/mame/konami/k573msu.h
@@ -4,8 +4,8 @@
  * Konami 573 Multi Session Unit
  *
  */
-#ifndef MAME_MACHINE_K573MSU_H
-#define MAME_MACHINE_K573MSU_H
+#ifndef MAME_KONAMI_K573MSU_H
+#define MAME_KONAMI_K573MSU_H
 
 #pragma once
 
@@ -24,4 +24,4 @@ protected:
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
 
-#endif // MAME_MACHINE_K573MSU_H
+#endif // MAME_KONAMI_K573MSU_H
diff --git a/src/mame/konami/k573npu.h b/src/mame/konami/k573npu.h
index c4317f2dc67..3f89c518f02 100644
--- a/src/mame/konami/k573npu.h
+++ b/src/mame/konami/k573npu.h
@@ -4,8 +4,8 @@
  * Konami 573 Network PCB Unit
  *
  */
-#ifndef MAME_MACHINE_K573NPU_H
-#define MAME_MACHINE_K573NPU_H
+#ifndef MAME_KONAMI_K573NPU_H
+#define MAME_KONAMI_K573NPU_H
 
 #pragma once
 
@@ -24,4 +24,4 @@ protected:
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
 
-#endif // MAME_MACHINE_K573NPU_H
+#endif // MAME_KONAMI_K573NPU_H
diff --git a/src/mame/konami/konami1.h b/src/mame/konami/konami1.h
index b1f29f8e78e..c7c2912b676 100644
--- a/src/mame/konami/konami1.h
+++ b/src/mame/konami/konami1.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Olivier Galibert
-#ifndef MAME_MACHINE_KONAMI1_H
-#define MAME_MACHINE_KONAMI1_H
+#ifndef MAME_KONAMI_KONAMI1_H
+#define MAME_KONAMI_KONAMI1_H
 
 #pragma once
 
@@ -42,4 +42,4 @@ protected:
 
 DECLARE_DEVICE_TYPE(KONAMI1, konami1_device)
 
-#endif // MAME_MACHINE_KONAMI1_H
+#endif // MAME_KONAMI_KONAMI1_H
diff --git a/src/mame/konami/konami_helper.h b/src/mame/konami/konami_helper.h
index fc6fa2c64e2..a91a93c5788 100644
--- a/src/mame/konami/konami_helper.h
+++ b/src/mame/konami/konami_helper.h
@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
 /* Konami video helper functions */
-#ifndef MAME_VIDEO_KONAMI_HELPER_H
-#define MAME_VIDEO_KONAMI_HELPER_H
+#ifndef MAME_KONAMI_KONAMI_HELPER_H
+#define MAME_KONAMI_KONAMI_HELPER_H
 
 #pragma once
 
@@ -15,4 +15,4 @@ void konami_sortlayers4(int *layer, int *pri);
 // helper function to sort five tile layers by priority order
 void konami_sortlayers5(int *layer, int *pri);
 
-#endif // MAME_VIDEO_KONAMI_HELPER_H
+#endif // MAME_KONAMI_KONAMI_HELPER_H
diff --git a/src/mame/konami/konamigs.cpp b/src/mame/konami/konamigs.cpp
index 783adaf93ed..50b95b64f3c 100644
--- a/src/mame/konami/konamigs.cpp
+++ b/src/mame/konami/konamigs.cpp
@@ -48,6 +48,9 @@
 #include "speaker.h"
 #include "screen.h"
 
+
+namespace {
+
 class gsan_state : public driver_device
 {
 public:
@@ -1123,6 +1126,8 @@ ROM_START( runpuppy )
 	DISK_IMAGE( "an10311003", 0, SHA1(5f972e29c201cdd6697f25140b37a11f02b605f5) )
 ROM_END
 
+} // anonymous namespace
+
 
 //**************************************************************************
 //  GAME DRIVERS
diff --git a/src/mame/konami/konblands.cpp b/src/mame/konami/konblands.cpp
index 6b5d325585a..43edf1ed2b2 100644
--- a/src/mame/konami/konblands.cpp
+++ b/src/mame/konami/konblands.cpp
@@ -26,6 +26,9 @@
 #include "screen.h"
 #include "speaker.h"
 
+
+namespace {
+
 #define MASTER_CLOCK XTAL(18'432'000)
 
 class konblands_state : public driver_device
@@ -328,6 +331,8 @@ ROM_START( kbadlandsh )
 	DISK_IMAGE_READONLY( "badlands", 0, NO_DUMP )
 ROM_END
 
+} // anonymous namespace
+
 
 GAME( 1984, kbadlands,  0,         konblands,  konblands, konblands_state, empty_init, ROT0, "Konami",      "Badlands (Konami, set 1)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
 GAME( 1984, kbadlandsh, kbadlands, konblandsh, konblands, konblands_state, empty_init, ROT0, "Konami",      "Badlands (Konami, set 2)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/konami/konppc.h b/src/mame/konami/konppc.h
index fb4ce32f023..88d6d6c8134 100644
--- a/src/mame/konami/konppc.h
+++ b/src/mame/konami/konppc.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Ville Linde
-#ifndef MAME_MACHINE_KONPPC_H
-#define MAME_MACHINE_KONPPC_H
+#ifndef MAME_KONAMI_KONPPC_H
+#define MAME_KONAMI_KONPPC_H
 
 #pragma once
 
@@ -109,4 +109,4 @@ private:
 DECLARE_DEVICE_TYPE(KONPPC, konppc_device)
 
 
-#endif // MAME_MACHINE_KONPPC_H
+#endif // MAME_KONAMI_KONPPC_H
diff --git a/src/mame/konami/kontest.cpp b/src/mame/konami/kontest.cpp
index bab7d594709..a3f0e2fca1b 100644
--- a/src/mame/konami/kontest.cpp
+++ b/src/mame/konami/kontest.cpp
@@ -27,6 +27,9 @@
 #include "screen.h"
 #include "speaker.h"
 
+
+namespace {
+
 #define MAIN_CLOCK XTAL(24'000'000)
 
 class kontest_state : public driver_device
@@ -287,4 +290,7 @@ ROM_START( kontest )
 	ROM_LOAD( "800a02.4f",    0x000000, 0x000020, CRC(6d604171) SHA1(6b1366fb53cecbde6fb651142a77917dd16daf69) )
 ROM_END
 
+} // anonymous namespace
+
+
 GAME( 1987?, kontest, 0, kontest, kontest, kontest_state, empty_init, ROT0, "Konami",      "Konami Test Board (GX800, Japan)", MACHINE_SUPPORTS_SAVE ) // late 1987 or early 1988
diff --git a/src/mame/konami/kpython.cpp b/src/mame/konami/kpython.cpp
index db6f270ea81..7ecc5b09004 100644
--- a/src/mame/konami/kpython.cpp
+++ b/src/mame/konami/kpython.cpp
@@ -173,6 +173,8 @@ Notes:
 #include "screen.h"
 
 
+namespace {
+
 class kpython_state : public driver_device
 {
 public:
@@ -339,6 +341,8 @@ ROM_START( popn9 )
 	DISK_IMAGE_READONLY( "c00jab", 0, BAD_DUMP SHA1(3763aaded9b45388a664edd84a3f7f8ff4101be4) )
 ROM_END
 
+} // anonymous namespace
+
 
 GAME(2002, kpython,          0,   kpython,   kpython, kpython_state, empty_init, ROT0, "Konami", "Konami Python BIOS",                            MACHINE_IS_SKELETON|MACHINE_IS_BIOS_ROOT)
 GAME(2002, dogstdx,    kpython,   kpython,   kpython, kpython_state, empty_init, ROT0, "Konami", "dogstation Deluxe",                             MACHINE_IS_SKELETON)
diff --git a/src/mame/konami/midikbd.h b/src/mame/konami/midikbd.h
index 9048153f530..ebec095a231 100644
--- a/src/mame/konami/midikbd.h
+++ b/src/mame/konami/midikbd.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Carl
-#ifndef MAME_MACHINE_MIDIKBD_H
-#define MAME_MACHINE_MIDIKBD_H
+#ifndef MAME_KONAMI_MIDIKBD_H
+#define MAME_KONAMI_MIDIKBD_H
 
 #pragma once
 
@@ -36,4 +36,4 @@ private:
 
 DECLARE_DEVICE_TYPE(MIDI_KBD, midi_keyboard_device)
 
-#endif // MAME_MACHINE_MIDIKBD_H
+#endif // MAME_KONAMI_MIDIKBD_H
diff --git a/src/mame/konami/otomedius.cpp b/src/mame/konami/otomedius.cpp
index df9f03809ee..238b481d64b 100644
--- a/src/mame/konami/otomedius.cpp
+++ b/src/mame/konami/otomedius.cpp
@@ -19,6 +19,9 @@
 #include "cpu/i386/i386.h"
 #include "screen.h"
 
+
+namespace {
+
 class konami_pc_state : public driver_device
 {
 public:
@@ -99,4 +102,7 @@ ROM_START( otomedius )
 	DISK_IMAGE( "otomedius", 0, SHA1(9283f8b7cd747be7b8e7321953adbf6cbe926f25) )
 ROM_END
 
+} // anonymous namespace
+
+
 GAME( 2007, otomedius,  0,   konami_pc, konami_pc, konami_pc_state, empty_init, ROT0, "Konami", "Otomedius (ver GGG:J:A:A:2008041801)",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/konami/piratesh.cpp b/src/mame/konami/piratesh.cpp
index 7791c1dc05a..a269c84f075 100644
--- a/src/mame/konami/piratesh.cpp
+++ b/src/mame/konami/piratesh.cpp
@@ -48,6 +48,8 @@
 #include "speaker.h"
 
 
+namespace {
+
 class piratesh_state : public driver_device
 {
 public:
@@ -683,5 +685,8 @@ ROM_START( piratesh )
 //  ROM_LOAD( "piratesh.nv", 0x0000, 0x080, CRC(28df2269) SHA1(3f071c97662745a199f96964e2e79f795bd5a391) )
 ROM_END
 
+} // anonymous namespace
+
+
 //    year  name        parent    machine   input     state           init
 GAME( 1995, piratesh,   0,        piratesh, piratesh, piratesh_state, empty_init, ROT90,  "Konami", "Pirate Ship (ver UAA)", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/konami/quickpick5.cpp b/src/mame/konami/quickpick5.cpp
index 854059b21de..9660f0c2fec 100644
--- a/src/mame/konami/quickpick5.cpp
+++ b/src/mame/konami/quickpick5.cpp
@@ -37,6 +37,9 @@
 #include "speaker.h"
 #include "tilemap.h"
 
+
+namespace {
+
 class quickpick5_state : public driver_device
 {
 public:
@@ -668,6 +671,8 @@ ROM_START( waijockey )
 	ROM_LOAD( "gs-257-a01.1g", 0x000000, 0x020000, CRC(8ce0e693) SHA1(fad19ba37c7987a4d2797200b96ac9c050eb5d94) )
 ROM_END
 
+} // anonymous namespace
+
 
 GAME( 1991, quickp5,   0, quickpick5, quickpick5,  quickpick5_state, empty_init, ROT0, "Konami", "Quick Pick 5", MACHINE_IMPERFECT_GRAPHICS)
 GAME( 1993, waijockey, 0, waijockey,  waijockey,   quickpick5_state, empty_init, ROT0, "Konami", "Wai Wai Jockey", MACHINE_NOT_WORKING) // works but not playable due to bad gfx
diff --git a/src/mame/konami/tgtpanic.cpp b/src/mame/konami/tgtpanic.cpp
index 25882b3e0de..167e9d3b47f 100644
--- a/src/mame/konami/tgtpanic.cpp
+++ b/src/mame/konami/tgtpanic.cpp
@@ -16,6 +16,8 @@
 #include "screen.h"
 
 
+namespace {
+
 class tgtpanic_state : public driver_device
 {
 public:
@@ -180,6 +182,8 @@ ROM_START( tgtpanic )
 	ROM_LOAD( "601_ja_a01.13e", 0x0000, 0x8000, CRC(ece71952) SHA1(0f9cbd8adac2b1950bc608d51f0f122399c8f00f) )
 ROM_END
 
+} // anonymous namespace
+
 
 /*************************************
  *
diff --git a/src/mame/konami/trackfld_a.h b/src/mame/konami/trackfld_a.h
index 141916cec65..8346aa86db7 100644
--- a/src/mame/konami/trackfld_a.h
+++ b/src/mame/konami/trackfld_a.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Chris Hardy
-#ifndef MAME_AUDIO_TRACKFLD_H
-#define MAME_AUDIO_TRACKFLD_H
+#ifndef MAME_KONAMI_TRACKFLD_H
+#define MAME_KONAMI_TRACKFLD_H
 
 #pragma once
 
@@ -44,4 +44,4 @@ private:
 
 DECLARE_DEVICE_TYPE(TRACKFLD_AUDIO, trackfld_audio_device)
 
-#endif // MAME_AUDIO_TRACKFLD_H
+#endif // MAME_KONAMI_TRACKFLD_H
diff --git a/src/mame/konami/twinkle.cpp b/src/mame/konami/twinkle.cpp
index a800174decc..645b5df35dd 100644
--- a/src/mame/konami/twinkle.cpp
+++ b/src/mame/konami/twinkle.cpp
@@ -282,6 +282,9 @@ Notes:
 
 #include "bmiidx.lh"
 
+
+namespace {
+
 class twinkle_state : public driver_device
 {
 public:
@@ -1629,6 +1632,9 @@ ROM_START( bmiidxc2 )
 	DISK_IMAGE_READONLY( "983hdda01", 0, SHA1(bcbbf55acf8bebc5773ffc5769420a0129f4da57) )
 ROM_END
 
+} // anonymous namespace
+
+
 GAMEL( 1999, gq863,    0,       twinkle,  twinkle,  twinkle_state, empty_init, ROT0, "Konami", "Twinkle System", MACHINE_IS_BIOS_ROOT, layout_bmiidx )
 
 GAMEL( 1999, bmiidx,   gq863,   twinklex, twinklex, twinkle_state, empty_init, ROT0, "Konami", "beatmania IIDX (863 JAB)", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING, layout_bmiidx )
diff --git a/src/mame/konami/zs01.h b/src/mame/konami/zs01.h
index 5c8645d12f3..102361ae7e2 100644
--- a/src/mame/konami/zs01.h
+++ b/src/mame/konami/zs01.h
@@ -6,8 +6,8 @@
  * Secure SerialFlash
  *
  */
-#ifndef MAME_MACHINE_ZS01_H
-#define MAME_MACHINE_ZS01_H
+#ifndef MAME_KONAMI_ZS01_H
+#define MAME_KONAMI_ZS01_H
 
 #pragma once
 
@@ -113,4 +113,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(ZS01, zs01_device)
 
-#endif // MAME_MACHINE_ZS01_H
+#endif // MAME_KONAMI_ZS01_H
diff --git a/src/mame/kontron/kdt6.cpp b/src/mame/kontron/kdt6.cpp
index 0bb23cb71be..69963b0ec00 100644
--- a/src/mame/kontron/kdt6.cpp
+++ b/src/mame/kontron/kdt6.cpp
@@ -35,6 +35,8 @@
 #include "kdt6.lh"
 
 
+namespace {
+
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
@@ -753,6 +755,8 @@ ROM_START( psi98 )
 	// 8-CD9F  12H6  fdc timing generator
 ROM_END
 
+} // anonymous namespace
+
 
 //**************************************************************************
 //  SYSTEM DRIVERS
diff --git a/src/mame/korg/korgds8.cpp b/src/mame/korg/korgds8.cpp
index 0bd438ab6cf..5633ebc983f 100644
--- a/src/mame/korg/korgds8.cpp
+++ b/src/mame/korg/korgds8.cpp
@@ -18,6 +18,8 @@
 #include "screen.h"
 #include "speaker.h"
 
+namespace {
+
 class korg_ds8_state : public driver_device
 {
 public:
@@ -262,5 +264,8 @@ ROM_START(korg707)
 	ROM_LOAD("870904.ic7", 0x0000, 0x8000, CRC(3eb80aae) SHA1(8574f48c9a1724c483ac8ee7c82ea46d1f583d6d)) // 27C256
 ROM_END
 
+} // anonymous namespace
+
+
 SYST(1986, ds8,     0, 0, ds8,     ds8, korg_ds8_state, empty_init, "Korg", "DS-8 Digital Synthesizer",    MACHINE_IS_SKELETON)
 SYST(1987, korg707, 0, 0, korg707, ds8, korg_ds8_state, empty_init, "Korg", "707 Performing Synthesizer", MACHINE_IS_SKELETON)
diff --git a/src/mame/korg/korgdss1.cpp b/src/mame/korg/korgdss1.cpp
index 941a9697085..67f18d64bdb 100644
--- a/src/mame/korg/korgdss1.cpp
+++ b/src/mame/korg/korgdss1.cpp
@@ -24,6 +24,9 @@
 #include "emupal.h"
 #include "screen.h"
 
+
+namespace {
+
 class korg_dss1_state : public driver_device
 {
 public:
@@ -577,5 +580,8 @@ ROM_START(dssmsrk)
 	ROM_LOAD("113003.u30", 0x00000, 0x10000, CRC(81b17db3) SHA1(af8a3167e06641d41b9b9e6e024335c2eb827274))
 ROM_END
 
+} // anonymous namespace
+
+
 SYST(1986, dss1,    0,    0, dss1,    dss1, korg_dss1_state,    empty_init, "Korg",               "DSS-1 Digital Sampling Synthesizer",                        MACHINE_IS_SKELETON)
 SYST(1987, dssmsrk, dss1, 0, dssmsrk, dss1, korg_dssmsrk_state, empty_init, "Korg / Sound Logic", "DSS-1 Digital Sampling Synthesizer (Memory/SCSI Retrofit)", MACHINE_IS_SKELETON)
diff --git a/src/mame/korg/korgdvp1.cpp b/src/mame/korg/korgdvp1.cpp
index dd8ba17808f..e28c31a3f30 100644
--- a/src/mame/korg/korgdvp1.cpp
+++ b/src/mame/korg/korgdvp1.cpp
@@ -12,6 +12,9 @@
 #include "cpu/tms32010/tms32010.h"
 #include "machine/nvram.h"
 
+
+namespace {
+
 class korgdvp1_state : public driver_device
 {
 public:
@@ -110,4 +113,7 @@ ROM_START(dvp1)
 	ROM_LOAD("tms320m10nl.ic8", 0x000, 0xc00, NO_DUMP)
 ROM_END
 
+} // anonymous namespace
+
+
 SYST(1985, dvp1, 0, 0, dvp1, dvp1, korgdvp1_state, empty_init, "Korg", "DVP-1 Digital Voice Processor", MACHINE_IS_SKELETON)
diff --git a/src/mame/korg/korgdw8k.cpp b/src/mame/korg/korgdw8k.cpp
index 8f7bc9045f9..69f19f2f02f 100644
--- a/src/mame/korg/korgdw8k.cpp
+++ b/src/mame/korg/korgdw8k.cpp
@@ -11,6 +11,9 @@
 //#include "bus/midi/midi.h"
 #include "machine/nvram.h"
 
+
+namespace {
+
 class korgdw8k_state : public driver_device
 {
 public:
@@ -163,6 +166,9 @@ ROM_START(ex8000)
 	ROM_LOAD("hn613256p-cb5_32004089.ic43", 0x18000, 0x08000, CRC(0958145d) SHA1(fd7fd60bde8739a937bd0af11caac76e566b4a00))
 ROM_END
 
+} // anonymous namespace
+
+
 SYST(1985, dw8000,   0,      0, dw8000,   dw8000, korgdw8k_state, empty_init, "Korg",               "DW-8000 Programmable Digital Waveform Synthesizer", MACHINE_IS_SKELETON)
 SYST(1985, dw8000ex, dw8000, 0, dw8000ex, dw8000, korgdw8k_state, empty_init, "Korg / Musitronics", "DW-8000-EX Programmable Digital Waveform Synthesizer", MACHINE_IS_SKELETON)
 SYST(1985, ex8000,   dw8000, 0, dw8000,   dw8000, korgdw8k_state, empty_init, "Korg",               "EX-8000 Programmable Polyphonic Synthe Module", MACHINE_IS_SKELETON)
diff --git a/src/mame/korg/korgm1.cpp b/src/mame/korg/korgm1.cpp
index 554b90e4c1e..f2bdaaf73e9 100644
--- a/src/mame/korg/korgm1.cpp
+++ b/src/mame/korg/korgm1.cpp
@@ -18,6 +18,9 @@
 #include "screen.h"
 //#include "speaker.h"
 
+
+namespace {
+
 class korgm1_state : public driver_device
 {
 public:
@@ -364,6 +367,9 @@ ROM_START( korgm1p1 )
 	ROM_LOAD( "u204.bin", 0x300000, 0x100000, CRC(ff8d6307) SHA1(3021fe2ce88884e57b397bc5dfb4b29afc56eec4) )
 ROM_END
 
+} // anonymous namespace
+
+
 SYST(1988, korgm1,    0,      0, korgm1, korgm1, korgm1_state, empty_init, "Korg",                 "M1 Music Workstation (Rev 19)",    MACHINE_IS_SKELETON)
 SYST(1988, korgm1ex,  korgm1, 0, korgm1, korgm1, korgm1_state, empty_init, "Korg",                 "M1 EX Music Workstation (v1.29)",  MACHINE_IS_SKELETON)
 SYST(1988, korgm1r,   korgm1, 0, korgm1, korgm1, korgm1_state, empty_init, "Korg",                 "M1R Music Workstation (v1.06)",    MACHINE_IS_SKELETON)
diff --git a/src/mame/korg/korgws.cpp b/src/mame/korg/korgws.cpp
index ba3501083a3..1d2455a4783 100644
--- a/src/mame/korg/korgws.cpp
+++ b/src/mame/korg/korgws.cpp
@@ -11,6 +11,9 @@
 #include "cpu/m6502/m3745x.h"
 //#include "video/t6963c.h"
 
+
+namespace {
+
 class korgws_state : public driver_device
 {
 public:
@@ -100,6 +103,9 @@ ROM_START(korgwssr)
 	ROM_LOAD("m37450m4-233fp.bin", 0x0000, 0x2000, NO_DUMP)
 ROM_END
 
+} // anonymous namespace
+
+
 SYST(1992, korgwsex, 0, 0, korgws,   korgws, korgws_state, empty_init, "Korg", "WaveStation EX", MACHINE_IS_SKELETON)
 SYST(1991, korgwsad, 0, 0, korgws,   korgws, korgws_state, empty_init, "Korg", "WaveStation A/D", MACHINE_IS_SKELETON)
 SYST(1992, korgwssr, 0, 0, korgwssr, korgws, korgws_state, empty_init, "Korg", "WaveStation SR", MACHINE_IS_SKELETON)
diff --git a/src/mame/korg/korgz3.cpp b/src/mame/korg/korgz3.cpp
index ed320dd709d..f5a6cb349cc 100644
--- a/src/mame/korg/korgz3.cpp
+++ b/src/mame/korg/korgz3.cpp
@@ -15,6 +15,9 @@
 #include "sound/ymopz.h"
 #include "speaker.h"
 
+
+namespace {
+
 class korgz3_state : public driver_device
 {
 public:
@@ -144,4 +147,7 @@ ROM_START(korgz3)
 	ROM_LOAD("881605.ic13", 0x0000, 0x8000, CRC(39ca77fa) SHA1(b9073ef1dfad7f9d07558d2389875ebe26835068))
 ROM_END
 
+} // anonymous namespace
+
+
 SYST(1988, korgz3, 0, 0, korgz3, korgz3, korgz3_state, empty_init, "Korg", "Z3 Guitar Synthesizer", MACHINE_IS_SKELETON)
diff --git a/src/mame/korg/microkorg.cpp b/src/mame/korg/microkorg.cpp
index 7f57f2d1912..4d69500f29a 100644
--- a/src/mame/korg/microkorg.cpp
+++ b/src/mame/korg/microkorg.cpp
@@ -12,6 +12,9 @@
 #include "cpu/h8/h8s2320.h"
 #include "machine/intelfsh.h"
 
+
+namespace {
+
 class microkorg_state : public driver_device
 {
 public:
@@ -58,4 +61,7 @@ ROM_START(microkorg)
 	ROM_LOAD("korg_microkorg_v1.03_29lv800b.ic20", 0x000000, 0x100000, CRC(607ada7e) SHA1(4a6e2f4068cac7493484af2a8c1d1db7d8bd7a17))
 ROM_END
 
+} // anonymous namespace
+
+
 SYST(2002, microkorg, 0, 0, microkorg, microkorg, microkorg_state, empty_init, "Korg", "microKORG Synthesizer/Vocoder", MACHINE_IS_SKELETON)
diff --git a/src/mame/korg/poly800.cpp b/src/mame/korg/poly800.cpp
index 1a5ecb5755f..f38e993562a 100644
--- a/src/mame/korg/poly800.cpp
+++ b/src/mame/korg/poly800.cpp
@@ -14,6 +14,9 @@
 #include "machine/nvram.h"
 //#include "sound/msm5232.h"
 
+
+namespace {
+
 class poly800_state : public driver_device
 {
 public:
@@ -143,6 +146,9 @@ ROM_START(poly800ii)
 	ROM_LOAD("851005.ic24", 0x0000, 0x4000, CRC(09ae4fc5) SHA1(1e8a418919ef61334fb55aefa8aaebcaefc28ebd)) // 27C128 (last 3/8ths not addressable)
 ROM_END
 
+} // anonymous namespace
+
+
 SYST(1984, poly800,    0, 0, poly800,    poly800, poly800_state,   empty_init, "Korg", "Poly-800 Programmable Polyphonic Synthesizer", MACHINE_IS_SKELETON)
 SYST(1984, poly800mdk, 0, 0, poly800mdk, poly800, poly800_state,   empty_init, "Korg", "Poly-800 Programmable Polyphonic Synthesizer (MIDI Dump Kit)", MACHINE_IS_SKELETON)
 SYST(1986, poly800ii,  0, 0, poly800ii,  poly800, poly800ii_state, empty_init, "Korg", "Poly-800II Programmable Polyphonic Synthesizer", MACHINE_IS_SKELETON)
diff --git a/src/mame/korg/polysix.cpp b/src/mame/korg/polysix.cpp
index a0aff74997c..be8edca15a4 100644
--- a/src/mame/korg/polysix.cpp
+++ b/src/mame/korg/polysix.cpp
@@ -12,6 +12,9 @@
 #include "machine/nvram.h"
 #include "machine/pit8253.h"
 
+
+namespace {
+
 class ps6_base_state : public driver_device
 {
 protected:
@@ -188,5 +191,8 @@ ROM_START(poly61)
 	ROMX_LOAD("d8049c-384.bin", 0x000, 0x800, CRC(bbc421b5) SHA1(be683cdce5cbf867c5b8a52802288c1296f5fbd1), ROM_BIOS(1))
 ROM_END
 
+} // anonymous namespace
+
+
 SYST(1980, polysix, 0, 0, polysix, polysix, polysix_state, empty_init, "Korg", "Polysix Programmable Polyphonic Synthesizer", MACHINE_IS_SKELETON)
 SYST(1982, poly61,  0, 0, poly61,  polysix, poly61_state,  empty_init, "Korg", "Poly-61 Programmable Polyphonic Synthesizer", MACHINE_IS_SKELETON)
diff --git a/src/mame/kyber/kminus.cpp b/src/mame/kyber/kminus.cpp
index e35a261d83d..462e91cc5ff 100644
--- a/src/mame/kyber/kminus.cpp
+++ b/src/mame/kyber/kminus.cpp
@@ -19,6 +19,9 @@
 #include "screen.h"
 #include "softlist.h"
 
+
+namespace {
+
 class kminus_state : public driver_device
 {
 public:
@@ -332,6 +335,8 @@ ROM_START(kminus)
 	ROM_LOAD("kyberware_chargen.u24", 0x0000, 0x1000, CRC(18d9e79e) SHA1(e0a80dab109c0ac8b7f214d597955c97618208b3))
 ROM_END
 
+} // anonymous namespace
+
 
 //    YEAR  NAME    PARENT  COMPAT  MACHINE  INPUT   CLASS         INIT        COMPANY              FULLNAME       FLAGS
 COMP( 1982, kminus, 0,      0,      kminus,  0,      kminus_state, empty_init, "Kyber Calcolatori", "Kyber Minus", MACHINE_NOT_WORKING )
diff --git a/src/mame/leapfrog/leapfrog_iquest.cpp b/src/mame/leapfrog/leapfrog_iquest.cpp
index 006b28901e5..853cbe270ae 100644
--- a/src/mame/leapfrog/leapfrog_iquest.cpp
+++ b/src/mame/leapfrog/leapfrog_iquest.cpp
@@ -21,6 +21,9 @@
 #include "speaker.h"
 #include "screen.h"
 
+
+namespace {
+
 class leapfrog_iquest_state : public driver_device
 {
 public:
@@ -768,6 +771,7 @@ ROM_START( ttwistfb ) // PCB marks ROM glob as 16M
 	ROM_LOAD( "factblaster.bin", 0x000000, 0x200000, CRC(8efd63f5) SHA1(2cbd1299006ad9743d846e774afe7a134ba0fce3))
 ROM_END
 
+} // anonymous namespace
 
 
 //    year, name,        parent,    compat, machine,                         input,            class,                                init,       company,    fullname,                         flags
diff --git a/src/mame/leapfrog/leapfrog_leappad.cpp b/src/mame/leapfrog/leapfrog_leappad.cpp
index 8ab7a43bfeb..6990d1fd311 100644
--- a/src/mame/leapfrog/leapfrog_leappad.cpp
+++ b/src/mame/leapfrog/leapfrog_leappad.cpp
@@ -79,6 +79,9 @@
 #include "softlist_dev.h"
 #include "speaker.h"
 
+
+namespace {
+
 class leapfrog_leappad_state : public driver_device
 {
 public:
@@ -221,6 +224,9 @@ ROM_START( ltleappad )
 	ROMX_LOAD( "leappad_little_touch_german.bin", 0x000000, 0x400000, CRC(39ee76a2) SHA1(34f1b6e075e10e14380d925944f4c84d068ec58e), ROM_BIOS(1) ) // contains "Jan 11 2005 10:45:42 152-11010 Full Base ROM: V1.0 - Germany"
 ROM_END
 
+} // anonymous namespace
+
+
 //    year, name,      parent, compat, machine,            input,            class,                  init,       company,    fullname,               flags
 CONS( 2001, leappad,   0,      0,      leapfrog_leappad,   leapfrog_leappad, leapfrog_leappad_state, empty_init, "LeapFrog", "LeapPad",              MACHINE_IS_SKELETON )
 CONS( 2002, mfleappad, 0,      0,      leapfrog_mfleappad, leapfrog_leappad, leapfrog_leappad_state, empty_init, "LeapFrog", "My First LeapPad",     MACHINE_IS_SKELETON )
diff --git a/src/mame/leapfrog/leapfrog_leapster_explorer.cpp b/src/mame/leapfrog/leapfrog_leapster_explorer.cpp
index 774b60a728a..4acecc8896c 100644
--- a/src/mame/leapfrog/leapfrog_leapster_explorer.cpp
+++ b/src/mame/leapfrog/leapfrog_leapster_explorer.cpp
@@ -24,6 +24,9 @@
 #include "softlist_dev.h"
 #include "speaker.h"
 
+
+namespace {
+
 class leapfrog_leapster_explorer_state : public driver_device
 {
 public:
@@ -105,4 +108,7 @@ ROM_START( leapexpr )
 	ROM_LOAD( "internal.rom", 0x000000, 0x0100000, NO_DUMP )
 ROM_END
 
+} // anonymous namespace
+
+
 CONS( 2010, leapexpr,     0,       0,      leapfrog_leapster_explorer, leapfrog_leapster_explorer, leapfrog_leapster_explorer_state, empty_init, "LeapFrog", "Leapster Explorer",   MACHINE_IS_SKELETON )
diff --git a/src/mame/leapfrog/leapster.cpp b/src/mame/leapfrog/leapster.cpp
index 44070693795..3b55379181f 100644
--- a/src/mame/leapfrog/leapster.cpp
+++ b/src/mame/leapfrog/leapster.cpp
@@ -194,6 +194,8 @@ PCB - LEAPSTER-TV:
 #include "softlist_dev.h"
 
 
+namespace {
+
 class leapster_state : public driver_device
 {
 public:
@@ -359,6 +361,9 @@ void leapster_state::init_leapster()
 {
 }
 
+} // anonymous namespace
+
+
 CONS( 2003, leapster,    0,        0, leapster, leapster, leapster_state, init_leapster, "LeapFrog", "Leapster",       MACHINE_IS_SKELETON )
 CONS( 2005, leapstertv,  leapster, 0, leapster, leapster, leapster_state, init_leapster, "LeapFrog", "Leapster TV",    MACHINE_IS_SKELETON )
 CONS( 2005, leapsterlmx, leapster, 0, leapster, leapster, leapster_state, init_leapster, "LeapFrog", "Leapster L-MAX", MACHINE_IS_SKELETON )
diff --git a/src/mame/learsiegler/adm11.cpp b/src/mame/learsiegler/adm11.cpp
index e21e34ee018..0f84fe5f594 100644
--- a/src/mame/learsiegler/adm11.cpp
+++ b/src/mame/learsiegler/adm11.cpp
@@ -33,6 +33,9 @@
 #include "video/scn2674.h"
 #include "screen.h"
 
+
+namespace {
+
 class adm11_state : public driver_device
 {
 public:
@@ -193,4 +196,7 @@ ROM_START(adm12)
 	ROM_LOAD("u35.bin", 0x0000, 0x1000, CRC(66d7bc44) SHA1(cd839839f29657207098d85900cb570285be91a6)) // HN462732-P
 ROM_END
 
+} // anonymous namespace
+
+
 COMP(1984, adm12, 0, 0, adm12, adm12, adm11_state, empty_init, "Lear Siegler", "ADM 12 Video Display Terminal", MACHINE_IS_SKELETON)
diff --git a/src/mame/learsiegler/adm23.cpp b/src/mame/learsiegler/adm23.cpp
index 04b1c419590..16213d6cd3e 100644
--- a/src/mame/learsiegler/adm23.cpp
+++ b/src/mame/learsiegler/adm23.cpp
@@ -11,6 +11,9 @@
 #include "video/mc6845.h"
 #include "screen.h"
 
+
+namespace {
+
 class adm23_state : public driver_device
 {
 public:
@@ -82,5 +85,7 @@ ROM_START(adm23)
 	ROM_LOAD("129253-61_u3.bin", 0x0000, 0x0020, NO_DUMP) // N82S123N at location labeled "S288"
 ROM_END
 
+} // anonymous namespace
+
 
 COMP(1982, adm23, 0, 0, adm23, adm23, adm23_state, empty_init, "Lear Siegler", "ADM 23 Smart Terminal", MACHINE_IS_SKELETON)
diff --git a/src/mame/learsiegler/adm31.cpp b/src/mame/learsiegler/adm31.cpp
index 466c6ed4852..6d11abc1885 100644
--- a/src/mame/learsiegler/adm31.cpp
+++ b/src/mame/learsiegler/adm31.cpp
@@ -29,6 +29,9 @@
 #include "video/tms9927.h"
 #include "screen.h"
 
+
+namespace {
+
 class adm31_state : public driver_device
 {
 public:
@@ -509,5 +512,7 @@ ROM_START(adm31)
 	ROM_LOAD("chargen.bin", 0x0000, 0x0800, NO_DUMP)
 ROM_END
 
+} // anonymous namespace
+
 
 COMP(1978, adm31, 0, 0, adm31, adm31, adm31_state, empty_init, "Lear Siegler", "ADM-31 Data Display Terminal", MACHINE_IS_SKELETON)
diff --git a/src/mame/learsiegler/adm36.cpp b/src/mame/learsiegler/adm36.cpp
index 1d006e876a7..ecde17ec173 100644
--- a/src/mame/learsiegler/adm36.cpp
+++ b/src/mame/learsiegler/adm36.cpp
@@ -19,6 +19,8 @@
 #include "screen.h"
 
 
+namespace {
+
 class adm36_state : public driver_device
 {
 public:
@@ -197,5 +199,7 @@ ROM_START(adm36)
 	ROM_LOAD("u56.bin", 0x0000, 0x1000, CRC(70e46897) SHA1(85b4360912fc05243b3b2df29bde5a3def94086b))
 ROM_END
 
+} // anonymous namespace
+
 
 COMP(1981, adm36, 0, 0, adm36, adm36, adm36_state, empty_init, "Lear Siegler", "ADM 36 Video Display Terminal", MACHINE_IS_SKELETON)
diff --git a/src/mame/lsi/octo_kbd.h b/src/mame/lsi/octo_kbd.h
index 4ae05e47a7a..8d2019b3d86 100644
--- a/src/mame/lsi/octo_kbd.h
+++ b/src/mame/lsi/octo_kbd.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Barry Rodewald
-#ifndef MAME_MACHINE_OCTO_KBD_H
-#define MAME_MACHINE_OCTO_KBD_H
+#ifndef MAME_LSI_OCTO_KBD_H
+#define MAME_LSI_OCTO_KBD_H
 
 #pragma once
 
@@ -31,4 +31,4 @@ private:
 
 DECLARE_DEVICE_TYPE(OCTOPUS_KEYBOARD, octopus_keyboard_device)
 
-#endif // MAME_MACHINE_OCTO_KBD_H
+#endif // MAME_LSI_OCTO_KBD_H
diff --git a/src/mame/lsi/octopus.cpp b/src/mame/lsi/octopus.cpp
index f4a40f893c2..9844e2c0f6c 100644
--- a/src/mame/lsi/octopus.cpp
+++ b/src/mame/lsi/octopus.cpp
@@ -137,6 +137,8 @@ It's a very rare computer. It has 2 processors, Z80 and 8088, so it can run both
 #include "speaker.h"
 
 
+namespace {
+
 class octopus_state : public driver_device
 {
 public:
@@ -180,7 +182,7 @@ private:
 	uint8_t vram_r(offs_t offset);
 	void vram_w(offs_t offset, uint8_t data);
 	uint8_t get_slave_ack(offs_t offset);
-	DECLARE_WRITE_LINE_MEMBER(fdc_drq);
+	[[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(fdc_drq);
 	uint8_t bank_sel_r(offs_t offset);
 	void bank_sel_w(offs_t offset, uint8_t data);
 	uint8_t dma_read(offs_t offset);
@@ -1029,6 +1031,9 @@ ROM_START( octopus )
 	ROM_LOAD( "octopus_gfx_card",  0x0000, 0x2000, CRC(b2386534) SHA1(5e3c4682afb4eb222e48a7203269a16d26911836) )
 ROM_END
 
+} // anonymous namespace
+
+
 /* Driver */
 
 //    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT    CLASS          INIT        COMPANY                 FULLNAME       FLAGS
diff --git a/src/mame/luxor/abc1600_v.h b/src/mame/luxor/abc1600_v.h
index b8d60ba0e53..12ed527ab0d 100644
--- a/src/mame/luxor/abc1600_v.h
+++ b/src/mame/luxor/abc1600_v.h
@@ -5,8 +5,8 @@
     Luxor ABC 1600 Mover emulation
 
 **********************************************************************/
-#ifndef MAME_VIDEO_ABC1600_H
-#define MAME_VIDEO_ABC1600_H
+#ifndef MAME_LUXOR_ABC1600_H
+#define MAME_LUXOR_ABC1600_H
 
 #pragma once
 
@@ -143,4 +143,4 @@ DECLARE_DEVICE_TYPE(ABC1600_MOVER, abc1600_mover_device)
 
 
 
-#endif // MAME_VIDEO_ABC1600_H
+#endif // MAME_LUXOR_ABC1600_H
diff --git a/src/mame/luxor/abc1600mac.h b/src/mame/luxor/abc1600mac.h
index 73b0695a727..122dc09bfbf 100644
--- a/src/mame/luxor/abc1600mac.h
+++ b/src/mame/luxor/abc1600mac.h
@@ -5,8 +5,8 @@
     Luxor ABC 1600 Memory Access Controller emulation
 
 **********************************************************************/
-#ifndef MAME_MACHINE_ABC1600MAC_H
-#define MAME_MACHINE_ABC1600MAC_H
+#ifndef MAME_LUXOR_ABC1600MAC_H
+#define MAME_LUXOR_ABC1600MAC_H
 
 #pragma once
 
@@ -141,4 +141,4 @@ constexpr int AS_MAC = 1;
 DECLARE_DEVICE_TYPE(ABC1600_MAC, abc1600_mac_device)
 
 
-#endif // MAME_MACHINE_ABC1600MAC_H
+#endif // MAME_LUXOR_ABC1600MAC_H
diff --git a/src/mame/luxor/abc80kb.h b/src/mame/luxor/abc80kb.h
index 6e097f61142..f519411ce68 100644
--- a/src/mame/luxor/abc80kb.h
+++ b/src/mame/luxor/abc80kb.h
@@ -5,8 +5,8 @@
     Luxor ABC-80 keyboard emulation
 
 **********************************************************************/
-#ifndef MAME_MACHINE_ABC80KB_H
-#define MAME_MACHINE_ABC80KB_H
+#ifndef MAME_LUXOR_ABC80KB_H
+#define MAME_LUXOR_ABC80KB_H
 
 #pragma once
 
@@ -58,4 +58,4 @@ DECLARE_DEVICE_TYPE(ABC80_KEYBOARD, abc80_keyboard_device)
 
 
 
-#endif // MAME_MACHINE_ABC80KB_H
+#endif // MAME_LUXOR_ABC80KB_H
diff --git a/src/mame/luxor/ds90.cpp b/src/mame/luxor/ds90.cpp
index 90389d59314..43e6e167d2f 100644
--- a/src/mame/luxor/ds90.cpp
+++ b/src/mame/luxor/ds90.cpp
@@ -26,6 +26,9 @@
 #include "machine/z8536.h"
 #include "abc1600_v.h"
 
+
+namespace {
+
 #define MC68010_TAG  "14m"
 #define NS32081_TAG  "06o"
 #define MC68450_TAG  "11m"
@@ -165,4 +168,7 @@ ROM_START( x37 )
 	ROM_LOAD( "pat8039.12h", 0x924, 0x104, CRC(d3f6974f) SHA1(98dc1bac1c822fe7af0edd683acfc2e5c51f0451) ) // DS60 NS32081 FLOATING POINT PROCESSOR INTERFACE
 ROM_END
 
+} // anonymous namespace
+
+
 COMP( 1985, x37, 0,      0,      x37, x37, x37_state, empty_init, "Luxor", "X37 (prototype)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )