summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author angelosa <salese_corp_ltd@email.it>2018-02-05 10:20:58 +0100
committer angelosa <salese_corp_ltd@email.it>2018-02-05 10:23:50 +0100
commit18835562189492bd15263dba9d0ea5175cc6221c (patch)
tree9194c410f920656c93dea22ffe47d81c882d0b09
parent3630bb07a76313b9c53014933211fc78174c8df6 (diff)
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)
-rw-r--r--src/mame/includes/3do.h4
-rw-r--r--src/mame/includes/a2600.h4
-rw-r--r--src/mame/includes/abc1600.h4
-rw-r--r--src/mame/includes/abc80x.h4
-rw-r--r--src/mame/includes/ac1.h4
-rw-r--r--src/mame/includes/adam.h4
-rw-r--r--src/mame/includes/advision.h4
-rw-r--r--src/mame/includes/aim65.h4
-rw-r--r--src/mame/includes/amstrad.h4
-rw-r--r--src/mame/includes/apple2e.h4
-rw-r--r--src/mame/includes/apple2gs.h4
-rw-r--r--src/mame/includes/apple3.h4
-rw-r--r--src/mame/includes/archimds.h4
-rw-r--r--src/mame/includes/asuka.h1
-rw-r--r--src/mame/includes/atari400.h4
-rw-r--r--src/mame/includes/bebox.h4
-rw-r--r--src/mame/includes/bk.h5
-rw-r--r--src/mame/includes/bw12.h5
-rw-r--r--src/mame/includes/bwidow.h4
-rw-r--r--src/mame/includes/c80.h4
-rw-r--r--src/mame/includes/cdi.h5
-rw-r--r--src/mame/includes/channelf.h4
-rw-r--r--src/mame/includes/coleco.h4
-rw-r--r--src/mame/includes/comquest.h4
-rw-r--r--src/mame/includes/comx35.h4
-rw-r--r--src/mame/includes/cps1.h4
-rw-r--r--src/mame/includes/crvision.h5
-rw-r--r--src/mame/includes/cxhumax.h5
-rw-r--r--src/mame/includes/dai.h4
-rw-r--r--src/mame/includes/dgn_beta.h4
-rw-r--r--src/mame/includes/electron.h4
-rw-r--r--src/mame/includes/elf.h4
-rw-r--r--src/mame/includes/esripsys.h4
-rw-r--r--src/mame/includes/eti660.h4
-rw-r--r--src/mame/includes/fidelbase.h4
-rw-r--r--src/mame/includes/galaxold.h4
-rw-r--r--src/mame/includes/galaxy.h6
-rw-r--r--src/mame/includes/galeb.h4
-rw-r--r--src/mame/includes/gamecom.h4
-rw-r--r--src/mame/includes/gb.h4
-rw-r--r--src/mame/includes/gba.h5
-rw-r--r--src/mame/includes/gp32.h5
-rw-r--r--src/mame/includes/gstriker.h4
-rw-r--r--src/mame/includes/hp9845.h5
-rw-r--r--src/mame/includes/huebler.h5
-rw-r--r--src/mame/includes/imds2.h4
-rw-r--r--src/mame/includes/kaneko16.h4
-rw-r--r--src/mame/includes/kim1.h4
-rw-r--r--src/mame/includes/kramermc.h4
-rw-r--r--src/mame/includes/lynx.h4
-rw-r--r--src/mame/includes/mac.h4
-rw-r--r--src/mame/includes/macpci.h4
-rw-r--r--src/mame/includes/mario.h5
-rw-r--r--src/mame/includes/micronic.h4
-rw-r--r--src/mame/includes/microtan.h4
-rw-r--r--src/mame/includes/mikro80.h4
-rw-r--r--src/mame/includes/mikromik.h4
-rw-r--r--src/mame/includes/msx.h4
-rw-r--r--src/mame/includes/mtx.h4
-rw-r--r--src/mame/includes/nc.h4
-rw-r--r--src/mame/includes/nds.h5
-rw-r--r--src/mame/includes/newbrain.h4
-rw-r--r--src/mame/includes/next.h4
-rw-r--r--src/mame/includes/novagbase.h4
-rw-r--r--src/mame/includes/ob68k1a.h4
-rw-r--r--src/mame/includes/osi.h4
-rw-r--r--src/mame/includes/pc1251.h4
-rw-r--r--src/mame/includes/pc1350.h4
-rw-r--r--src/mame/includes/pc1401.h4
-rw-r--r--src/mame/includes/pc1403.h4
-rw-r--r--src/mame/includes/pc4.h4
-rw-r--r--src/mame/includes/pc6001.h4
-rw-r--r--src/mame/includes/pc8001.h4
-rw-r--r--src/mame/includes/pc8401a.h4
-rw-r--r--src/mame/includes/pc9801.h4
-rw-r--r--src/mame/includes/pce.h4
-rw-r--r--src/mame/includes/pcw.h4
-rw-r--r--src/mame/includes/pcw16.h4
-rw-r--r--src/mame/includes/pdp1.h4
-rw-r--r--src/mame/includes/pes.h4
-rw-r--r--src/mame/includes/phc25.h4
-rw-r--r--src/mame/includes/pmd85.h4
-rw-r--r--src/mame/includes/pocketc.h4
-rw-r--r--src/mame/includes/poly88.h4
-rw-r--r--src/mame/includes/poly880.h4
-rw-r--r--src/mame/includes/prof80.h4
-rw-r--r--src/mame/includes/psion.h4
-rw-r--r--src/mame/includes/px8.h4
-rw-r--r--src/mame/includes/radio86.h4
-rw-r--r--src/mame/includes/s11.h4
-rw-r--r--src/mame/includes/s11a.h4
-rw-r--r--src/mame/includes/s11b.h4
-rw-r--r--src/mame/includes/s11c.h4
-rw-r--r--src/mame/includes/sg1000.h5
-rw-r--r--src/mame/includes/snes.h5
-rw-r--r--src/mame/includes/softbox.h4
-rw-r--r--src/mame/includes/sorcerer.h4
-rw-r--r--src/mame/includes/specpls3.h4
-rw-r--r--src/mame/includes/ssystem3.h4
-rw-r--r--src/mame/includes/svision.h4
-rw-r--r--src/mame/includes/tdv2324.h4
-rw-r--r--src/mame/includes/ti89.h4
-rw-r--r--src/mame/includes/timex.h4
-rw-r--r--src/mame/includes/tmc1800.h4
-rw-r--r--src/mame/includes/tmc2000e.h4
-rw-r--r--src/mame/includes/tmc600.h4
-rw-r--r--src/mame/includes/tranz330.h5
-rw-r--r--src/mame/includes/tx0.h4
-rw-r--r--src/mame/includes/ut88.h4
-rw-r--r--src/mame/includes/vc4000.h4
-rw-r--r--src/mame/includes/vcs80.h4
-rw-r--r--src/mame/includes/vectrex.h4
-rw-r--r--src/mame/includes/vidbrain.h4
-rw-r--r--src/mame/includes/vip.h4
-rw-r--r--src/mame/includes/wpc_dot.h4
-rw-r--r--src/mame/includes/wpc_flip1.h4
-rw-r--r--src/mame/includes/wpc_flip2.h4
-rw-r--r--src/mame/includes/wswan.h4
118 files changed, 249 insertions, 236 deletions
diff --git a/src/mame/includes/3do.h b/src/mame/includes/3do.h
index 049439e60b6..ff227a5658a 100644
--- a/src/mame/includes/3do.h
+++ b/src/mame/includes/3do.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef _3DO_H_
-#define _3DO_H_
+#ifndef MAME_INCLUDES_3DO_H
+#define MAME_INCLUDES_3DO_H
#include "machine/nvram.h"
#include "machine/timer.h"
diff --git a/src/mame/includes/a2600.h b/src/mame/includes/a2600.h
index 1a18177d2d5..fdaa171838f 100644
--- a/src/mame/includes/a2600.h
+++ b/src/mame/includes/a2600.h
@@ -8,8 +8,8 @@
****************************************************************************/
-#ifndef MAME_INCLUDES_A2600H
-#define MAME_INCLUDES_A2600H
+#ifndef MAME_INCLUDES_A2600_H
+#define MAME_INCLUDES_A2600_H
#pragma once
diff --git a/src/mame/includes/abc1600.h b/src/mame/includes/abc1600.h
index d64bed61f72..f0a63689450 100644
--- a/src/mame/includes/abc1600.h
+++ b/src/mame/includes/abc1600.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder
#pragma once
-#ifndef __ABC1600__
-#define __ABC1600__
+#ifndef MAME_INCLUDES_ABC1600_H
+#define MAME_INCLUDES_ABC1600_H
#include "bus/abcbus/abcbus.h"
#include "bus/rs232/rs232.h"
diff --git a/src/mame/includes/abc80x.h b/src/mame/includes/abc80x.h
index fa7f6e88418..74d4a2348c5 100644
--- a/src/mame/includes/abc80x.h
+++ b/src/mame/includes/abc80x.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder
#pragma once
-#ifndef __ABC800__
-#define __ABC800__
+#ifndef MAME_INCLUDES_ABC800_H
+#define MAME_INCLUDES_ABC800_H
#include "bus/abcbus/abcbus.h"
#include "bus/rs232/rs232.h"
diff --git a/src/mame/includes/ac1.h b/src/mame/includes/ac1.h
index 0c6bb23b0ae..6459ddaaff5 100644
--- a/src/mame/includes/ac1.h
+++ b/src/mame/includes/ac1.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef AC1_H_
-#define AC1_H_
+#ifndef MAME_INCLUDES_AC1_H
+#define MAME_INCLUDES_AC1_H
#include "machine/z80pio.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/adam.h b/src/mame/includes/adam.h
index edfa51fced8..3e7a77f7296 100644
--- a/src/mame/includes/adam.h
+++ b/src/mame/includes/adam.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder
#pragma once
-#ifndef ADAM_H_
-#define ADAM_H_
+#ifndef MAME_INCLUDES_ADAM_H
+#define MAME_INCLUDES_ADAM_H
#include "bus/adam/exp.h"
#include "bus/adamnet/adamnet.h"
diff --git a/src/mame/includes/advision.h b/src/mame/includes/advision.h
index 2932ae090fb..6c7b76f0f6d 100644
--- a/src/mame/includes/advision.h
+++ b/src/mame/includes/advision.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef __ADVISION__
-#define __ADVISION__
+#ifndef MAME_INCLUDES_ADVISION_H
+#define MAME_INCLUDES_ADVISION_H
#include "sound/dac.h"
#include "bus/generic/slot.h"
diff --git a/src/mame/includes/aim65.h b/src/mame/includes/aim65.h
index ddd5bdd1b12..28cb79fc850 100644
--- a/src/mame/includes/aim65.h
+++ b/src/mame/includes/aim65.h
@@ -8,8 +8,8 @@
*
****************************************************************************/
-#ifndef AIM65_H_
-#define AIM65_H_
+#ifndef MAME_INCLUDES_AIM65_H
+#define MAME_INCLUDES_AIM65_H
#include "cpu/m6502/m6502.h"
#include "video/dl1416.h"
diff --git a/src/mame/includes/amstrad.h b/src/mame/includes/amstrad.h
index d67636891de..e90a6833009 100644
--- a/src/mame/includes/amstrad.h
+++ b/src/mame/includes/amstrad.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef AMSTRAD_H_
-#define AMSTRAD_H_
+#ifndef MAME_INCLUDES_AMSTRAD_H
+#define MAME_INCLUDES_AMSTRAD_H
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/includes/apple2e.h b/src/mame/includes/apple2e.h
index 29c45d5f9b4..1604b172dfe 100644
--- a/src/mame/includes/apple2e.h
+++ b/src/mame/includes/apple2e.h
@@ -6,8 +6,8 @@
***************************************************************************/
-#ifndef APPLE2E_H_
-#define APPLE2E_H_
+#ifndef MAME_INCLUDES_APPLE2E_H
+#define MAME_INCLUDES_APPLE2E_H
INPUT_PORTS_EXTERN( apple2ep );
diff --git a/src/mame/includes/apple2gs.h b/src/mame/includes/apple2gs.h
index 8d67258d55a..787d287b5ea 100644
--- a/src/mame/includes/apple2gs.h
+++ b/src/mame/includes/apple2gs.h
@@ -8,8 +8,8 @@
*
****************************************************************************/
-#ifndef APPLE2GS_H_
-#define APPLE2GS_H_
+#ifndef MAME_INCLUDES_APPLE2GS_H
+#define MAME_INCLUDES_APPLE2GS_H
#define RUN_ADB_MICRO (0)
diff --git a/src/mame/includes/apple3.h b/src/mame/includes/apple3.h
index 8c1503bb10f..a88921eed99 100644
--- a/src/mame/includes/apple3.h
+++ b/src/mame/includes/apple3.h
@@ -8,8 +8,8 @@
*
****************************************************************************/
-#ifndef APPLE3_H_
-#define APPLE3_H_
+#ifndef MAME_INCLUDES_APPLE3_H
+#define MAME_INCLUDES_APPLE3_H
#include "cpu/m6502/m6502.h"
#include "includes/apple2.h"
diff --git a/src/mame/includes/archimds.h b/src/mame/includes/archimds.h
index 7db518ccfc6..67c1112a597 100644
--- a/src/mame/includes/archimds.h
+++ b/src/mame/includes/archimds.h
@@ -6,8 +6,8 @@
*
*****************************************************************************/
-#ifndef _ARCHIMEDES_H_
-#define _ARCHIMEDES_H_
+#ifndef MAME_INCLUDES_ARCHIMEDES_H
+#define MAME_INCLUDES_ARCHIMEDES_H
#include "machine/aakart.h"
#include "sound/dac.h"
diff --git a/src/mame/includes/asuka.h b/src/mame/includes/asuka.h
index 07a2b409bb1..2788fd11429 100644
--- a/src/mame/includes/asuka.h
+++ b/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
diff --git a/src/mame/includes/atari400.h b/src/mame/includes/atari400.h
index ae5805880e1..bd06a84b10c 100644
--- a/src/mame/includes/atari400.h
+++ b/src/mame/includes/atari400.h
@@ -11,8 +11,8 @@
******************************************************************************/
-#ifndef ATARI_H
-#define ATARI_H
+#ifndef MAME_INCLUDES_ATARI_H
+#define MAME_INCLUDES_ATARI_H
#include "machine/6821pia.h"
#include "sound/pokey.h"
diff --git a/src/mame/includes/bebox.h b/src/mame/includes/bebox.h
index 3307f4c48a0..3e1c3bd144e 100644
--- a/src/mame/includes/bebox.h
+++ b/src/mame/includes/bebox.h
@@ -8,8 +8,8 @@
*
****************************************************************************/
-#ifndef BEBOX_H_
-#define BEBOX_H_
+#ifndef MAME_INCLUDES_BEBOX_H
+#define MAME_INCLUDES_BEBOX_H
#include "machine/53c810.h"
#include "machine/am9517a.h"
diff --git a/src/mame/includes/bk.h b/src/mame/includes/bk.h
index 9d16bbf3b80..52e33a17a8d 100644
--- a/src/mame/includes/bk.h
+++ b/src/mame/includes/bk.h
@@ -6,8 +6,9 @@
*
****************************************************************************/
-#ifndef BK_H_
-#define BK_H_
+#ifndef MAME_INCLUDES_BK_H
+#define MAME_INCLUDES_BK_H
+
#include "imagedev/cassette.h"
class bk_state : public driver_device
diff --git a/src/mame/includes/bw12.h b/src/mame/includes/bw12.h
index 2c1fd8b4dda..f9f1af2bc5b 100644
--- a/src/mame/includes/bw12.h
+++ b/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"
diff --git a/src/mame/includes/bwidow.h b/src/mame/includes/bwidow.h
index 559aaf58531..25c1b38ff0c 100644
--- a/src/mame/includes/bwidow.h
+++ b/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_
-#define BWIDOW_H_
+#ifndef MAME_INCLUDES_BWIDOW_H
+#define MAME_INCLUDES_BWIDOW_H
#define MASTER_CLOCK (XTAL(12'096'000))
#define CLOCK_3KHZ (MASTER_CLOCK / 4096)
diff --git a/src/mame/includes/c80.h b/src/mame/includes/c80.h
index b8b90a93486..e4b8608a648 100644
--- a/src/mame/includes/c80.h
+++ b/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"
diff --git a/src/mame/includes/cdi.h b/src/mame/includes/cdi.h
index 570983327c1..b03f50175fb 100644
--- a/src/mame/includes/cdi.h
+++ b/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"
diff --git a/src/mame/includes/channelf.h b/src/mame/includes/channelf.h
index 3897fd84ae1..30633f8b4cc 100644
--- a/src/mame/includes/channelf.h
+++ b/src/mame/includes/channelf.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef CHANNELF_H_
-#define CHANNELF_H_
+#ifndef MAME_INCLUDES_CHANNELF_H
+#define MAME_INCLUDES_CHANNELF_H
#include "cpu/f8/f8.h"
#include "audio/channelf.h"
diff --git a/src/mame/includes/coleco.h b/src/mame/includes/coleco.h
index 7c48d7d6046..f8624113a17 100644
--- a/src/mame/includes/coleco.h
+++ b/src/mame/includes/coleco.h
@@ -2,8 +2,8 @@
// copyright-holders:Mike Balfour, Ben Bruscella, Sean Young
#pragma once
-#ifndef __COLECO__
-#define __COLECO__
+#ifndef MAME_INCLUDES_COLECO_H
+#define MAME_INCLUDES_COLECO_H
#include "cpu/z80/z80.h"
diff --git a/src/mame/includes/comquest.h b/src/mame/includes/comquest.h
index 97e1b60a662..118f22cde06 100644
--- a/src/mame/includes/comquest.h
+++ b/src/mame/includes/comquest.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef COMQUEST_H_
-#define COMQUEST_H_
+#ifndef MAME_INCLUDES_COMQUEST_H
+#define MAME_INCLUDES_COMQUEST_H
class comquest_state : public driver_device
diff --git a/src/mame/includes/comx35.h b/src/mame/includes/comx35.h
index 5a620058e39..bc175f91c9f 100644
--- a/src/mame/includes/comx35.h
+++ b/src/mame/includes/comx35.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder
#pragma once
-#ifndef __COMX35__
-#define __COMX35__
+#ifndef MAME_INCLUDES_COMX35_H
+#define MAME_INCLUDES_COMX35_H
#include "bus/comx35/exp.h"
#include "cpu/cosmac/cosmac.h"
diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h
index 3023c5566cd..58f0b0b0346 100644
--- a/src/mame/includes/cps1.h
+++ b/src/mame/includes/cps1.h
@@ -6,8 +6,8 @@
***************************************************************************/
-#ifndef _CPS1_H_
-#define _CPS1_H_
+#ifndef MAME_INCLUDES_CPS1_H
+#define MAME_INCLUDES_CPS1_H
#include "sound/msm5205.h"
#include "sound/qsound.h"
diff --git a/src/mame/includes/crvision.h b/src/mame/includes/crvision.h
index 70e34043980..be78ba3bcdb 100644
--- a/src/mame/includes/crvision.h
+++ b/src/mame/includes/crvision.h
@@ -1,9 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Wilbert Pol, Curt Coder
-#ifndef __CRVISION__
-#define __CRVISION__
-
+#ifndef MAME_INCLUDES_CRVISION_H
+#define MAME_INCLUDES_CRVISION_H
#include "cpu/m6502/m6502.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/cxhumax.h b/src/mame/includes/cxhumax.h
index b87cbfe578d..9d1c40e3f61 100644
--- a/src/mame/includes/cxhumax.h
+++ b/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"
diff --git a/src/mame/includes/dai.h b/src/mame/includes/dai.h
index 656e1736eec..9505269891f 100644
--- a/src/mame/includes/dai.h
+++ b/src/mame/includes/dai.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef DAI_H_
-#define DAI_H_
+#ifndef MAME_INCLUDES_DAI_H
+#define MAME_INCLUDES_DAI_H
#include "cpu/i8085/i8085.h"
#include "audio/dai_snd.h"
diff --git a/src/mame/includes/dgn_beta.h b/src/mame/includes/dgn_beta.h
index b9a1bff1478..3ec0f13f888 100644
--- a/src/mame/includes/dgn_beta.h
+++ b/src/mame/includes/dgn_beta.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef DGN_BETA_H_
-#define DGN_BETA_H_
+#ifndef MAME_INCLUDES_DGN_BETA_H
+#define MAME_INCLUDES_DGN_BETA_H
#include "video/mc6845.h"
#include "machine/wd_fdc.h"
diff --git a/src/mame/includes/electron.h b/src/mame/includes/electron.h
index 5a332cbd24d..736772213ea 100644
--- a/src/mame/includes/electron.h
+++ b/src/mame/includes/electron.h
@@ -10,8 +10,8 @@
*
****************************************************************************/
-#ifndef ELECTRON_H_
-#define ELECTRON_H_
+#ifndef MAME_INCLUDES_ELECTRON_H
+#define MAME_INCLUDES_ELECTRON_H
#include "machine/ram.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/elf.h b/src/mame/includes/elf.h
index 0bb07f044b8..8b04e012059 100644
--- a/src/mame/includes/elf.h
+++ b/src/mame/includes/elf.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder
#pragma once
-#ifndef __INCLUDES_ELF__
-#define __INCLUDES_ELF__
+#ifndef MAME_INCLUDES_ELF_H
+#define MAME_INCLUDES_ELF_H
#include "cpu/cosmac/cosmac.h"
diff --git a/src/mame/includes/esripsys.h b/src/mame/includes/esripsys.h
index bcbc7398795..1ff54fe461a 100644
--- a/src/mame/includes/esripsys.h
+++ b/src/mame/includes/esripsys.h
@@ -6,8 +6,8 @@
*************************************************************************/
-#ifndef _ESRIPSYS_H_
-#define _ESRIPSYS_H_
+#ifndef MAME_INCLUDES_ESRIPSYS_H
+#define MAME_INCLUDES_ESRIPSYS_H
#pragma once
diff --git a/src/mame/includes/eti660.h b/src/mame/includes/eti660.h
index c760399ec51..cfef8f97bf1 100644
--- a/src/mame/includes/eti660.h
+++ b/src/mame/includes/eti660.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder
#pragma once
-#ifndef __ETI660__
-#define __ETI660__
+#ifndef MAME_INCLUDES_ETI660_H
+#define MAME_INCLUDES_ETI660_H
#include "cpu/cosmac/cosmac.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/fidelbase.h b/src/mame/includes/fidelbase.h
index 4294ea37825..7bd852fe752 100644
--- a/src/mame/includes/fidelbase.h
+++ b/src/mame/includes/fidelbase.h
@@ -9,8 +9,8 @@
#pragma once
-#ifndef DRIVERS_FIDELBASE_H
-#define DRIVERS_FIDELBASE_H
+#ifndef MAME_INCLUDES_FIDELBASE_H
+#define MAME_INCLUDES_FIDELBASE_H
#include "machine/timer.h"
#include "sound/dac.h"
diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h
index b2bdddfe0fb..65abe022f24 100644
--- a/src/mame/includes/galaxold.h
+++ b/src/mame/includes/galaxold.h
@@ -12,8 +12,8 @@
***************************************************************************/
-#ifndef __GALAXOLD_H__
-#define __GALAXOLD_H__
+#ifndef MAME_INCLUDES_GALAXOLD_H
+#define MAME_INCLUDES_GALAXOLD_H
#include "machine/7474.h"
#include "machine/timer.h"
diff --git a/src/mame/includes/galaxy.h b/src/mame/includes/galaxy.h
index 7433c744df0..3a0e8658560 100644
--- a/src/mame/includes/galaxy.h
+++ b/src/mame/includes/galaxy.h
@@ -5,9 +5,9 @@
* includes/galaxy.h
*
****************************************************************************/
-
-#ifndef GALAXY_H_
-#define GALAXY_H_
+
+#ifndef MAME_INCLUDES_GALAXY_H
+#define MAME_INCLUDES_GALAXY_H
#include "imagedev/snapquik.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/galeb.h b/src/mame/includes/galeb.h
index 7341af9e157..219099c9a91 100644
--- a/src/mame/includes/galeb.h
+++ b/src/mame/includes/galeb.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef GALEB_H_
-#define GALEB_H_
+#ifndef MAME_INCLUDES_GALEB_H
+#define MAME_INCLUDES_GALEB_H
#include "sound/dac.h"
diff --git a/src/mame/includes/gamecom.h b/src/mame/includes/gamecom.h
index 580093405a3..b05a653b104 100644
--- a/src/mame/includes/gamecom.h
+++ b/src/mame/includes/gamecom.h
@@ -10,8 +10,8 @@
*
****************************************************************************/
-#ifndef GAMECOM_H_
-#define GAMECOM_H_
+#ifndef MAME_INCLUDES_GAMECOM_H
+#define MAME_INCLUDES_GAMECOM_H
#include "cpu/sm8500/sm8500.h"
#include "sound/dac.h"
diff --git a/src/mame/includes/gb.h b/src/mame/includes/gb.h
index 16acb90cb8c..3930c4c8f98 100644
--- a/src/mame/includes/gb.h
+++ b/src/mame/includes/gb.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef GB_H_
-#define GB_H_
+#ifndef MAME_INCLUDES_GB_H
+#define MAME_INCLUDES_GB_H
#include "sound/gb.h"
#include "cpu/lr35902/lr35902.h"
diff --git a/src/mame/includes/gba.h b/src/mame/includes/gba.h
index a45cf3907f3..be3bed71092 100644
--- a/src/mame/includes/gba.h
+++ b/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"
diff --git a/src/mame/includes/gp32.h b/src/mame/includes/gp32.h
index 9cb60706937..1ef3f79bb19 100644
--- a/src/mame/includes/gp32.h
+++ b/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"
diff --git a/src/mame/includes/gstriker.h b/src/mame/includes/gstriker.h
index d5807478e9a..e5c9ef7e0aa 100644
--- a/src/mame/includes/gstriker.h
+++ b/src/mame/includes/gstriker.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Farfetch'd, David Haywood
-#ifndef __GSTRIKER_H
-#define __GSTRIKER_H
+#ifndef MAME_INCLUDES_GSTRIKER_H
+#define MAME_INCLUDES_GSTRIKER_H
#include "machine/6850acia.h"
#include "machine/gen_latch.h"
diff --git a/src/mame/includes/hp9845.h b/src/mame/includes/hp9845.h
index 17e8c7ecec1..6b71748f7de 100644
--- a/src/mame/includes/hp9845.h
+++ b/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"
diff --git a/src/mame/includes/huebler.h b/src/mame/includes/huebler.h
index 8028d4f78da..98103b05e90 100644
--- a/src/mame/includes/huebler.h
+++ b/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"
diff --git a/src/mame/includes/imds2.h b/src/mame/includes/imds2.h
index de3ea9ebbb1..757f23177d4 100644
--- a/src/mame/includes/imds2.h
+++ b/src/mame/includes/imds2.h
@@ -2,8 +2,8 @@
// copyright-holders:F. Ulivi
// Driver for Intel Intellec MDS series-II
-#ifndef _IMDS2_H_
-#define _IMDS2_H_
+#ifndef MAME_INCLUDES_IMDS2_H
+#define MAME_INCLUDES_IMDS2_H
#include "cpu/i8085/i8085.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/includes/kaneko16.h b/src/mame/includes/kaneko16.h
index 65490f7a16d..c2e2927af40 100644
--- a/src/mame/includes/kaneko16.h
+++ b/src/mame/includes/kaneko16.h
@@ -6,8 +6,8 @@
***************************************************************************/
-#ifndef __KANEKO16_H__
-#define __KANEKO16_H__
+#ifndef MAME_INCLUDES_KANEKO16_H
+#define MAME_INCLUDES_KANEKO16_H
#include "machine/gen_latch.h"
#include "machine/nvram.h"
diff --git a/src/mame/includes/kim1.h b/src/mame/includes/kim1.h
index 45c86416443..5d436b05ff9 100644
--- a/src/mame/includes/kim1.h
+++ b/src/mame/includes/kim1.h
@@ -8,8 +8,8 @@
#pragma once
-#ifndef __KIM1__
-#define __KIM1__
+#ifndef MAME_INCLUDES_KIM1_H
+#define MAME_INCLUDES_KIM1_H
#include "softlist.h"
#include "cpu/m6502/m6502.h"
diff --git a/src/mame/includes/kramermc.h b/src/mame/includes/kramermc.h
index 241acfe89e7..dd4a0b36d8b 100644
--- a/src/mame/includes/kramermc.h
+++ b/src/mame/includes/kramermc.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef KRAMERMC_H_
-#define KRAMERMC_H_
+#ifndef MAME_INCLUDES_KRAMERMC_H
+#define MAME_INCLUDES_KRAMERMC_H
#include "machine/z80pio.h"
diff --git a/src/mame/includes/lynx.h b/src/mame/includes/lynx.h
index 30b8753c625..26f893de1ae 100644
--- a/src/mame/includes/lynx.h
+++ b/src/mame/includes/lynx.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef LYNX_H_
-#define LYNX_H_
+#ifndef MAME_INCLUDES_LYNX_H
+#define MAME_INCLUDES_LYNX_H
#include "audio/lynx.h"
#include "imagedev/snapquik.h"
diff --git a/src/mame/includes/mac.h b/src/mame/includes/mac.h
index 8b848cf6dd3..397d183a888 100644
--- a/src/mame/includes/mac.h
+++ b/src/mame/includes/mac.h
@@ -8,8 +8,8 @@
*
****************************************************************************/
-#ifndef MAC_H_
-#define MAC_H_
+#ifndef MAME_INCLUDES_MAC_H
+#define MAME_INCLUDES_MAC_H
#include "machine/8530scc.h"
#include "machine/6522via.h"
diff --git a/src/mame/includes/macpci.h b/src/mame/includes/macpci.h
index 156285f5ebd..888ea958c2b 100644
--- a/src/mame/includes/macpci.h
+++ b/src/mame/includes/macpci.h
@@ -8,8 +8,8 @@
*
****************************************************************************/
-#ifndef MACPCI_H_
-#define MACPCI_H_
+#ifndef MAME_INCLUDES_MACPCI_H
+#define MAME_INCLUDES_MACPCI_H
#include "machine/8530scc.h"
#include "machine/6522via.h"
diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h
index 225b5c86ad4..b363d9330e4 100644
--- a/src/mame/includes/mario.h
+++ b/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"
diff --git a/src/mame/includes/micronic.h b/src/mame/includes/micronic.h
index 18750a463e2..5704a55e065 100644
--- a/src/mame/includes/micronic.h
+++ b/src/mame/includes/micronic.h
@@ -6,8 +6,8 @@
*****************************************************************************/
-#ifndef __MICRONIC__
-#define __MICRONIC__
+#ifndef MAME_INCLUDES_MICRONIC_H
+#define MAME_INCLUDES_MICRONIC_H
#include "cpu/z80/z80.h"
#include "video/hd61830.h"
diff --git a/src/mame/includes/microtan.h b/src/mame/includes/microtan.h
index 6bc91590135..1b224044742 100644
--- a/src/mame/includes/microtan.h
+++ b/src/mame/includes/microtan.h
@@ -14,8 +14,8 @@
*
******************************************************************************/
-#ifndef MICROTAN_H_
-#define MICROTAN_H_
+#ifndef MAME_INCLUDES_MICROTAN_H
+#define MAME_INCLUDES_MICROTAN_H
#include "imagedev/snapquik.h"
#include "machine/6522via.h"
diff --git a/src/mame/includes/mikro80.h b/src/mame/includes/mikro80.h
index 64688b9d8a9..7f75035e811 100644
--- a/src/mame/includes/mikro80.h
+++ b/src/mame/includes/mikro80.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef MIKRO80_H_
-#define MIKRO80_H_
+#ifndef MAME_INCLUDES_MIKRO80_H
+#define MAME_INCLUDES_MIKRO80_H
#include "machine/i8255.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/mikromik.h b/src/mame/includes/mikromik.h
index 2024fefd5ad..5bdbef22bc2 100644
--- a/src/mame/includes/mikromik.h
+++ b/src/mame/includes/mikromik.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder
#pragma once
-#ifndef __MIKROMIKKO__
-#define __MIKROMIKKO__
+#ifndef MAME_INCLUDES_MIKROMIKKO_H
+#define MAME_INCLUDES_MIKROMIKKO_H
#include "bus/rs232/rs232.h"
#include "cpu/i8085/i8085.h"
diff --git a/src/mame/includes/msx.h b/src/mame/includes/msx.h
index d14f716d71e..4771f6c51dd 100644
--- a/src/mame/includes/msx.h
+++ b/src/mame/includes/msx.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef __MSX_H__
-#define __MSX_H__
+#ifndef MAME_INCLUDES_MSX_H
+#define MAME_INCLUDES_MSX_H
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
diff --git a/src/mame/includes/mtx.h b/src/mame/includes/mtx.h
index bc6e6e17125..28ca6aa3b40 100644
--- a/src/mame/includes/mtx.h
+++ b/src/mame/includes/mtx.h
@@ -6,8 +6,8 @@
*************************************************************************/
-#ifndef __MTX__
-#define __MTX__
+#ifndef MAME_INCLUDES_MTX_H
+#define MAME_INCLUDES_MTX_H
#include "imagedev/snapquik.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/nc.h b/src/mame/includes/nc.h
index 4bb15789107..d86a8693e62 100644
--- a/src/mame/includes/nc.h
+++ b/src/mame/includes/nc.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef NC_H_
-#define NC_H_
+#ifndef MAME_INCLUDES_NC_H
+#define MAME_INCLUDES_NC_H
#include "bus/centronics/ctronics.h"
#include "machine/i8251.h"
diff --git a/src/mame/includes/nds.h b/src/mame/includes/nds.h
index 89a91b2cfd5..6a7d36a0842 100644
--- a/src/mame/includes/nds.h
+++ b/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"
diff --git a/src/mame/includes/newbrain.h b/src/mame/includes/newbrain.h
index 7e307687050..c118475e167 100644
--- a/src/mame/includes/newbrain.h
+++ b/src/mame/includes/newbrain.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder
#pragma once
-#ifndef __NEWBRAIN__
-#define __NEWBRAIN__
+#ifndef MAME_INCLUDES_NEWBRAIN_H
+#define MAME_INCLUDES_NEWBRAIN_H
#include "bus/newbrain/exp.h"
diff --git a/src/mame/includes/next.h b/src/mame/includes/next.h
index bd2133b7639..a40dec3e5d9 100644
--- a/src/mame/includes/next.h
+++ b/src/mame/includes/next.h
@@ -2,8 +2,8 @@
// copyright-holders:Olivier Galibert
#pragma once
-#ifndef __NEXT__
-#define __NEXT__
+#ifndef MAME_INCLUDES_NEXT_H
+#define MAME_INCLUDES_NEXT_H
#include "cpu/m68000/m68000.h"
#include "machine/nscsi_bus.h"
diff --git a/src/mame/includes/novagbase.h b/src/mame/includes/novagbase.h
index 475769113bb..c9f251f4694 100644
--- a/src/mame/includes/novagbase.h
+++ b/src/mame/includes/novagbase.h
@@ -9,8 +9,8 @@
#pragma once
-#ifndef DRIVERS_NOVAGBASE_H
-#define DRIVERS_NOVAGBASE_H
+#ifndef MAME_INCLUDES_NOVAGBASE_H
+#define MAME_INCLUDES_NOVAGBASE_H
#include "machine/timer.h"
#include "sound/dac.h"
diff --git a/src/mame/includes/ob68k1a.h b/src/mame/includes/ob68k1a.h
index c79de69cc63..c27ba558070 100644
--- a/src/mame/includes/ob68k1a.h
+++ b/src/mame/includes/ob68k1a.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder
#pragma once
-#ifndef __OB68K1A__
-#define __OB68K1A__
+#ifndef MAME_INCLUDES_OB68K1A_H
+#define MAME_INCLUDES_OB68K1A_H
#include "bus/rs232/rs232.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/includes/osi.h b/src/mame/includes/osi.h
index 485204bf31c..e9037eef9ad 100644
--- a/src/mame/includes/osi.h
+++ b/src/mame/includes/osi.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder, Robbbert, Wilbert Pol
#pragma once
-#ifndef __OSI__
-#define __OSI__
+#ifndef MAME_INCLUDES_OSI_H
+#define MAME_INCLUDES_OSI_H
#include "cpu/m6502/m6502.h"
diff --git a/src/mame/includes/pc1251.h b/src/mame/includes/pc1251.h
index 7f6d56a5a6b..07590dc5412 100644
--- a/src/mame/includes/pc1251.h
+++ b/src/mame/includes/pc1251.h
@@ -8,8 +8,8 @@
*
****************************************************************************/
-#ifndef PC1251_H_
-#define PC1251_H_
+#ifndef MAME_INCLUDES_PC1251_H
+#define MAME_INCLUDES_PC1251_H
#include "pocketc.h"
#include "cpu/sc61860/sc61860.h"
diff --git a/src/mame/includes/pc1350.h b/src/mame/includes/pc1350.h
index ce56614bce2..2b7484bb0e7 100644
--- a/src/mame/includes/pc1350.h
+++ b/src/mame/includes/pc1350.h
@@ -8,8 +8,8 @@
*
****************************************************************************/
-#ifndef PC1350_H_
-#define PC1350_H_
+#ifndef MAME_INCLUDES_PC1350_H
+#define MAME_INCLUDES_PC1350_H
#include "pocketc.h"
#include "cpu/sc61860/sc61860.h"
diff --git a/src/mame/includes/pc1401.h b/src/mame/includes/pc1401.h
index c9b7ce2d407..76dc2191f1f 100644
--- a/src/mame/includes/pc1401.h
+++ b/src/mame/includes/pc1401.h
@@ -8,8 +8,8 @@
*
****************************************************************************/
-#ifndef PC1401_H_
-#define PC1401_H_
+#ifndef MAME_INCLUDES_PC1401_H
+#define MAME_INCLUDES_PC1401_H
#include "pocketc.h"
#include "cpu/sc61860/sc61860.h"
diff --git a/src/mame/includes/pc1403.h b/src/mame/includes/pc1403.h
index e777847587b..88ca9fc48a9 100644
--- a/src/mame/includes/pc1403.h
+++ b/src/mame/includes/pc1403.h
@@ -8,8 +8,8 @@
*
****************************************************************************/
-#ifndef PC1403_H_
-#define PC1403_H_
+#ifndef MAME_INCLUDES_PC1403_H
+#define MAME_INCLUDES_PC1403_H
#include "pocketc.h"
#include "cpu/sc61860/sc61860.h"
diff --git a/src/mame/includes/pc4.h b/src/mame/includes/pc4.h
index 079c6693718..0c1b90fb9cc 100644
--- a/src/mame/includes/pc4.h
+++ b/src/mame/includes/pc4.h
@@ -8,8 +8,8 @@
#pragma once
-#ifndef _PC4_H_
-#define _PC4_H_
+#ifndef MAME_INCLUDES_PC4_H
+#define MAME_INCLUDES_PC4_H
#include "sound/beep.h"
diff --git a/src/mame/includes/pc6001.h b/src/mame/includes/pc6001.h
index 0607b33741d..dc24f6fe55b 100644
--- a/src/mame/includes/pc6001.h
+++ b/src/mame/includes/pc6001.h
@@ -3,8 +3,8 @@
#pragma once
-#ifndef __PC6001__
-#define __PC6001__
+#ifndef MAME_INCLUDES_PC6001_H
+#define MAME_INCLUDES_PC6001_H
#include "emu.h"
diff --git a/src/mame/includes/pc8001.h b/src/mame/includes/pc8001.h
index 674e1a8e189..6075ad841f6 100644
--- a/src/mame/includes/pc8001.h
+++ b/src/mame/includes/pc8001.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder
#pragma once
-#ifndef __PC8001__
-#define __PC8001__
+#ifndef MAME_INCLUDES_PC8001_H
+#define MAME_INCLUDES_PC8001_H
#include "cpu/z80/z80.h"
diff --git a/src/mame/includes/pc8401a.h b/src/mame/includes/pc8401a.h
index 51d3e41a23a..21d89a109ec 100644
--- a/src/mame/includes/pc8401a.h
+++ b/src/mame/includes/pc8401a.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder
#pragma once
-#ifndef __PC8401A__
-#define __PC8401A__
+#ifndef MAME_INCLUDES_PC8401A_H
+#define MAME_INCLUDES_PC8401A_H
#include "cpu/z80/z80.h"
diff --git a/src/mame/includes/pc9801.h b/src/mame/includes/pc9801.h
index 3141db039a7..db64b540367 100644
--- a/src/mame/includes/pc9801.h
+++ b/src/mame/includes/pc9801.h
@@ -3,8 +3,8 @@
#pragma once
-#ifndef __PC9801__
-#define __PC9801__
+#ifndef MAME_INCLUDES_PC9801_H
+#define MAME_INCLUDES_PC9801_H
#include "cpu/i386/i386.h"
#include "cpu/i86/i286.h"
diff --git a/src/mame/includes/pce.h b/src/mame/includes/pce.h
index 53581993155..762338e114f 100644
--- a/src/mame/includes/pce.h
+++ b/src/mame/includes/pce.h
@@ -8,8 +8,8 @@
*
****************************************************************************/
-#ifndef PCE_H_
-#define PCE_H_
+#ifndef MAME_INCLUDES_PCE_H
+#define MAME_INCLUDES_PCE_H
#include "cdrom.h"
#include "cpu/h6280/h6280.h"
diff --git a/src/mame/includes/pcw.h b/src/mame/includes/pcw.h
index b242095cdb4..a2fe5262240 100644
--- a/src/mame/includes/pcw.h
+++ b/src/mame/includes/pcw.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef PCW_H_
-#define PCW_H_
+#ifndef MAME_INCLUDES_PCW_H
+#define MAME_INCLUDES_PCW_H
#include "machine/upd765.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/pcw16.h b/src/mame/includes/pcw16.h
index 9a018f4099e..01c31e591e6 100644
--- a/src/mame/includes/pcw16.h
+++ b/src/mame/includes/pcw16.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef PCW16_H_
-#define PCW16_H_
+#ifndef MAME_INCLUDES_PCW16_H
+#define MAME_INCLUDES_PCW16_H
#include "cpu/z80/z80.h"
#include "machine/upd765.h" /* FDC superio */
diff --git a/src/mame/includes/pdp1.h b/src/mame/includes/pdp1.h
index adb47696860..c2da17d2096 100644
--- a/src/mame/includes/pdp1.h
+++ b/src/mame/includes/pdp1.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef PDP1_H_
-#define PDP1_H_
+#ifndef MAME_INCLUDES_PDP1_H
+#define MAME_INCLUDES_PDP1_H
#include "cpu/pdp1/pdp1.h"
#include "video/crt.h"
diff --git a/src/mame/includes/pes.h b/src/mame/includes/pes.h
index 762a9d40b8f..d206e8f4dc8 100644
--- a/src/mame/includes/pes.h
+++ b/src/mame/includes/pes.h
@@ -8,8 +8,8 @@
#pragma once
-#ifndef _PES_H_
-#define _PES_H_
+#ifndef MAME_INCLUDES_PES_H
+#define MAME_INCLUDES_PES_H
#include "machine/terminal.h"
#include "sound/tms5220.h"
diff --git a/src/mame/includes/phc25.h b/src/mame/includes/phc25.h
index 8f250e1a5d0..7b623df56ee 100644
--- a/src/mame/includes/phc25.h
+++ b/src/mame/includes/phc25.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder, Robbbert
#pragma once
-#ifndef __PHC25__
-#define __PHC25__
+#ifndef MAME_INCLUDES_PHC25_H
+#define MAME_INCLUDES_PHC25_H
#include "cpu/z80/z80.h"
diff --git a/src/mame/includes/pmd85.h b/src/mame/includes/pmd85.h
index efde2d9ca79..1103445fa05 100644
--- a/src/mame/includes/pmd85.h
+++ b/src/mame/includes/pmd85.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef PMD85_H_
-#define PMD85_H_
+#ifndef MAME_INCLUDES_PMD85_H
+#define MAME_INCLUDES_PMD85_H
#include "machine/i8251.h"
#include "machine/pit8253.h"
diff --git a/src/mame/includes/pocketc.h b/src/mame/includes/pocketc.h
index d86a319a5aa..ab9b6b5ef78 100644
--- a/src/mame/includes/pocketc.h
+++ b/src/mame/includes/pocketc.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef POCKETC_H_
-#define POCKETC_H_
+#ifndef MAME_INCLUDES_POCKETC_H
+#define MAME_INCLUDES_POCKETC_H
typedef const char *POCKETC_FIGURE[];
diff --git a/src/mame/includes/poly88.h b/src/mame/includes/poly88.h
index ecf434ec4f9..500c3033f4a 100644
--- a/src/mame/includes/poly88.h
+++ b/src/mame/includes/poly88.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef POLY88_H_
-#define POLY88_H_
+#ifndef MAME_INCLUDES_POLY88_H
+#define MAME_INCLUDES_POLY88_H
#include "machine/i8251.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/poly880.h b/src/mame/includes/poly880.h
index a439bb133fb..9491f9f3d93 100644
--- a/src/mame/includes/poly880.h
+++ b/src/mame/includes/poly880.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder
#pragma once
-#ifndef __POLY880__
-#define __POLY880__
+#ifndef MAME_INCLUDES_POLY880_H
+#define MAME_INCLUDES_POLY880_H
#include "cpu/z80/z80.h"
diff --git a/src/mame/includes/prof80.h b/src/mame/includes/prof80.h
index fab918f06f9..3d69dbc5b54 100644
--- a/src/mame/includes/prof80.h
+++ b/src/mame/includes/prof80.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder
#pragma once
-#ifndef __PROF80__
-#define __PROF80__
+#ifndef MAME_INCLUDES_PROF80_H
+#define MAME_INCLUDES_PROF80_H
#include "bus/ecbbus/ecbbus.h"
#include "bus/rs232/rs232.h"
diff --git a/src/mame/includes/psion.h b/src/mame/includes/psion.h
index 724594245f4..c89e40aefc4 100644
--- a/src/mame/includes/psion.h
+++ b/src/mame/includes/psion.h
@@ -8,8 +8,8 @@
#pragma once
-#ifndef _PSION_H_
-#define _PSION_H_
+#ifndef MAME_INCLUDES_PSION_H
+#define MAME_INCLUDES_PSION_H
#include "cpu/m6800/m6801.h"
#include "machine/nvram.h"
diff --git a/src/mame/includes/px8.h b/src/mame/includes/px8.h
index 6fa9366f572..61b24b567bb 100644
--- a/src/mame/includes/px8.h
+++ b/src/mame/includes/px8.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder,Dirk Best
#pragma once
-#ifndef __PX8__
-#define __PX8__
+#ifndef MAME_INCLUDES_PX8_H
+#define MAME_INCLUDES_PX8_H
#include "cpu/z80/z80.h"
diff --git a/src/mame/includes/radio86.h b/src/mame/includes/radio86.h
index 2eda68ad751..9296f8e375d 100644
--- a/src/mame/includes/radio86.h
+++ b/src/mame/includes/radio86.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef radio86_H_
-#define radio86_H_
+#ifndef MAME_INCLUDES_RADIO86_H
+#define MAME_INCLUDES_RADIO86_H
#include "machine/i8255.h"
#include "machine/i8257.h"
diff --git a/src/mame/includes/s11.h b/src/mame/includes/s11.h
index 0aeafeeff23..7407238d86b 100644
--- a/src/mame/includes/s11.h
+++ b/src/mame/includes/s11.h
@@ -6,8 +6,8 @@
* Created on: 1/01/2013
*/
-#ifndef S11_H_
-#define S11_H_
+#ifndef MAME_INCLUDES_S11_H
+#define MAME_INCLUDES_S11_H
#include "audio/s11c_bg.h"
#include "machine/6821pia.h"
diff --git a/src/mame/includes/s11a.h b/src/mame/includes/s11a.h
index dbc1ccbb692..10ec57869e2 100644
--- a/src/mame/includes/s11a.h
+++ b/src/mame/includes/s11a.h
@@ -6,8 +6,8 @@
* Created on: 1/01/2013
*/
-#ifndef S11A_H_
-#define S11A_H_
+#ifndef MAME_INCLUDES_S11A_H
+#define MAME_INCLUDES_S11A_H
#include "includes/s11.h"
diff --git a/src/mame/includes/s11b.h b/src/mame/includes/s11b.h
index a03284792a9..fbf377b8eac 100644
--- a/src/mame/includes/s11b.h
+++ b/src/mame/includes/s11b.h
@@ -6,8 +6,8 @@
* Created on: 1/01/2013
*/
-#ifndef S11B_H_
-#define S11B_H_
+#ifndef MAME_INCLUDES_S11B_H
+#define MAME_INCLUDES_S11B_H
#include "includes/s11a.h"
diff --git a/src/mame/includes/s11c.h b/src/mame/includes/s11c.h
index a44be5fcece..a20ad111e2c 100644
--- a/src/mame/includes/s11c.h
+++ b/src/mame/includes/s11c.h
@@ -6,8 +6,8 @@
* Created on: 1/01/2013
*/
-#ifndef S11C_H_
-#define S11C_H_
+#ifndef MAME_INCLUDES_S11C_H
+#define MAME_INCLUDES_S11C_H
#include "includes/s11b.h"
diff --git a/src/mame/includes/sg1000.h b/src/mame/includes/sg1000.h
index 3c9f8f2f3d1..f741b0afeaa 100644
--- a/src/mame/includes/sg1000.h
+++ b/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"
diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h
index 0511c93fba2..e64428de8f2 100644
--- a/src/mame/includes/snes.h
+++ b/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"
diff --git a/src/mame/includes/softbox.h b/src/mame/includes/softbox.h
index bc6b3bae329..88d915797e3 100644
--- a/src/mame/includes/softbox.h
+++ b/src/mame/includes/softbox.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder, Mike Naberezny
#pragma once
-#ifndef __SOFTBOX__
-#define __SOFTBOX__
+#ifndef MAME_INCLUDES_SOFTBOX_H
+#define MAME_INCLUDES_SOFTBOX_H
#include "bus/ieee488/ieee488.h"
#include "bus/imi7000/imi7000.h"
diff --git a/src/mame/includes/sorcerer.h b/src/mame/includes/sorcerer.h
index d20055e57da..590ed58bb63 100644
--- a/src/mame/includes/sorcerer.h
+++ b/src/mame/includes/sorcerer.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef SORCERER_H_
-#define SORCERER_H_
+#ifndef MAME_INCLUDES_SORCERER_H
+#define MAME_INCLUDES_SORCERER_H
#include "cpu/z80/z80.h"
#include "sound/wave.h"
diff --git a/src/mame/includes/specpls3.h b/src/mame/includes/specpls3.h
index 644b0ef461e..cd6b06c8d35 100644
--- a/src/mame/includes/specpls3.h
+++ b/src/mame/includes/specpls3.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef __SPECPLS3_H__
-#define __SPECPLS3_H__
+#ifndef MAME_INCLUDES_SPECPLS3_H
+#define MAME_INCLUDES_SPECPLS3_H
INPUT_PORTS_EXTERN( spec_plus );
diff --git a/src/mame/includes/ssystem3.h b/src/mame/includes/ssystem3.h
index 8304bf227b3..f9b8e4e400b 100644
--- a/src/mame/includes/ssystem3.h
+++ b/src/mame/includes/ssystem3.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef SSYSTEM3_H_
-#define SSYSTEM3_H_
+#ifndef MAME_INCLUDES_SSYSTEM3_H
+#define MAME_INCLUDES_SSYSTEM3_H
#include "machine/6522via.h"
diff --git a/src/mame/includes/svision.h b/src/mame/includes/svision.h
index f704ad71012..52fe089a699 100644
--- a/src/mame/includes/svision.h
+++ b/src/mame/includes/svision.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef SVISION_H_
-#define SVISION_H_
+#ifndef MAME_INCLUDES_SVISION_H
+#define MAME_INCLUDES_SVISION_H
#include "cpu/m6502/m65c02.h"
#include "machine/timer.h"
diff --git a/src/mame/includes/tdv2324.h b/src/mame/includes/tdv2324.h
index bcb84bbad9a..f401bea04a7 100644
--- a/src/mame/includes/tdv2324.h
+++ b/src/mame/includes/tdv2324.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder,Jonathan Gevaryahu
#pragma once
-#ifndef __TDV2324__
-#define __TDV2324__
+#ifndef MAME_INCLUDES_TDV2324_H
+#define MAME_INCLUDES_TDV2324_H
#include "cpu/i8085/i8085.h"
diff --git a/src/mame/includes/ti89.h b/src/mame/includes/ti89.h
index fcf9b396f3e..89a24d9afe4 100644
--- a/src/mame/includes/ti89.h
+++ b/src/mame/includes/ti89.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef TI89_H_
-#define TI89_H_
+#ifndef MAME_INCLUDES_TI89_H
+#define MAME_INCLUDES_TI89_H
#include "machine/intelfsh.h"
#include "machine/timer.h"
diff --git a/src/mame/includes/timex.h b/src/mame/includes/timex.h
index 7587fbf4655..e9dbfa17a06 100644
--- a/src/mame/includes/timex.h
+++ b/src/mame/includes/timex.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef __TIMEX_H__
-#define __TIMEX_H__
+#ifndef MAME_INCLUDES_TIMEX_H
+#define MAME_INCLUDES_TIMEX_H
/* Border sizes for TS2068. These are guesses based on the number of cycles
available per frame. */
diff --git a/src/mame/includes/tmc1800.h b/src/mame/includes/tmc1800.h
index 846e93cee8f..dcbe07dde64 100644
--- a/src/mame/includes/tmc1800.h
+++ b/src/mame/includes/tmc1800.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder
#pragma once
-#ifndef __TMC1800__
-#define __TMC1800__
+#ifndef MAME_INCLUDES_TMC1800_H
+#define MAME_INCLUDES_TMC1800_H
#include "cpu/cosmac/cosmac.h"
diff --git a/src/mame/includes/tmc2000e.h b/src/mame/includes/tmc2000e.h
index b2856e06d68..215fd8f814e 100644
--- a/src/mame/includes/tmc2000e.h
+++ b/src/mame/includes/tmc2000e.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder
#pragma once
-#ifndef __TMC2000E__
-#define __TMC2000E__
+#ifndef MAME_INCLUDES_TMC2000E_H
+#define MAME_INCLUDES_TMC2000E_H
#include "cpu/cosmac/cosmac.h"
diff --git a/src/mame/includes/tmc600.h b/src/mame/includes/tmc600.h
index d3bae5717f2..e65c7c5df1e 100644
--- a/src/mame/includes/tmc600.h
+++ b/src/mame/includes/tmc600.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder
#pragma once
-#ifndef __TMC600__
-#define __TMC600__
+#ifndef MAME_INCLUDES_TMC600_H
+#define MAME_INCLUDES_TMC600_H
#include "cpu/cosmac/cosmac.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/tranz330.h b/src/mame/includes/tranz330.h
index 5c1e882ec7e..613b8c5e4f0 100644
--- a/src/mame/includes/tranz330.h
+++ b/src/mame/includes/tranz330.h
@@ -1,7 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Ryan Holtz
-#ifndef VERIFONE_TRANZ330_H
-#define VERIFONE_TRANZ330_H
+
+#ifndef MAME_INCLUDES_TRANZ330_H
+#define MAME_INCLUDES_TRANZ330_H
#pragma once
diff --git a/src/mame/includes/tx0.h b/src/mame/includes/tx0.h
index bfbdc0a3702..f91ec088315 100644
--- a/src/mame/includes/tx0.h
+++ b/src/mame/includes/tx0.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef TX0_H_
-#define TX0_H_
+#ifndef MAME_INCLUDES_TX0_H
+#define MAME_INCLUDES_TX0_H
#include "video/crt.h"
#include "cpu/pdp1/tx0.h"
diff --git a/src/mame/includes/ut88.h b/src/mame/includes/ut88.h
index 1d696a6b904..0507d67df83 100644
--- a/src/mame/includes/ut88.h
+++ b/src/mame/includes/ut88.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef UT88_H_
-#define UT88_H_
+#ifndef MAME_INCLUDES_UT88_H
+#define MAME_INCLUDES_UT88_H
#include "cpu/i8085/i8085.h"
#include "sound/dac.h"
diff --git a/src/mame/includes/vc4000.h b/src/mame/includes/vc4000.h
index 5a55f137331..dd8ea3e299a 100644
--- a/src/mame/includes/vc4000.h
+++ b/src/mame/includes/vc4000.h
@@ -7,8 +7,8 @@
*
****************************************************************************/
-#ifndef VC4000_H_
-#define VC4000_H_
+#ifndef MAME_INCLUDES_VC4000_H
+#define MAME_INCLUDES_VC4000_H
#include "audio/vc4000.h"
#include "cpu/s2650/s2650.h"
diff --git a/src/mame/includes/vcs80.h b/src/mame/includes/vcs80.h
index ae0d0306fdf..c83015bacfc 100644
--- a/src/mame/includes/vcs80.h
+++ b/src/mame/includes/vcs80.h
@@ -2,8 +2,8 @@
// copyright-holders:Miodrag Milanovic, Robbbert
#pragma once
-#ifndef __VCS80__
-#define __VCS80__
+#ifndef MAME_INCLUDES_VCS80_H
+#define MAME_INCLUDES_VCS80_H
#include "cpu/z80/z80.h"
diff --git a/src/mame/includes/vectrex.h b/src/mame/includes/vectrex.h
index 669e5b4cb77..f46e51a5341 100644
--- a/src/mame/includes/vectrex.h
+++ b/src/mame/includes/vectrex.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef VECTREX_H_
-#define VECTREX_H_
+#ifndef MAME_INCLUDES_VECTREX_H
+#define MAME_INCLUDES_VECTREX_H
#include "machine/6522via.h"
#include "sound/dac.h"
diff --git a/src/mame/includes/vidbrain.h b/src/mame/includes/vidbrain.h
index 9a49470b699..0163d1dbaf2 100644
--- a/src/mame/includes/vidbrain.h
+++ b/src/mame/includes/vidbrain.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder
#pragma once
-#ifndef __VIDBRAIN__
-#define __VIDBRAIN__
+#ifndef MAME_INCLUDES_VIDBRAIN_H
+#define MAME_INCLUDES_VIDBRAIN_H
#include "bus/vidbrain/exp.h"
#include "cpu/f8/f8.h"
diff --git a/src/mame/includes/vip.h b/src/mame/includes/vip.h
index 9a3d773d3d0..b687625f7af 100644
--- a/src/mame/includes/vip.h
+++ b/src/mame/includes/vip.h
@@ -2,8 +2,8 @@
// copyright-holders:Curt Coder
#pragma once
-#ifndef __VIP__
-#define __VIP__
+#ifndef MAME_INCLUDES_VIP_H
+#define MAME_INCLUDES_VIP_H
#include "bus/vip/byteio.h"
#include "bus/vip/exp.h"
diff --git a/src/mame/includes/wpc_dot.h b/src/mame/includes/wpc_dot.h
index c8f4dd94af6..ddcf7fabf7a 100644
--- a/src/mame/includes/wpc_dot.h
+++ b/src/mame/includes/wpc_dot.h
@@ -7,8 +7,8 @@
* Author: bsr
*/
-#ifndef WPC_DOT_H_
-#define WPC_DOT_H_
+#ifndef MAME_INCLUDES_WPC_DOT_H
+#define MAME_INCLUDES_WPC_DOT_H
#include "cpu/m6809/m6809.h"
#include "audio/wpcsnd.h"
diff --git a/src/mame/includes/wpc_flip1.h b/src/mame/includes/wpc_flip1.h
index 1c1f1768e68..a71950bbebe 100644
--- a/src/mame/includes/wpc_flip1.h
+++ b/src/mame/includes/wpc_flip1.h
@@ -5,8 +5,8 @@
*
*/
-#ifndef WPC_FLIP1_H_
-#define WPC_FLIP1_H_
+#ifndef MAME_INCLUDES_WPC_FLIP1_H
+#define MAME_INCLUDES_WPC_FLIP1_H
#include "includes/wpc_dot.h"
diff --git a/src/mame/includes/wpc_flip2.h b/src/mame/includes/wpc_flip2.h
index 3ff48444bce..b283681f571 100644
--- a/src/mame/includes/wpc_flip2.h
+++ b/src/mame/includes/wpc_flip2.h
@@ -5,8 +5,8 @@
*
*/
-#ifndef WPC_FLIP2_H_
-#define WPC_FLIP2_H_
+#ifndef MAME_INCLUDES_WPC_FLIP2_H
+#define MAME_INCLUDES_WPC_FLIP2_H
#include "includes/wpc_flip1.h"
diff --git a/src/mame/includes/wswan.h b/src/mame/includes/wswan.h
index 06800718ab2..48df6221f83 100644
--- a/src/mame/includes/wswan.h
+++ b/src/mame/includes/wswan.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef WSWAN_H_
-#define WSWAN_H_
+#ifndef MAME_INCLUDES_WSWAN_H
+#define MAME_INCLUDES_WSWAN_H
#define WSWAN_TYPE_MONO 0
#define WSWAN_TYPE_COLOR 1