Bulk replace convention for include guards in src/mame/includes/ files:

MAME_INCLUDES_<FILENAME>_H is now the standardized way for a MAME include header, starting with a double underscore is reserved by the C++ standard go figure (nw)

src/mame/includes/3do.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef _3DO_H_
+#ifndef MAME_INCLUDES_3DO_H
-#define _3DO_H_
+#define MAME_INCLUDES_3DO_H
 
 #include "machine/nvram.h"
 #include "machine/timer.h"

src/mame/includes/a2600.h

@@ -8,8 +8,8 @@
 
  ****************************************************************************/
 
-#ifndef MAME_INCLUDES_A2600H
+#ifndef MAME_INCLUDES_A2600_H
-#define MAME_INCLUDES_A2600H
+#define MAME_INCLUDES_A2600_H
 
 #pragma once
 

src/mame/includes/abc1600.h

@@ -2,8 +2,8 @@
 // copyright-holders:Curt Coder
 #pragma once
 
-#ifndef __ABC1600__
+#ifndef MAME_INCLUDES_ABC1600_H
-#define __ABC1600__
+#define MAME_INCLUDES_ABC1600_H
 
 #include "bus/abcbus/abcbus.h"
 #include "bus/rs232/rs232.h"

src/mame/includes/abc80x.h

@@ -2,8 +2,8 @@
 // copyright-holders:Curt Coder
 #pragma once
 
-#ifndef __ABC800__
+#ifndef MAME_INCLUDES_ABC800_H
-#define __ABC800__
+#define MAME_INCLUDES_ABC800_H
 
 #include "bus/abcbus/abcbus.h"
 #include "bus/rs232/rs232.h"

src/mame/includes/ac1.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef AC1_H_
+#ifndef MAME_INCLUDES_AC1_H
-#define AC1_H_
+#define MAME_INCLUDES_AC1_H
 
 #include "machine/z80pio.h"
 #include "imagedev/cassette.h"

src/mame/includes/adam.h

@@ -2,8 +2,8 @@
 // copyright-holders:Curt Coder
 #pragma once
 
-#ifndef ADAM_H_
+#ifndef MAME_INCLUDES_ADAM_H
-#define ADAM_H_
+#define MAME_INCLUDES_ADAM_H
 
 #include "bus/adam/exp.h"
 #include "bus/adamnet/adamnet.h"

src/mame/includes/advision.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ADVISION__
+#ifndef MAME_INCLUDES_ADVISION_H
-#define __ADVISION__
+#define MAME_INCLUDES_ADVISION_H
 
 #include "sound/dac.h"
 #include "bus/generic/slot.h"

src/mame/includes/aim65.h

@@ -8,8 +8,8 @@
  *
  ****************************************************************************/
 
-#ifndef AIM65_H_
+#ifndef MAME_INCLUDES_AIM65_H
-#define AIM65_H_
+#define MAME_INCLUDES_AIM65_H
 
 #include "cpu/m6502/m6502.h"
 #include "video/dl1416.h"

src/mame/includes/amstrad.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef AMSTRAD_H_
+#ifndef MAME_INCLUDES_AMSTRAD_H
-#define AMSTRAD_H_
+#define MAME_INCLUDES_AMSTRAD_H
 
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"

src/mame/includes/apple2e.h

@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#ifndef APPLE2E_H_
+#ifndef MAME_INCLUDES_APPLE2E_H
-#define APPLE2E_H_
+#define MAME_INCLUDES_APPLE2E_H
 
 INPUT_PORTS_EXTERN( apple2ep );
 

src/mame/includes/apple2gs.h

@@ -8,8 +8,8 @@
  *
  ****************************************************************************/
 
-#ifndef APPLE2GS_H_
+#ifndef MAME_INCLUDES_APPLE2GS_H
-#define APPLE2GS_H_
+#define MAME_INCLUDES_APPLE2GS_H
 
 #define RUN_ADB_MICRO (0)
 

src/mame/includes/apple3.h

@@ -8,8 +8,8 @@
  *
  ****************************************************************************/
 
-#ifndef APPLE3_H_
+#ifndef MAME_INCLUDES_APPLE3_H
-#define APPLE3_H_
+#define MAME_INCLUDES_APPLE3_H
 
 #include "cpu/m6502/m6502.h"
 #include "includes/apple2.h"

src/mame/includes/archimds.h

@@ -6,8 +6,8 @@
  *
  *****************************************************************************/
 
