Demote tautological-compare to a warning again.

clang on Windows x86-64 is getting upset about code that is making no
assumptions about the relative sizes of uint64_t and long.

Also, fixed more #include guards.

src/devices/cpu/e132xs/e132xsdrc_ops.hxx

@@ -1,5 +1,9 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz
+#ifndef MAME_CPU_E132XS_E132XSDRC_OPS_HXX
+#define MAME_CPU_E132XS_E132XSDRC_OPS_HXX
+
+#pragma once
 
 #include "e132xs.h"
 
@@ -5207,3 +5211,4 @@ void hyperstone_device::generate_do(drcuml_block &block, compiler_state &compile
 	fatalerror(" ");
 }
 
+#endif // MAME_CPU_E132XS_E132XSDRC_OPS_HXX

src/devices/cpu/i860/i860dec.hxx

@@ -35,6 +35,11 @@
  *   today also use IEEE FP.
  *
  */
+#ifndef MAME_CPU_I860_I860DEC_HXX
+#define MAME_CPU_I860_I860DEC_HXX
+
+#pragma once
+
 #include "i860.h"
 #include <cmath>
 
@@ -4670,3 +4675,5 @@ void debugger (i860s *cpustate)
 }
 
 #endif
+
+#endif // MAME_CPU_I860_I860DEC_HXX

src/devices/cpu/sh/sh_dasm.h

@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Juergen Buchmueller, R. Belmont
 
-#ifndef MAME_CPU_SH_SH_SHDASM_H
-#define MAME_CPU_SH_SH_SHDASM_H
+#ifndef MAME_CPU_SH_SH_DASM_H
+#define MAME_CPU_SH_SH_DASM_H
 
 #pragma once
 
@@ -42,4 +42,4 @@ private:
 	bool m_is_sh34;
 };
 
-#endif // MAME_CPU_SH_SH_SHDASM_H
+#endif // MAME_CPU_SH_SH_DASM_H

src/devices/cpu/sparc/sparcdasm.h

@@ -4,8 +4,8 @@
     SPARC disassembler
 */
 
-#ifndef MAME_CPU_SPARC_SPARC_DASM_H
-#define MAME_CPU_SPARC_SPARC_DASM_H
+#ifndef MAME_CPU_SPARC_SPARCDASM_H
+#define MAME_CPU_SPARC_SPARCDASM_H
 
 #pragma once
 
@@ -255,4 +255,4 @@ private:
 	vis_op_desc_map         m_vis_op_desc;
 };
 
-#endif // MAME_CPU_SPARC_SPARC_DASM_H
+#endif // MAME_CPU_SPARC_SPARCDASM_H

src/devices/cpu/spc700/spc700ds.h

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Karl Stenerud
-#ifndef MAME_CPU_SPC800_SPC700DS_H
-#define MAME_CPU_SPC800_SPC700DS_H
+#ifndef MAME_CPU_SPC700_SPC700DS_H
+#define MAME_CPU_SPC700_SPC700DS_H
 
 #pragma once
 
@@ -63,4 +63,4 @@ private:
 };
 
 
-#endif // MAME_CPU_SPC800_SPC700DS_H
+#endif // MAME_CPU_SPC700_SPC700DS_H

src/devices/imagedev/flopdrv.h

@@ -2,8 +2,8 @@
 // copyright-holders:Nathan Woods, Miodrag Milanovic
 /* flopdrv provides simple emulation of a disc drive */
 
-#ifndef MAME_IMAGEDV_FLOPDRV_H
-#define MAME_IMAGEDV_FLOPDRV_H
+#ifndef MAME_IMAGEDEV_FLOPDRV_H
+#define MAME_IMAGEDEV_FLOPDRV_H
 
 #pragma once
 
@@ -224,4 +224,4 @@ protected:
 	char            m_extension_list[256];
 };
 
-#endif // MAME_IMAGEDV_FLOPDRV_H
+#endif // MAME_IMAGEDEV_FLOPDRV_H

src/devices/machine/74148.h

@@ -40,8 +40,8 @@
 
 *****************************************************************************/
 
