diff --git a/src/mame/bally/astrocde.h b/src/mame/bally/astrocde.h
index 72f7f3121..c6aea3938 100644
--- a/src/mame/bally/astrocde.h
+++ b/src/mame/bally/astrocde.h
@@ -5,8 +5,8 @@
     Bally Astrocade-based hardware
 
 ***************************************************************************/
-#ifndef MAME_MIDWAY_ASTROCDE_H
-#define MAME_MIDWAY_ASTROCDE_H
+#ifndef MAME_BALLY_ASTROCDE_H
+#define MAME_BALLY_ASTROCDE_H
 
 #pragma once
 
@@ -281,4 +281,4 @@ private:
 	output_finder<19> m_lamps;
 };
 
-#endif // MAME_MIDWAY_ASTROCDE_H
+#endif // MAME_BALLY_ASTROCDE_H
diff --git a/src/mame/bally/balsente.h b/src/mame/bally/balsente.h
index 55f32c6c6..3d1052481 100644
--- a/src/mame/bally/balsente.h
+++ b/src/mame/bally/balsente.h
@@ -7,8 +7,8 @@
     driver by Aaron Giles
 
 ***************************************************************************/
-#ifndef MAME_MIDWAY_BALSENTE_H
-#define MAME_MIDWAY_BALSENTE_H
+#ifndef MAME_BALLY_BALSENTE_H
+#define MAME_BALLY_BALSENTE_H
 
 #pragma once
 
@@ -209,4 +209,4 @@ private:
 	required_memory_bank m_bankef;
 };
 
-#endif // MAME_MIDWAY_BALSENTE_H
+#endif // MAME_BALLY_BALSENTE_H
diff --git a/src/mame/bally/csd.h b/src/mame/bally/csd.h
index e97d9faa4..4b54910e1 100644
--- a/src/mame/bally/csd.h
+++ b/src/mame/bally/csd.h
@@ -5,8 +5,8 @@
     Cheap Squeak Deluxe / Artificial Artist Sound Board
 
 ***************************************************************************/
-#ifndef MAME_MIDWAY_CSD_H
-#define MAME_MIDWAY_CSD_H
+#ifndef MAME_BALLY_CSD_H
+#define MAME_BALLY_CSD_H
 
 #pragma once
 
@@ -67,4 +67,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(MIDWAY_CHEAP_SQUEAK_DELUXE, midway_cheap_squeak_deluxe_device)
 
-#endif // MAME_MIDWAY_CSD_H
+#endif // MAME_BALLY_CSD_H
diff --git a/src/mame/bally/gridlee.h b/src/mame/bally/gridlee.h
index cd6bc26c1..8a6be3f08 100644
--- a/src/mame/bally/gridlee.h
+++ b/src/mame/bally/gridlee.h
@@ -7,8 +7,8 @@
     driver by Aaron Giles
 
 ***************************************************************************/
-#ifndef MAME_MIDWAY_GRIDLEE_H
-#define MAME_MIDWAY_GRIDLEE_H
+#ifndef MAME_BALLY_GRIDLEE_H
+#define MAME_BALLY_GRIDLEE_H
 
 #pragma once
 
@@ -121,4 +121,4 @@ private:
 
 DECLARE_DEVICE_TYPE(GRIDLEE, gridlee_sound_device)
 
-#endif // MAME_MIDWAY_GRIDLEE_H
+#endif // MAME_BALLY_GRIDLEE_H
diff --git a/src/mame/bally/mcr.h b/src/mame/bally/mcr.h
index d070d5623..1472bfd95 100644
--- a/src/mame/bally/mcr.h
+++ b/src/mame/bally/mcr.h
@@ -5,8 +5,8 @@
     Midway MCR system
 
 **************************************************************************/
-#ifndef MAME_MIDWAY_MCR_H
-#define MAME_MIDWAY_MCR_H
+#ifndef MAME_BALLY_MCR_H
+#define MAME_BALLY_MCR_H
 
 #pragma once
 