-#ifndef _ARCHIMEDES_H_
+#ifndef MAME_INCLUDES_ARCHIMEDES_H
-#define _ARCHIMEDES_H_
+#define MAME_INCLUDES_ARCHIMEDES_H
 
 #include "machine/aakart.h"
 #include "sound/dac.h"

src/mame/includes/asuka.h

@@ -5,6 +5,7 @@
     Asuka & Asuka  (+ Taito/Visco games on similar hardware)
 
 *************************************************************************/
+
 #ifndef MAME_INCLUDES_ASUKA_H
 #define MAME_INCLUDES_ASUKA_H
 

src/mame/includes/atari400.h

@@ -11,8 +11,8 @@
 
 ******************************************************************************/
 
-#ifndef ATARI_H
+#ifndef MAME_INCLUDES_ATARI_H
-#define ATARI_H
+#define MAME_INCLUDES_ATARI_H
 
 #include "machine/6821pia.h"
 #include "sound/pokey.h"

src/mame/includes/bebox.h

@@ -8,8 +8,8 @@
  *
  ****************************************************************************/
 
-#ifndef BEBOX_H_
+#ifndef MAME_INCLUDES_BEBOX_H
-#define BEBOX_H_
+#define MAME_INCLUDES_BEBOX_H
 
 #include "machine/53c810.h"
 #include "machine/am9517a.h"

src/mame/includes/bk.h

@@ -6,8 +6,9 @@
  *
  ****************************************************************************/
 
-#ifndef BK_H_
+#ifndef MAME_INCLUDES_BK_H
-#define BK_H_
+#define MAME_INCLUDES_BK_H
+
 #include "imagedev/cassette.h"
 
 class bk_state : public driver_device

src/mame/includes/bw12.h

@@ -1,7 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Curt Coder
-#ifndef __BW12__
+
-#define __BW12__
+#ifndef MAME_INCLUDES_BW12_H
+#define MAME_INCLUDES_BW12_H
 
 #include "cpu/z80/z80.h"
 #include "machine/ram.h"

src/mame/includes/bwidow.h

@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Brad Oliver, Bernd Wiebelt, Allard van der Bas
 
-#ifndef BWIDOW_H_
+#ifndef MAME_INCLUDES_BWIDOW_H
-#define BWIDOW_H_
+#define MAME_INCLUDES_BWIDOW_H
 
 #define MASTER_CLOCK (XTAL(12'096'000))
 #define CLOCK_3KHZ   (MASTER_CLOCK / 4096)

src/mame/includes/c80.h

@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Curt Coder
-#ifndef __C80__
-#define __C80__
 
+#ifndef MAME_INCLUDES_C80_H
+#define MAME_INCLUDES_C80_H
 
 #include "cpu/z80/z80.h"
 #include "cpu/z80/z80daisy.h"

src/mame/includes/cdi.h

@@ -1,7 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz
-#ifndef _INCLUDES_CDI_H_
+
-#define _INCLUDES_CDI_H_
+#ifndef MAME_INCLUDES_CDI_H
+#define MAME_INCLUDES_CDI_H
 
 #include "machine/cdi070.h"
 #include "machine/cdislave.h"

src/mame/includes/channelf.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef CHANNELF_H_
+#ifndef MAME_INCLUDES_CHANNELF_H
-#define CHANNELF_H_
+#define MAME_INCLUDES_CHANNELF_H
 
 #include "cpu/f8/f8.h"
 #include "audio/channelf.h"

src/mame/includes/coleco.h

@@ -2,8 +2,8 @@
 // copyright-holders:Mike Balfour, Ben Bruscella, Sean Young
 #pragma once
 
-#ifndef __COLECO__
+#ifndef MAME_INCLUDES_COLECO_H
-#define __COLECO__
+#define MAME_INCLUDES_COLECO_H
 
 
 #include "cpu/z80/z80.h"

src/mame/includes/comquest.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef COMQUEST_H_
+#ifndef MAME_INCLUDES_COMQUEST_H
-#define COMQUEST_H_
+#define MAME_INCLUDES_COMQUEST_H
 
 
 class comquest_state : public driver_device

src/mame/includes/comx35.h

@@ -2,8 +2,8 @@
 // copyright-holders:Curt Coder
 #pragma once
 