-#ifndef MAME_DEVICES_MACHINE_74148_H
-#define MAME_DEVICES_MACHINE_74148_H
+#ifndef MAME_MACHINE_74148_H
+#define MAME_MACHINE_74148_H
 
 #pragma once
 

src/devices/machine/74153.h

@@ -18,8 +18,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_DEVICES_MACHINE_74153_H
-#define MAME_DEVICES_MACHINE_74153_H
+#ifndef MAME_MACHINE_74153_H
+#define MAME_MACHINE_74153_H
 
 #pragma once
 
@@ -83,4 +83,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(TTL153, ttl153_device)
 
-#endif // MAME_DEVICES_MACHINE_74153_H
+#endif // MAME_MACHINE_74153_H

src/devices/machine/74165.h

@@ -18,8 +18,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_DEVICES_MACHINE_74165_H
-#define MAME_DEVICES_MACHINE_74165_H
+#ifndef MAME_MACHINE_74165_H
+#define MAME_MACHINE_74165_H
 
 #pragma once
 
@@ -70,4 +70,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(TTL165, ttl165_device)
 
-#endif // MAME_DEVICES_MACHINE_74165_H
+#endif // MAME_MACHINE_74165_H

src/devices/machine/74166.h

@@ -18,8 +18,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_DEVICES_MACHINE_74166_H
-#define MAME_DEVICES_MACHINE_74166_H
+#ifndef MAME_MACHINE_74166_H
+#define MAME_MACHINE_74166_H
 
 #pragma once
 
@@ -69,4 +69,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(TTL166, ttl166_device)
 
-#endif // MAME_DEVICES_MACHINE_74166_H
+#endif // MAME_MACHINE_74166_H

src/devices/machine/7474.h

@@ -39,8 +39,8 @@
 
 *****************************************************************************/
 
-#ifndef MAME_MACHINE_TTL7474_H
-#define MAME_MACHINE_TTL7474_H
+#ifndef MAME_MACHINE_7474_H
+#define MAME_MACHINE_7474_H
 
 #pragma once
 
@@ -102,4 +102,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(TTL7474, ttl7474_device)
 
-#endif // MAME_MACHINE_TTL7474_H
+#endif // MAME_MACHINE_7474_H

src/devices/machine/adc0808.h

@@ -31,8 +31,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_DEVICES_MACHINE_ADC0808_H
-#define MAME_DEVICES_MACHINE_ADC0808_H
+#ifndef MAME_MACHINE_ADC0808_H
+#define MAME_MACHINE_ADC0808_H
 
 #pragma once
 
@@ -110,4 +110,4 @@ DECLARE_DEVICE_TYPE(ADC0808, adc0808_device)
 DECLARE_DEVICE_TYPE(ADC0809, adc0809_device)
 DECLARE_DEVICE_TYPE(M58990, m58990_device)
 
-#endif // MAME_DEVICES_MACHINE_ADC0808_H
+#endif // MAME_MACHINE_ADC0808_H

src/devices/machine/adc0844.h

@@ -20,8 +20,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_DEVICES_MACHINE_ADC0844_H
-#define MAME_DEVICES_MACHINE_ADC0844_H
+#ifndef MAME_MACHINE_ADC0844_H
+#define MAME_MACHINE_ADC0844_H
 
 #pragma once
 
@@ -92,4 +92,4 @@ private:
 DECLARE_DEVICE_TYPE(ADC0844, adc0844_device)
 DECLARE_DEVICE_TYPE(ADC0848, adc0848_device)
 
-#endif // MAME_DEVICES_MACHINE_ADC0844_H
+#endif // MAME_MACHINE_ADC0844_H

src/devices/machine/am2910.h

@@ -7,8 +7,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_AM2910_AM2910_H
-#define MAME_MACHINE_AM2910_AM2910_H
+#ifndef MAME_MACHINE_AM2910_H
+#define MAME_MACHINE_AM2910_H
 
 #pragma once
 
@@ -79,4 +79,4 @@ protected:
 // device type definition
 DECLARE_DEVICE_TYPE(AM2910, am2910_device)
 
-#endif // MAME_MACHINE_AM2910_AM2910_H
+#endif // MAME_MACHINE_AM2910_H

src/devices/machine/am9517a.h

