Fixed up some more #include guards.

src/devices/bus/pci/zr36057.h

@@ -1,13 +1,14 @@
 // license:BSD-3-Clause
 // copyright-holders:
 
-#ifndef MAME_VIDEO_ZR36057_PCI_H
-#define MAME_VIDEO_ZR36057_PCI_H
+#ifndef MAME_BUS_PCI_ZR36057_H
+#define MAME_BUS_PCI_ZR36057_H
 
 #pragma once
 
 #include "pci_slot.h"
 
+
 class zr36057_device : public pci_card_device
 {
 public:
@@ -35,4 +36,4 @@ class zr36057_device : public pci_card_device
 
 DECLARE_DEVICE_TYPE(ZR36057_PCI, zr36057_device)
 
-#endif // MAME_VIDEO_ZR36057_PCI_H
+#endif // MAME_BUS_PCI_ZR36057_H

src/mame/amstrad/pda600_copro.h

@@ -6,8 +6,8 @@
 
 **********************************************************************/
 
-#ifndef MAME_MACHINE_PDA600_COPRO_H
-#define MAME_MACHINE_PDA600_COPRO_H
+#ifndef MAME_AMSTRAD_PDA600_COPRO_H
+#define MAME_AMSTRAD_PDA600_COPRO_H
 
 #pragma once
 
@@ -64,4 +64,4 @@ class pda600_copro_device : public device_t,
 
 DECLARE_DEVICE_TYPE(PDA600_COPRO_HLE, pda600_copro_device)
 
-#endif // MAME_MACHINE_PDA600_COPRO_H
+#endif // MAME_AMSTRAD_PDA600_COPRO_H

src/mame/seibu/sei021x_sei0220_spr.h

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:David Graves, Angelo Salese, David Haywood, Tomasz Slanina, Carlos A. Lozano, Bryan McPhail, Pierpaolo Prazzoli
-#ifndef MAME_VIDEO_SEI021X_SEI0220_SPR_H
-#define MAME_VIDEO_SEI021X_SEI0220_SPR_H
+#ifndef MAME_SEIBU_SEI021X_SEI0220_SPR_H
+#define MAME_SEIBU_SEI021X_SEI0220_SPR_H
 
 #pragma once
 
@@ -77,4 +77,4 @@ class sei0211_device : public sei0210_device
 DECLARE_DEVICE_TYPE(SEI0210, sei0210_device)
 DECLARE_DEVICE_TYPE(SEI0211, sei0211_device)
 
-#endif // MAME_VIDEO_SEI021X_SEI0220_SPR_H
+#endif // MAME_SEIBU_SEI021X_SEI0220_SPR_H

src/mame/shared/awpvid.cpp

@@ -17,11 +17,9 @@
 #include "machine/steppers.h"
 
 
-void awp_draw_reel(running_machine &machine, const char* reeltag, stepper_device &reel)
+void awp_draw_reel(running_machine &machine, const char *reeltag, stepper_device &reel)
 {
-	char rg[16];
-
-	int reelpos =  reel.get_position();
+	int reelpos = reel.get_position();
 	if (reelpos == machine.output().get_value(reeltag))
 	{
 		// Not moved, no need to update.
@@ -33,11 +31,12 @@ void awp_draw_reel(running_machine &machine, const char* reeltag, stepper_device
 		// if the reel isn't configured don't do this, otherwise you'll get DIV0
 		if (reel.get_max())
 		{
+			char rg[16];
 			sprintf(rg,"s%s", reeltag); // our new scrolling reels are called 'sreel'
 			// normalize the value
 			int sreelpos = (reelpos * 0x10000) / reel.get_max();
 
-			machine.output().set_value(rg,sreelpos);
+			machine.output().set_value(rg, sreelpos);
 		}
 	}
 }

src/mame/shared/awpvid.h

@@ -5,11 +5,13 @@
     AWP Hardware video simulation system
 
 *************************************************************************************/
-#ifndef AWP_VIDEO
-#define AWP_VIDEO
+#ifndef MAME_SHARED_AWPVID_H
+#define MAME_SHARED_AWPVID_H
+
+#pragma once
 
 #include "machine/steppers.h"
 
-void awp_draw_reel(running_machine &machine, const char* reeltag, stepper_device &reel);
+void awp_draw_reel(running_machine &machine, const char *reeltag, stepper_device &reel);
 
 #endif

src/mame/shared/gottlieb_a.h

@@ -5,6 +5,10 @@
     Gottlieb hardware
 
 ***************************************************************************/
+#ifndef MAME_SHARED_GOTTLIEB_A_H
+#define MAME_SHARED_GOTTLIEB_A_H
+
+#pragma once
 
 #include "cpu/m6502/m6502.h"
 #include "cpu/m6502/m6503.h"
@@ -340,3 +344,4 @@ class gottlieb_sound_p7_device : public gottlieb_sound_p5_device
 	u8 m_msm_latch2;
 };
 
+#endif // MAME_SHARED_GOTTLIEB_A_H

src/mame/shared/inder_vid.h

@@ -12,8 +12,9 @@
 #pragma once
 
 
-#include "video/ramdac.h"
 #include "cpu/tms34010/tms34010.h"
+#include "video/ramdac.h"
+
 #include "emupal.h"
 
 DECLARE_DEVICE_TYPE(INDER_VIDEO, inder_vid_device)

src/mame/shared/isbc_215g.h

@@ -5,10 +5,11 @@
 
 #pragma once
 
-#include "cpu/i8089/i8089.h"
 #include "bus/isbx/isbx.h"
+#include "cpu/i8089/i8089.h"
 #include "imagedev/harddriv.h"
 
+
 class isbc_215g_device : public device_t
 {
 public:

src/mame/shared/mega32x.h

@@ -10,9 +10,11 @@
 #include "cpu/sh/sh7604.h"
 #include "machine/timer.h"
 #include "sound/dac.h"
+
 #include "emupal.h"
 #include "screen.h"
 
+
 class sega_32x_device : public device_t, public device_palette_interface, public device_sound_interface, public device_video_interface
 {
 public:

src/mame/shared/megacdcd.h

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
-#ifndef MAME_SHARED_SEGACDCD_H
-#define MAME_SHARED_SEGACDCD_H
+#ifndef MAME_SHARED_MEGACDCD_H
+#define MAME_SHARED_MEGACDCD_H
 
 #include "imagedev/cdromimg.h"
 #include "machine/timer.h"
@@ -193,4 +193,4 @@ class lc89510_temp_device : public device_t
 
 DECLARE_DEVICE_TYPE(LC89510_TEMP, lc89510_temp_device)
 
-#endif // MAME_SHARED_SEGACDCD_H
+#endif // MAME_SHARED_MEGACDCD_H

src/mame/shared/mitcrt.h

@@ -2,14 +2,14 @@
 // copyright-holders:Raphael Nabet
 /*************************************************************************
 
-    video/crt.h
+    shared/mitcrt.h
 
     CRT video emulation for TX-0 and PDP-1
 
 *************************************************************************/
 
-#ifndef MAME_SHARED_CRT_H
-#define MAME_SHARED_CRT_H
+#ifndef MAME_SHARED_MITCRT_H
+#define MAME_SHARED_MITCRT_H
 
 #pragma once
 
@@ -73,4 +73,4 @@ DECLARE_DEVICE_TYPE(CRT, crt_device)
 
 
 
-#endif // MAME_SHARED_CRT_H
+#endif // MAME_SHARED_MITCRT_H

src/mame/shared/pcshare.h

@@ -5,11 +5,12 @@
 
 #pragma once
 
+#include "machine/8042kbdc.h"
 #include "machine/am9517a.h"
+#include "machine/mc146818.h"
 #include "machine/pic8259.h"
 #include "machine/pit8253.h"
-#include "machine/mc146818.h"
-#include "machine/8042kbdc.h"
+
 
 class pcat_base_state : public driver_device
 {

src/mame/shared/seibusound.h

@@ -24,15 +24,17 @@
     * = encrypted
 
 ***************************************************************************/
-#ifndef MAME_SHARED_SEIBU_H
-#define MAME_SHARED_SEIBU_H
+#ifndef MAME_SHARED_SEIBUSOUND_H
+#define MAME_SHARED_SEIBUSOUND_H
 
 #pragma once
 
 #include "cpu/z80/z80.h"
 #include "sound/msm5205.h"
+
 #include "dirom.h"
 
+
 class seibu_sound_common {
 public:
 	virtual ~seibu_sound_common() = default;
@@ -192,4 +194,4 @@ DECLARE_DEVICE_TYPE(SEIBU_ADPCM, seibu_adpcm_device)
 
 /**************************************************************************/
 
-#endif // MAME_SHARED_SEIBU_H
+#endif // MAME_SHARED_SEIBUSOUND_H

src/mame/shared/taito68705.h

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood, Vas Crabb
-#ifndef MAME_SHARED_TAITO68705INTERFACE_H
-#define MAME_SHARED_TAITO68705INTERFACE_H
+#ifndef MAME_SHARED_TAITO68705_H
+#define MAME_SHARED_TAITO68705_H
 
 #pragma once
 
@@ -140,4 +140,4 @@ class arkanoid_68705p5_device : public arkanoid_mcu_device_base
 	virtual void device_add_mconfig(machine_config &config) override;
 };
 
-#endif // MAME_SHARED_TAITO68705INTERFACE_H
+#endif // MAME_SHARED_TAITO68705_H

src/mame/shared/teleprinter.h

@@ -29,8 +29,9 @@ class teleprinter_device : public generic_terminal_device
 	virtual void device_add_mconfig(machine_config &config) override;
 
 private:
-	static constexpr unsigned WIDTH = 80;
-	static constexpr unsigned HEIGHT = 50;
+	static inline constexpr unsigned WIDTH = 80;
+	static inline constexpr unsigned HEIGHT = 50;
+
 	uint32_t tp_update(screen_device &device, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 	void scroll_line();
 	void write_char(uint8_t data);

src/mame/shared/vboysound.h

@@ -6,8 +6,8 @@
     By Richard Bannister and Gil Pedersen.
     MAME device adaptation by R. Belmont
 */
-#ifndef MAME_SHARED_VBOY_H
-#define MAME_SHARED_VBOY_H
+#ifndef MAME_SHARED_VBOYSOUND_H
+#define MAME_SHARED_VBOYSOUND_H
 
 #pragma once
 
@@ -89,4 +89,4 @@ class vboysnd_device : public device_t, public device_sound_interface
 // device type definition
 DECLARE_DEVICE_TYPE(VBOYSND, vboysnd_device)
 
-#endif //MAME_SHARED_VBOY_H
+#endif //MAME_SHARED_VBOYSOUND_H

src/mame/shared/vt100_kbd.cpp

@@ -18,6 +18,9 @@
 #include "emu.h"
 #include "vt100_kbd.h"
 
+#include "speaker.h"
+
+//#define VERBOSE 1
 #include "logmacro.h"
 
 

src/mame/shared/vt100_kbd.h

@@ -14,7 +14,6 @@
 #include "machine/ay31015.h"
 #include "machine/ripple_counter.h"
 #include "sound/beep.h"
-#include "speaker.h"
 
 
 //**************************************************************************

src/mame/shared/williamssound.h

@@ -7,6 +7,10 @@
     Functions to emulate general the various Williams/Midway sound cards.
 
 ****************************************************************************/
+#ifndef MAME_SHARED_WILLIAMSSOUND_H
+#define MAME_SHARED_WILLIAMSSOUND_H
+
+#pragma once
 
 #include "machine/6821pia.h"
 #include "cpu/m6800/m6800.h"
@@ -315,3 +319,5 @@ class williams_s11_sound_device : public device_t, public device_mixer_interface
 	required_device<hc55516_device> m_hc;
 	u8 m_dummy = 0;   // needed for save-state support
 };
+
+#endif // MAME_SHARED_WILLIAMSSOUND_H

src/mame/shared/wswansound.h

@@ -1,12 +1,13 @@
 // license:BSD-3-Clause
 // copyright-holders:Wilbert Pol
-#ifndef MAME_SHARED_WSWAN_H
-#define MAME_SHARED_WSWAN_H
+#ifndef MAME_SHARED_WSWANSOUND_H
+#define MAME_SHARED_WSWANSOUND_H
 
 #pragma once
 
 #include "dirom.h"
 
+
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
@@ -83,4 +84,4 @@ class wswan_sound_device : public device_t,
 
 DECLARE_DEVICE_TYPE(WSWAN_SND, wswan_sound_device)
 
-#endif // MAME_SHARED_WSWAN_H
+#endif // MAME_SHARED_WSWANSOUND_H