-#ifndef __COMX35__
+#ifndef MAME_INCLUDES_COMX35_H
-#define __COMX35__
+#define MAME_INCLUDES_COMX35_H
 
 #include "bus/comx35/exp.h"
 #include "cpu/cosmac/cosmac.h"

src/mame/includes/cps1.h

@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#ifndef _CPS1_H_
+#ifndef MAME_INCLUDES_CPS1_H
-#define _CPS1_H_
+#define MAME_INCLUDES_CPS1_H
 
 #include "sound/msm5205.h"
 #include "sound/qsound.h"

src/mame/includes/crvision.h

@@ -1,9 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Wilbert Pol, Curt Coder
 
-#ifndef __CRVISION__
+#ifndef MAME_INCLUDES_CRVISION_H
-#define __CRVISION__
+#define MAME_INCLUDES_CRVISION_H
-
 
 #include "cpu/m6502/m6502.h"
 #include "imagedev/cassette.h"

src/mame/includes/cxhumax.h

@@ -1,7 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Lukasz Markowski
-#ifndef CXHUMAX_H_
+
-#define CXHUMAX_H_
+#ifndef MAME_INCLUDES_CXHUMAX_H
+#define MAME_INCLUDES_CXHUMAX_H
 
 #include "cpu/arm7/arm7.h"
 #include "cpu/arm7/arm7core.h"

src/mame/includes/dai.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef DAI_H_
+#ifndef MAME_INCLUDES_DAI_H
-#define DAI_H_
+#define MAME_INCLUDES_DAI_H
 
 #include "cpu/i8085/i8085.h"
 #include "audio/dai_snd.h"

src/mame/includes/dgn_beta.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef DGN_BETA_H_
+#ifndef MAME_INCLUDES_DGN_BETA_H
-#define DGN_BETA_H_
+#define MAME_INCLUDES_DGN_BETA_H
 
 #include "video/mc6845.h"
 #include "machine/wd_fdc.h"

src/mame/includes/electron.h

@@ -10,8 +10,8 @@
  *
  ****************************************************************************/
 
-#ifndef ELECTRON_H_
+#ifndef MAME_INCLUDES_ELECTRON_H
-#define ELECTRON_H_
+#define MAME_INCLUDES_ELECTRON_H
 
 #include "machine/ram.h"
 #include "imagedev/cassette.h"

src/mame/includes/elf.h

@@ -2,8 +2,8 @@
 // copyright-holders:Curt Coder
 #pragma once
 
-#ifndef __INCLUDES_ELF__
+#ifndef MAME_INCLUDES_ELF_H
-#define __INCLUDES_ELF__
+#define MAME_INCLUDES_ELF_H
 
 
 #include "cpu/cosmac/cosmac.h"

src/mame/includes/esripsys.h

@@ -6,8 +6,8 @@
 
 *************************************************************************/
 
-#ifndef _ESRIPSYS_H_
+#ifndef MAME_INCLUDES_ESRIPSYS_H
-#define _ESRIPSYS_H_
+#define MAME_INCLUDES_ESRIPSYS_H
 
 #pragma once
 

src/mame/includes/eti660.h

@@ -2,8 +2,8 @@
 // copyright-holders:Curt Coder
 #pragma once
 
-#ifndef __ETI660__
+#ifndef MAME_INCLUDES_ETI660_H
-#define __ETI660__
+#define MAME_INCLUDES_ETI660_H
 
 #include "cpu/cosmac/cosmac.h"
 #include "imagedev/cassette.h"

src/mame/includes/fidelbase.h

@@ -9,8 +9,8 @@
 
 #pragma once
 
-#ifndef DRIVERS_FIDELBASE_H
+#ifndef MAME_INCLUDES_FIDELBASE_H
-#define DRIVERS_FIDELBASE_H
+#define MAME_INCLUDES_FIDELBASE_H
 
 #include "machine/timer.h"
 #include "sound/dac.h"

src/mame/includes/galaxold.h

@@ -12,8 +12,8 @@
 
 ***************************************************************************/
 
-#ifndef __GALAXOLD_H__
+#ifndef MAME_INCLUDES_GALAXOLD_H
-#define __GALAXOLD_H__
+#define MAME_INCLUDES_GALAXOLD_H
 
 #include "machine/7474.h"
 #include "machine/timer.h"

src/mame/includes/galaxy.h

@@ -5,9 +5,9 @@
  * includes/galaxy.h
  *
  ****************************************************************************/