@@ -29,8 +29,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_AM9517_H
-#define MAME_MACHINE_AM9517_H
+#ifndef MAME_MACHINE_AM9517A_H
+#define MAME_MACHINE_AM9517A_H
 
 #pragma once
 
@@ -244,4 +244,4 @@ DECLARE_DEVICE_TYPE(V5X_DMAU,     v5x_dmau_device)
 DECLARE_DEVICE_TYPE(PCXPORT_DMAC, pcxport_dmac_device)
 DECLARE_DEVICE_TYPE(EISA_DMA,     eisa_dma_device)
 
-#endif // MAME_MACHINE_AM9517_H
+#endif // MAME_MACHINE_AM9517A_H

src/devices/machine/applepic.h

@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:AJR
 
-#ifndef MAME_DEVICES_MACHINE_APPLEPIC_H
-#define MAME_DEVICES_MACHINE_APPLEPIC_H
+#ifndef MAME_MACHINE_APPLEPIC_H
+#define MAME_MACHINE_APPLEPIC_H
 
 #pragma once
 
@@ -107,4 +107,4 @@ private:
 // device type declaration
 DECLARE_DEVICE_TYPE(APPLEPIC, applepic_device)
 
-#endif // MAME_DEVICES_MACHINE_APPLEPIC_H
+#endif // MAME_MACHINE_APPLEPIC_H

src/devices/machine/bankdev.h

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:smf
-#ifndef MAME_DEVICES_MACHINE_BANKDEV_H
-#define MAME_DEVICES_MACHINE_BANKDEV_H
+#ifndef MAME_MACHINE_BANKDEV_H
+#define MAME_MACHINE_BANKDEV_H
 
 #pragma once
 
@@ -77,4 +77,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(ADDRESS_MAP_BANK, address_map_bank_device)
 
-#endif // MAME_DEVICES_MACHINE_BANKDEV_H
+#endif // MAME_MACHINE_BANKDEV_H

src/devices/machine/bcreader.h

@@ -8,8 +8,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_DEVICES_MACHINE_BCREADER_H
-#define MAME_DEVICES_MACHINE_BCREADER_H
+#ifndef MAME_MACHINE_BCREADER_H
+#define MAME_MACHINE_BCREADER_H
 
 #pragma once
 
@@ -49,4 +49,4 @@ DECLARE_DEVICE_TYPE(BARCODE_READER, barcode_reader_device)
 // device type iterator
 typedef device_type_enumerator<barcode_reader_device> barcode_reader_device_enumerator;
 
-#endif // MAME_DEVICES_MACHINE_BCREADER_H
+#endif // MAME_MACHINE_BCREADER_H

src/devices/machine/buffer.h

@@ -1,7 +1,9 @@
 // license:BSD-3-Clause
 // copyright-holders:smf
-#ifndef MAME_DEVICES_MACHINE_BUFFER_H
-#define MAME_DEVICES_MACHINE_BUFFER_H
+#ifndef MAME_MACHINE_BUFFER_H
+#define MAME_MACHINE_BUFFER_H
+
+#pragma once
 
 class input_buffer_device : public device_t
 {
@@ -27,4 +29,4 @@ protected:
 
 DECLARE_DEVICE_TYPE(INPUT_BUFFER, input_buffer_device)
 
-#endif // MAME_DEVICES_MACHINE_BUFFER_H
+#endif // MAME_MACHINE_BUFFER_H

src/devices/machine/dp8573a.h

@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz
 
-#ifndef DEVICES_MACHINE_DP8573_H
-#define DEVICES_MACHINE_DP8573_H
+#ifndef MAME_MACHINE_DP8573_H
+#define MAME_MACHINE_DP8573_H
 
 #pragma once
 
@@ -70,4 +70,4 @@ protected:
 DECLARE_DEVICE_TYPE(DP8572A, dp8572a_device)
 DECLARE_DEVICE_TYPE(DP8573A, dp8573a_device)
 
-#endif // DEVICES_MACHINE_DP8573_H
+#endif // MAME_MACHINE_DP8573_H

src/devices/machine/gt913_snd.h

@@ -4,8 +4,8 @@
     Casio GT913 sound (HLE)
 ***************************************************************************/
 
-#ifndef MAME_AUDIO_GT913_H
-#define MAME_AUDIO_GT913_H
+#ifndef MAME_MACHINE_GT913_SND_H
+#define MAME_MACHINE_GT913_SND_H
 
 #pragma once
 
@@ -85,4 +85,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(GT913_SOUND, gt913_sound_device)
 
-#endif // MAME_AUDIO_GT913_H
+#endif // MAME_MACHINE_GT913_SND_H

src/devices/machine/i8087.h

@@ -1,5 +1,9 @@
 // license:BSD-3-Clause
 // copyright-holders:Philip Bennett, Carl
+#ifndef MAME_MACHINE_I8087_H
+#define MAME_MACHINE_I8087_H
+
+#pragma once
 
 // SoftFloat 2 lacks an include guard
 #ifndef softfloat2_h
@@ -223,3 +227,5 @@ private:
 	void build_opcode_table();
 
 };
