summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/sound
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2017-02-11 18:23:11 +0100
committer Olivier Galibert <galibert@pobox.com>2017-02-11 18:31:20 +0100
commita2557f1b02478c5aaa1fdfa00204ac2e219319a1 (patch)
tree6f1693d59aa53be8c76ffe3bcf7fbc72f8546453 /src/devices/sound
parentc49b631153be9efc3a7e7b6172c17f5418843c0b (diff)
Remove emu.h from headers (nw)
Per Vas' request. If the compile fails for you (i'm thinking osx and windows native debuggers here in particular), add '#include "emu.h"' as first include of the cpp files that fail. Due to our use of precompilation and forced inclusion, emu.h must be included as the very first non-comment thing we do if we want to be sure msvc compiles are identical to gcc/clang ones. Doing it directly instead of through an include increases the correctness probability by a magnitude.
Diffstat (limited to 'src/devices/sound')
-rw-r--r--src/devices/sound/2203intf.cpp1
-rw-r--r--src/devices/sound/2203intf.h1
-rw-r--r--src/devices/sound/2608intf.cpp1
-rw-r--r--src/devices/sound/2608intf.h1
-rw-r--r--src/devices/sound/2610intf.cpp1
-rw-r--r--src/devices/sound/2610intf.h1
-rw-r--r--src/devices/sound/2612intf.cpp1
-rw-r--r--src/devices/sound/2612intf.h1
-rw-r--r--src/devices/sound/262intf.h1
-rw-r--r--src/devices/sound/3526intf.cpp1
-rw-r--r--src/devices/sound/3526intf.h1
-rw-r--r--src/devices/sound/3812intf.h1
-rw-r--r--src/devices/sound/8950intf.cpp1
-rw-r--r--src/devices/sound/8950intf.h1
-rw-r--r--src/devices/sound/ad1848.cpp1
-rw-r--r--src/devices/sound/ad1848.h1
-rw-r--r--src/devices/sound/ay8910.h1
-rw-r--r--src/devices/sound/cdp1863.cpp1
-rw-r--r--src/devices/sound/cdp1863.h1
-rw-r--r--src/devices/sound/cdp1864.cpp1
-rw-r--r--src/devices/sound/cdp1864.h1
-rw-r--r--src/devices/sound/cdp1869.h1
-rw-r--r--src/devices/sound/dac.cpp1
-rw-r--r--src/devices/sound/dac.h1
-rw-r--r--src/devices/sound/dac76.cpp1
-rw-r--r--src/devices/sound/dac76.h1
-rw-r--r--src/devices/sound/dave.cpp1
-rw-r--r--src/devices/sound/dave.h1
-rw-r--r--src/devices/sound/es1373.cpp1
-rw-r--r--src/devices/sound/esqpump.cpp1
-rw-r--r--src/devices/sound/esqpump.h1
-rw-r--r--src/devices/sound/lmc1992.cpp1
-rw-r--r--src/devices/sound/lmc1992.h1
-rw-r--r--src/devices/sound/mm5837.cpp1
-rw-r--r--src/devices/sound/mm5837.h1
-rw-r--r--src/devices/sound/mos6560.h1
-rw-r--r--src/devices/sound/mos6581.cpp1
-rw-r--r--src/devices/sound/mos6581.h1
-rw-r--r--src/devices/sound/mos7360.h1
-rw-r--r--src/devices/sound/pcd3311.cpp1
-rw-r--r--src/devices/sound/pcd3311.h1
-rw-r--r--src/devices/sound/pci-ac97.cpp1
-rw-r--r--src/devices/sound/sb0400.cpp1
-rw-r--r--src/devices/sound/t6721a.cpp1
-rw-r--r--src/devices/sound/t6721a.h1
-rw-r--r--src/devices/sound/tms5110.h1
-rw-r--r--src/devices/sound/tms5220.h1
-rw-r--r--src/devices/sound/upd1771.h1
-rw-r--r--src/devices/sound/volt_reg.cpp1
-rw-r--r--src/devices/sound/volt_reg.h1
-rw-r--r--src/devices/sound/ym2413.h1
-rw-r--r--src/devices/sound/ymf271.h1
-rw-r--r--src/devices/sound/ymf278b.h1
-rw-r--r--src/devices/sound/ymz280b.h1
54 files changed, 22 insertions, 32 deletions
diff --git a/src/devices/sound/2203intf.cpp b/src/devices/sound/2203intf.cpp
index fc47564ac21..04bdd980c6e 100644
--- a/src/devices/sound/2203intf.cpp
+++ b/src/devices/sound/2203intf.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Ernesto Corvi
+#include "emu.h"
#include "2203intf.h"
#include "fm.h"
diff --git a/src/devices/sound/2203intf.h b/src/devices/sound/2203intf.h
index 24ffa5d3f9c..20c63887a04 100644
--- a/src/devices/sound/2203intf.h
+++ b/src/devices/sound/2203intf.h
@@ -5,7 +5,6 @@
#ifndef __2203INTF_H__
#define __2203INTF_H__
-#include "emu.h"
#include "ay8910.h"
void ym2203_update_request(void *param);
diff --git a/src/devices/sound/2608intf.cpp b/src/devices/sound/2608intf.cpp
index dd5b3ee6359..fd409f77cd3 100644
--- a/src/devices/sound/2608intf.cpp
+++ b/src/devices/sound/2608intf.cpp
@@ -13,6 +13,7 @@
***************************************************************************/
+#include "emu.h"
#include "2608intf.h"
#include "fm.h"
diff --git a/src/devices/sound/2608intf.h b/src/devices/sound/2608intf.h
index 8d1cd9442fd..25551a01227 100644
--- a/src/devices/sound/2608intf.h
+++ b/src/devices/sound/2608intf.h
@@ -5,7 +5,6 @@
#ifndef __2608INTF_H__
#define __2608INTF_H__
-#include "emu.h"
#include "ay8910.h"
void ym2608_update_request(void *param);
diff --git a/src/devices/sound/2610intf.cpp b/src/devices/sound/2610intf.cpp
index 4a2e3efe3bc..813079d6cb2 100644
--- a/src/devices/sound/2610intf.cpp
+++ b/src/devices/sound/2610intf.cpp
@@ -13,6 +13,7 @@
***************************************************************************/
+#include "emu.h"
#include "2610intf.h"
#include "fm.h"
diff --git a/src/devices/sound/2610intf.h b/src/devices/sound/2610intf.h
index 94376220586..4eff12cb54b 100644
--- a/src/devices/sound/2610intf.h
+++ b/src/devices/sound/2610intf.h
@@ -5,7 +5,6 @@
#ifndef __2610INTF_H__
#define __2610INTF_H__
-#include "emu.h"
#include "ay8910.h"
void ym2610_update_request(void *param);
diff --git a/src/devices/sound/2612intf.cpp b/src/devices/sound/2612intf.cpp
index cfcfed9d8fb..650c9a35041 100644
--- a/src/devices/sound/2612intf.cpp
+++ b/src/devices/sound/2612intf.cpp
@@ -13,6 +13,7 @@
***************************************************************************/
+#include "emu.h"
#include "2612intf.h"
#include "fm.h"
diff --git a/src/devices/sound/2612intf.h b/src/devices/sound/2612intf.h
index 51b774f0034..0695893f548 100644
--- a/src/devices/sound/2612intf.h
+++ b/src/devices/sound/2612intf.h
@@ -5,7 +5,6 @@
#ifndef __2612INTF_H__
#define __2612INTF_H__
-#include "emu.h"
void ym2612_update_request(void *param);
diff --git a/src/devices/sound/262intf.h b/src/devices/sound/262intf.h
index 63f4c8743cb..16f00e225d7 100644
--- a/src/devices/sound/262intf.h
+++ b/src/devices/sound/262intf.h
@@ -5,7 +5,6 @@
#ifndef __262INTF_H__
#define __262INTF_H__
-#include "emu.h"
#define MCFG_YMF262_IRQ_HANDLER(_devcb) \
devcb = &ymf262_device::set_irq_handler(*device, DEVCB_##_devcb);
diff --git a/src/devices/sound/3526intf.cpp b/src/devices/sound/3526intf.cpp
index 685d0be50b5..dc967d21e80 100644
--- a/src/devices/sound/3526intf.cpp
+++ b/src/devices/sound/3526intf.cpp
@@ -18,6 +18,7 @@
* NOTES
*
******************************************************************************/
+#include "emu.h"
#include "3526intf.h"
#include "fmopl.h"
diff --git a/src/devices/sound/3526intf.h b/src/devices/sound/3526intf.h
index c6139d17e48..2c448c526ad 100644
--- a/src/devices/sound/3526intf.h
+++ b/src/devices/sound/3526intf.h
@@ -5,7 +5,6 @@
#ifndef __3526INTF_H__
#define __3526INTF_H__
-#include "emu.h"
#define MCFG_YM3526_IRQ_HANDLER(_devcb) \
devcb = &ym3526_device::set_irq_handler(*device, DEVCB_##_devcb);
diff --git a/src/devices/sound/3812intf.h b/src/devices/sound/3812intf.h
index 10ae11ecaa7..d76a633d55b 100644
--- a/src/devices/sound/3812intf.h
+++ b/src/devices/sound/3812intf.h
@@ -5,7 +5,6 @@
#ifndef __3812INTF_H__
#define __3812INTF_H__
-#include "emu.h"
#define MCFG_YM3812_IRQ_HANDLER(_devcb) \
devcb = &ym3812_device::set_irq_handler(*device, DEVCB_##_devcb);
diff --git a/src/devices/sound/8950intf.cpp b/src/devices/sound/8950intf.cpp
index bcb4364a3db..7aecbd64b04 100644
--- a/src/devices/sound/8950intf.cpp
+++ b/src/devices/sound/8950intf.cpp
@@ -18,6 +18,7 @@
* NOTES
*
******************************************************************************/
+#include "emu.h"
#include "8950intf.h"
#include "fmopl.h"
diff --git a/src/devices/sound/8950intf.h b/src/devices/sound/8950intf.h
index 0c109e5712c..3e6e0497f08 100644
--- a/src/devices/sound/8950intf.h
+++ b/src/devices/sound/8950intf.h
@@ -5,7 +5,6 @@
#ifndef __8950INTF_H__
#define __8950INTF_H__
-#include "emu.h"
#define MCFG_Y8950_IRQ_HANDLER(_devcb) \
devcb = &y8950_device::set_irq_handler(*device, DEVCB_##_devcb);
diff --git a/src/devices/sound/ad1848.cpp b/src/devices/sound/ad1848.cpp
index ab8eb093e67..79ba429c619 100644
--- a/src/devices/sound/ad1848.cpp
+++ b/src/devices/sound/ad1848.cpp
@@ -3,6 +3,7 @@
// Analog Devices AD1848, main codec in Windows Sound System adapters
+#include "emu.h"
#include "sound/ad1848.h"
#include "sound/volt_reg.h"
diff --git a/src/devices/sound/ad1848.h b/src/devices/sound/ad1848.h
index e6305ea19a6..2c064f4eb68 100644
--- a/src/devices/sound/ad1848.h
+++ b/src/devices/sound/ad1848.h
@@ -3,7 +3,6 @@
#ifndef _AD1848_H_
#define _AD1848_H_
-#include "emu.h"
#include "sound/dac.h"
#define MCFG_AD1848_IRQ_CALLBACK(_cb) \
diff --git a/src/devices/sound/ay8910.h b/src/devices/sound/ay8910.h
index 6dfa3356508..a46bef62ffc 100644
--- a/src/devices/sound/ay8910.h
+++ b/src/devices/sound/ay8910.h
@@ -5,7 +5,6 @@
#ifndef __AY8910_H__
#define __AY8910_H__
-#include "emu.h"
/*
AY-3-8910A: 2 I/O ports
diff --git a/src/devices/sound/cdp1863.cpp b/src/devices/sound/cdp1863.cpp
index c85a55ee4a5..51a52ca286d 100644
--- a/src/devices/sound/cdp1863.cpp
+++ b/src/devices/sound/cdp1863.cpp
@@ -14,6 +14,7 @@
*/
+#include "emu.h"
#include "cdp1863.h"
diff --git a/src/devices/sound/cdp1863.h b/src/devices/sound/cdp1863.h
index 6890490fe53..d1f1b438d83 100644
--- a/src/devices/sound/cdp1863.h
+++ b/src/devices/sound/cdp1863.h
@@ -22,7 +22,6 @@
#ifndef __CDP1863__
#define __CDP1863__
-#include "emu.h"
diff --git a/src/devices/sound/cdp1864.cpp b/src/devices/sound/cdp1864.cpp
index f5996591cc3..78e3fbfbd7d 100644
--- a/src/devices/sound/cdp1864.cpp
+++ b/src/devices/sound/cdp1864.cpp
@@ -21,6 +21,7 @@
*/
+#include "emu.h"
#include "cdp1864.h"
diff --git a/src/devices/sound/cdp1864.h b/src/devices/sound/cdp1864.h
index f90e6005d2b..34f1c0be117 100644
--- a/src/devices/sound/cdp1864.h
+++ b/src/devices/sound/cdp1864.h
@@ -37,7 +37,6 @@
#ifndef __CDP1864__
#define __CDP1864__
-#include "emu.h"
#include "machine/rescap.h"
#include "video/resnet.h"
diff --git a/src/devices/sound/cdp1869.h b/src/devices/sound/cdp1869.h
index 212476f670e..035631e12e3 100644
--- a/src/devices/sound/cdp1869.h
+++ b/src/devices/sound/cdp1869.h
@@ -78,7 +78,6 @@
#ifndef __CDP1869__
#define __CDP1869__
-#include "emu.h"
diff --git a/src/devices/sound/dac.cpp b/src/devices/sound/dac.cpp
index 10694f731b9..fc413390107 100644
--- a/src/devices/sound/dac.cpp
+++ b/src/devices/sound/dac.cpp
@@ -15,4 +15,5 @@
#define DAC_GENERATOR_EPILOG(_dac_type, _dac_class) \
const device_type _dac_type = &device_creator<_dac_class>;
+#include "emu.h"
#include "dac.h"
diff --git a/src/devices/sound/dac.h b/src/devices/sound/dac.h
index 1e961798ee3..07156bdf777 100644
--- a/src/devices/sound/dac.h
+++ b/src/devices/sound/dac.h
@@ -15,7 +15,6 @@
#ifndef __DAC_H__
#define __DAC_H__
-#include "emu.h"
#define DAC_VREF_POS_INPUT (0)
#define DAC_VREF_NEG_INPUT (1)
diff --git a/src/devices/sound/dac76.cpp b/src/devices/sound/dac76.cpp
index 67fc452b260..0aa8dc93798 100644
--- a/src/devices/sound/dac76.cpp
+++ b/src/devices/sound/dac76.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "dac76.h"
diff --git a/src/devices/sound/dac76.h b/src/devices/sound/dac76.h
index b0086b2885f..ee0a4225e47 100644
--- a/src/devices/sound/dac76.h
+++ b/src/devices/sound/dac76.h
@@ -24,7 +24,6 @@
#ifndef __DAC76_H__
#define __DAC76_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/sound/dave.cpp b/src/devices/sound/dave.cpp
index 69a7f2aec6f..573bc010e99 100644
--- a/src/devices/sound/dave.cpp
+++ b/src/devices/sound/dave.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "dave.h"
diff --git a/src/devices/sound/dave.h b/src/devices/sound/dave.h
index 95bcf38fe92..1c22369a62e 100644
--- a/src/devices/sound/dave.h
+++ b/src/devices/sound/dave.h
@@ -11,7 +11,6 @@
#ifndef __DAVE__
#define __DAVE__
-#include "emu.h"
diff --git a/src/devices/sound/es1373.cpp b/src/devices/sound/es1373.cpp
index be6f46bbbd6..5f6a14e63c5 100644
--- a/src/devices/sound/es1373.cpp
+++ b/src/devices/sound/es1373.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Ted Green
+#include "emu.h"
#include "es1373.h"
#define LOG_ES (0)
diff --git a/src/devices/sound/esqpump.cpp b/src/devices/sound/esqpump.cpp
index 86c69195f4b..988aaa7f9d5 100644
--- a/src/devices/sound/esqpump.cpp
+++ b/src/devices/sound/esqpump.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "sound/esqpump.h"
const device_type ESQ_5505_5510_PUMP = &device_creator<esq_5505_5510_pump>;
diff --git a/src/devices/sound/esqpump.h b/src/devices/sound/esqpump.h
index 0752b8aa397..b904a023c3c 100644
--- a/src/devices/sound/esqpump.h
+++ b/src/devices/sound/esqpump.h
@@ -5,7 +5,6 @@
#ifndef _ESQPUMP_H_
#define _ESQPUMP_H_
-#include "emu.h"
#include "sound/es5506.h"
#include "cpu/es5510/es5510.h"
diff --git a/src/devices/sound/lmc1992.cpp b/src/devices/sound/lmc1992.cpp
index a55b26075ce..96cb91b094d 100644
--- a/src/devices/sound/lmc1992.cpp
+++ b/src/devices/sound/lmc1992.cpp
@@ -20,6 +20,7 @@
*/
+#include "emu.h"
#include "lmc1992.h"
diff --git a/src/devices/sound/lmc1992.h b/src/devices/sound/lmc1992.h
index d38003de183..d672bfc15a6 100644
--- a/src/devices/sound/lmc1992.h
+++ b/src/devices/sound/lmc1992.h
@@ -29,7 +29,6 @@
#ifndef __LMC1992__
#define __LMC1992__
-#include "emu.h"
diff --git a/src/devices/sound/mm5837.cpp b/src/devices/sound/mm5837.cpp
index fc700cdd55b..9ab3dd70141 100644
--- a/src/devices/sound/mm5837.cpp
+++ b/src/devices/sound/mm5837.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "mm5837.h"
diff --git a/src/devices/sound/mm5837.h b/src/devices/sound/mm5837.h
index f7d7b18b509..cd312c1a572 100644
--- a/src/devices/sound/mm5837.h
+++ b/src/devices/sound/mm5837.h
@@ -19,7 +19,6 @@
#ifndef __MM5837_H__
#define __MM5837_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/sound/mos6560.h b/src/devices/sound/mos6560.h
index c004a6252a4..849ff00d87d 100644
--- a/src/devices/sound/mos6560.h
+++ b/src/devices/sound/mos6560.h
@@ -34,7 +34,6 @@
#ifndef __MOS6560__
#define __MOS6560__
-#include "emu.h"
diff --git a/src/devices/sound/mos6581.cpp b/src/devices/sound/mos6581.cpp
index 47ec1909467..7854021a72d 100644
--- a/src/devices/sound/mos6581.cpp
+++ b/src/devices/sound/mos6581.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "mos6581.h"
#include "sid.h"
diff --git a/src/devices/sound/mos6581.h b/src/devices/sound/mos6581.h
index d0a0e611e17..a441adb82dc 100644
--- a/src/devices/sound/mos6581.h
+++ b/src/devices/sound/mos6581.h
@@ -28,7 +28,6 @@
#ifndef __MOS6581__
#define __MOS6581__
-#include "emu.h"
diff --git a/src/devices/sound/mos7360.h b/src/devices/sound/mos7360.h
index fc80ff14b8b..102110bc83e 100644
--- a/src/devices/sound/mos7360.h
+++ b/src/devices/sound/mos7360.h
@@ -34,7 +34,6 @@
#ifndef __MOS7360__
#define __MOS7360__
-#include "emu.h"
diff --git a/src/devices/sound/pcd3311.cpp b/src/devices/sound/pcd3311.cpp
index 96c7c122cf4..50a017da863 100644
--- a/src/devices/sound/pcd3311.cpp
+++ b/src/devices/sound/pcd3311.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "pcd3311.h"
diff --git a/src/devices/sound/pcd3311.h b/src/devices/sound/pcd3311.h
index 81c8fa7e089..00e2fdc8eb9 100644
--- a/src/devices/sound/pcd3311.h
+++ b/src/devices/sound/pcd3311.h
@@ -22,7 +22,6 @@
#ifndef __PCD3311__
#define __PCD3311__
-#include "emu.h"
diff --git a/src/devices/sound/pci-ac97.cpp b/src/devices/sound/pci-ac97.cpp
index 21c9f108aee..8f6afc300bd 100644
--- a/src/devices/sound/pci-ac97.cpp
+++ b/src/devices/sound/pci-ac97.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "pci-ac97.h"
const device_type AC97 = &device_creator<ac97_device>;
diff --git a/src/devices/sound/sb0400.cpp b/src/devices/sound/sb0400.cpp
index 43aff7dc9b3..20bdac1331e 100644
--- a/src/devices/sound/sb0400.cpp
+++ b/src/devices/sound/sb0400.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "sb0400.h"
const device_type SB0400 = &device_creator<sb0400_device>;
diff --git a/src/devices/sound/t6721a.cpp b/src/devices/sound/t6721a.cpp
index 2ad0f4f7e76..2eb5cd313d3 100644
--- a/src/devices/sound/t6721a.cpp
+++ b/src/devices/sound/t6721a.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "t6721a.h"
diff --git a/src/devices/sound/t6721a.h b/src/devices/sound/t6721a.h
index 8da6737c9ea..f9d45ffb2d4 100644
--- a/src/devices/sound/t6721a.h
+++ b/src/devices/sound/t6721a.h
@@ -35,7 +35,6 @@
#ifndef __T6721__
#define __T6721__
-#include "emu.h"
diff --git a/src/devices/sound/tms5110.h b/src/devices/sound/tms5110.h
index 569b943a575..deb461342d8 100644
--- a/src/devices/sound/tms5110.h
+++ b/src/devices/sound/tms5110.h
@@ -5,7 +5,6 @@
#ifndef __TMS5110_H__
#define __TMS5110_H__
-#include "emu.h"
/* HACK: if defined, uses impossibly perfect 'straight line' interpolation */
#undef PERFECT_INTERPOLATION_HACK
diff --git a/src/devices/sound/tms5220.h b/src/devices/sound/tms5220.h
index a71ada3a0b2..4a345052836 100644
--- a/src/devices/sound/tms5220.h
+++ b/src/devices/sound/tms5220.h
@@ -5,7 +5,6 @@
#ifndef __TMS5220_H__
#define __TMS5220_H__
-#include "emu.h"
#include "machine/spchrom.h"
enum
diff --git a/src/devices/sound/upd1771.h b/src/devices/sound/upd1771.h
index 2cf8b7ce6c6..77c5eed3ea9 100644
--- a/src/devices/sound/upd1771.h
+++ b/src/devices/sound/upd1771.h
@@ -9,7 +9,6 @@
#ifndef __UPD1771_H__
#define __UPD1771_H__
-#include "emu.h"
#define MAX_PACKET_SIZE 0x8000
diff --git a/src/devices/sound/volt_reg.cpp b/src/devices/sound/volt_reg.cpp
index 42a20d53950..82065a72568 100644
--- a/src/devices/sound/volt_reg.cpp
+++ b/src/devices/sound/volt_reg.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "volt_reg.h"
const device_type VOLTAGE_REGULATOR = &device_creator<voltage_regulator_device>;
diff --git a/src/devices/sound/volt_reg.h b/src/devices/sound/volt_reg.h
index 968a996dd93..18adb8264c6 100644
--- a/src/devices/sound/volt_reg.h
+++ b/src/devices/sound/volt_reg.h
@@ -11,7 +11,6 @@
#ifndef __VOLTAGE_REGULATOR_H__
#define __VOLTAGE_REGULATOR_H__
-#include "emu.h"
#define MCFG_VOLTAGE_REGULATOR_OUTPUT(_output) \
voltage_regulator_device::set_output(*device, _output);
diff --git a/src/devices/sound/ym2413.h b/src/devices/sound/ym2413.h
index aac803e46bc..21494ed00f5 100644
--- a/src/devices/sound/ym2413.h
+++ b/src/devices/sound/ym2413.h
@@ -5,7 +5,6 @@
#ifndef __YM2413_H__
#define __YM2413_H__
-#include "emu.h"
class ym2413_device : public device_t,
public device_sound_interface
diff --git a/src/devices/sound/ymf271.h b/src/devices/sound/ymf271.h
index 743b796d1ee..5c8598b54e6 100644
--- a/src/devices/sound/ymf271.h
+++ b/src/devices/sound/ymf271.h
@@ -5,7 +5,6 @@
#ifndef __YMF271_H__
#define __YMF271_H__
-#include "emu.h"
#define MCFG_YMF271_IRQ_HANDLER(_devcb) \
devcb = &ymf271_device::set_irq_handler(*device, DEVCB_##_devcb);
diff --git a/src/devices/sound/ymf278b.h b/src/devices/sound/ymf278b.h
index bca1113ae4f..1d1388630e8 100644
--- a/src/devices/sound/ymf278b.h
+++ b/src/devices/sound/ymf278b.h
@@ -5,7 +5,6 @@
#ifndef __YMF278B_H__
#define __YMF278B_H__
-#include "emu.h"
#define YMF278B_STD_CLOCK (33868800) /* standard clock for OPL4 */
diff --git a/src/devices/sound/ymz280b.h b/src/devices/sound/ymz280b.h
index 74dcd6bc0e4..267a9b570b6 100644
--- a/src/devices/sound/ymz280b.h
+++ b/src/devices/sound/ymz280b.h
@@ -12,7 +12,6 @@
#ifndef __YMZ280B_H__
#define __YMZ280B_H__
-#include "emu.h"
#define MAKE_WAVS 0