-
+ 
-#ifndef GALAXY_H_
+#ifndef MAME_INCLUDES_GALAXY_H
-#define GALAXY_H_
+#define MAME_INCLUDES_GALAXY_H
 
 #include "imagedev/snapquik.h"
 #include "imagedev/cassette.h"

src/mame/includes/galeb.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef GALEB_H_
+#ifndef MAME_INCLUDES_GALEB_H
-#define GALEB_H_
+#define MAME_INCLUDES_GALEB_H
 
 #include "sound/dac.h"
 

src/mame/includes/gamecom.h

@@ -10,8 +10,8 @@
  *
  ****************************************************************************/
 
-#ifndef GAMECOM_H_
+#ifndef MAME_INCLUDES_GAMECOM_H
-#define GAMECOM_H_
+#define MAME_INCLUDES_GAMECOM_H
 
 #include "cpu/sm8500/sm8500.h"
 #include "sound/dac.h"

src/mame/includes/gb.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef GB_H_
+#ifndef MAME_INCLUDES_GB_H
-#define GB_H_
+#define MAME_INCLUDES_GB_H
 
 #include "sound/gb.h"
 #include "cpu/lr35902/lr35902.h"

src/mame/includes/gba.h

@@ -1,7 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:R. Belmont,Ryan Holtz
-#ifndef _GBA_H_
+
-#define _GBA_H_
+#ifndef MAME_INCLUDES_GBA_H
+#define MAME_INCLUDES_GBA_H
 
 #include "sound/gb.h"
 #include "machine/intelfsh.h"

src/mame/includes/gp32.h

@@ -1,7 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Tim Schuerewegen
-#ifndef _GP32_H_
+
-#define _GP32_H_
+#ifndef MAME_INCLUDES_GP32_H
+#define MAME_INCLUDES_GP32_H
 
 #include "machine/smartmed.h"
 #include "sound/dac.h"

src/mame/includes/gstriker.h

@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Farfetch'd, David Haywood
 
-#ifndef __GSTRIKER_H
+#ifndef MAME_INCLUDES_GSTRIKER_H
-#define __GSTRIKER_H
+#define MAME_INCLUDES_GSTRIKER_H
 
 #include "machine/6850acia.h"
 #include "machine/gen_latch.h"

src/mame/includes/hp9845.h

@@ -3,8 +3,9 @@
 // *******************************
 // Driver for HP 9845B/C/T systems
 // *******************************
-#ifndef _HP9845_H_
+
-#define _HP9845_H_
+#ifndef MAME_INCLUDES_HP9845_H
+#define MAME_INCLUDES_HP9845_H
 
 #include "cpu/hphybrid/hphybrid.h"
 #include "machine/hp_taco.h"

src/mame/includes/huebler.h

@@ -1,7 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Curt Coder
-#ifndef __HUEBLER__
+
-#define __HUEBLER__
+#ifndef MAME_INCLUDES_HUEBLER_H
+#define MAME_INCLUDES_HUEBLER_H
 
 #define SCREEN_TAG      "screen"
 #define Z80_TAG         "z80"

src/mame/includes/imds2.h

@@ -2,8 +2,8 @@
 // copyright-holders:F. Ulivi
 // Driver for Intel Intellec MDS series-II
 
-#ifndef _IMDS2_H_
+#ifndef MAME_INCLUDES_IMDS2_H
-#define _IMDS2_H_
+#define MAME_INCLUDES_IMDS2_H
 
 #include "cpu/i8085/i8085.h"
 #include "cpu/mcs48/mcs48.h"

src/mame/includes/kaneko16.h

@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#ifndef __KANEKO16_H__
+#ifndef MAME_INCLUDES_KANEKO16_H
-#define __KANEKO16_H__
+#define MAME_INCLUDES_KANEKO16_H
 
 #include "machine/gen_latch.h"
 #include "machine/nvram.h"

src/mame/includes/kim1.h

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#ifndef __KIM1__
+#ifndef MAME_INCLUDES_KIM1_H
-#define __KIM1__
+#define MAME_INCLUDES_KIM1_H
 
 #include "softlist.h"
 #include "cpu/m6502/m6502.h"

src/mame/includes/kramermc.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef KRAMERMC_H_
+#ifndef MAME_INCLUDES_KRAMERMC_H
-#define KRAMERMC_H_
+#define MAME_INCLUDES_KRAMERMC_H
 
 #include "machine/z80pio.h"
 