@@ -238,4 +238,4 @@ extern const z80_daisy_config mcr_ipu_daisy_chain[];
 extern const gfx_layout mcr_bg_layout;
 extern const gfx_layout mcr_sprite_layout;
 
-#endif // MAME_MIDWAY_MCR_H
+#endif // MAME_BALLY_MCR_H
diff --git a/src/mame/bally/mcr3.h b/src/mame/bally/mcr3.h
index 92edac82f..ac8de7e31 100644
--- a/src/mame/bally/mcr3.h
+++ b/src/mame/bally/mcr3.h
@@ -5,8 +5,8 @@
     Midway MCR-3 system
 
 **************************************************************************/
-#ifndef MAME_MIDWAY_MCR3_H
-#define MAME_MIDWAY_MCR3_H
+#ifndef MAME_BALLY_MCR3_H
+#define MAME_BALLY_MCR3_H
 
 #pragma once
 
@@ -149,4 +149,4 @@ private:
 	required_ioport_array<2> m_analog_inputs;
 };
 
-#endif // MAME_MIDWAY_MCR3_H
+#endif // MAME_BALLY_MCR3_H
diff --git a/src/mame/bally/midway_sound.h b/src/mame/bally/midway_sound.h
index 85c7d48fa..f39724a94 100644
--- a/src/mame/bally/midway_sound.h
+++ b/src/mame/bally/midway_sound.h
@@ -7,8 +7,8 @@
     Functions to emulate general the various Midway sound cards.
 
 ***************************************************************************/
-#ifndef MAME_MIDWAY_MIDWAY_H
-#define MAME_MIDWAY_MIDWAY_H
+#ifndef MAME_BALLY_MIDWAY_SOUND_H
+#define MAME_BALLY_MIDWAY_SOUND_H
 
 #pragma once
 
@@ -205,4 +205,4 @@ private:
 	void irq_w(int state);
 };
 
-#endif // MAME_MIDWAY_MIDWAY_H
+#endif // MAME_BALLY_MIDWAY_SOUND_H
diff --git a/src/mame/bally/sente6vb.h b/src/mame/bally/sente6vb.h
index af14d3d22..76aff4707 100644
--- a/src/mame/bally/sente6vb.h
+++ b/src/mame/bally/sente6vb.h
@@ -5,9 +5,8 @@
     Bally/Sente 6VB audio board emulation
 
 ***************************************************************************/
-
-#ifndef MAME_MIDWAY_SENTE6VB_H
-#define MAME_MIDWAY_SENTE6VB_H
+#ifndef MAME_BALLY_SENTE6VB_H
+#define MAME_BALLY_SENTE6VB_H
 
 #pragma once
 
@@ -81,4 +80,4 @@ private:
 
 DECLARE_DEVICE_TYPE(SENTE6VB, sente6vb_device)
 
-#endif // MAME_MIDWAY_SENTE6VB_H
+#endif // MAME_BALLY_SENTE6VB_H
diff --git a/src/mame/williams/midtunit.h b/src/mame/williams/midtunit.h
index 943b9992f..291a29c61 100644
--- a/src/mame/williams/midtunit.h
+++ b/src/mame/williams/midtunit.h
@@ -6,8 +6,8 @@
     Driver for Midway T-unit games.
 
 **************************************************************************/
-#ifndef MAME_MIDWAY_MIDTUNIT_H
-#define MAME_MIDWAY_MIDTUNIT_H
+#ifndef MAME_WILLIAMS_MIDTUNIT_H
+#define MAME_WILLIAMS_MIDTUNIT_H
 
 #pragma once
 
@@ -141,4 +141,4 @@ private:
 	uint16_t   m_mk2_prot_data = 0;
 };
 