+
+#endif // MAME_MACHINE_I8087_H

src/devices/machine/ldp1450hle.h

@@ -7,8 +7,8 @@
 
 *************************************************************************/
 
-#ifndef MAME_MACHINE_LDP1450_H
-#define MAME_MACHINE_LDP1450_H
+#ifndef MAME_MACHINE_LDP1450HLE_H
+#define MAME_MACHINE_LDP1450HLE_H
 
 #pragma once
 
@@ -195,4 +195,4 @@ private:
 
 };
 
-#endif // MAME_MACHINE_LDP1450_H
+#endif // MAME_MACHINE_LDP1450HLE_H

src/devices/machine/ldv4200hle.h

@@ -4,12 +4,12 @@
 
     ldv4200hle.h
 
-    Pioneer LD-V4200 laserdisc player simulation.
+    Pioneer LD-V4200 LaserDisc player simulation.
 
 *************************************************************************/
 
-#ifndef MAME_MACHINE_LDV4200_H
-#define MAME_MACHINE_LDV4200_H
+#ifndef MAME_MACHINE_LDV4200HLE_H
+#define MAME_MACHINE_LDV4200HLE_H
 
 #pragma once
 
@@ -209,4 +209,4 @@ private:
 	uint32_t            m_curr_frame;
 };
 
-#endif // MAME_MACHINE_LDV4200_H
+#endif // MAME_MACHINE_LDV4200HLE_H

src/devices/machine/locomo.h

@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_LOCOMO
-#define MAME_MACHINE_LOCOMO
+#ifndef MAME_MACHINE_LOCOMO_H
+#define MAME_MACHINE_LOCOMO_H
 
 #pragma once
 
@@ -31,4 +31,4 @@ protected:
 
 DECLARE_DEVICE_TYPE(LOCOMO, locomo_device)
 
-#endif // MAME_MACHINE_LOCOMO
+#endif // MAME_MACHINE_LOCOMO_H

src/devices/machine/mediagx_cs5530_video.h

@@ -1,8 +1,8 @@
 // license: BSD-3-Clause
 // copyright-holders: Angelo Salese
 
-#ifndef MAME_MACHINE_SIS630_VGA_H
-#define MAME_MACHINE_SIS630_VGA_H
+#ifndef MAME_MACHINE_MEDIAGX_CS5530_VIDEO_H
+#define MAME_MACHINE_MEDIAGX_CS5530_VIDEO_H
 
 #pragma once
 
@@ -26,4 +26,4 @@ protected:
 DECLARE_DEVICE_TYPE(MEDIAGX_CS5530_VIDEO, mediagx_cs5530_video_device)
 
 
-#endif
+#endif // MAME_MACHINE_MEDIAGX_CS5530_VIDEO_H

src/devices/machine/mv_sonora.h

@@ -6,8 +6,8 @@
     Supports 5 different modelines at up to 16bpp
 
 *********************************************************************/
-#ifndef MAME_MACHINE_MAC_VIDEO_SONORA_H
-#define MAME_MACHINE_MAC_VIDEO_SONORA_H
+#ifndef MAME_MACHINE_MV_SONORA_H
+#define MAME_MACHINE_MV_SONORA_H
 
 #pragma once
 