src/mame/includes/lynx.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef LYNX_H_
+#ifndef MAME_INCLUDES_LYNX_H
-#define LYNX_H_
+#define MAME_INCLUDES_LYNX_H
 
 #include "audio/lynx.h"
 #include "imagedev/snapquik.h"

src/mame/includes/mac.h

@@ -8,8 +8,8 @@
  *
  ****************************************************************************/
 
-#ifndef MAC_H_
+#ifndef MAME_INCLUDES_MAC_H
-#define MAC_H_
+#define MAME_INCLUDES_MAC_H
 
 #include "machine/8530scc.h"
 #include "machine/6522via.h"

src/mame/includes/macpci.h

@@ -8,8 +8,8 @@
  *
  ****************************************************************************/
 
-#ifndef MACPCI_H_
+#ifndef MAME_INCLUDES_MACPCI_H
-#define MACPCI_H_
+#define MAME_INCLUDES_MACPCI_H
 
 #include "machine/8530scc.h"
 #include "machine/6522via.h"

src/mame/includes/mario.h

@@ -1,7 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Mirko Buffoni
-#ifndef MARIO_H_
+
-#define MARIO_H_
+#ifndef MAME_INCLUDES_MARIO_H
+#define MAME_INCLUDES_MARIO_H
 
 #include "machine/gen_latch.h"
 #include "machine/z80dma.h"

src/mame/includes/micronic.h

@@ -6,8 +6,8 @@
 
 *****************************************************************************/
 
-#ifndef __MICRONIC__
+#ifndef MAME_INCLUDES_MICRONIC_H
-#define __MICRONIC__
+#define MAME_INCLUDES_MICRONIC_H
 
 #include "cpu/z80/z80.h"
 #include "video/hd61830.h"

src/mame/includes/microtan.h

@@ -14,8 +14,8 @@
  *
  ******************************************************************************/
 
-#ifndef MICROTAN_H_
+#ifndef MAME_INCLUDES_MICROTAN_H
-#define MICROTAN_H_
+#define MAME_INCLUDES_MICROTAN_H
 
 #include "imagedev/snapquik.h"
 #include "machine/6522via.h"

src/mame/includes/mikro80.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef MIKRO80_H_
+#ifndef MAME_INCLUDES_MIKRO80_H
-#define MIKRO80_H_
+#define MAME_INCLUDES_MIKRO80_H
 
 #include "machine/i8255.h"
 #include "imagedev/cassette.h"

src/mame/includes/mikromik.h

@@ -2,8 +2,8 @@
 // copyright-holders:Curt Coder
 #pragma once
 
-#ifndef __MIKROMIKKO__
+#ifndef MAME_INCLUDES_MIKROMIKKO_H
-#define __MIKROMIKKO__
+#define MAME_INCLUDES_MIKROMIKKO_H
 
 #include "bus/rs232/rs232.h"
 #include "cpu/i8085/i8085.h"

src/mame/includes/msx.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef __MSX_H__
+#ifndef MAME_INCLUDES_MSX_H
-#define __MSX_H__
+#define MAME_INCLUDES_MSX_H
 
 #include "cpu/z80/z80.h"
 #include "machine/i8255.h"

src/mame/includes/mtx.h

@@ -6,8 +6,8 @@
 
 *************************************************************************/
 
-#ifndef __MTX__
+#ifndef MAME_INCLUDES_MTX_H
-#define __MTX__
+#define MAME_INCLUDES_MTX_H
 
 #include "imagedev/snapquik.h"
 #include "imagedev/cassette.h"

src/mame/includes/nc.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef NC_H_
+#ifndef MAME_INCLUDES_NC_H
-#define NC_H_
+#define MAME_INCLUDES_NC_H
 
 #include "bus/centronics/ctronics.h"
 #include "machine/i8251.h"

src/mame/includes/nds.h

@@ -1,8 +1,9 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz, R. Belmont
 #pragma once
-#ifndef INCLUDES_NDS_H
+
-#define INCLUDES_NDS_H
+#ifndef MAME_INCLUDES_NDS_H
+#define MAME_INCLUDES_NDS_H
 
 #include "cpu/arm7/arm7.h"
 #include "cpu/arm7/arm7core.h"

src/mame/includes/newbrain.h

@@ -2,8 +2,8 @@
 // copyright-holders:Curt Coder
 #pragma once
 
