diff --git a/src/emu/cpu/alph8201/alph8201.h b/src/emu/cpu/alph8201/alph8201.h
index 62a86429790..32e11965bd8 100644
--- a/src/emu/cpu/alph8201/alph8201.h
+++ b/src/emu/cpu/alph8201/alph8201.h
@@ -18,7 +18,8 @@
 
 #include "cpuintrf.h"
 
-enum {
+enum
+{
 	ALPHA8201_PC=1,
 	ALPHA8201_SP,
 	ALPHA8201_RB,
diff --git a/src/emu/cpu/cdp1802/1802dasm.c b/src/emu/cpu/cdp1802/1802dasm.c
index e625ffea51e..2f017e2eef2 100644
--- a/src/emu/cpu/cdp1802/1802dasm.c
+++ b/src/emu/cpu/cdp1802/1802dasm.c
@@ -24,7 +24,8 @@
 
 #include "cdp1802.h"
 
-typedef enum {
+typedef enum
+{
 	Ill,
 	Imm,
 	Imp,
diff --git a/src/emu/cpu/cdp1802/cdp1802.c b/src/emu/cpu/cdp1802/cdp1802.c
index 645a734e2db..c6f94bf1285 100644
--- a/src/emu/cpu/cdp1802/cdp1802.c
+++ b/src/emu/cpu/cdp1802/cdp1802.c
@@ -10,7 +10,8 @@
 #define CDP1802_CYCLES_DMA			8
 #define CDP1802_CYCLES_INTERRUPT	8
 
-enum {
+enum
+{
 	CDP1802_STATE_0_FETCH,
 	CDP1802_STATE_1_RESET,
 	CDP1802_STATE_1_INIT,
diff --git a/src/emu/cpu/cdp1802/cdp1802.h b/src/emu/cpu/cdp1802/cdp1802.h
index 59356d52a86..19cc7701c1a 100644
--- a/src/emu/cpu/cdp1802/cdp1802.h
+++ b/src/emu/cpu/cdp1802/cdp1802.h
@@ -5,38 +5,41 @@
 
 #include "cpuintrf.h"
 
-enum {
+enum
+{
 	CDP1802_INPUT_LINE_INT,
 	CDP1802_INPUT_LINE_DMAIN,
 	CDP1802_INPUT_LINE_DMAOUT
 };
 
-enum {
+enum
+{
 	EF1 = 0x01,
 	EF2 = 0x02,
 	EF3 = 0x04,
 	EF4 = 0x08
 };
 
-typedef enum _cdp1802_control_mode cdp1802_control_mode;
 enum _cdp1802_control_mode {
 	CDP1802_MODE_LOAD,
 	CDP1802_MODE_RESET,
 	CDP1802_MODE_PAUSE,
 	CDP1802_MODE_RUN
 };
+typedef enum _cdp1802_control_mode cdp1802_control_mode;
 
-typedef enum _cdp1802_state cdp1802_state;
 enum _cdp1802_state {
 	CDP1802_STATE_CODE_S0_FETCH,
 	CDP1802_STATE_CODE_S1_EXECUTE,
 	CDP1802_STATE_CODE_S2_DMA,
 	CDP1802_STATE_CODE_S3_INTERRUPT
 };
+typedef enum _cdp1802_state cdp1802_state;
 
 // CDP1802 Registers
 
-enum {
+enum
+{
 	CDP1802_PC = 1,
 	CDP1802_P,		// Designates which register is Program Counter
 	CDP1802_X,		// Designates which register is Data Pointer
diff --git a/src/emu/cpu/cop400/cop400.h b/src/emu/cpu/cop400/cop400.h
index 4936badeed4..9fe7430a27a 100644
--- a/src/emu/cpu/cop400/cop400.h
+++ b/src/emu/cpu/cop400/cop400.h
@@ -22,7 +22,8 @@
 #define	COP400_PORT_SIO	0x105
 #define	COP400_PORT_CKO	0x106
 
-enum {
+enum
+{
 	COP400_PC=1,
 	COP400_A,
 	COP400_B,
diff --git a/src/emu/cpu/cp1610/cp1610.h b/src/emu/cpu/cp1610/cp1610.h
index 0fe2768840c..2b98041b67b 100644
--- a/src/emu/cpu/cp1610/cp1610.h
+++ b/src/emu/cpu/cp1610/cp1610.h
@@ -24,7 +24,8 @@
 
 #include "cpuintrf.h"
 
-enum {
+enum
+{
 	CP1610_R0=1, CP1610_R1, CP1610_R2, CP1610_R3,
 	CP1610_R4, CP1610_R5, CP1610_R6, CP1610_R7
 };
diff --git a/src/emu/cpu/drcbeut.h b/src/emu/cpu/drcbeut.h
index fd281ec9a6b..800bb14302f 100644
--- a/src/emu/cpu/drcbeut.h
+++ b/src/emu/cpu/drcbeut.h
@@ -152,4 +152,4 @@ INLINE int drchash_code_exists(drchash_state *drchash, UINT32 mode, UINT32 pc)
 }
 
 
-#endif
+#endif /* __DRCBEUT_H__ */
diff --git a/src/emu/cpu/drccache.h b/src/emu/cpu/drccache.h
index 8fa7c82da1e..130436b1411 100644
--- a/src/emu/cpu/drccache.h
+++ b/src/emu/cpu/drccache.h
@@ -10,6 +10,8 @@
 
 ***************************************************************************/
 
+#pragma once
+
 #ifndef __DRCCACHE_H__
 #define __DRCCACHE_H__
 
@@ -104,4 +106,4 @@ drccodeptr drccache_end_codegen(drccache *cache);
 void drccache_request_oob_codegen(drccache *cache, drccache_oob_func callback, void *param1, void *param2, void *param3);
 
 
-#endif
+#endif /* __DRCCACHE_H__ */
diff --git a/src/emu/cpu/drcfe.h b/src/emu/cpu/drcfe.h
index 201e2a3ff2c..127f6596193 100644
--- a/src/emu/cpu/drcfe.h
+++ b/src/emu/cpu/drcfe.h
@@ -31,6 +31,8 @@
 
 ***************************************************************************/
 
+#pragma once
+
 #ifndef __DRCFE_H__
 #define __DRCFE_H__
 
@@ -157,4 +159,4 @@ void drcfe_exit(drcfe_state *drcfe);
 const opcode_desc *drcfe_describe_code(drcfe_state *drcfe, offs_t startpc);
 
 
-#endif
+#endif /* __DRCFE_H__ */
diff --git a/src/emu/cpu/drcuml.h b/src/emu/cpu/drcuml.h
index 76a7f4e2149..bcadfffefbc 100644
--- a/src/emu/cpu/drcuml.h
+++ b/src/emu/cpu/drcuml.h
@@ -506,4 +506,4 @@ void drcuml_add_comment(drcuml_block *block, const char *format, ...) ATTR_PRINT
 void drcuml_disasm(const drcuml_instruction *inst, char *buffer, drcuml_state *state);
 
 
-#endif
+#endif /* __DRCUML_H__ */
diff --git a/src/emu/cpu/drcumlsh.h b/src/emu/cpu/drcumlsh.h
index 2a9a3f3c941..89c29beb676 100644
--- a/src/emu/cpu/drcumlsh.h
+++ b/src/emu/cpu/drcumlsh.h
@@ -226,4 +226,4 @@
 #define UML_FDRSQRT(block, dst, src1)						do { drcuml_block_append_2(block, DRCUML_OP_FRSQRT,  8, IF_ALWAYS,  dst, src1); } while (0)
 
 
-#endif
+#endif /* __DRCUMLSH_H__ */
diff --git a/src/emu/cpu/ds5002fp/ds5002fp.h b/src/emu/cpu/ds5002fp/ds5002fp.h
index 40a84d11c97..975f571d8c8 100644
--- a/src/emu/cpu/ds5002fp/ds5002fp.h
+++ b/src/emu/cpu/ds5002fp/ds5002fp.h
@@ -44,7 +44,8 @@
 
 #include "cpuintrf.h"
 
-enum {
+enum
+{
 	DS5002FP_PC=1, DS5002FP_SP, DS5002FP_PSW, DS5002FP_ACC, DS5002FP_B, DS5002FP_DPH, DS5002FP_DPL, DS5002FP_IE,
 	DS5002FP_PCON, DS5002FP_MCON, DS5002FP_RPCTL, DS5002FP_CRC,
 	DS5002FP_R0, DS5002FP_R1, DS5002FP_R2, DS5002FP_R3, DS5002FP_R4, DS5002FP_R5, DS5002FP_R6, DS5002FP_R7, DS5002FP_RB
diff --git a/src/emu/cpu/dsp56k/dsp56def.h b/src/emu/cpu/dsp56k/dsp56def.h
index 1719a2e2d73..a0ea85ad857 100644
--- a/src/emu/cpu/dsp56k/dsp56def.h
+++ b/src/emu/cpu/dsp56k/dsp56def.h
@@ -5,13 +5,6 @@
 /***************************************************************************
     ALU
 ***************************************************************************/
-
-#pragma once
-
-#ifndef __DSP56DEF_H__
-#define __DSP56DEF_H__
-
-
 #define X		core.ALU.x.d
 #define X1		core.ALU.x.w.h
 #define X0		core.ALU.x.w.l
@@ -387,5 +380,3 @@ static void PCDDR_set(UINT16 value);
 
 /* Port C Dtaa Register (PCD) */
 static void PCD_set(UINT16 value);
-
-#endif /* __DSP56DEF_H__ */
diff --git a/src/emu/cpu/f8/f8.h b/src/emu/cpu/f8/f8.h
index 5e865c272c1..a74262f0ea7 100644
--- a/src/emu/cpu/f8/f8.h
+++ b/src/emu/cpu/f8/f8.h
@@ -30,7 +30,8 @@
 extern "C" {
 #endif
 
-enum {
+enum
+{
 	F8_PC0=1, F8_PC1, F8_DC0, F8_DC1, F8_W, F8_A, F8_IS,
         F8_J, F8_HU, F8_HL, F8_KU, F8_KL, F8_QU, F8_QL,
 
diff --git a/src/emu/cpu/g65816/g65816op.h b/src/emu/cpu/g65816/g65816op.h
index 495749fe675..cc5dd8778c8 100644
--- a/src/emu/cpu/g65816/g65816op.h
+++ b/src/emu/cpu/g65816/g65816op.h
@@ -1,9 +1,3 @@
-#pragma once
-
-#ifndef __G65816OP_H__
-#define __G65816OP_H__
-
-
 #include "deprecat.h"
 
 /* ======================================================================== */
@@ -2453,5 +2447,3 @@ TABLE_FUNCTION(int, execute, (int clocks))
 	}
 	return clocks;
 }
-
-#endif /* __G65816OP_H__ */
diff --git a/src/emu/cpu/h6280/h6280.h b/src/emu/cpu/h6280/h6280.h
index 7ce9aed7d3a..fbfea140d25 100644
--- a/src/emu/cpu/h6280/h6280.h
+++ b/src/emu/cpu/h6280/h6280.h
@@ -17,7 +17,8 @@
 
 #include "cpuintrf.h"
 
-enum {
+enum
+{
 	H6280_PC=1, H6280_S, H6280_P, H6280_A, H6280_X, H6280_Y,
 	H6280_IRQ_MASK, H6280_TIMER_STATE,
 	H6280_NMI_STATE, H6280_IRQ1_STATE, H6280_IRQ2_STATE, H6280_IRQT_STATE,
diff --git a/src/emu/cpu/h6280/h6280ops.h b/src/emu/cpu/h6280/h6280ops.h
index bc2058487b1..4237b86447e 100644
--- a/src/emu/cpu/h6280/h6280ops.h
+++ b/src/emu/cpu/h6280/h6280ops.h
@@ -1,8 +1,3 @@
-#pragma once
-
-#ifndef __H6280OPS_H__
-#define __H6280OPS_H__
-
 /*****************************************************************************
 
     h6280ops.h - Addressing modes and opcode macros for the Hu6820 cpu
@@ -1384,5 +1379,3 @@ INLINE void WRMEM(offs_t addr, UINT8 data) {
  ***************************************************************/
 #define CSL														\
     h6280.clocks_per_cycle = 4;
-
-#endif /* __H6280OPS_H__ */
diff --git a/src/emu/cpu/hd6309/hd6309.h b/src/emu/cpu/hd6309/hd6309.h
index c39d2198d15..491ad3d1350 100644
--- a/src/emu/cpu/hd6309/hd6309.h
+++ b/src/emu/cpu/hd6309/hd6309.h
@@ -7,9 +7,11 @@
 
 #include "cpuintrf.h"
 
-enum {
+enum
+{
 	HD6309_PC=1, HD6309_S, HD6309_CC ,HD6309_A, HD6309_B, HD6309_U, HD6309_X, HD6309_Y, HD6309_DP,
-	HD6309_E, HD6309_F, HD6309_V, HD6309_MD };
+	HD6309_E, HD6309_F, HD6309_V, HD6309_MD
+};
 
 #define HD6309_IRQ_LINE 0	/* IRQ line number */
 #define HD6309_FIRQ_LINE 1	 /* FIRQ line number */
diff --git a/src/emu/cpu/i386/cycles.h b/src/emu/cpu/i386/cycles.h
index daeeb17f229..f17517acc33 100644
--- a/src/emu/cpu/i386/cycles.h
+++ b/src/emu/cpu/i386/cycles.h
@@ -3,7 +3,8 @@
 #ifndef __CYCLES_H__
 #define __CYCLES_H__
 
-typedef enum {
+typedef enum
+{
 	CYCLES_MOV_REG_REG,
 	CYCLES_MOV_REG_MEM,
 	CYCLES_MOV_MEM_REG,
diff --git a/src/emu/cpu/i386/i386.h b/src/emu/cpu/i386/i386.h
index 2aeb9a54f3f..d7d80e8f7a4 100644
--- a/src/emu/cpu/i386/i386.h
+++ b/src/emu/cpu/i386/i386.h
@@ -17,7 +17,8 @@ extern int i386_dasm_one(char *buffer, UINT32 pc, const UINT8 *oprom, int mode);
 typedef enum { ES, CS, SS, DS, FS, GS } SREGS;
 
 #ifdef LSB_FIRST
-typedef enum {
+typedef enum
+{
 	AL = 0,
 	AH = 1,
 	CL = 4,
@@ -28,7 +29,8 @@ typedef enum {
 	BH = 13
 } BREGS;
 #else
-typedef enum {
+typedef enum
+{
 	AL = 3,
 	AH = 2,
 	CL = 7,
@@ -41,7 +43,8 @@ typedef enum {
 #endif
 
 #ifdef LSB_FIRST
-typedef enum {
+typedef enum
+{
 	AX = 0,
 	CX = 2,
 	DX = 4,
@@ -52,7 +55,8 @@ typedef enum {
 	DI = 14
 } WREGS;
 #else
-typedef enum {
+typedef enum
+{
 	AX = 1,
 	CX = 3,
 	DX = 5,
diff --git a/src/emu/cpu/i386/i386dasm.c b/src/emu/cpu/i386/i386dasm.c
index a418e3233a5..a57790d6c1e 100644
--- a/src/emu/cpu/i386/i386dasm.c
+++ b/src/emu/cpu/i386/i386dasm.c
@@ -6,7 +6,8 @@
 
 #include "cpuintrf.h"
 
-enum {
+enum
+{
 	PARAM_REG = 1,		/* 16 or 32-bit register */
 	PARAM_REG8,			/* 8-bit register */
 	PARAM_REG16,		/* 16-bit register */
diff --git a/src/emu/cpu/i386/i386ops.h b/src/emu/cpu/i386/i386ops.h
index 6d316bc7cdb..797d89f6b72 100644
--- a/src/emu/cpu/i386/i386ops.h
+++ b/src/emu/cpu/i386/i386ops.h
@@ -1,8 +1,3 @@
-#pragma once
-
-#ifndef __I386OPS_H__
-#define __I386OPS_H__
-
 typedef struct {
 	UINT8 opcode;
 	UINT32 flags;
@@ -372,5 +367,3 @@ static const X86_OPCODE x86_opcode_table[] =
 	{ 0xC1,		OP_2BYTE|OP_I486,			I486OP(xadd_rm16_r16),			I486OP(xadd_rm32_r32),		},
 	{ 0xC7,		OP_2BYTE|OP_PENTIUM,		PENTIUMOP(cmpxchg8b_m64),		PENTIUMOP(cmpxchg8b_m64),	}
 };
-
-#endif /* __I386OPS_H__ */
diff --git a/src/emu/cpu/i8051/i8051.h b/src/emu/cpu/i8051/i8051.h
index bd99eef41e4..d1f1563779c 100644
--- a/src/emu/cpu/i8051/i8051.h
+++ b/src/emu/cpu/i8051/i8051.h
@@ -37,7 +37,8 @@
 
 #include "cpuintrf.h"
 
-enum {
+enum
+{
 	I8051_PC=1, I8051_SP, I8051_PSW, I8051_ACC, I8051_B, I8051_DPH, I8051_DPL, I8051_IE,
 	I8051_R0, I8051_R1, I8051_R2, I8051_R3, I8051_R4, I8051_R5, I8051_R6, I8051_R7, I8051_RB
 };
diff --git a/src/emu/cpu/i8085/i8085.h b/src/emu/cpu/i8085/i8085.h
index 02a7a9f909e..4c367d3df08 100644
--- a/src/emu/cpu/i8085/i8085.h
+++ b/src/emu/cpu/i8085/i8085.h
@@ -3,11 +3,13 @@
 
 #include "cpuintrf.h"
 
-enum {
+enum
+{
 	I8085_PC=1, I8085_SP, I8085_AF ,I8085_BC, I8085_DE, I8085_HL,
 	I8085_HALT, I8085_IM, I8085_IREQ, I8085_ISRV, I8085_VECTOR,
 	I8085_TRAP_STATE, I8085_INTR_STATE,
-	I8085_RST55_STATE, I8085_RST65_STATE, I8085_RST75_STATE};
+	I8085_RST55_STATE, I8085_RST65_STATE, I8085_RST75_STATE
+};
 
 enum
 {
diff --git a/src/emu/cpu/i8085/i8085cpu.h b/src/emu/cpu/i8085/i8085cpu.h
index 737844b431c..e4e788f99de 100644
--- a/src/emu/cpu/i8085/i8085cpu.h
+++ b/src/emu/cpu/i8085/i8085cpu.h
@@ -10,11 +10,6 @@
  *
  *******************************************************/
 
-#pragma once
-
-#ifndef __I8085CPU_H__
-#define __I8085CPU_H__
-
 
 #define SF              0x80
 #define ZF              0x40
@@ -192,5 +187,3 @@ int q = I.AF.b.h+R; 							\
 		(((I.BC.b.h^I.HL.b.h)&(I.HL.b.h^q)&SF)>>5);				\
 	if (I.HL.b.l!=0) I.AF.b.l&=~ZF;								\
 }
-
-#endif /* __I8085CPU_H__ */
diff --git a/src/emu/cpu/i8085/i8085daa.h b/src/emu/cpu/i8085/i8085daa.h
index af3e00906fa..bd6533b2dce 100644
--- a/src/emu/cpu/i8085/i8085daa.h
+++ b/src/emu/cpu/i8085/i8085daa.h
@@ -1,8 +1,3 @@
-#pragma once
-
-#ifndef __I8085DAA_H__
-#define __I8085DAA_H__
-
 static const UINT16 DAA[2048] = {
   (0x00<<8)   +ZF         +VF      ,
   (0x01<<8)                        ,
@@ -2053,5 +2048,3 @@ static const UINT16 DAA[2048] = {
   (0x98<<8)+SF         +XF   +NF+CF,
   (0x99<<8)+SF         +XF+VF+NF+CF
 };
-
-#endif /* __I8085DAA_H__ */
diff --git a/src/emu/cpu/i86/ea.h b/src/emu/cpu/i86/ea.h
index 04c20ea5a84..dca12337a5b 100644
--- a/src/emu/cpu/i86/ea.h
+++ b/src/emu/cpu/i86/ea.h
@@ -1,9 +1,3 @@
-#pragma once
-
-#ifndef __EA_H__
-#define __EA_H__
-
-
 static unsigned EA;
 static UINT16 EO; /* HJB 12/13/98 effective offset of the address (before segment is added) */
 
@@ -62,5 +56,3 @@ static unsigned (*const GetEA[192])(void)={
 	EA_200, EA_201, EA_202, EA_203, EA_204, EA_205, EA_206, EA_207,
 	EA_200, EA_201, EA_202, EA_203, EA_204, EA_205, EA_206, EA_207
 };
-
-#endif /* __EA_H__ */
diff --git a/src/emu/cpu/i86/host.h b/src/emu/cpu/i86/host.h
index a487644eeca..44c8c48c621 100644
--- a/src/emu/cpu/i86/host.h
+++ b/src/emu/cpu/i86/host.h
@@ -1,11 +1,6 @@
 /*****************************************************************************/
 /* host dependent types                                                      */
 
-#pragma once
-
-#ifndef __HOST_H__
-#define __HOST_H__
-
 
 /*#define BIGCASE*/
 
@@ -16,5 +11,3 @@ typedef UINT8 BOOLEAN;
 typedef UINT8 BYTE;
 typedef UINT16 WORD;
 typedef UINT32 DWORD;
-
-#endif /* __HOST_H__ */
diff --git a/src/emu/cpu/i86/i86mem.h b/src/emu/cpu/i86/i86mem.h
index b31497ad918..55eaf874c62 100644
--- a/src/emu/cpu/i86/i86mem.h
+++ b/src/emu/cpu/i86/i86mem.h
@@ -1,8 +1,3 @@
-#pragma once
-
-#ifndef __I86MEM_H__
-#define __I86MEM_H__
-
 typedef struct _memory_interface memory_interface;
 struct _memory_interface
 {
@@ -18,5 +13,3 @@ struct _memory_interface
 	void	(*wbyte_port)(offs_t, UINT8);
 	void	(*wword_port)(offs_t, UINT16);
 };
-
-#endif /* __I86MEM_H__ */
diff --git a/src/emu/cpu/i86/instr186.h b/src/emu/cpu/i86/instr186.h
index 3c7fe303b5f..54de28e18ad 100644
--- a/src/emu/cpu/i86/instr186.h
+++ b/src/emu/cpu/i86/instr186.h
@@ -1,8 +1,3 @@
-#pragma once
-
-#ifndef __INSTR186_H__
-#define __INSTR186_H__
-
 /****************************************************************************
 *             real mode i286 emulator v1.4 by Fabrice Frances               *
 *               (initial work based on David Hedley's pcemu)                *
@@ -30,5 +25,3 @@ static void PREFIX186(_outsw)(void);
 /* changed instructions */
 static void PREFIX186(_repne)(void);
 static void PREFIX186(_repe)(void);
-
-#endif /* __INSTR186_H__ */
diff --git a/src/emu/cpu/i86/instr286.h b/src/emu/cpu/i86/instr286.h
index 8edc90115c3..53431ada3be 100644
--- a/src/emu/cpu/i86/instr286.h
+++ b/src/emu/cpu/i86/instr286.h
@@ -1,9 +1,3 @@
-#pragma once
-
-#ifndef __INSTR286_H__
-#define __INSTR286_H__
-
-
 #define ILLEGAL_INSTRUCTION 6
 #define GENERAL_PROTECTION_FAULT 0xd
 
@@ -17,5 +11,3 @@ static void i80286_code_descriptor(UINT16 selector, UINT16 offset);
 static void i80286_data_descriptor(int reg, UINT16 selector);
 static void PREFIX286(_0fpre)(void);
 static void PREFIX286(_arpl)(void);
-
-#endif /* __INSTR286_H__ */
diff --git a/src/emu/cpu/i86/instrv30.h b/src/emu/cpu/i86/instrv30.h
index 5d4580ec231..0647ae8d841 100644
--- a/src/emu/cpu/i86/instrv30.h
+++ b/src/emu/cpu/i86/instrv30.h
@@ -1,8 +1,3 @@
-#pragma once
-
-#ifndef __INSTRV30_H__
-#define __INSTRV30_H__
-
 static void PREFIXV30(_0fpre)(void);
 static void PREFIXV30(_repnc)(void);
 static void PREFIXV30(_repc)(void);
@@ -10,5 +5,3 @@ static void PREFIXV30(_setalc)(void);
 #if 0
 static void PREFIXV30(_brks)(void);
 #endif
-
-#endif /* __INSTRV30_H__ */
diff --git a/src/emu/cpu/i86/modrm.h b/src/emu/cpu/i86/modrm.h
index cee4325e77f..2f83dbfe1e9 100644
--- a/src/emu/cpu/i86/modrm.h
+++ b/src/emu/cpu/i86/modrm.h
@@ -1,15 +1,12 @@
-#pragma once
-
-#ifndef __MODRM_H__
-#define __MODRM_H__
-
-
-static struct {
-	struct {
+static struct
+{
+	struct
+	{
 		WREGS w[256];
 		BREGS b[256];
 	} reg;
-	struct {
+	struct
+	{
 		WREGS w[256];
 		BREGS b[256];
 	} RM;
@@ -120,5 +117,3 @@ static struct {
 	unsigned src = FETCHOP; 				\
 	unsigned dst = I.regs.w[AX];			\
     src += (FETCH << 8)
-
-#endif /* __MODRM_H__ */
diff --git a/src/emu/cpu/i86/table186.h b/src/emu/cpu/i86/table186.h
index 8659e7531be..9a415558f0f 100644
--- a/src/emu/cpu/i86/table186.h
+++ b/src/emu/cpu/i86/table186.h
@@ -1,8 +1,3 @@
-#pragma once
-
-#ifndef __TABLE186_H__
-#define __TABLE186_H__
-
 static void (*const PREFIX186(_instruction)[256])(void) =
 {
 	 PREFIX86(_add_br8),           /* 0x00 */
@@ -528,5 +523,3 @@ static void (*const PREFIX186(_instruction)[256])(void) =
 #else
 #define TABLE186 PREFIX186(_instruction)[FETCHOP]();
 #endif
-
-#endif /* __TABLE186_H__ */
diff --git a/src/emu/cpu/i86/table286.h b/src/emu/cpu/i86/table286.h
index 70dc32d17f5..b3dfac80eda 100644
--- a/src/emu/cpu/i86/table286.h
+++ b/src/emu/cpu/i86/table286.h
@@ -1,8 +1,3 @@
-#pragma once
-
-#ifndef __TABLE286_H__
-#define __TABLE286_H__
-
 /*
  * special 286 protected mode instructions missing
  * at the time the same like table186.h
@@ -533,5 +528,3 @@ static void (*const PREFIX286(_instruction)[256])(void) =
 #else
 #define TABLE286 PREFIX286(_instruction)[FETCHOP]();
 #endif
-
-#endif /* __TABLE286_H__ */
diff --git a/src/emu/cpu/i86/table86.h b/src/emu/cpu/i86/table86.h
index 75ce17fcacc..1038501bd03 100644
--- a/src/emu/cpu/i86/table86.h
+++ b/src/emu/cpu/i86/table86.h
@@ -1,8 +1,3 @@
-#pragma once
-
-#ifndef __TABLE86_H__
-#define __TABLE86_H__
-
 static void (*const PREFIX86(_instruction)[256])(void) =
 {
 	 PREFIX86(_add_br8),          /* 0x00 */
@@ -528,5 +523,3 @@ static void (*const PREFIX86(_instruction)[256])(void) =
 #else
 #define TABLE86 PREFIX86(_instruction)[FETCHOP]();
 #endif
-
-#endif /* __TABLE86_H__ */
diff --git a/src/emu/cpu/i86/tablev30.h b/src/emu/cpu/i86/tablev30.h
index a1581bbaaef..3c29bf85678 100644
--- a/src/emu/cpu/i86/tablev30.h
+++ b/src/emu/cpu/i86/tablev30.h
@@ -1,8 +1,3 @@
-#pragma once
-
-#ifndef __TABLEV30_H__
-#define __TABLEV30_H__
-
 // special nec instructions missing
 // at the time the same like table186.h
 
@@ -531,5 +526,3 @@ static void (*const PREFIXV30(_instruction)[256])(void) =
 #else
 #define TABLEV30 PREFIXV30(_instruction)[FETCHOP]();
 #endif
-
-#endif /* __TABLEV30_H__ */
diff --git a/src/emu/cpu/i8x41/i8x41.h b/src/emu/cpu/i8x41/i8x41.h
index 9c1a586771d..cfefeb40c3e 100644
--- a/src/emu/cpu/i8x41/i8x41.h
+++ b/src/emu/cpu/i8x41/i8x41.h
@@ -83,7 +83,8 @@ struct _i8x41_config
 #define I8X42_intRAM_MASK		0xff
 
 
-enum {
+enum
+{
 	I8X41_PC=1, I8X41_SP, I8X41_PSW, I8X41_T, I8X41_DATA, I8X41_DATA_DASM,
 	I8X41_CMND, I8X41_CMND_DASM, I8X41_STAT, I8X41_P1, I8X41_P2,I8X41_A,
 	I8X41_R0, I8X41_R1, I8X41_R2, I8X41_R3, I8X41_R4, I8X41_R5, I8X41_R6, I8X41_R7
diff --git a/src/emu/cpu/i960/i960.h b/src/emu/cpu/i960/i960.h
index 0116c2df531..25501eb4d9a 100644
--- a/src/emu/cpu/i960/i960.h
+++ b/src/emu/cpu/i960/i960.h
@@ -5,7 +5,8 @@
 
 #include "cpuintrf.h"
 
-enum {
+enum
+{
   I960_PFP = 0,
   I960_SP  = 1,
   I960_RIP = 2,
@@ -52,7 +53,8 @@ enum {
   I960_PIP = 37
 };
 
-enum {
+enum
+{
   I960_IRQ0 = 0,
   I960_IRQ1 = 1,
   I960_IRQ2 = 2,
diff --git a/src/emu/cpu/konami/konami.h b/src/emu/cpu/konami/konami.h
index 607a85694d2..571518e7255 100644
--- a/src/emu/cpu/konami/konami.h
+++ b/src/emu/cpu/konami/konami.h
@@ -7,9 +7,11 @@
 
 #include "cpuintrf.h"
 
-enum {
+enum
+{
 	KONAMI_PC=1, KONAMI_S, KONAMI_CC ,KONAMI_A, KONAMI_B, KONAMI_U, KONAMI_X, KONAMI_Y,
-	KONAMI_DP };
+	KONAMI_DP
+};
 
 enum
 {
diff --git a/src/emu/cpu/lh5801/5801dasm.c b/src/emu/cpu/lh5801/5801dasm.c
index 7295417f6c6..2216b801cef 100644
--- a/src/emu/cpu/lh5801/5801dasm.c
+++ b/src/emu/cpu/lh5801/5801dasm.c
@@ -24,7 +24,8 @@
 
 #include "lh5801.h"
 
-typedef enum {
+typedef enum
+{
 	Imp,
 	Reg,
 	Vec, // imm byte (vector at 0xffxx)
@@ -45,7 +46,8 @@ typedef enum {
 	RelM
 } Adr;
 
-typedef enum {
+typedef enum
+{
 	RegNone,
 	A,
 	XL, XH, X,
@@ -62,7 +64,8 @@ static const char *const RegNames[]= {
 #undef SEC
 #endif
 
-typedef enum {
+typedef enum
+{
 	ILL, ILL2, PREFD, NOP,
 
 	LDA, STA, LDI, LDX, STX,
diff --git a/src/emu/cpu/lh5801/lh5801.c b/src/emu/cpu/lh5801/lh5801.c
index 58cca27c408..80806254c07 100644
--- a/src/emu/cpu/lh5801/lh5801.c
+++ b/src/emu/cpu/lh5801/lh5801.c
@@ -25,7 +25,8 @@
 
 #define LOG(x)	do { if (VERBOSE) logerror x; } while (0)
 
-enum {
+enum
+{
 	LH5801_T=1,
 	LH5801_P,
 	LH5801_S,
diff --git a/src/emu/cpu/lr35902/lr35902.h b/src/emu/cpu/lr35902/lr35902.h
index 78a0ea5d379..dd7ae9fe75d 100644
--- a/src/emu/cpu/lr35902/lr35902.h
+++ b/src/emu/cpu/lr35902/lr35902.h
@@ -13,7 +13,8 @@ struct _lr35902_cpu_core
 	void	(*timer_fired_func)(int cycles);
 };
 
-enum {
+enum
+{
 	LR35902_PC=1, LR35902_SP, LR35902_AF, LR35902_BC, LR35902_DE, LR35902_HL,
 	LR35902_IRQ_STATE,
 	/* Pseudo registers to keep track of the interrupt statuses */
diff --git a/src/emu/cpu/m37710/m37710op.h b/src/emu/cpu/m37710/m37710op.h
index 6630da56804..fa97ee7f4db 100644
--- a/src/emu/cpu/m37710/m37710op.h
+++ b/src/emu/cpu/m37710/m37710op.h
@@ -2,11 +2,6 @@
 /* ============================= CONFIGURATION ============================ */
 /* ======================================================================== */
 
-#pragma once
-
-#ifndef __M37710OP_H__
-#define __M37710OP_H__
-
 
 #undef FLAG_SET_M
 #undef FLAG_SET_X
@@ -2963,5 +2958,3 @@ TABLE_FUNCTION(int, execute, (int clocks))
 /* ======================================================================== */
 /* ================================== EOF ================================= */
 /* ======================================================================== */
-
-#endif /* __M37710OP_H__ */
diff --git a/src/emu/cpu/m6502/m4510.h b/src/emu/cpu/m6502/m4510.h
index 4a75319d6e4..6400cbb0b26 100644
--- a/src/emu/cpu/m6502/m4510.h
+++ b/src/emu/cpu/m6502/m4510.h
@@ -27,7 +27,8 @@
 #include "m6502.h"
 
 
-enum {
+enum
+{
 	M4510_PC=1, M4510_S, M4510_P, M4510_A, M4510_X, M4510_Y,
 	M4510_Z, M4510_B, M4510_EA, M4510_ZP,
 	M4510_NMI_STATE, M4510_IRQ_STATE,
diff --git a/src/emu/cpu/m6502/m6502.h b/src/emu/cpu/m6502/m6502.h
index 811d6d60df1..783203e70fd 100644
--- a/src/emu/cpu/m6502/m6502.h
+++ b/src/emu/cpu/m6502/m6502.h
@@ -49,7 +49,8 @@
 #define SUBTYPE_DECO16	5
 #endif
 
-enum {
+enum
+{
 	M6502_PC=1, M6502_S, M6502_P, M6502_A, M6502_X, M6502_Y,
 	M6502_EA, M6502_ZP,
 	M6502_SUBTYPE
diff --git a/src/emu/cpu/m6502/m6509.h b/src/emu/cpu/m6502/m6509.h
index a2198c12dfb..12d689c8b6e 100644
--- a/src/emu/cpu/m6502/m6509.h
+++ b/src/emu/cpu/m6502/m6509.h
@@ -26,7 +26,8 @@
 
 #include "m6502.h"
 
-enum {
+enum
+{
 	M6509_PC=1, M6509_S, M6509_P, M6509_A, M6509_X, M6509_Y,
 	M6509_EA, M6509_ZP, M6509_NMI_STATE, M6509_IRQ_STATE, M6509_SO_STATE,
 	M6509_PC_BANK, M6509_IND_BANK
diff --git a/src/emu/cpu/m6502/m65ce02.h b/src/emu/cpu/m6502/m65ce02.h
index b07f02d7f81..145a1c6aeb3 100644
--- a/src/emu/cpu/m6502/m65ce02.h
+++ b/src/emu/cpu/m6502/m65ce02.h
@@ -26,7 +26,8 @@
 
 #include "m6502.h"
 
-enum {
+enum
+{
 	M65CE02_PC=1, M65CE02_S, M65CE02_P, M65CE02_A, M65CE02_X, M65CE02_Y,
 	M65CE02_Z, M65CE02_B, M65CE02_EA, M65CE02_ZP,
 	M65CE02_NMI_STATE, M65CE02_IRQ_STATE
diff --git a/src/emu/cpu/m6502/minc4510.h b/src/emu/cpu/m6502/minc4510.h
index f2c40bf371a..9fb13e01e6e 100644
--- a/src/emu/cpu/m6502/minc4510.h
+++ b/src/emu/cpu/m6502/minc4510.h
@@ -5,11 +5,6 @@
  *
  *****************************************************************************/
 
-#pragma once
-
-#ifndef __MINC4510_H__
-#define __MINC4510_H__
-
 
 /* 4510 flags */
 #define F_C	0x01
@@ -75,5 +70,3 @@
  ***************************************************************/
 #undef RDOPARG
 #define RDOPARG() m4510_cpu_readop_arg(); m4510_ICount -= 1
-
-#endif /* __MINC4510_H__ */
diff --git a/src/emu/cpu/m6502/mincce02.h b/src/emu/cpu/m6502/mincce02.h
index 183f67532a4..f83b0458b06 100644
--- a/src/emu/cpu/m6502/mincce02.h
+++ b/src/emu/cpu/m6502/mincce02.h
@@ -5,11 +5,6 @@
  *
  *****************************************************************************/
 
-#pragma once
-
-#ifndef __MINCCE02_H__
-#define __MINCCE02_H__
-
 
 /* 65ce02 flags */
 #define F_C	0x01
@@ -74,5 +69,3 @@
 
 #define RDMEM(addr)			program_read_byte_8le(addr); m65ce02_ICount -= 1
 #define WRMEM(addr,data)	program_write_byte_8le(addr,data); m65ce02_ICount -= 1
-
-#endif /* __MINCCE02_H__ */
diff --git a/src/emu/cpu/m6502/ops02.h b/src/emu/cpu/m6502/ops02.h
index 890eb9b86b3..b898e04f17c 100644
--- a/src/emu/cpu/m6502/ops02.h
+++ b/src/emu/cpu/m6502/ops02.h
@@ -20,11 +20,6 @@
  *
  *****************************************************************************/
 
-#pragma once
-
-#ifndef __OPS02_H__
-#define __OPS02_H__
-
 
 /* 6502 flags */
 #define F_C 0x01
@@ -811,5 +806,3 @@
 #define TYA 													\
 	A = Y;														\
 	SET_NZ(A)
-
-#endif /* __OPS02_H__ */
diff --git a/src/emu/cpu/m6502/ops09.h b/src/emu/cpu/m6502/ops09.h
index 59b74f26987..21a3e152cf9 100644
--- a/src/emu/cpu/m6502/ops09.h
+++ b/src/emu/cpu/m6502/ops09.h
@@ -20,12 +20,6 @@
  *
  *****************************************************************************/
 
-#pragma once
-
-#ifndef __OPS09_H__
-#define __OPS09_H__
-
-
 #define m6502 m6509
 #define m6502_ICount m6509_ICount
 
@@ -218,5 +212,3 @@
 #define KIL 													\
 	PCW--;														\
 	logerror("M6509 KILL opcode %05x: %02x\n", PCD, cpu_readop(PCD))
-
-#endif /* __OPS09_H__ */
diff --git a/src/emu/cpu/m6502/ops4510.h b/src/emu/cpu/m6502/ops4510.h
index 94b2221f83b..33ea7c7318f 100644
--- a/src/emu/cpu/m6502/ops4510.h
+++ b/src/emu/cpu/m6502/ops4510.h
@@ -22,11 +22,6 @@
  *
  *****************************************************************************/
 
-#pragma once
-
-#ifndef __OPS4510_H__
-#define __OPS4510_H__
-
 
 /* 65ce02 ********************************************************
  * TXS  Transfer index X to stack LSB
@@ -79,6 +74,4 @@
  { \
 				UINT8 op = RDOP();								\
 				(*m4510.insn[op])();							\
- } \
-
-#endif /* __OPS4510_H__ */
+ }
diff --git a/src/emu/cpu/m6502/opsc02.h b/src/emu/cpu/m6502/opsc02.h
index 2fd379d0493..3bb4f483d6e 100644
--- a/src/emu/cpu/m6502/opsc02.h
+++ b/src/emu/cpu/m6502/opsc02.h
@@ -20,11 +20,6 @@
  *
  *****************************************************************************/
 
-#pragma once
-
-#ifndef __OPSC02_H__
-#define __OPSC02_H__
-
 
 /***************************************************************
  ***************************************************************
@@ -355,5 +350,3 @@
 	EAW = PCW + (INT16)(EAW-1); 								\
 	PCD = EAD;													\
 	CHANGE_PC
-
-#endif /* __OPSC02_H__ */
diff --git a/src/emu/cpu/m6502/opsce02.h b/src/emu/cpu/m6502/opsce02.h
index 084ec3540ba..bf54bcfb000 100644
--- a/src/emu/cpu/m6502/opsce02.h
+++ b/src/emu/cpu/m6502/opsce02.h
@@ -22,11 +22,6 @@
  *
  *****************************************************************************/
 
-#pragma once
-
-#ifndef __OPSCE02_H__
-#define __OPSCE02_H__
-
 
 #define SET_NZ(n)	if ((n) == 0) P = (P & ~F_N) | F_Z; else P = (P & ~(F_N | F_Z)) | ((n) & F_N)
 #define SET_Z(n)	if ((n) == 0) P |= F_Z; else P &= ~F_Z
@@ -994,5 +989,3 @@
 #define TZA										\
 	A = Z;										\
 	SET_NZ(A)
-
-#endif /* __OPSCE02_H__ */
diff --git a/src/emu/cpu/m6502/opsn2a03.h b/src/emu/cpu/m6502/opsn2a03.h
index cf3ab47cdd4..8632168fe32 100644
--- a/src/emu/cpu/m6502/opsn2a03.h
+++ b/src/emu/cpu/m6502/opsn2a03.h
@@ -4,11 +4,6 @@
  ***************************************************************
  ***************************************************************/
 
-#pragma once
-
-#ifndef __OPSN2A03_H__
-#define __OPSN2A03_H__
-
 
 /* N2A03 *******************************************************
  *  ADC Add with carry - no decimal mode
@@ -41,5 +36,3 @@
 		A = (UINT8) sum;										\
 	}															\
 	SET_NZ(A)
-
-#endif /* __OPSN2A03_H__ */
diff --git a/src/emu/cpu/m6800/m6800.c b/src/emu/cpu/m6800/m6800.c
index f70f0781a93..c87f4ff11d8 100644
--- a/src/emu/cpu/m6800/m6800.c
+++ b/src/emu/cpu/m6800/m6800.c
@@ -82,7 +82,8 @@ TODO:
 
 #if 0
 /* CPU subtypes, needed for extra insn after TAP/CLI/SEI */
-enum {
+enum
+{
 	SUBTYPE_M6800,
 	SUBTYPE_M6801,
 	SUBTYPE_M6802,
diff --git a/src/emu/cpu/m6800/m6800.h b/src/emu/cpu/m6800/m6800.h
index 7f2afb90f4f..c65c897be06 100644
--- a/src/emu/cpu/m6800/m6800.h
+++ b/src/emu/cpu/m6800/m6800.h
@@ -7,9 +7,11 @@
 
 #include "cpuintrf.h"
 
-enum {
+enum
+{
 	M6800_PC=1, M6800_S, M6800_A, M6800_B, M6800_X, M6800_CC,
-	M6800_WAI_STATE };
+	M6800_WAI_STATE
+};
 
 #define M6800_WAI		8			/* set when WAI is waiting for an interrupt */
 #define M6800_SLP		0x10		/* HD63701 only */
diff --git a/src/emu/cpu/m68000/m68kmake.c b/src/emu/cpu/m68000/m68kmake.c
index f1f7073efa3..ae43d725c14 100644
--- a/src/emu/cpu/m68000/m68kmake.c
+++ b/src/emu/cpu/m68000/m68kmake.c
@@ -127,7 +127,8 @@ static const char g_version[] = "3.32";
 /* ============================== PROTOTYPES ============================== */
 /* ======================================================================== */
 
-enum {
+enum
+{
 	CPU_TYPE_000 = 0,
 	CPU_TYPE_010,
 	CPU_TYPE_020,
diff --git a/src/emu/cpu/m6805/m6805.c b/src/emu/cpu/m6805/m6805.c
index f928d7f557e..74c1d7ff044 100644
--- a/src/emu/cpu/m6805/m6805.c
+++ b/src/emu/cpu/m6805/m6805.c
@@ -36,7 +36,8 @@
 
 #define IRQ_LEVEL_DETECT 0
 
-enum {
+enum
+{
 	SUBTYPE_M6805,
 	SUBTYPE_M68705,
 	SUBTYPE_HD63705
diff --git a/src/emu/cpu/m6809/m6809.h b/src/emu/cpu/m6809/m6809.h
index ee8fde41de9..13ac4569210 100644
--- a/src/emu/cpu/m6809/m6809.h
+++ b/src/emu/cpu/m6809/m6809.h
@@ -7,9 +7,11 @@
 
 #include "cpuintrf.h"
 
-enum {
+enum
+{
 	M6809_PC=1, M6809_S, M6809_CC ,M6809_A, M6809_B, M6809_U, M6809_X, M6809_Y,
-	M6809_DP };
+	M6809_DP
+};
 
 #define M6809_IRQ_LINE	0	/* IRQ line number */
 #define M6809_FIRQ_LINE 1   /* FIRQ line number */
diff --git a/src/emu/cpu/mc68hc11/hc11dasm.c b/src/emu/cpu/mc68hc11/hc11dasm.c
index 5fcc162334c..0339e70f1dc 100644
--- a/src/emu/cpu/mc68hc11/hc11dasm.c
+++ b/src/emu/cpu/mc68hc11/hc11dasm.c
@@ -7,7 +7,8 @@
 #include "cpuintrf.h"
 #include <stdarg.h>
 
-enum {
+enum
+{
 	EA_IMM8 = 1,
 	EA_IMM16,
 	EA_EXT,
diff --git a/src/emu/cpu/mc68hc11/hc11ops.h b/src/emu/cpu/mc68hc11/hc11ops.h
index a060ff2220e..ea3751d0dfd 100644
--- a/src/emu/cpu/mc68hc11/hc11ops.h
+++ b/src/emu/cpu/mc68hc11/hc11ops.h
@@ -1,8 +1,3 @@
-#pragma once
-
-#ifndef __HC11OPS_H__
-#define __HC11OPS_H__
-
 typedef struct _hc11_opcode_list_struct hc11_opcode_list_struct;
 struct _hc11_opcode_list_struct
 {
@@ -194,5 +189,3 @@ static const hc11_opcode_list_struct hc11_opcode_list[] =
 	{	0,		0x1a,			HC11OP(page3)				},
 	{	0,		0xcd,			HC11OP(page4)				},
 };
-
-#endif /* __HC11OPS_H__ */
diff --git a/src/emu/cpu/mc68hc11/mc68hc11.c b/src/emu/cpu/mc68hc11/mc68hc11.c
index d04c2e1b5fd..272d60a4e81 100644
--- a/src/emu/cpu/mc68hc11/mc68hc11.c
+++ b/src/emu/cpu/mc68hc11/mc68hc11.c
@@ -7,7 +7,8 @@
 #include "debugger.h"
 #include "mc68hc11.h"
 
-enum {
+enum
+{
 	HC11_PC = 1,
 	HC11_SP,
 	HC11_A,
diff --git a/src/emu/cpu/minx/minx.h b/src/emu/cpu/minx/minx.h
index 2b6fbf77b17..7cb04b4133b 100644
--- a/src/emu/cpu/minx/minx.h
+++ b/src/emu/cpu/minx/minx.h
@@ -8,7 +8,8 @@
 #include "osd_cpu.h"
 #include "driver.h"
 
-enum {
+enum
+{
         MINX_PC=1, MINX_SP, MINX_BA, MINX_HL, MINX_X, MINX_Y,
         MINX_U, MINX_V, MINX_F, MINX_E, MINX_N, MINX_I,
         MINX_XI, MINX_YI,
diff --git a/src/emu/cpu/minx/minxfunc.h b/src/emu/cpu/minx/minxfunc.h
index a4d7d249874..b1747e275f2 100644
--- a/src/emu/cpu/minx/minxfunc.h
+++ b/src/emu/cpu/minx/minxfunc.h
@@ -1,9 +1,3 @@
-#pragma once
-
-#ifndef __MINXFUNC_H__
-#define __MINXFUNC_H__
-
-
 INLINE UINT8 ADD8( UINT8 arg1, UINT8 arg2 )
 {
 	UINT32 res = arg1 + arg2;
@@ -367,5 +361,3 @@ INLINE void CALL( UINT16 arg )
 #define AD2_Y8	UINT32 addr2 = ( regs.YI << 16 ) | ( regs.Y + rdop() )
 #define AD2_XL	UINT32 addr2 = ( regs.XI << 16 ) | ( regs.X + ( regs.HL & 0x00FF ) )
 #define AD2_YL	UINT32 addr2 = ( regs.YI << 16 ) | ( regs.Y + ( regs.HL & 0x00FF ) )
-
-#endif /* __MINXFUNC_H__ */
diff --git a/src/emu/cpu/minx/minxopce.h b/src/emu/cpu/minx/minxopce.h
index 0a258a06a01..830b34e3ae9 100644
--- a/src/emu/cpu/minx/minxopce.h
+++ b/src/emu/cpu/minx/minxopce.h
@@ -1,9 +1,3 @@
-#pragma once
-
-#ifndef __MINXOPCE_H__
-#define __MINXOPCE_H__
-
-
 #undef OP
 #define OP(nn) INLINE void minx_CE_##nn(void)
 
@@ -335,5 +329,3 @@ static const int insnminx_cycles_CE[256] = {
 	12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
 	12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12
 };
-
-#endif /* __MINXOPCE_H__ */
diff --git a/src/emu/cpu/minx/minxopcf.h b/src/emu/cpu/minx/minxopcf.h
index ca7941d1f83..09b59f9ce2e 100644
--- a/src/emu/cpu/minx/minxopcf.h
+++ b/src/emu/cpu/minx/minxopcf.h
@@ -1,9 +1,3 @@
-#pragma once
-
-#ifndef __MINXOPCF_H__
-#define __MINXOPCF_H__
-
-
 #undef OP
 #define OP(nn) INLINE void minx_CF_##nn(void)
 
@@ -335,5 +329,3 @@ static const int insnminx_cycles_CF[256] = {
 	 8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
 	 8,  8,  8,  8,  8,  8,  1,  1,  8,  8,  8,  1,  1,  1,  8,  1
 };
-
-#endif /* __MINXOPCF_H__ */
diff --git a/src/emu/cpu/minx/minxops.h b/src/emu/cpu/minx/minxops.h
index a61def55861..484b2e7c2d7 100644
--- a/src/emu/cpu/minx/minxops.h
+++ b/src/emu/cpu/minx/minxops.h
@@ -1,9 +1,3 @@
-#pragma once
-
-#ifndef __MINXOPS_H__
-#define __MINXOPS_H__
-
-
 #undef OP
 #define OP(nn) INLINE void minx_##nn(void)
 
@@ -335,5 +329,3 @@ static const int insnminx_cycles[256] = {
 	 8,  8,  8,  8,  8,  8,  8,  8, 12, 12, 12, 12, 12, 12, 12, 12,
 	20,  8, 24, 12,  8,  1,  8, 12,  8,  8,  8, 20, 20,  1,  1,  8
 };
-
-#endif /* __MINXOPS_H__ */
diff --git a/src/emu/cpu/nec/necdasm.c b/src/emu/cpu/nec/necdasm.c
index 5f50db7582e..5387500c3a4 100644
--- a/src/emu/cpu/nec/necdasm.c
+++ b/src/emu/cpu/nec/necdasm.c
@@ -21,7 +21,8 @@ static const nec_config default_config =
 
 static const nec_config *Iconfig;
 
-enum {
+enum
+{
 	PARAM_REG8 = 1,		/* 8-bit register */
 	PARAM_REG16,		/* 16-bit register */
 	PARAM_REG2_8,		/* 8-bit register */
@@ -60,7 +61,8 @@ enum {
 	PARAM_IY
 };
 
-enum {
+enum
+{
 	MODRM = 1,
 	GROUP,
 	FPU,
diff --git a/src/emu/cpu/nec/necintrf.h b/src/emu/cpu/nec/necintrf.h
index d9978755f24..19fa1c60829 100644
--- a/src/emu/cpu/nec/necintrf.h
+++ b/src/emu/cpu/nec/necintrf.h
@@ -4,11 +4,13 @@
 
 #include "cpuintrf.h"
 
-enum {
+enum
+{
 	NEC_PC=0,
 	NEC_IP, NEC_AW, NEC_CW, NEC_DW, NEC_BW, NEC_SP, NEC_BP, NEC_IX, NEC_IY,
 	NEC_FLAGS, NEC_ES, NEC_CS, NEC_SS, NEC_DS,
-	NEC_VECTOR, NEC_PENDING };
+	NEC_VECTOR, NEC_PENDING
+};
 
 /* Public functions */
 extern void v20_get_info(UINT32 state, cpuinfo *info);
diff --git a/src/emu/cpu/pdp1/pdp1.h b/src/emu/cpu/pdp1/pdp1.h
index f5a74cfaa94..a34a2606c40 100644
--- a/src/emu/cpu/pdp1/pdp1.h
+++ b/src/emu/cpu/pdp1/pdp1.h
@@ -1,5 +1,7 @@
-#ifndef _PDP1_H
-#define _PDP1_H
+#pragma once
+
+#ifndef __PDP1_H__
+#define __PDP1_H__
 
 #include "cpuintrf.h"
 
@@ -21,7 +23,8 @@ enum
 #define pdp1_pulse_start_clear()	cpunum_set_reg(0, PDP1_START_CLEAR, 0)
 #define pdp1_pulse_iot_done()		cpunum_set_reg(0, PDP1_IO_COMPLETE, 0)
 
-typedef struct pdp1_reset_param_t
+typedef struct _pdp1_reset_param_t pdp1_reset_param_t;
+struct _pdp1_reset_param_t
 {
 	/* callbacks for iot instructions (required for any I/O) */
 	void (*extern_iot[64])(int op2, int nac, int mb, int *io, int ac);
@@ -36,7 +39,7 @@ typedef struct pdp1_reset_param_t
 	int hw_mul_div;
 	/* 0: standard sequence break system 1: type 20 sequence break system */
 	int type_20_sbs;
-} pdp1_reset_param_t;
+};
 
 #define IOT_NO_COMPLETION_PULSE -1
 
@@ -76,4 +79,4 @@ void pdp1_get_info(UINT32 state, cpuinfo *info);
 
 unsigned pdp1_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
 
-#endif /* _PDP1_H */
+#endif /* __PDP1_H__ */
diff --git a/src/emu/cpu/pdp1/tx0.h b/src/emu/cpu/pdp1/tx0.h
index f883c3cfb19..17e7a8325f1 100644
--- a/src/emu/cpu/pdp1/tx0.h
+++ b/src/emu/cpu/pdp1/tx0.h
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef __TX0_H__
+#define __TX0_H__
+
 #include "cpuintrf.h"
 
 
@@ -19,7 +24,8 @@ enum
 #define tx0_pulse_reset()		cpunum_set_reg(0, TX0_RESET, 0)
 #define tx0_pulse_io_complete()	cpunum_set_reg(0, TX0_IO_COMPLETE, 0)
 
-typedef struct tx0_reset_param_t
+typedef struct _tx0_reset_param_t tx0_reset_param_t;
+struct _tx0_reset_param_t
 {
 	/* 8 standard I/O handlers:
         0: cpy (8kW only)
@@ -35,7 +41,7 @@ typedef struct tx0_reset_param_t
 	void (*sel_handler)(void);
 	/* callback called when reset line is pulsed: IO devices should reset */
 	void (*io_reset_callback)(void);
-} tx0_reset_param_t;
+};
 
 /* PUBLIC FUNCTIONS */
 void tx0_64kw_get_info(UINT32 state, cpuinfo *info);
@@ -46,3 +52,5 @@ void tx0_8kw_get_info(UINT32 state, cpuinfo *info);
 
 unsigned tx0_dasm_64kw(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
 unsigned tx0_dasm_8kw(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
+
+#endif /* __TX0_H__ */
diff --git a/src/emu/cpu/pic16c5x/pic16c5x.h b/src/emu/cpu/pic16c5x/pic16c5x.h
index 7be0cce7428..a185e5e4520 100644
--- a/src/emu/cpu/pic16c5x/pic16c5x.h
+++ b/src/emu/cpu/pic16c5x/pic16c5x.h
@@ -9,8 +9,10 @@
  *                                                                          *
  \**************************************************************************/
 
-#ifndef _PIC16C5X_H
-#define _PIC16C5X_H
+#pragma once
+
+#ifndef __PIC16C5X_H__
+#define __PIC16C5X_H__
 
 
 #include "cpuintrf.h"
@@ -24,7 +26,8 @@
  *  is handled by the cpu execution engine.
  */
 
-enum {
+enum
+{
 	PIC16C5x_PC=1, PIC16C5x_STK0, PIC16C5x_STK1, PIC16C5x_FSR,
 	PIC16C5x_W,    PIC16C5x_ALU,  PIC16C5x_STR,  PIC16C5x_OPT,
 	PIC16C5x_TMR0, PIC16C5x_PRTA, PIC16C5x_PRTB, PIC16C5x_PRTC,
@@ -130,4 +133,4 @@ offs_t pic16C5x_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *o
 #endif
 
 
-#endif	/* _PIC16C5X_H */
+#endif	/* __PIC16C5X_H__ */
diff --git a/src/emu/cpu/powerpc/ppc.h b/src/emu/cpu/powerpc/ppc.h
index 623250ae672..8d8bda25b05 100644
--- a/src/emu/cpu/powerpc/ppc.h
+++ b/src/emu/cpu/powerpc/ppc.h
@@ -11,6 +11,8 @@
 
 ***************************************************************************/
 
+#pragma once
+
 #ifndef __PPC_H__
 #define __PPC_H__
 
diff --git a/src/emu/cpu/powerpc/ppc_ops.h b/src/emu/cpu/powerpc/ppc_ops.h
index d87bac5a27d..48b9d5144a7 100644
--- a/src/emu/cpu/powerpc/ppc_ops.h
+++ b/src/emu/cpu/powerpc/ppc_ops.h
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef __PPC_OPS_H__
+#define __PPC_OPS_H__
+
 static PPC_OPCODE ppc_opcode_common[] =
 {
 	/*code  subcode         handler             */
@@ -141,3 +146,5 @@ static PPC_OPCODE ppc_opcode_common[] =
 	{ 26,	-1,				ppc_xori			},
 	{ 27,	-1,				ppc_xoris			}
 };
+
+#endif /* __PPC_OPS_H__ */
diff --git a/src/emu/cpu/powerpc/ppccom.h b/src/emu/cpu/powerpc/ppccom.h
index c7dc1ca36a1..00701c224f9 100644
--- a/src/emu/cpu/powerpc/ppccom.h
+++ b/src/emu/cpu/powerpc/ppccom.h
@@ -6,6 +6,8 @@
 
 ***************************************************************************/
 
+#pragma once
+
 #ifndef __PPCCOM_H__
 #define __PPCCOM_H__
 
@@ -595,4 +597,4 @@ void ppccom_execute_mtdcr(powerpc_state *ppc);
 void ppc4xx_set_info(powerpc_state *ppc, UINT32 state, cpuinfo *info);
 void ppc4xx_get_info(powerpc_state *ppc, UINT32 state, cpuinfo *info);
 
-#endif
+#endif /* __PPCCOM_H__ */
diff --git a/src/emu/cpu/powerpc/ppcfe.h b/src/emu/cpu/powerpc/ppcfe.h
index d6a46e5dc8e..27886e1806a 100644
--- a/src/emu/cpu/powerpc/ppcfe.h
+++ b/src/emu/cpu/powerpc/ppcfe.h
@@ -48,4 +48,4 @@
 
 int ppcfe_describe(void *param, opcode_desc *desc, const opcode_desc *prev);
 
-#endif
+#endif /* __PPCFE_H__ */
diff --git a/src/emu/cpu/rsp/rsp.h b/src/emu/cpu/rsp/rsp.h
index 2ee22b4f912..a78cf528c0b 100644
--- a/src/emu/cpu/rsp/rsp.h
+++ b/src/emu/cpu/rsp/rsp.h
@@ -1,6 +1,9 @@
-#ifndef _RSP_H
-#define _RSP_H
+#pragma once
 
+#ifndef __RSP_H__
+#define __RSP_H__
+
+typedef struct _rsp_config rsp_config;
 struct _rsp_config
 {
 	read32_machine_func dp_reg_r;
@@ -9,7 +12,6 @@ struct _rsp_config
 	write32_machine_func sp_reg_w;
 	void (*sp_set_status)(UINT32 status);
 };
-typedef struct _rsp_config rsp_config;
 
 enum
 {
@@ -71,4 +73,4 @@ void rsp_get_info(UINT32 state, cpuinfo *info);
 
 extern offs_t rsp_dasm_one(char *buffer, offs_t pc, UINT32 op);
 
-#endif
+#endif /* __RSP_H__ */
diff --git a/src/emu/cpu/s2650/s2650.h b/src/emu/cpu/s2650/s2650.h
index 51c4a78e998..2c92c6c82e6 100644
--- a/src/emu/cpu/s2650/s2650.h
+++ b/src/emu/cpu/s2650/s2650.h
@@ -1,9 +1,12 @@
-#ifndef S2650_H
-#define S2650_H
+#pragma once
+
+#ifndef __S2650_H__
+#define __S2650_H__
 
 #include "cpuintrf.h"
 
-enum {
+enum
+{
 	S2650_PC=1, S2650_PS, S2650_R0, S2650_R1, S2650_R2, S2650_R3,
 	S2650_R1A, S2650_R2A, S2650_R3A,
 	S2650_HALT, S2650_SI, S2650_FO
@@ -25,4 +28,4 @@ extern void s2650_get_info(UINT32 state, cpuinfo *info);
 
 extern offs_t s2650_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
 
-#endif
+#endif /* __S2650_H__ */
diff --git a/src/emu/cpu/s2650/s2650cpu.h b/src/emu/cpu/s2650/s2650cpu.h
index 5a61e5d4cb1..edd2c5f922c 100644
--- a/src/emu/cpu/s2650/s2650cpu.h
+++ b/src/emu/cpu/s2650/s2650cpu.h
@@ -31,5 +31,3 @@
 #define R1      S.reg[1]
 #define R2      S.reg[2]
 #define R3      S.reg[3]
-
-
diff --git a/src/emu/cpu/saturn/saturn.c b/src/emu/cpu/saturn/saturn.c
index 39c3d7babd8..151029064e5 100644
--- a/src/emu/cpu/saturn/saturn.c
+++ b/src/emu/cpu/saturn/saturn.c
@@ -52,7 +52,7 @@ typedef SaturnNib Saturn64[16];
  ****************************************************************************/
 typedef struct
 {
-	SATURN_CONFIG *config;
+	saturn_cpu_core *config;
 
 	Saturn64 reg[9]; //r0,r1,r2,r3,r4,a,b,c,d
 
@@ -98,7 +98,7 @@ static Saturn_Regs saturn;
 
 static void saturn_init(int index, int clock, const void *config, int (*irqcallback)(int))
 {
-	saturn.config = (SATURN_CONFIG *) config;
+	saturn.config = (saturn_cpu_core *) config;
 	saturn.irq_callback = irqcallback;
 
 	state_save_register_item_array("saturn",index,saturn.reg[R0]);
diff --git a/src/emu/cpu/saturn/saturn.h b/src/emu/cpu/saturn/saturn.h
index 55910276cd8..002a9d71829 100644
--- a/src/emu/cpu/saturn/saturn.h
+++ b/src/emu/cpu/saturn/saturn.h
@@ -40,7 +40,9 @@ HP38G             09/??/95              1LT8             Yorke
 /* 4 bit processor
    20 address lines */
 
-#ifndef _SATURN_H
+#pragma once
+
+#ifndef __SATURN_H__
 #define _SATURN_H
 
 #include "cpuintrf.h"
@@ -49,7 +51,8 @@ HP38G             09/??/95              1LT8             Yorke
 #define SATURN_INT_IRQ	1
 #define SATURN_INT_NMI	2
 
-typedef struct
+typedef struct _saturn_cpu_core saturn_cpu_core;
+struct _saturn_cpu_core
 {
 	void (*out)(running_machine*,int);
 	int (*in)(running_machine*);
@@ -59,9 +62,10 @@ typedef struct
 	int (*id)(running_machine*);
 	void (*crc)(running_machine*,int addr, int data);
 	void (*rsi)(running_machine*);
-} SATURN_CONFIG;
+};
 
-enum {
+enum
+{
 	SATURN_A=1, SATURN_B, SATURN_C, SATURN_D,
 	SATURN_R0, SATURN_R1, SATURN_R2, SATURN_R3, SATURN_R4,
 	SATURN_RSTK0, SATURN_RSTK1, SATURN_RSTK2, SATURN_RSTK3,
@@ -86,5 +90,4 @@ unsigned saturn_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *o
 
 void saturn_get_info(UINT32 state, cpuinfo *info);
 
-#endif
-
+#endif /* __SATURN_H__ */
diff --git a/src/emu/cpu/saturn/saturnds.c b/src/emu/cpu/saturn/saturnds.c
index a66e7b13981..4f8254f9d93 100644
--- a/src/emu/cpu/saturn/saturnds.c
+++ b/src/emu/cpu/saturn/saturnds.c
@@ -71,7 +71,8 @@ static const char number_2_hex[]=
 
 
 // don't split branch and return, source relies on this ordering
-typedef enum {
+typedef enum
+{
 	Return, ReturnSetXM, ReturnSetCarry, ReturnClearCarry, ReturnFromInterrupt,
 	jump3,jump4,jump,
 	call3,call4,call,
@@ -551,8 +552,10 @@ static const struct {
 
 };
 
-typedef struct {
-	enum {
+typedef struct
+{
+	enum
+	{
 		Complete=-1,
 		Illegal,
 		Opcode0, Opcode0E, Opcode0Ea,
@@ -569,7 +572,8 @@ typedef struct {
 		OpcodeE,
 		OpcodeF
 	} sel;
-	enum {
+	enum
+	{
 		AdrNone,
 		AdrAF, AdrA, AdrB, AdrCount,
 		BranchReturn, TestBranchRet, ImmBranch,
diff --git a/src/emu/cpu/sc61860/sc.h b/src/emu/cpu/sc61860/sc.h
index 11e70cff8b4..1b00af1c65b 100644
--- a/src/emu/cpu/sc61860/sc.h
+++ b/src/emu/cpu/sc61860/sc.h
@@ -15,7 +15,8 @@
 #define F0 94
 #define C 95
 
-enum {
+enum
+{
 	SC61860_PC=1, SC61860_DP,
 	SC61860_P, SC61860_Q, SC61860_R,
 	SC61860_CARRY,
diff --git a/src/emu/cpu/sc61860/sc61860.c b/src/emu/cpu/sc61860/sc61860.c
index 895cb092d87..58481475710 100644
--- a/src/emu/cpu/sc61860/sc61860.c
+++ b/src/emu/cpu/sc61860/sc61860.c
@@ -41,7 +41,7 @@
  ****************************************************************************/
 typedef struct
 {
-    SC61860_CONFIG *config;
+    sc61860_cpu_core *config;
     UINT8 ram[0x60]; // internal special ram
     UINT8 p, q, r; //7 bits only?
 
@@ -87,7 +87,7 @@ static void sc61860_reset(void)
 
 static void sc61860_init(int index, int clock, const void *config, int (*irqcallback)(int))
 {
-	sc61860.config = (SC61860_CONFIG *) config;
+	sc61860.config = (sc61860_cpu_core *) config;
 	timer_pulse(ATTOTIME_IN_HZ(500), NULL, 0, sc61860_2ms_tick);
 }
 
diff --git a/src/emu/cpu/sc61860/sc61860.h b/src/emu/cpu/sc61860/sc61860.h
index 3b881861d26..12aa3ef2b5f 100644
--- a/src/emu/cpu/sc61860/sc61860.h
+++ b/src/emu/cpu/sc61860/sc61860.h
@@ -19,8 +19,11 @@
  *   - This entire notice must remain in the source code.
  *
  *****************************************************************************/
-#ifndef _SC61860_H
-#define _SC61860_H
+
+#pragma once
+
+#ifndef __SC61860_H__
+#define __SC61860_H__
 
 /*
   official names seam to be
@@ -35,7 +38,9 @@
 
 #include "cpuintrf.h"
 
-typedef struct {
+typedef struct _sc61860_cpu_core sc61860_cpu_core;
+struct _sc61860_cpu_core
+{
     int (*reset)(void);
     int (*brk)(void);
     int (*x)(void);
@@ -44,7 +49,7 @@ typedef struct {
     int (*inb)(void);
     void (*outb)(int);
     void (*outc)(int);
-} SC61860_CONFIG;
+};
 
 unsigned sc61860_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
 
@@ -53,4 +58,4 @@ UINT8 *sc61860_internal_ram(void);
 
 void sc61860_get_info(UINT32 state, cpuinfo *info);
 
-#endif
+#endif /* __SC61860_H__ */
diff --git a/src/emu/cpu/sc61860/scdasm.c b/src/emu/cpu/sc61860/scdasm.c
index 2e6709af9b1..422bec9a3b4 100644
--- a/src/emu/cpu/sc61860/scdasm.c
+++ b/src/emu/cpu/sc61860/scdasm.c
@@ -79,7 +79,8 @@
 */
 
 
-typedef enum {
+typedef enum
+{
 	Ill,
 	Imp,
 	Imm, ImmW,
diff --git a/src/emu/cpu/se3208/se3208.h b/src/emu/cpu/se3208/se3208.h
index e93e0868246..a8b4bb3be49 100644
--- a/src/emu/cpu/se3208/se3208.h
+++ b/src/emu/cpu/se3208/se3208.h
@@ -1,6 +1,7 @@
 #include "cpuintrf.h"
 
-enum {
+enum
+{
 	SE3208_PC=1, SE3208_SR, SE3208_ER, SE3208_SP,SE3208_PPC,
 	SE3208_R0, SE3208_R1, SE3208_R2, SE3208_R3, SE3208_R4, SE3208_R5, SE3208_R6, SE3208_R7
 };
diff --git a/src/emu/cpu/sh2/sh2.h b/src/emu/cpu/sh2/sh2.h
index cd5f9b7d888..6ae5b0083c6 100644
--- a/src/emu/cpu/sh2/sh2.h
+++ b/src/emu/cpu/sh2/sh2.h
@@ -25,8 +25,10 @@
  *
  *****************************************************************************/
 
-#ifndef _SH2_H
-#define _SH2_H
+#pragma once
+
+#ifndef __SH2_H__
+#define __SH2_H__
 
 #include "cpuintrf.h"
 
@@ -49,7 +51,8 @@
 #define SH2_INT_15		15
 #define SH2_INT_ABUS	16
 
-enum {
+enum
+{
 	SH2_PC=1, SH2_SR, SH2_PR, SH2_GBR, SH2_VBR, SH2_MACH, SH2_MACL,
 	SH2_R0, SH2_R1, SH2_R2, SH2_R3, SH2_R4, SH2_R5, SH2_R6, SH2_R7,
 	SH2_R8, SH2_R9, SH2_R10, SH2_R11, SH2_R12, SH2_R13, SH2_R14, SH2_R15, SH2_EA
@@ -82,7 +85,8 @@ enum
 	CPUINFO_PTR_SH2_FASTRAM_BASE
 };
 
-struct sh2_config
+typedef struct _sh2_cpu_core sh2_cpu_core;
+struct _sh2_cpu_core
 {
   int is_slave;
 };
@@ -105,5 +109,4 @@ extern unsigned DasmSH2( char *dst, unsigned pc, UINT16 opcode );
 #define SH2DRC_COMPATIBLE_OPTIONS	(SH2DRC_STRICT_VERIFY | SH2DRC_FLUSH_PC | SH2DRC_STRICT_PCREL)
 #define SH2DRC_FASTEST_OPTIONS	(0)
 
-#endif /* _SH2_H */
-
+#endif /* __SH2_H__ */
diff --git a/src/emu/cpu/sh2/sh2comn.c b/src/emu/cpu/sh2/sh2comn.c
index 56358fca720..917cd876090 100644
--- a/src/emu/cpu/sh2/sh2comn.c
+++ b/src/emu/cpu/sh2/sh2comn.c
@@ -672,7 +672,7 @@ void sh2_exception(const char *message, int irqline)
 
 void sh2_common_init(int alloc, int index, int clock, const void *config, int (*irqcallback)(int))
 {
-	const struct sh2_config *conf = config;
+	const sh2_cpu_core *conf = config;
 
 	if (alloc)
 	{
diff --git a/src/emu/cpu/sh2/sh2comn.h b/src/emu/cpu/sh2/sh2comn.h
index cf3a26dd162..8112ef346ff 100644
--- a/src/emu/cpu/sh2/sh2comn.h
+++ b/src/emu/cpu/sh2/sh2comn.h
@@ -6,8 +6,10 @@
  *
  *****************************************************************************/
 
-#ifndef _SH2_COMMON_H_
-#define _SH2_COMMON_H_
+#pragma once
+
+#ifndef __SH2COMN_H__
+#define __SH2COMN_H__
 
 #define USE_SH2DRC
 
@@ -17,13 +19,15 @@
 #include "cpu/drcumlsh.h"
 #endif
 
-typedef struct
+typedef struct _irq_entry irq_entry;
+struct _irq_entry
 {
 	int irq_vector;
 	int irq_priority;
-} irq_entry;
+};
 
-enum {
+enum
+{
 	ICF  = 0x00800000,
 	OCFA = 0x00080000,
 	OCFB = 0x00040000,
@@ -166,4 +170,4 @@ void sh2_set_irq_line(int irqline, int state);
 void sh2_set_frt_input(int cpunum, int state);
 void sh2_exception(const char *message, int irqline);
 
-#endif
+#endif /* __SH2COMN_H__ */
diff --git a/src/emu/cpu/sh4/sh4.c b/src/emu/cpu/sh4/sh4.c
index 7d2205a3c07..8efd8a0caf8 100644
--- a/src/emu/cpu/sh4/sh4.c
+++ b/src/emu/cpu/sh4/sh4.c
@@ -118,7 +118,8 @@ static const int exception_codes[] = { 0x000, 0x020, 0x000, 0x140, 0x140, 0x1E0,
 	0x7E0, 0x6C0, 0xB00, 0xB80, 0x400, 0x420, 0x440, 0x460, 0x480, 0x4A0, 0x4C0, 0x4E0, 0x500, 0x520, 0x540, 0x700, 0x720, 0x740, 0x760,
 	0x560, 0x580, 0x5A0 };
 
-enum {
+enum
+{
 	ICF  = 0x00800000,
 	OCFA = 0x00080000,
 	OCFB = 0x00040000,
diff --git a/src/emu/cpu/sh4/sh4.h b/src/emu/cpu/sh4/sh4.h
index ab60ec85bbb..c9956d4494c 100644
--- a/src/emu/cpu/sh4/sh4.h
+++ b/src/emu/cpu/sh4/sh4.h
@@ -8,17 +8,19 @@
  *
  *****************************************************************************/
 
-#ifndef _SH4_H
-#define _SH4_H
+#ifndef __SH4_H__
+#define __SH4_H__
 
 #include "cpuintrf.h"
 
 #define SH4_INT_NONE	-1
-enum {
+enum
+{
 	SH4_IRL0=0, SH4_IRL1, SH4_IRL2, SH4_IRL3, SH4_IRLn
 };
 
-enum {
+enum
+{
 	SH4_PC=1, SH4_SR, SH4_PR, SH4_GBR, SH4_VBR, SH4_DBR, SH4_MACH, SH4_MACL,
 	SH4_R0, SH4_R1, SH4_R2, SH4_R3, SH4_R4, SH4_R5, SH4_R6, SH4_R7,
 	SH4_R8, SH4_R9, SH4_R10, SH4_R11, SH4_R12, SH4_R13, SH4_R14, SH4_R15, SH4_EA,
@@ -30,7 +32,8 @@ enum {
 	SH4_XF8, SH4_XF9, SH4_XF10, SH4_XF11, SH4_XF12, SH4_XF13, SH4_XF14, SH4_XF15
 };
 
-enum {
+enum
+{
 	SH4_INTC_NMI=23, SH4_INTC_IRLn0, SH4_INTC_IRLn1, SH4_INTC_IRLn2, SH4_INTC_IRLn3, SH4_INTC_IRLn4,
 	SH4_INTC_IRLn5, SH4_INTC_IRLn6, SH4_INTC_IRLn7, SH4_INTC_IRLn8, SH4_INTC_IRLn9, SH4_INTC_IRLnA,
 	SH4_INTC_IRLnB, SH4_INTC_IRLnC, SH4_INTC_IRLnD, SH4_INTC_IRLnE, SH4_INTC_IRL0, SH4_INTC_IRL1,
@@ -105,5 +108,5 @@ READ32_HANDLER( sh4_internal_r );
 
 extern unsigned DasmSH4( char *dst, unsigned pc, UINT16 opcode );
 
-#endif /* _SH4_H */
+#endif /* __SH4_H__ */
 
diff --git a/src/emu/cpu/sh4/sh4regs.h b/src/emu/cpu/sh4/sh4regs.h
index a53ad7e0c18..874648e4bd0 100644
--- a/src/emu/cpu/sh4/sh4regs.h
+++ b/src/emu/cpu/sh4/sh4regs.h
@@ -1,5 +1,7 @@
-#ifndef _SH4REGS_H
-#define _SH4REGS_H
+#pragma once
+
+#ifndef __SH4REGS_H__
+#define __SH4REGS_H__
 
 /* 00000001111111100000000011111100 */
 #define PTEH 	0x2000 	/* FF000000 */
@@ -154,4 +156,4 @@
 #define SDINT 	0x3E05 	/* FFF00014 */
 #define SIZEREGS 15878
 
-#endif
+#endif /* __SH4REGS_H__ */
diff --git a/src/emu/cpu/sharc/sharc.h b/src/emu/cpu/sharc/sharc.h
index 89b653d7367..aa16b26e018 100644
--- a/src/emu/cpu/sharc/sharc.h
+++ b/src/emu/cpu/sharc/sharc.h
@@ -1,5 +1,7 @@
-#ifndef _SHARC_H
-#define _SHARC_H
+#pragma once
+
+#ifndef __SHARC_H__
+#define __SHARC_H__
 
 #include "cpuintrf.h"
 
@@ -8,7 +10,8 @@
 #define SHARC_INPUT_FLAG2		5
 #define SHARC_INPUT_FLAG3		6
 
-typedef enum {
+typedef enum
+{
 	BOOT_MODE_EPROM,
 	BOOT_MODE_HOST,
 	BOOT_MODE_LINK,
@@ -30,4 +33,4 @@ void adsp21062_get_info(UINT32 state, cpuinfo *info);
 
 extern UINT32 sharc_dasm_one(char *buffer, offs_t pc, UINT64 opcode);
 
-#endif /* _SHARC_H */
+#endif /* __SHARC_H__ */
diff --git a/src/emu/cpu/sm8500/sm8500.h b/src/emu/cpu/sm8500/sm8500.h
index 66f360afd4e..c5a6b73c4cf 100644
--- a/src/emu/cpu/sm8500/sm8500.h
+++ b/src/emu/cpu/sm8500/sm8500.h
@@ -1,5 +1,8 @@
-#ifndef sm8500_H
-#define sm8500_H
+#pragma once
+
+#ifndef __SM8500_H__
+#define __SM8500_H__
+
 #include "cpuintrf.h"
 
 typedef struct {
@@ -20,7 +23,8 @@ typedef struct {
 #define WDT_INT         9
 #define NMI_INT         10
 
-enum {
+enum
+{
 	/* "main" 16 bit register */
         SM8500_PC=1, SM8500_SP, SM8500_PS, SM8500_SYS16, SM8500_RR0, SM8500_RR2, SM8500_RR4, SM8500_RR6, SM8500_RR8, SM8500_RR10,
 	SM8500_RR12, SM8500_RR14,
@@ -51,5 +55,4 @@ INLINE void sm85cpu_mem_writeword( UINT32 address, UINT16 value )
 
 extern unsigned sm8500_dasm( char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram );
 
-#endif
-
+#endif /* __SM8500_H__ */
diff --git a/src/emu/cpu/spc700/spc700.h b/src/emu/cpu/spc700/spc700.h
index 3b25c083b05..867916b906e 100644
--- a/src/emu/cpu/spc700/spc700.h
+++ b/src/emu/cpu/spc700/spc700.h
@@ -1,5 +1,7 @@
-#ifndef SPC700__HEADER
-#define SPC700__HEADER
+#pragma once
+
+#ifndef __SPC700_H__
+#define __SPC700_H__
 
 /* ======================================================================== */
 /* ============================= Configuration ============================ */
@@ -148,5 +150,4 @@ extern void spc700_get_info(UINT32 state, cpuinfo *info);
 /* ============================== END OF FILE ============================= */
 /* ======================================================================== */
 
-#endif /* SPC700__HEADER */
-
+#endif /* __SPC700_H__ */
diff --git a/src/emu/cpu/spc700/spc700ds.h b/src/emu/cpu/spc700/spc700ds.h
index 42e594d5d44..0129de7e0ca 100644
--- a/src/emu/cpu/spc700/spc700ds.h
+++ b/src/emu/cpu/spc700/spc700ds.h
@@ -1,5 +1,7 @@
-#ifndef HEADER__SPC700DS
-#define HEADER__SPC700DS
+#pragma once
+
+#ifndef __SPC700DS_H__
+#define __SPC700DS_H__
 /* ======================================================================== */
 /* =============================== COPYRIGHT ============================== */
 /* ======================================================================== */
@@ -24,4 +26,4 @@ offs_t spc700_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opr
 #define spc700_read_8_disassembler(addr)				program_read_byte_8(addr)
 
 
-#endif /* HEADER__SPC700DS */
+#endif /* __SPC700DS_H__ */
diff --git a/src/emu/cpu/ssp1601/ssp1601.h b/src/emu/cpu/ssp1601/ssp1601.h
index e8e96a62f84..60700d3aa1b 100644
--- a/src/emu/cpu/ssp1601/ssp1601.h
+++ b/src/emu/cpu/ssp1601/ssp1601.h
@@ -1,9 +1,12 @@
-#ifndef SSP1601_H
-#define SSP1601_H
+#pragma once
+
+#ifndef __SSP1601_H__
+#define __SSP1601_H__
 
 #include "cpuintrf.h"
 
-enum {
+enum
+{
 	/* general registers */
 	SSP_R0,   SSP_X,     SSP_Y,    SSP_A,
 	SSP_ST,   SSP_STACK, SSP_PC,   SSP_P,
@@ -19,4 +22,4 @@ void ssp1601_get_info(UINT32 state, cpuinfo *info);
 
 extern unsigned dasm_ssp1601(char *buffer, unsigned pc, const UINT8 *oprom);
 
-#endif /* SSP1601_H */
+#endif /* __SSP1601_H__ */
diff --git a/src/emu/cpu/t11/t11.h b/src/emu/cpu/t11/t11.h
index 74e7b576c0b..a05968d1be3 100644
--- a/src/emu/cpu/t11/t11.h
+++ b/src/emu/cpu/t11/t11.h
@@ -1,12 +1,16 @@
 /*** T-11: Portable DEC T-11 emulator ******************************************/
 
-#ifndef _T11_H
-#define _T11_H
+#pragma once
+
+#ifndef __T11_H__
+#define __T11_H__
 
 #include "cpuintrf.h"
 
-enum {
-	T11_R0=1, T11_R1, T11_R2, T11_R3, T11_R4, T11_R5, T11_SP, T11_PC, T11_PSW };
+enum
+{
+	T11_R0=1, T11_R1, T11_R2, T11_R3, T11_R4, T11_R5, T11_SP, T11_PC, T11_PSW
+};
 
 #define T11_IRQ0        0      /* IRQ0 */
 #define T11_IRQ1		1	   /* IRQ1 */
@@ -45,4 +49,4 @@ extern void t11_get_info(UINT32 state, cpuinfo *info);
 
 offs_t t11_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
 
-#endif /* _T11_H */
+#endif /* __T11_H__ */
diff --git a/src/emu/cpu/tlcs90/tlcs90.h b/src/emu/cpu/tlcs90/tlcs90.h
index 3b091acd88b..129a97a718c 100644
--- a/src/emu/cpu/tlcs90/tlcs90.h
+++ b/src/emu/cpu/tlcs90/tlcs90.h
@@ -1,5 +1,7 @@
-#ifndef TLCS90_INCLUDE
-#define TLCS90_INCLUDE
+#pragma once
+
+#ifndef __TLCS90_H__
+#define __TLCS90_H__
 
 #include "cpuintrf.h"
 
@@ -12,7 +14,8 @@ unsigned t90_dasm(char *buffer, UINT32 oldpc, const UINT8 *oprom, const UINT8 *o
 
 #define T90_IOBASE	0xffc0
 
-typedef enum	{
+typedef enum
+{
 	T90_P0=T90_IOBASE,	T90_P1,		T90_P01CR_IRFL,	T90_IRFH,	T90_P2,		T90_P2CR,	T90_P3,		T90_P3CR,
 	T90_P4,				T90_P4CR,	T90_P5,			T90_SMMOD,	T90_P6,		T90_P7,		T90_P67CR,	T90_SMCR,
 	T90_P8,				T90_P8CR,	T90_WDMOD,		T90_WDCR,	T90_TREG0,	T90_TREG1,	T90_TREG2,	T90_TREG3,
@@ -21,4 +24,4 @@ typedef enum	{
 	T90_DMAEH,			T90_SCMOD,	T90_SCCR,		T90_SCBUF,	T90_BX,		T90_BY,		T90_ADREG,	T90_ADMOD
 }	e_ir;
 
-#endif
+#endif /* __TLCS90_H__ */
diff --git a/src/emu/cpu/tms32010/tms32010.h b/src/emu/cpu/tms32010/tms32010.h
index a46cbbbd513..ec998187bf1 100644
--- a/src/emu/cpu/tms32010/tms32010.h
+++ b/src/emu/cpu/tms32010/tms32010.h
@@ -11,8 +11,10 @@
  *                                                                          *
  \**************************************************************************/
 
-#ifndef _TMS32010_H
-#define _TMS32010_H
+#pragma once
+
+#ifndef __TMS32010_H__
+#define __TMS32010_H__
 
 
 #include "cpuintrf.h"
@@ -37,7 +39,8 @@
 										/* their support is ever added).    */
 
 
-enum {
+enum
+{
 	TMS32010_PC=1, TMS32010_SP,   TMS32010_STR,  TMS32010_ACC,
 	TMS32010_PREG, TMS32010_TREG, TMS32010_AR0,  TMS32010_AR1,
 	TMS32010_STK0, TMS32010_STK1, TMS32010_STK2, TMS32010_STK3
@@ -125,4 +128,4 @@ void tms32010_get_info(UINT32 state, cpuinfo *info);
 
 offs_t tms32010_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
 
-#endif	/* _TMS32010_H */
+#endif	/* __TMS32010_H__ */
diff --git a/src/emu/cpu/tms32025/tms32025.h b/src/emu/cpu/tms32025/tms32025.h
index a5a9a728995..543d2eeffde 100644
--- a/src/emu/cpu/tms32025/tms32025.h
+++ b/src/emu/cpu/tms32025/tms32025.h
@@ -15,8 +15,10 @@
  *                                                                          *
  \***************************************************************************/
 
-#ifndef _TMS32025_H
-#define _TMS32025_H
+#pragma once
+
+#ifndef __TMS32025_H__
+#define __TMS32025_H__
 
 
 #include "cpuintrf.h"
@@ -50,7 +52,8 @@
 #define TMS32025_INT_NONE		  -1
 
 
-enum {
+enum
+{
 	TMS32025_PC=1,
 	TMS32025_PFC,  TMS32025_STR0, TMS32025_STR1, TMS32025_IFR,
 	TMS32025_RPTC, TMS32025_ACC,  TMS32025_PREG, TMS32025_TREG,
@@ -73,4 +76,4 @@ extern void tms32026_get_info(UINT32 state, cpuinfo *info);
 
 offs_t tms32025_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
 
-#endif	/* _TMS32025_H */
+#endif	/* __TMS32025_H__ */
diff --git a/src/emu/cpu/tms32031/tms32031.h b/src/emu/cpu/tms32031/tms32031.h
index 1ecc7ce5fdc..80f96b82edd 100644
--- a/src/emu/cpu/tms32031/tms32031.h
+++ b/src/emu/cpu/tms32031/tms32031.h
@@ -6,8 +6,10 @@
 
 ***************************************************************************/
 
-#ifndef _TMS32031_H
-#define _TMS32031_H
+#pragma once
+
+#ifndef __TMS32031_H__
+#define __TMS32031_H__
 
 #include "cpuintrf.h"
 
@@ -75,4 +77,4 @@ extern double convert_tms3203x_fp_to_double(UINT32 floatdata);
 extern UINT32 convert_float_to_tms3203x_fp(float fval);
 extern UINT32 convert_double_to_tms3203x_fp(double dval);
 
-#endif /* _TMS32031_H */
+#endif /* __TMS32031_H__ */
diff --git a/src/emu/cpu/tms32051/tms32051.c b/src/emu/cpu/tms32051/tms32051.c
index 10135b3e959..623910bbfe1 100644
--- a/src/emu/cpu/tms32051/tms32051.c
+++ b/src/emu/cpu/tms32051/tms32051.c
@@ -23,7 +23,8 @@ static void check_interrupts(void);
 #define INTERRUPT_TXNT		7
 #define INTERRUPT_INT4		8
 
-enum {
+enum
+{
 	TMS32051_PC = 1,
 	TMS32051_ACC,
 	TMS32051_ACCB,
diff --git a/src/emu/cpu/tms32051/tms32051.h b/src/emu/cpu/tms32051/tms32051.h
index f3b2d60b609..f616878a825 100644
--- a/src/emu/cpu/tms32051/tms32051.h
+++ b/src/emu/cpu/tms32051/tms32051.h
@@ -1,5 +1,7 @@
-#ifndef _TMS32051_H
-#define _TMS32051_H
+#pragma once
+
+#ifndef __TMS32051_H__
+#define __TMS32051_H__
 
 #if (HAS_TMS32051)
 void tms32051_get_info(UINT32 state, cpuinfo *info);
@@ -7,4 +9,4 @@ void tms32051_get_info(UINT32 state, cpuinfo *info);
 
 offs_t tms32051_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
 
-#endif /* _TMS32051_H */
+#endif /* __TMS32051_H__ */
diff --git a/src/emu/cpu/tms34010/34010ops.h b/src/emu/cpu/tms34010/34010ops.h
index 2a387b6966e..a10662d4eb4 100644
--- a/src/emu/cpu/tms34010/34010ops.h
+++ b/src/emu/cpu/tms34010/34010ops.h
@@ -7,8 +7,10 @@
 
 ***************************************************************************/
 
-#ifndef _34010OPS_H
-#define _34010OPS_H
+#pragma once
+
+#ifndef __34010OPS_H__
+#define __34010OPS_H__
 
 #include "cpuintrf.h"
 
@@ -276,4 +278,4 @@ enum
 
 
 
-#endif /* _34010OPS_H */
+#endif /* __34010OPS_H__ */
diff --git a/src/emu/cpu/tms34010/tms34010.h b/src/emu/cpu/tms34010/tms34010.h
index d49d06419f9..7ffa9b94011 100644
--- a/src/emu/cpu/tms34010/tms34010.h
+++ b/src/emu/cpu/tms34010/tms34010.h
@@ -7,8 +7,10 @@
 
 ***************************************************************************/
 
-#ifndef _TMS34010_H
-#define _TMS34010_H
+#pragma once
+
+#ifndef __TMS34010_H__
+#define __TMS34010_H__
 
 #include "cpuintrf.h"
 #include "driver.h"
@@ -125,4 +127,4 @@ READ16_HANDLER( tms34020_io_register_r );
 offs_t tms34010_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
 offs_t tms34020_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
 
-#endif /* _TMS34010_H */
+#endif /* __TMS34010_H__ */
diff --git a/src/emu/cpu/tms7000/tms7000.h b/src/emu/cpu/tms7000/tms7000.h
index 71d7306d90a..541dcc1f79b 100644
--- a/src/emu/cpu/tms7000/tms7000.h
+++ b/src/emu/cpu/tms7000/tms7000.h
@@ -17,8 +17,10 @@
  *
  *****************************************************************************/
 
-#ifndef _TMS7000_H
-#define _TMS7000_H
+#pragma once
+
+#ifndef __TMS7000_H__
+#define __TMS7000_H__
 
 #include "cpuintrf.h"
 
@@ -28,14 +30,16 @@ enum { TMS7000_VCC, TMS7000_VSS };
 
 enum { TMS7000_NMOS, TMS7000_CMOS };
 
-enum {
+enum
+{
 	TMS7000_IRQ1_LINE = 0,   /* INT1 */
 	TMS7000_IRQ2_LINE,       /* INT2 */
 	TMS7000_IRQ3_LINE,       /* INT3 */
 	TMS7000_IRQNONE = 255
 };
 
-enum {
+enum
+{
 	TMS7000_PORTA = 0,
 	TMS7000_PORTB,
 	TMS7000_PORTC,
@@ -49,5 +53,4 @@ extern void tms7000_exl_get_info(UINT32 state, cpuinfo *info);
 
 extern unsigned tms7000_dasm( char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram );
 
-#endif /* _TMS7000_H */
-
+#endif /* __TMS7000_H__ */
diff --git a/src/emu/cpu/tms9900/tms9900.h b/src/emu/cpu/tms9900/tms9900.h
index 43aa7c4f5e2..4a025efbeb2 100644
--- a/src/emu/cpu/tms9900/tms9900.h
+++ b/src/emu/cpu/tms9900/tms9900.h
@@ -4,8 +4,10 @@
   C Header file for TMS9900 core
 */
 
-#ifndef TMS9900_H
-#define TMS9900_H
+#pragma once
+
+#ifndef __TMS9900_H__
+#define __TMS9900_H__
 
 #include "cpuintrf.h"
 
@@ -35,7 +37,8 @@
 #define TI9985_ID		TMS9985_ID
 
 
-enum {
+enum
+{
 	TMS9900_PC=1, TMS9900_WP, TMS9900_STATUS, TMS9900_IR,
 	TMS9900_R0, TMS9900_R1, TMS9900_R2, TMS9900_R3,
 	TMS9900_R4, TMS9900_R5, TMS9900_R6, TMS9900_R7,
@@ -216,6 +219,4 @@ typedef struct tms99110areset_param
 
 unsigned Dasm9900 (char *buffer, unsigned pc, int model_id, const UINT8 *oprom, const UINT8 *opram);
 
-#endif
-
-
+#endif /* __TMS9900_H__ */
diff --git a/src/emu/cpu/upd7810/upd7810.h b/src/emu/cpu/upd7810/upd7810.h
index 98451276708..f5b0445d162 100644
--- a/src/emu/cpu/upd7810/upd7810.h
+++ b/src/emu/cpu/upd7810/upd7810.h
@@ -1,5 +1,7 @@
-#ifndef _UPD7810_H_
-#define _UPD7810_H_
+#pragma once
+
+#ifndef __UPD7810_H__
+#define __UPD7810_H__
 
 #include "cpuintrf.h"
 
@@ -10,7 +12,8 @@
 */
 
 // unfortunatly memory configuration differs with internal rom size
-typedef enum {
+typedef enum
+{
 	TYPE_7801,
 	TYPE_78C05,
 	TYPE_78C06,
@@ -36,7 +39,8 @@ typedef struct {
     upd7810_io_callback io_callback;
 } UPD7810_CONFIG;
 
-enum {
+enum
+{
 	UPD7810_PC=1, UPD7810_SP, UPD7810_PSW,
 	UPD7810_EA, UPD7810_V, UPD7810_A, UPD7810_VA,
 	UPD7810_BC, UPD7810_B, UPD7810_C, UPD7810_DE, UPD7810_D, UPD7810_E, UPD7810_HL, UPD7810_H, UPD7810_L,
@@ -51,11 +55,13 @@ enum {
 };
 
 /* port numbers for PA,PB,PC,PD and PF */
-enum {
+enum
+{
 	UPD7810_PORTA, UPD7810_PORTB, UPD7810_PORTC, UPD7810_PORTD, UPD7810_PORTF
 };
 
-enum {
+enum
+{
 	UPD7807_PORTA, UPD7807_PORTB, UPD7807_PORTC, UPD7807_PORTD, UPD7807_PORTF,
 	UPD7807_PORTT
 };
@@ -165,5 +171,4 @@ offs_t upd7807_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *op
 offs_t upd7801_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
 offs_t upd78c05_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
 
-#endif
-
+#endif /* __UPD7810_H__ */
diff --git a/src/emu/cpu/v30mz/necintrf.h b/src/emu/cpu/v30mz/necintrf.h
index 33650b9f716..0bc97f84d88 100644
--- a/src/emu/cpu/v30mz/necintrf.h
+++ b/src/emu/cpu/v30mz/necintrf.h
@@ -1,16 +1,18 @@
 /* ASG 971222 -- rewrote this interface */
-#ifndef __NEC_H_
-#define __NEC_H_
+#ifndef __NECINTRF_H__
+#define __NECINTRF_H__
 
 #include "cpuintrf.h"
 
-enum {
+enum
+{
 	NEC_PC=0,
 	NEC_IP, NEC_AW, NEC_CW, NEC_DW, NEC_BW, NEC_SP, NEC_BP, NEC_IX, NEC_IY,
 	NEC_FLAGS, NEC_ES, NEC_CS, NEC_SS, NEC_DS,
-	NEC_VECTOR, NEC_PENDING };
+	NEC_VECTOR, NEC_PENDING
+};
 
 /* Public functions */
 extern void v30mz_get_info(UINT32 state, cpuinfo *info);
 
-#endif
+#endif /* __NECINTRF_H__ */
diff --git a/src/emu/cpu/v60/v60.h b/src/emu/cpu/v60/v60.h
index 37d3c68da92..98c4fe4c06e 100644
--- a/src/emu/cpu/v60/v60.h
+++ b/src/emu/cpu/v60/v60.h
@@ -1,9 +1,12 @@
-#ifndef __V60_H
-#define __V60_H
+#pragma once
+
+#ifndef __V60_H__
+#define __V60_H__
 
 #include "cpuintrf.h"
 
-enum {
+enum
+{
 	V60_R0 = 1,
 	V60_R1,
 	V60_R2,
@@ -80,11 +83,10 @@ void v60_stall(void);
 
 #if HAS_V60
 void v60_get_info(UINT32 state, cpuinfo *info);
-#endif
-
-#endif
+#endif /* HAS_V60 */
 
 #if HAS_V70
 void v70_get_info(UINT32 state, cpuinfo *info);
-#endif
+#endif /* HAS_V70 */
 
+#endif /* __V60_H__ */
diff --git a/src/emu/cpu/v810/v810.h b/src/emu/cpu/v810/v810.h
index ea0cdb74134..6860d54f035 100644
--- a/src/emu/cpu/v810/v810.h
+++ b/src/emu/cpu/v810/v810.h
@@ -1,5 +1,7 @@
-#ifndef V810_H
-#define V810_H
+#pragma once
+
+#ifndef __V810_H__
+#define __V810_H__
 
 #include "cpuintrf.h"
 
@@ -119,6 +121,5 @@ enum
 
 	V810_PC
 };
-#endif
-
 
+#endif /* __V810_H__ */
diff --git a/src/emu/cpu/vtlb.h b/src/emu/cpu/vtlb.h
index c6b2045e7cd..8b51cfe2775 100644
--- a/src/emu/cpu/vtlb.h
+++ b/src/emu/cpu/vtlb.h
@@ -86,4 +86,4 @@ void vtlb_flush_address(vtlb_state *vtlb, offs_t address);
 const vtlb_entry *vtlb_table(vtlb_state *vtlb);
 
 
-#endif
+#endif /* __VTLB_H__ */
diff --git a/src/emu/cpu/x86emit.h b/src/emu/cpu/x86emit.h
index a9cae927839..5d1c1b522c0 100644
--- a/src/emu/cpu/x86emit.h
+++ b/src/emu/cpu/x86emit.h
@@ -18,6 +18,8 @@
 
 ***************************************************************************/
 
+#pragma once
+
 #ifndef __X86EMIT_H__
 #define __X86EMIT_H__
 
@@ -3143,4 +3145,4 @@ INLINE void emit_cvttpd2dq_r128_m128(x86code **emitptr, UINT8 dreg, DECLARE_MEMP
 INLINE void emit_roundpd_r128_r128_imm(x86code **emitptr, UINT8 dreg, UINT8 sreg, UINT8 imm)		{ emit_op_modrm_reg(emitptr, OP_ROUNDPD_Vdq_Wdq_Ib, OP_32BIT, dreg, sreg); emit_byte(emitptr, imm); }
 INLINE void emit_roundpd_r128_m128_imm(x86code **emitptr, UINT8 dreg, DECLARE_MEMPARAMS, UINT8 imm) { emit_op_modrm_mem(emitptr, OP_ROUNDPD_Vdq_Wdq_Ib, OP_32BIT, dreg, MEMPARAMS); emit_byte(emitptr, imm); }
 
-#endif
+#endif /* __X86EMIT_H__ */
diff --git a/src/emu/cpu/z180/z180.h b/src/emu/cpu/z180/z180.h
index 7191c1d1f20..c7744f87ceb 100644
--- a/src/emu/cpu/z180/z180.h
+++ b/src/emu/cpu/z180/z180.h
@@ -1,9 +1,12 @@
-#ifndef Z180_H
-#define Z180_H
+#pragma once
+
+#ifndef __Z180_H__
+#define __Z180_H__
 
 #include "cpuintrf.h"
 
-enum {
+enum
+{
 	Z180_PC=1,
 	Z180_SP,
 	Z180_AF,
@@ -93,7 +96,8 @@ enum {
 	Z180_IOLINES	/* read/write I/O lines */
 };
 
-enum {
+enum
+{
 	Z180_TABLE_op,
 	Z180_TABLE_cb,
 	Z180_TABLE_ed,
@@ -129,5 +133,4 @@ extern void z180_get_info(UINT32 state, cpuinfo *info);
 
 offs_t z180_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
 
-#endif
-
+#endif /* __Z180_H__ */
diff --git a/src/emu/cpu/z80/z80.h b/src/emu/cpu/z80/z80.h
index 7ab686ebd44..c4b165032e1 100644
--- a/src/emu/cpu/z80/z80.h
+++ b/src/emu/cpu/z80/z80.h
@@ -1,9 +1,12 @@
-#ifndef _Z80_H_
-#define _Z80_H_
+#pragma once
+
+#ifndef __Z80_H__
+#define __Z80_H__
 
 #include "cpuintrf.h"
 
-enum {
+enum
+{
 	Z80_PC=1, Z80_SP,
 	Z80_A, Z80_B, Z80_C, Z80_D, Z80_E, Z80_H, Z80_L,
 	Z80_AF, Z80_BC, Z80_DE, Z80_HL,
@@ -12,7 +15,8 @@ enum {
 	Z80_DC0, Z80_DC1, Z80_DC2, Z80_DC3
 };
 
-enum {
+enum
+{
 	Z80_TABLE_op,
 	Z80_TABLE_cb,
 	Z80_TABLE_ed,
@@ -31,5 +35,4 @@ extern void z80_get_info(UINT32 state, cpuinfo *info);
 
 extern unsigned z80_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
 
-#endif
-
+#endif /* __Z80_H__ */
diff --git a/src/emu/cpu/z8000/z8000.h b/src/emu/cpu/z8000/z8000.h
index bb75f6396e8..1cbe19aab8f 100644
--- a/src/emu/cpu/z8000/z8000.h
+++ b/src/emu/cpu/z8000/z8000.h
@@ -1,14 +1,19 @@
-#ifndef Z8K_H
+#pragma once
+
+#ifndef __Z8000_H__
+#define __Z8000_H__
 
 #include "cpuintrf.h"
 
-enum {
+enum
+{
 	Z8000_PC=1, Z8000_NSP, Z8000_FCW, Z8000_PSAP, Z8000_REFRESH,
 	Z8000_IRQ_REQ, Z8000_IRQ_SRV, Z8000_IRQ_VEC,
 	Z8000_R0, Z8000_R1, Z8000_R2, Z8000_R3,
 	Z8000_R4, Z8000_R5, Z8000_R6, Z8000_R7,
 	Z8000_R8, Z8000_R9, Z8000_R10, Z8000_R11,
-	Z8000_R12, Z8000_R13, Z8000_R14, Z8000_R15 };
+	Z8000_R12, Z8000_R13, Z8000_R14, Z8000_R15
+};
 
 /* Interrupt Types that can be generated by outside sources */
 #define Z8000_TRAP		0x4000	/* internal trap */
@@ -24,4 +29,4 @@ extern void z8000_get_info(UINT32 state, cpuinfo *info);
 
 offs_t z8000_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
 
-#endif /* Z8K_H */
+#endif /* __Z8000_H__ */
diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c
index 57cc21c5935..e9214bd4c7a 100644
--- a/src/mame/drivers/cps3.c
+++ b/src/mame/drivers/cps3.c
@@ -2412,7 +2412,7 @@ static INTERRUPT_GEN(cps3_other_interrupt)
 }
 
 
-//static struct sh2_config sh2cp_conf_slave  = { 1 };
+//static sh2_cpu_core sh2cp_conf_slave  = { 1 };
 
 
 static const custom_sound_interface custom_interface =
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index 242efd684fd..15ec32a20db 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -2487,8 +2487,8 @@ static GFXDECODE_START( stv )
 
 GFXDECODE_END
 
-static const struct sh2_config sh2_conf_master = { 0 };
-static const struct sh2_config sh2_conf_slave  = { 1 };
+static const sh2_cpu_core sh2_conf_master = { 0 };
+static const sh2_cpu_core sh2_conf_slave  = { 1 };
 
 static int scsp_last_line = 0;