@@ -73,4 +73,4 @@ private:
 
 DECLARE_DEVICE_TYPE(MAC_VIDEO_SONORA, mac_video_sonora_device)
 
-#endif  /* MAME_MACHINE_MAC_VIDEO_SONORA_H */
+#endif // MAME_MACHINE_MV_SONORA_H

src/devices/machine/pc97338.h

@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders: Angelo Salese
 
-#ifndef MAME_MACHINE_PC97336_H
-#define MAME_MACHINE_PC97336_H
+#ifndef MAME_MACHINE_PC97338_H
+#define MAME_MACHINE_PC97338_H
 
 #pragma once
 
@@ -121,4 +121,4 @@ private:
 
 DECLARE_DEVICE_TYPE(PC97338, pc97338_device);
 
-#endif // MAME_MACHINE_PC97336_H
+#endif // MAME_MACHINE_PC97338_H

src/devices/machine/pxa255.h

@@ -9,8 +9,8 @@
  *
  **************************************************************************/
 
-#ifndef MAME_MACHINE_PXA255
-#define MAME_MACHINE_PXA255
+#ifndef MAME_MACHINE_PXA255_H
+#define MAME_MACHINE_PXA255_H
 
 #pragma once
 
@@ -478,4 +478,4 @@ protected:
 
 DECLARE_DEVICE_TYPE(PXA255_PERIPHERALS, pxa255_periphs_device)
 
-#endif // MAME_MACHINE_PXA255
+#endif // MAME_MACHINE_PXA255_H

src/devices/machine/sa1110.h

@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_SA1110
-#define MAME_MACHINE_SA1110
+#ifndef MAME_MACHINE_SA1110_H
+#define MAME_MACHINE_SA1110_H
 
 #pragma once
 
@@ -905,4 +905,4 @@ protected:
 
 DECLARE_DEVICE_TYPE(SA1110_PERIPHERALS, sa1110_periphs_device)
 
-#endif // MAME_MACHINE_SA1110
+#endif // MAME_MACHINE_SA1110_H

src/devices/machine/sa1111.h

@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_SA1111
-#define MAME_MACHINE_SA1111
+#ifndef MAME_MACHINE_SA1111_H
+#define MAME_MACHINE_SA1111_H
 
 #pragma once
 
@@ -685,4 +685,4 @@ protected:
 
 DECLARE_DEVICE_TYPE(SA1111, sa1111_device)
 
-#endif // MAME_MACHINE_SA1111
+#endif // MAME_MACHINE_SA1111_H

src/devices/machine/scc66470.h

@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_VIDEO_SCC66470_H
-#define MAME_VIDEO_SCC66470_H
+#ifndef MAME_MACHINE_SCC66470_H
+#define MAME_MACHINE_SCC66470_H
 
 #pragma once
 
@@ -112,4 +112,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(SCC66470, scc66470_device)
 
-#endif // MAME_VIDEO_SCC66470_H
+#endif // MAME_MACHINE_SCC66470_H

src/devices/machine/sci4.h

@@ -3,8 +3,8 @@
 
 // Yamaha SCI4 / XV833A00, 7-lines serial chip with 4 multiplexed on one and the other 3 separated
 
-#ifndef DEVICES_MACHINE_SCI4_H
-#define DEVICES_MACHINE_SCI4_H
+#ifndef MAME_MACHINE_SCI4_H
+#define MAME_MACHINE_SCI4_H
 
 #pragma once
 
@@ -71,4 +71,4 @@ protected:
 
 DECLARE_DEVICE_TYPE(SCI4, sci4_device)
 
-#endif
+#endif // MAME_MACHINE_SCI4_H

src/devices/machine/scoop.h

@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_SCOOP
-#define MAME_MACHINE_SCOOP
+#ifndef MAME_MACHINE_SCOOP_H
+#define MAME_MACHINE_SCOOP_H
 
 #pragma once
 
@@ -39,4 +39,4 @@ protected:
 
 DECLARE_DEVICE_TYPE(SCOOP, scoop_device)
 
-#endif // MAME_MACHINE_SCOOP
+#endif // MAME_MACHINE_SCOOP_H

src/devices/machine/segacrpt_device.h

@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
 