-#ifndef __NEWBRAIN__
+#ifndef MAME_INCLUDES_NEWBRAIN_H
-#define __NEWBRAIN__
+#define MAME_INCLUDES_NEWBRAIN_H
 
 
 #include "bus/newbrain/exp.h"

src/mame/includes/next.h

@@ -2,8 +2,8 @@
 // copyright-holders:Olivier Galibert
 #pragma once
 
-#ifndef __NEXT__
+#ifndef MAME_INCLUDES_NEXT_H
-#define __NEXT__
+#define MAME_INCLUDES_NEXT_H
 
 #include "cpu/m68000/m68000.h"
 #include "machine/nscsi_bus.h"

src/mame/includes/novagbase.h

@@ -9,8 +9,8 @@
 
 #pragma once
 
-#ifndef DRIVERS_NOVAGBASE_H
+#ifndef MAME_INCLUDES_NOVAGBASE_H
-#define DRIVERS_NOVAGBASE_H
+#define MAME_INCLUDES_NOVAGBASE_H
 
 #include "machine/timer.h"
 #include "sound/dac.h"

src/mame/includes/ob68k1a.h

@@ -2,8 +2,8 @@
 // copyright-holders:Curt Coder
 #pragma once
 
-#ifndef __OB68K1A__
+#ifndef MAME_INCLUDES_OB68K1A_H
-#define __OB68K1A__
+#define MAME_INCLUDES_OB68K1A_H
 
 #include "bus/rs232/rs232.h"
 #include "cpu/m68000/m68000.h"

src/mame/includes/osi.h

@@ -2,8 +2,8 @@
 // copyright-holders:Curt Coder, Robbbert, Wilbert Pol
 #pragma once
 
-#ifndef __OSI__
+#ifndef MAME_INCLUDES_OSI_H
-#define __OSI__
+#define MAME_INCLUDES_OSI_H
 
 
 #include "cpu/m6502/m6502.h"

src/mame/includes/pc1251.h

@@ -8,8 +8,8 @@
  *
  ****************************************************************************/
 
-#ifndef PC1251_H_
+#ifndef MAME_INCLUDES_PC1251_H
-#define PC1251_H_
+#define MAME_INCLUDES_PC1251_H
 
 #include "pocketc.h"
 #include "cpu/sc61860/sc61860.h"

src/mame/includes/pc1350.h

@@ -8,8 +8,8 @@
  *
  ****************************************************************************/
 
-#ifndef PC1350_H_
+#ifndef MAME_INCLUDES_PC1350_H
-#define PC1350_H_
+#define MAME_INCLUDES_PC1350_H
 
 #include "pocketc.h"
 #include "cpu/sc61860/sc61860.h"

src/mame/includes/pc1401.h

@@ -8,8 +8,8 @@
  *
  ****************************************************************************/
 
-#ifndef PC1401_H_
+#ifndef MAME_INCLUDES_PC1401_H
-#define PC1401_H_
+#define MAME_INCLUDES_PC1401_H
 
 #include "pocketc.h"
 #include "cpu/sc61860/sc61860.h"

src/mame/includes/pc1403.h

@@ -8,8 +8,8 @@
  *
  ****************************************************************************/
 
-#ifndef PC1403_H_
+#ifndef MAME_INCLUDES_PC1403_H
-#define PC1403_H_
+#define MAME_INCLUDES_PC1403_H
 
 #include "pocketc.h"
 #include "cpu/sc61860/sc61860.h"

src/mame/includes/pc4.h

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#ifndef _PC4_H_
+#ifndef MAME_INCLUDES_PC4_H
-#define _PC4_H_
+#define MAME_INCLUDES_PC4_H
 
 
 #include "sound/beep.h"

src/mame/includes/pc6001.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#ifndef __PC6001__
+#ifndef MAME_INCLUDES_PC6001_H
-#define __PC6001__
+#define MAME_INCLUDES_PC6001_H
 
 #include "emu.h"
 

src/mame/includes/pc8001.h

@@ -2,8 +2,8 @@
 // copyright-holders:Curt Coder
 #pragma once
 
-#ifndef __PC8001__
+#ifndef MAME_INCLUDES_PC8001_H
-#define __PC8001__
+#define MAME_INCLUDES_PC8001_H
 
 
 #include "cpu/z80/z80.h"

src/mame/includes/pc8401a.h

@@ -2,8 +2,8 @@
 // copyright-holders:Curt Coder
 #pragma once
 