-#endif // MAME_MIDWAY_MIDTUNIT_H
+#endif // MAME_WILLIAMS_MIDTUNIT_H
diff --git a/src/mame/williams/midtunit_v.h b/src/mame/williams/midtunit_v.h
index 17e714a46..ce1d7a9a9 100644
--- a/src/mame/williams/midtunit_v.h
+++ b/src/mame/williams/midtunit_v.h
@@ -7,12 +7,11 @@
 
 **************************************************************************/
 
-#ifndef MAME_MIDWAY_MIDTUNIT_V_H
-#define MAME_MIDWAY_MIDTUNIT_V_H
+#ifndef MAME_WILLIAMS_MIDTUNIT_V_H
+#define MAME_WILLIAMS_MIDTUNIT_V_H
 
 #pragma once
 
-#include "emu.h"
 #include "cpu/tms34010/tms34010.h"
 #include "emupal.h"
 
@@ -230,4 +229,4 @@ DECLARE_DEVICE_TYPE(MIDTUNIT_VIDEO, midtunit_video_device)
 DECLARE_DEVICE_TYPE(MIDWUNIT_VIDEO, midwunit_video_device)
 DECLARE_DEVICE_TYPE(MIDXUNIT_VIDEO, midxunit_video_device)
 
-#endif // MAME_MIDWAY_MIDTUNIT_V_H
+#endif // MAME_WILLIAMS_MIDTUNIT_V_H
diff --git a/src/mame/williams/midvunit.h b/src/mame/williams/midvunit.h
index 35d9129c8..3d431affd 100644
--- a/src/mame/williams/midvunit.h
+++ b/src/mame/williams/midvunit.h
@@ -5,8 +5,8 @@
     Driver for Midway V-Unit games
 
 **************************************************************************/
-#ifndef MAME_MIDWAY_MIDVUNIT_H
-#define MAME_MIDWAY_MIDVUNIT_H
+#ifndef MAME_WILLIAMS_MIDVUNIT_H
+#define MAME_WILLIAMS_MIDVUNIT_H
 
 #pragma once
 
@@ -283,4 +283,4 @@ private:
 	int m_lastval = 0;
 };
 
-#endif // MAME_MIDWAY_MIDVUNIT_H
+#endif // MAME_WILLIAMS_MIDVUNIT_H
diff --git a/src/mame/williams/midwayic.h b/src/mame/williams/midwayic.h
index 8584a372c..93b45c091 100644
--- a/src/mame/williams/midwayic.h
+++ b/src/mame/williams/midwayic.h
@@ -5,8 +5,8 @@
     Emulation of various Midway ICs
 
 ***************************************************************************/
-#ifndef MAME_MIDWAY_MIDWAYIC_H
-#define MAME_MIDWAY_MIDWAYIC_H
+#ifndef MAME_WILLIAMS_MIDWAYIC_H
+#define MAME_WILLIAMS_MIDWAYIC_H
 
 #pragma once
 
@@ -239,4 +239,4 @@ DECLARE_DEVICE_TYPE(MIDWAY_SERIAL_PIC_EMU, midway_serial_pic_emu_device)
 DECLARE_DEVICE_TYPE(MIDWAY_SERIAL_PIC2, midway_serial_pic2_device)
 DECLARE_DEVICE_TYPE(MIDWAY_IOASIC, midway_ioasic_device)
 
-#endif // MAME_MIDWAY_MIDWAYIC_H
+#endif // MAME_WILLIAMS_MIDWAYIC_H
diff --git a/src/mame/williams/midwunit.h b/src/mame/williams/midwunit.h
index 4fccc28a2..642a0a207 100644
--- a/src/mame/williams/midwunit.h
+++ b/src/mame/williams/midwunit.h
@@ -5,8 +5,8 @@
     Driver for Midway Wolf-unit games.
 
 **************************************************************************/
-#ifndef MAME_MIDWAY_MIDWUNIT_H
-#define MAME_MIDWAY_MIDWUNIT_H
+#ifndef MAME_WILLIAMS_MIDWUNIT_H
+#define MAME_WILLIAMS_MIDWUNIT_H
 
 #pragma once
 