-#ifndef MAME_MACHINE_SEGACRYPT_DEVICE_H
-#define MAME_MACHINE_SEGACRYPT_DEVICE_H
+#ifndef MAME_MACHINE_SEGACRPT_DEVICE_H
+#define MAME_MACHINE_SEGACRPT_DEVICE_H
 
 #pragma once
 
@@ -290,5 +290,4 @@ DECLARE_DEVICE_TYPE(SEGA_315_5128, sega_315_5128_device)
 DECLARE_DEVICE_TYPE(SEGA_315_5028, sega_315_5028_device)
 DECLARE_DEVICE_TYPE(SEGA_315_5084, sega_315_5084_device)
 
-
-#endif // MAME_MACHINE_SEGACRYPT_DEVICE_H
+#endif // MAME_MACHINE_SEGACRPT_DEVICE_H

src/devices/machine/sis630_gui.h

@@ -1,8 +1,8 @@
 // license: BSD-3-Clause
 // copyright-holders: Angelo Salese
 
-#ifndef MAME_MACHINE_SIS630_VGA_H
-#define MAME_MACHINE_SIS630_VGA_H
+#ifndef MAME_MACHINE_SIS630_GUI_H
+#define MAME_MACHINE_SIS630_GUI_H
 
 #pragma once
 
@@ -94,5 +94,4 @@ private:
 
 DECLARE_DEVICE_TYPE(SIS630_BRIDGE, sis630_bridge_device)
 
-
-#endif
+#endif // MAME_MACHINE_SIS630_GUI_H

src/devices/machine/sis85c496.h

@@ -2,8 +2,8 @@
 // copyright-holders:R. Belmont
 // SiS 85c496 northbridge (PCI & CPU Memory Controller)
 
-#ifndef SIS85C496_H
-#define SIS85C496_H
+#ifndef MAME_MACHINE_SIS85C496_H
+#define MAME_MACHINE_SIS85C496_H
 
 #include "pci.h"
 #include "machine/ds128x.h"
@@ -193,4 +193,4 @@ private:
 
 DECLARE_DEVICE_TYPE(SIS85C496_HOST, sis85c496_host_device)
 
-#endif
+#endif // MAME_MACHINE_SIS85C496_H

src/devices/machine/smartmed.h

@@ -4,8 +4,8 @@
     smartmed.h: header file for smartmed.c
 */
 
-#ifndef MAME_MACHINE_SMARTMEDIA_H
-#define MAME_MACHINE_SMARTMEDIA_H
+#ifndef MAME_MACHINE_SMARTMED_H
+#define MAME_MACHINE_SMARTMED_H
 
 #pragma once
 
@@ -54,4 +54,4 @@ protected:
 // device type definition
 DECLARE_DEVICE_TYPE(SMARTMEDIA, smartmedia_image_device)
 
-#endif // MAME_MACHINE_SMARTMEDIA_H
+#endif // MAME_MACHINE_SMARTMED_H

src/devices/machine/smpc.h

@@ -6,8 +6,8 @@
 //void saturn_SMPC_w(offs_t offset, uint8_t data);
 //uint8_t saturn_SMPC_r(offs_t offset);
 
-#ifndef MAME_MACHINE_SMPC_HLE_H
-#define MAME_MACHINE_SMPC_HLE_H
+#ifndef MAME_MACHINE_SMPC_H
+#define MAME_MACHINE_SMPC_H
 
 #pragma once
 
@@ -199,12 +199,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(SMPC_HLE, smpc_hle_device)
 
-
-
-//**************************************************************************
-//  GLOBAL VARIABLES
-//**************************************************************************
-
-
-#endif // MAME_MACHINE_SMPC_HLE_H
-
+#endif // MAME_MACHINE_SMPC_H

src/devices/machine/sun4c_mmu.h

@@ -6,10 +6,10 @@
 
 ***************************************************************************/
 
-#pragma once
+#ifndef MAME_MACHINE_SUN4C_MMU_H
+#define MAME_MACHINE_SUN4C_MMU_H
 
-#ifndef DEVICE_MACHINE_SUN4C_MMU_H
-#define DEVICE_MACHINE_SUN4C_MMU_H
+#pragma once
 
 #include "cpu/sparc/sparc_intf.h"
 #include "machine/ram.h"