-#ifndef __PC8401A__
+#ifndef MAME_INCLUDES_PC8401A_H
-#define __PC8401A__
+#define MAME_INCLUDES_PC8401A_H
 
 
 #include "cpu/z80/z80.h"

src/mame/includes/pc9801.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#ifndef __PC9801__
+#ifndef MAME_INCLUDES_PC9801_H
-#define __PC9801__
+#define MAME_INCLUDES_PC9801_H
 
 #include "cpu/i386/i386.h"
 #include "cpu/i86/i286.h"

src/mame/includes/pce.h

@@ -8,8 +8,8 @@
  *
  ****************************************************************************/
 
-#ifndef PCE_H_
+#ifndef MAME_INCLUDES_PCE_H
-#define PCE_H_
+#define MAME_INCLUDES_PCE_H
 
 #include "cdrom.h"
 #include "cpu/h6280/h6280.h"

src/mame/includes/pcw.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef PCW_H_
+#ifndef MAME_INCLUDES_PCW_H
-#define PCW_H_
+#define MAME_INCLUDES_PCW_H
 
 #include "machine/upd765.h"
 #include "machine/ram.h"

src/mame/includes/pcw16.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef PCW16_H_
+#ifndef MAME_INCLUDES_PCW16_H
-#define PCW16_H_
+#define MAME_INCLUDES_PCW16_H
 
 #include "cpu/z80/z80.h"
 #include "machine/upd765.h"     /* FDC superio */

src/mame/includes/pdp1.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef PDP1_H_
+#ifndef MAME_INCLUDES_PDP1_H
-#define PDP1_H_
+#define MAME_INCLUDES_PDP1_H
 
 #include "cpu/pdp1/pdp1.h"
 #include "video/crt.h"

src/mame/includes/pes.h

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#ifndef _PES_H_
+#ifndef MAME_INCLUDES_PES_H
-#define _PES_H_
+#define MAME_INCLUDES_PES_H
 
 #include "machine/terminal.h"
 #include "sound/tms5220.h"

src/mame/includes/phc25.h

@@ -2,8 +2,8 @@
 // copyright-holders:Curt Coder, Robbbert
 #pragma once
 
-#ifndef __PHC25__
+#ifndef MAME_INCLUDES_PHC25_H
-#define __PHC25__
+#define MAME_INCLUDES_PHC25_H
 
 
 #include "cpu/z80/z80.h"

src/mame/includes/pmd85.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef PMD85_H_
+#ifndef MAME_INCLUDES_PMD85_H
-#define PMD85_H_
+#define MAME_INCLUDES_PMD85_H
 
 #include "machine/i8251.h"
 #include "machine/pit8253.h"

src/mame/includes/pocketc.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef POCKETC_H_
+#ifndef MAME_INCLUDES_POCKETC_H
-#define POCKETC_H_
+#define MAME_INCLUDES_POCKETC_H
 
 typedef const char *POCKETC_FIGURE[];
 

src/mame/includes/poly88.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef POLY88_H_
+#ifndef MAME_INCLUDES_POLY88_H
-#define POLY88_H_
+#define MAME_INCLUDES_POLY88_H
 
 #include "machine/i8251.h"
 #include "imagedev/cassette.h"

src/mame/includes/poly880.h

@@ -2,8 +2,8 @@
 // copyright-holders:Curt Coder
 #pragma once
 
-#ifndef __POLY880__
+#ifndef MAME_INCLUDES_POLY880_H
-#define __POLY880__
+#define MAME_INCLUDES_POLY880_H
 
 
 #include "cpu/z80/z80.h"

src/mame/includes/prof80.h

@@ -2,8 +2,8 @@
 // copyright-holders:Curt Coder
 #pragma once
 
-#ifndef __PROF80__
+#ifndef MAME_INCLUDES_PROF80_H
-#define __PROF80__
+#define MAME_INCLUDES_PROF80_H
 
 #include "bus/ecbbus/ecbbus.h"
 #include "bus/rs232/rs232.h"

src/mame/includes/psion.h

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#ifndef _PSION_H_
+#ifndef MAME_INCLUDES_PSION_H
-#define _PSION_H_
+#define MAME_INCLUDES_PSION_H
 
 #include "cpu/m6800/m6801.h"
 #include "machine/nvram.h"

src/mame/includes/px8.h

@@ -2,8 +2,8 @@
 // copyright-holders:Curt Coder,Dirk Best
 #pragma once
 