@@ -89,4 +89,4 @@ private:
 	uint16_t *m_umk3_palette = nullptr;
 };
 
-#endif // MAME_MIDWAY_MIDWUNIT_H
+#endif // MAME_WILLIAMS_MIDWUNIT_H
diff --git a/src/mame/williams/midyunit.h b/src/mame/williams/midyunit.h
index 9044b51c8..86e26fadf 100644
--- a/src/mame/williams/midyunit.h
+++ b/src/mame/williams/midyunit.h
@@ -6,8 +6,8 @@
     Williams/Midway Y/Z-unit system
 
 **************************************************************************/
-#ifndef MAME_MIDWAY_MIDYUNIT_H
-#define MAME_MIDWAY_MIDYUNIT_H
+#ifndef MAME_WILLIAMS_MIDYUNIT_H
+#define MAME_WILLIAMS_MIDYUNIT_H
 
 #pragma once
 
@@ -304,4 +304,4 @@ private:
 	void yawdim2_sound_map(address_map &map) ATTR_COLD;
 };
 
-#endif // MAME_MIDWAY_MIDYUNIT_H
+#endif // MAME_WILLIAMS_MIDYUNIT_H
diff --git a/src/mame/williams/midzeus.h b/src/mame/williams/midzeus.h
index 6b7429da9..b1c39840f 100644
--- a/src/mame/williams/midzeus.h
+++ b/src/mame/williams/midzeus.h
@@ -5,8 +5,8 @@
     Driver for Midway Zeus games
 
 **************************************************************************/
-#ifndef MAME_MIDWAY_MIDZEUS_H
-#define MAME_MIDWAY_MIDZEUS_H
+#ifndef MAME_WILLIAMS_MIDZEUS_H
+#define MAME_WILLIAMS_MIDZEUS_H
 
 #pragma once
 
@@ -202,4 +202,4 @@ private:
 	required_ioport m_io_gun_trigger;
 };
 
-#endif // MAME_MIDWAY_MIDZEUS_H
+#endif // MAME_WILLIAMS_MIDZEUS_H
diff --git a/src/mame/williams/williams.h b/src/mame/williams/williams.h
index 83b9e9e7b..fd1ff57b6 100644
--- a/src/mame/williams/williams.h
+++ b/src/mame/williams/williams.h
@@ -5,8 +5,8 @@
     Driver for early Williams games
 
 **************************************************************************/
-#ifndef MAME_MIDWAY_WILLIAMS_H
-#define MAME_MIDWAY_WILLIAMS_H
+#ifndef MAME_WILLIAMS_WILLIAMS_H
+#define MAME_WILLIAMS_WILLIAMS_H
 
 #pragma once
 
@@ -376,5 +376,4 @@ private:
 	void pia_s11_bg_strobe_w(int state);
 };
 
-
-#endif // MAME_MIDWAY_WILLIAMS_H
+#endif // MAME_WILLIAMS_WILLIAMS_H
diff --git a/src/mame/williams/williamsblitter.h b/src/mame/williams/williamsblitter.h
index 5a05cfe89..0af7da15b 100644
--- a/src/mame/williams/williamsblitter.h
+++ b/src/mame/williams/williamsblitter.h
@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MIDWAY_WILLIAMSBLITTER_H
-#define MAME_MIDWAY_WILLIAMSBLITTER_H
+#ifndef MAME_WILLIAMS_WILLIAMSBLITTER_H
+#define MAME_WILLIAMS_WILLIAMSBLITTER_H
 
 #pragma once
 
@@ -126,4 +126,4 @@ public:
 DECLARE_DEVICE_TYPE(WILLIAMS_BLITTER_SC1, williams_blitter_sc1_device)
 DECLARE_DEVICE_TYPE(WILLIAMS_BLITTER_SC2, williams_blitter_sc2_device)
 
-#endif // MAME_MIDWAY_WILLIAMSBLITTER_H
+#endif // MAME_WILLIAMS_WILLIAMSBLITTER_H