@@ -211,4 +211,4 @@ public:
 DECLARE_DEVICE_TYPE(SUN4_MMU, sun4_mmu_device)
 DECLARE_DEVICE_TYPE(SUN4C_MMU, sun4c_mmu_device)
 
-#endif // DEVICE_MACHINE_SUN4C_MMU_H
+#endif // MAME_MACHINE_SUN4C_MMU_H

src/devices/machine/tdc1008.h

@@ -7,8 +7,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_TDC1008_TDC1008_H
-#define MAME_MACHINE_TDC1008_TDC1008_H
+#ifndef MAME_MACHINE_TDC1008_H
+#define MAME_MACHINE_TDC1008_H
 
 #pragma once
 
@@ -108,4 +108,4 @@ protected:
 // device type definition
 DECLARE_DEVICE_TYPE(TDC1008, tdc1008_device)
 
-#endif // MAME_MACHINE_TDC1008_TDC1008_H
+#endif // MAME_MACHINE_TDC1008_H

src/devices/machine/timehelp.h

@@ -8,10 +8,10 @@
 
 ***************************************************************************/
 
-#pragma once
+#ifndef MAME_MACHINE_TIMEHELP_H
+#define MAME_MACHINE_TIMEHELP_H
 
-#ifndef SRC_DEVICES_MACHINE_TIMEHELP_H
-#define SRC_DEVICES_MACHINE_TIMEHELP_H
+#pragma once
 
 class time_helper
 {
@@ -55,4 +55,4 @@ public:
 
 };
 
-#endif // SRC_DEVICES_MACHINE_TIMEHELP_H
+#endif // MAME_MACHINE_TIMEHELP_H

src/devices/machine/tmc208k.h

@@ -10,8 +10,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_TMC208K_TMC208K_H
-#define MAME_MACHINE_TMC208K_TMC208K_H
+#ifndef MAME_MACHINE_TMC208K_H
+#define MAME_MACHINE_TMC208K_H
 
 #pragma once
 
@@ -99,4 +99,4 @@ protected:
 DECLARE_DEVICE_TYPE(TMC208K, tmc208k_device)
 DECLARE_DEVICE_TYPE(TMC28KU, tmc28ku_device)
 
-#endif // MAME_MACHINE_TMC208K_TMC208K_H
+#endif // MAME_MACHINE_TMC208K_H

src/devices/machine/ucb1200.h

@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_UCB1200
-#define MAME_MACHINE_UCB1200
+#ifndef MAME_MACHINE_UCB1200_H
+#define MAME_MACHINE_UCB1200_H
 
 #pragma once
 
@@ -144,4 +144,4 @@ protected:
 
 DECLARE_DEVICE_TYPE(UCB1200, ucb1200_device)
 
-#endif // MAME_MACHINE_UCB1200
+#endif // MAME_MACHINE_UCB1200_H

src/devices/machine/upd7004.h

@@ -24,8 +24,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_DEVICES_MACHINE_UPD7004_H
-#define MAME_DEVICES_MACHINE_UPD7004_H
+#ifndef MAME_MACHINE_UPD7004_H
+#define MAME_MACHINE_UPD7004_H
 
 #pragma once
 
@@ -78,4 +78,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(UPD7004, upd7004_device)
 
-#endif // MAME_DEVICES_MACHINE_UPD7004_H
+#endif // MAME_MACHINE_UPD7004_H

src/devices/machine/upd765.h

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Olivier Galibert
-#ifndef MAME_DEVICES_MACHINE_UPD765_H
-#define MAME_DEVICES_MACHINE_UPD765_H
+#ifndef MAME_MACHINE_UPD765_H
+#define MAME_MACHINE_UPD765_H
 
 #pragma once
 
@@ -635,4 +635,4 @@ DECLARE_DEVICE_TYPE(MCS3201,        mcs3201_device)
 DECLARE_DEVICE_TYPE(TC8566AF,       tc8566af_device)
 DECLARE_DEVICE_TYPE(HD63266F,       hd63266f_device)
 
-#endif // MAME_DEVICES_MACHINE_UPD765_H
+#endif // MAME_MACHINE_UPD765_H