-#ifndef __PX8__
+#ifndef MAME_INCLUDES_PX8_H
-#define __PX8__
+#define MAME_INCLUDES_PX8_H
 
 
 #include "cpu/z80/z80.h"

src/mame/includes/radio86.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef radio86_H_
+#ifndef MAME_INCLUDES_RADIO86_H
-#define radio86_H_
+#define MAME_INCLUDES_RADIO86_H
 
 #include "machine/i8255.h"
 #include "machine/i8257.h"

src/mame/includes/s11.h

@@ -6,8 +6,8 @@
  *  Created on: 1/01/2013
  */
 
-#ifndef S11_H_
+#ifndef MAME_INCLUDES_S11_H
-#define S11_H_
+#define MAME_INCLUDES_S11_H
 
 #include "audio/s11c_bg.h"
 #include "machine/6821pia.h"

src/mame/includes/s11a.h

@@ -6,8 +6,8 @@
  *  Created on: 1/01/2013
  */
 
-#ifndef S11A_H_
+#ifndef MAME_INCLUDES_S11A_H
-#define S11A_H_
+#define MAME_INCLUDES_S11A_H
 
 #include "includes/s11.h"
 

src/mame/includes/s11b.h

@@ -6,8 +6,8 @@
  *  Created on: 1/01/2013
  */
 
-#ifndef S11B_H_
+#ifndef MAME_INCLUDES_S11B_H
-#define S11B_H_
+#define MAME_INCLUDES_S11B_H
 
 #include "includes/s11a.h"
 

src/mame/includes/s11c.h

@@ -6,8 +6,8 @@
  *  Created on: 1/01/2013
  */
 
-#ifndef S11C_H_
+#ifndef MAME_INCLUDES_S11C_H
-#define S11C_H_
+#define MAME_INCLUDES_S11C_H
 
 #include "includes/s11b.h"
 

src/mame/includes/sg1000.h

@@ -1,7 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Curt Coder
-#ifndef __SG1000__
+
-#define __SG1000__
+#ifndef MAME_INCLUDES_SG1000_H
+#define MAME_INCLUDES_SG1000_H
 
 #include "cpu/z80/z80.h"
 #include "formats/sf7000_dsk.h"

src/mame/includes/snes.h

@@ -1,7 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Angelo Salese, R. Belmont, Anthony Kruize, Fabio Priuli, Ryan Holtz
-#ifndef _SNES_H_
+
-#define _SNES_H_
+#ifndef MAME_INCLUDES_SNES_H
+#define MAME_INCLUDES_SNES_H
 
 #include "cpu/spc700/spc700.h"
 #include "cpu/g65816/g65816.h"

src/mame/includes/softbox.h

@@ -2,8 +2,8 @@
 // copyright-holders:Curt Coder, Mike Naberezny
 #pragma once
 
-#ifndef __SOFTBOX__
+#ifndef MAME_INCLUDES_SOFTBOX_H
-#define __SOFTBOX__
+#define MAME_INCLUDES_SOFTBOX_H
 
 #include "bus/ieee488/ieee488.h"
 #include "bus/imi7000/imi7000.h"

src/mame/includes/sorcerer.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef SORCERER_H_
+#ifndef MAME_INCLUDES_SORCERER_H
-#define SORCERER_H_
+#define MAME_INCLUDES_SORCERER_H
 
 #include "cpu/z80/z80.h"
 #include "sound/wave.h"

src/mame/includes/specpls3.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef __SPECPLS3_H__
+#ifndef MAME_INCLUDES_SPECPLS3_H
-#define __SPECPLS3_H__
+#define MAME_INCLUDES_SPECPLS3_H
 
 INPUT_PORTS_EXTERN( spec_plus );
 

src/mame/includes/ssystem3.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef SSYSTEM3_H_
+#ifndef MAME_INCLUDES_SSYSTEM3_H
-#define SSYSTEM3_H_
+#define MAME_INCLUDES_SSYSTEM3_H
 
 #include "machine/6522via.h"
 

src/mame/includes/svision.h

@@ -6,8 +6,8 @@
  *
  ****************************************************************************/
 
-#ifndef SVISION_H_
+#ifndef MAME_INCLUDES_SVISION_H
-#define SVISION_H_
+#define MAME_INCLUDES_SVISION_H
 
 #include "cpu/m6502/m65c02.h"
 #include "machine/timer.h"