summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/bus
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/bus')
-rw-r--r--src/emu/bus/abcbus/abcbus.c15
-rw-r--r--src/emu/bus/abcbus/abcbus.h14
-rw-r--r--src/emu/bus/abcbus/lux10828.c15
-rw-r--r--src/emu/bus/abcbus/lux10828.h6
-rw-r--r--src/emu/bus/adam/exp.c5
-rw-r--r--src/emu/bus/adam/exp.h5
-rw-r--r--src/emu/bus/adamnet/adamnet.c7
-rw-r--r--src/emu/bus/adamnet/adamnet.h7
-rw-r--r--src/emu/bus/adamnet/fdc.c9
-rw-r--r--src/emu/bus/adamnet/fdc.h5
-rw-r--r--src/emu/bus/bw2/exp.c4
-rw-r--r--src/emu/bus/bw2/exp.h3
-rw-r--r--src/emu/bus/cbm2/exp.c5
-rw-r--r--src/emu/bus/cbm2/exp.h5
-rw-r--r--src/emu/bus/cbmiec/cbmiec.c11
-rw-r--r--src/emu/bus/cbmiec/cbmiec.h11
-rw-r--r--src/emu/bus/comx35/exp.c10
-rw-r--r--src/emu/bus/comx35/exp.h10
-rw-r--r--src/emu/bus/ep64/exp.c3
-rw-r--r--src/emu/bus/ep64/exp.h3
-rw-r--r--src/emu/bus/ieee488/ieee488.c9
-rw-r--r--src/emu/bus/ieee488/ieee488.h9
-rw-r--r--src/emu/bus/isbx/isbx.c4
-rw-r--r--src/emu/bus/isbx/isbx.h4
-rw-r--r--src/emu/bus/pet/exp.c4
-rw-r--r--src/emu/bus/pet/exp.h4
-rw-r--r--src/emu/bus/plus4/exp.c5
-rw-r--r--src/emu/bus/plus4/exp.h5
-rw-r--r--src/emu/bus/s100/s100.h9
-rw-r--r--src/emu/bus/vic10/exp.c3
-rw-r--r--src/emu/bus/vic10/exp.h3
-rw-r--r--src/emu/bus/vic20/exp.c10
-rw-r--r--src/emu/bus/vic20/exp.h9
-rw-r--r--src/emu/bus/vidbrain/exp.c5
-rw-r--r--src/emu/bus/vidbrain/exp.h5
-rw-r--r--src/emu/bus/vip/exp.c9
-rw-r--r--src/emu/bus/vip/exp.h9
-rw-r--r--src/emu/bus/wangpc/wangpc.c10
-rw-r--r--src/emu/bus/wangpc/wangpc.h10
39 files changed, 119 insertions, 160 deletions
diff --git a/src/emu/bus/abcbus/abcbus.c b/src/emu/bus/abcbus/abcbus.c
index bea1951221b..1ce2a6c753f 100644
--- a/src/emu/bus/abcbus/abcbus.c
+++ b/src/emu/bus/abcbus/abcbus.c
@@ -83,6 +83,21 @@ void abcbus_slot_device::device_start()
// SLOT_INTERFACE( abcbus_cards )
//-------------------------------------------------
+// slot devices
+#include "abc890.h"
+#include "dos.h"
+#include "fd2.h"
+#include "hdc.h"
+#include "lux10828.h"
+#include "lux21046.h"
+#include "lux21056.h"
+#include "lux4105.h"
+#include "uni800.h"
+#include "sio.h"
+#include "slutprov.h"
+#include "turbo.h"
+
+
SLOT_INTERFACE_START( abcbus_cards )
SLOT_INTERFACE("abc830", ABC830)
SLOT_INTERFACE("abc832", ABC832)
diff --git a/src/emu/bus/abcbus/abcbus.h b/src/emu/bus/abcbus/abcbus.h
index 87d668b2c02..81d0713c924 100644
--- a/src/emu/bus/abcbus/abcbus.h
+++ b/src/emu/bus/abcbus/abcbus.h
@@ -309,20 +309,6 @@ protected:
extern const device_type ABCBUS_SLOT;
-// slot devices
-#include "abc890.h"
-#include "dos.h"
-#include "fd2.h"
-#include "hdc.h"
-#include "lux10828.h"
-#include "lux21046.h"
-#include "lux21056.h"
-#include "lux4105.h"
-#include "uni800.h"
-#include "sio.h"
-#include "slutprov.h"
-#include "turbo.h"
-
SLOT_INTERFACE_EXTERN( abcbus_cards );
SLOT_INTERFACE_EXTERN( abc1600bus_cards );
diff --git a/src/emu/bus/abcbus/lux10828.c b/src/emu/bus/abcbus/lux10828.c
index 28debd473a4..566f0dd2ad4 100644
--- a/src/emu/bus/abcbus/lux10828.c
+++ b/src/emu/bus/abcbus/lux10828.c
@@ -688,18 +688,3 @@ WRITE8_MEMBER( luxor_55_10828_device::fdc_w )
m_fdc->gen_w(offset, data);
}
-
-
-
-//**************************************************************************
-// LUXOR 55 10828 DEVICE INPUT DEFAULTS
-//**************************************************************************
-
-//-------------------------------------------------
-// DEVICE_INPUT_DEFAULTS( abc830_slow )
-//-------------------------------------------------
-
-DEVICE_INPUT_DEFAULTS_START( abc830_slow )
- DEVICE_INPUT_DEFAULTS("SW1", 0x0f, 0x03)
- DEVICE_INPUT_DEFAULTS("S1", 0x01, 0x01)
-DEVICE_INPUT_DEFAULTS_END
diff --git a/src/emu/bus/abcbus/lux10828.h b/src/emu/bus/abcbus/lux10828.h
index 4067611460b..ed13c3c062e 100644
--- a/src/emu/bus/abcbus/lux10828.h
+++ b/src/emu/bus/abcbus/lux10828.h
@@ -112,10 +112,4 @@ private:
// device type definition
extern const device_type LUXOR_55_10828;
-
-// default input ports
-extern const input_device_default DEVICE_INPUT_DEFAULTS_NAME( abc830_slow )[];
-
-
-
#endif
diff --git a/src/emu/bus/adam/exp.c b/src/emu/bus/adam/exp.c
index a092c30edc4..f079b5f3c96 100644
--- a/src/emu/bus/adam/exp.c
+++ b/src/emu/bus/adam/exp.c
@@ -247,6 +247,11 @@ void adam_expansion_slot_device::bd_w(address_space &space, offs_t offset, UINT8
WRITE_LINE_MEMBER( adam_expansion_slot_device::int_w ) { m_out_int_func(state); }
+// slot devices
+#include "adamlink.h"
+#include "ide.h"
+#include "ram.h"
+
//-------------------------------------------------
// SLOT_INTERFACE( adam_slot1_devices )
//-------------------------------------------------
diff --git a/src/emu/bus/adam/exp.h b/src/emu/bus/adam/exp.h
index 42bb1f230a5..e3094c422c8 100644
--- a/src/emu/bus/adam/exp.h
+++ b/src/emu/bus/adam/exp.h
@@ -140,11 +140,6 @@ protected:
extern const device_type ADAM_EXPANSION_SLOT;
-// slot devices
-#include "adamlink.h"
-#include "ide.h"
-#include "ram.h"
-
SLOT_INTERFACE_EXTERN( adam_slot1_devices );
SLOT_INTERFACE_EXTERN( adam_slot2_devices );
SLOT_INTERFACE_EXTERN( adam_slot3_devices );
diff --git a/src/emu/bus/adamnet/adamnet.c b/src/emu/bus/adamnet/adamnet.c
index 39e39810255..f522930bdbf 100644
--- a/src/emu/bus/adamnet/adamnet.c
+++ b/src/emu/bus/adamnet/adamnet.c
@@ -251,6 +251,13 @@ WRITE_LINE_MEMBER( adamnet_device::reset_w )
// SLOT_INTERFACE( adamnet_devices )
//-------------------------------------------------
+// slot devices
+#include "ddp.h"
+#include "fdc.h"
+#include "kb.h"
+#include "printer.h"
+#include "spi.h"
+
SLOT_INTERFACE_START( adamnet_devices )
SLOT_INTERFACE("ddp", ADAM_DDP)
SLOT_INTERFACE("fdc", ADAM_FDC)
diff --git a/src/emu/bus/adamnet/adamnet.h b/src/emu/bus/adamnet/adamnet.h
index 37002f72a60..8c99cd4d622 100644
--- a/src/emu/bus/adamnet/adamnet.h
+++ b/src/emu/bus/adamnet/adamnet.h
@@ -127,13 +127,6 @@ extern const device_type ADAMNET;
extern const device_type ADAMNET_SLOT;
-// slot devices
-#include "ddp.h"
-#include "fdc.h"
-#include "kb.h"
-#include "printer.h"
-#include "spi.h"
-
SLOT_INTERFACE_EXTERN( adamnet_devices );
diff --git a/src/emu/bus/adamnet/fdc.c b/src/emu/bus/adamnet/fdc.c
index fe7bd49683b..1db2d7ec02c 100644
--- a/src/emu/bus/adamnet/fdc.c
+++ b/src/emu/bus/adamnet/fdc.c
@@ -358,12 +358,3 @@ WRITE8_MEMBER( adam_fdc_device::p2_w )
m_bus->txd_w(this, BIT(data, 4));
}
-
-
-//-------------------------------------------------
-// DEVICE_INPUT_DEFAULTS( drive2 )
-//-------------------------------------------------
-
-DEVICE_INPUT_DEFAULTS_START( drive2 )
- DEVICE_INPUT_DEFAULTS("SW3", 0x01, 0x01)
-DEVICE_INPUT_DEFAULTS_END
diff --git a/src/emu/bus/adamnet/fdc.h b/src/emu/bus/adamnet/fdc.h
index b8ec89575a6..617f8bd24c5 100644
--- a/src/emu/bus/adamnet/fdc.h
+++ b/src/emu/bus/adamnet/fdc.h
@@ -71,9 +71,4 @@ protected:
extern const device_type ADAM_FDC;
-// default inputs
-extern const input_device_default DEVICE_INPUT_DEFAULTS_NAME( drive2 )[];
-
-
-
#endif
diff --git a/src/emu/bus/bw2/exp.c b/src/emu/bus/bw2/exp.c
index 505322cfcb9..2b1470d4c13 100644
--- a/src/emu/bus/bw2/exp.c
+++ b/src/emu/bus/bw2/exp.c
@@ -181,10 +181,14 @@ WRITE8_MEMBER( bw2_expansion_slot_device::modsel_w )
}
+
//-------------------------------------------------
// SLOT_INTERFACE( bw2_expansion_cards )
//-------------------------------------------------
+// slot devices
+#include "ramcard.h"
+
SLOT_INTERFACE_START( bw2_expansion_cards )
SLOT_INTERFACE("ramcard", BW2_RAMCARD)
SLOT_INTERFACE_END
diff --git a/src/emu/bus/bw2/exp.h b/src/emu/bus/bw2/exp.h
index af1f58be548..eb664812987 100644
--- a/src/emu/bus/bw2/exp.h
+++ b/src/emu/bus/bw2/exp.h
@@ -127,9 +127,6 @@ protected:
extern const device_type BW2_EXPANSION_SLOT;
-// slot devices
-#include "ramcard.h"
-
SLOT_INTERFACE_EXTERN( bw2_expansion_cards );
diff --git a/src/emu/bus/cbm2/exp.c b/src/emu/bus/cbm2/exp.c
index 2017dfc8041..fcbc47f25c8 100644
--- a/src/emu/bus/cbm2/exp.c
+++ b/src/emu/bus/cbm2/exp.c
@@ -196,6 +196,11 @@ void cbm2_expansion_slot_device::write(address_space &space, offs_t offset, UINT
// SLOT_INTERFACE( cbm2_expansion_cards )
//-------------------------------------------------
+// slot devices
+#include "24k.h"
+#include "hrg.h"
+#include "std.h"
+
SLOT_INTERFACE_START( cbm2_expansion_cards )
SLOT_INTERFACE("24k", CBM2_24K)
SLOT_INTERFACE_INTERNAL("standard", CBM2_STD)
diff --git a/src/emu/bus/cbm2/exp.h b/src/emu/bus/cbm2/exp.h
index c04895758da..6b20d47baf1 100644
--- a/src/emu/bus/cbm2/exp.h
+++ b/src/emu/bus/cbm2/exp.h
@@ -132,11 +132,6 @@ protected:
extern const device_type CBM2_EXPANSION_SLOT;
-// slot devices
-#include "24k.h"
-#include "hrg.h"
-#include "std.h"
-
SLOT_INTERFACE_EXTERN( cbm2_expansion_cards );
diff --git a/src/emu/bus/cbmiec/cbmiec.c b/src/emu/bus/cbmiec/cbmiec.c
index 18bd3a64ff9..f466c0ef147 100644
--- a/src/emu/bus/cbmiec/cbmiec.c
+++ b/src/emu/bus/cbmiec/cbmiec.c
@@ -485,6 +485,17 @@ int cbm_iec_device::get_signal(int signal)
// SLOT_INTERFACE( cbm_iec_devices )
//-------------------------------------------------
+// slot devices
+#include "c1541.h"
+#include "c1571.h"
+#include "c1581.h"
+#include "c64_nl10.h"
+#include "cmdhd.h"
+#include "diag264_lb_iec.h"
+#include "fd2000.h"
+#include "interpod.h"
+#include "serialbox.h"
+
SLOT_INTERFACE_START( cbm_iec_devices )
SLOT_INTERFACE("c1540", C1540)
SLOT_INTERFACE("c1541", C1541)
diff --git a/src/emu/bus/cbmiec/cbmiec.h b/src/emu/bus/cbmiec/cbmiec.h
index d3718427ad6..5bf37a1ea89 100644
--- a/src/emu/bus/cbmiec/cbmiec.h
+++ b/src/emu/bus/cbmiec/cbmiec.h
@@ -206,17 +206,6 @@ extern const device_type CBM_IEC;
extern const device_type CBM_IEC_SLOT;
-// slot devices
-#include "c1541.h"
-#include "c1571.h"
-#include "c1581.h"
-#include "c64_nl10.h"
-#include "cmdhd.h"
-#include "diag264_lb_iec.h"
-#include "fd2000.h"
-#include "interpod.h"
-#include "serialbox.h"
-
SLOT_INTERFACE_EXTERN( cbm_iec_devices );
diff --git a/src/emu/bus/comx35/exp.c b/src/emu/bus/comx35/exp.c
index aa117ac8eff..5d0d2e1f699 100644
--- a/src/emu/bus/comx35/exp.c
+++ b/src/emu/bus/comx35/exp.c
@@ -226,6 +226,16 @@ WRITE_LINE_MEMBER( comx_expansion_slot_device::clear_w ) { m_out_clear_func(stat
// SLOT_INTERFACE( comx_expansion_cards )
//-------------------------------------------------
+// slot devices
+#include "clm.h"
+#include "eprom.h"
+#include "expbox.h"
+#include "fdc.h"
+#include "joycard.h"
+#include "printer.h"
+#include "ram.h"
+#include "thermal.h"
+
SLOT_INTERFACE_START( comx_expansion_cards )
SLOT_INTERFACE("eb", COMX_EB)
SLOT_INTERFACE("fd", COMX_FD)
diff --git a/src/emu/bus/comx35/exp.h b/src/emu/bus/comx35/exp.h
index 66a1122a1b9..710fe52569c 100644
--- a/src/emu/bus/comx35/exp.h
+++ b/src/emu/bus/comx35/exp.h
@@ -160,16 +160,6 @@ protected:
extern const device_type COMX_EXPANSION_SLOT;
-// slot devices
-#include "clm.h"
-#include "eprom.h"
-#include "expbox.h"
-#include "fdc.h"
-#include "joycard.h"
-#include "printer.h"
-#include "ram.h"
-#include "thermal.h"
-
SLOT_INTERFACE_EXTERN( comx_expansion_cards );
diff --git a/src/emu/bus/ep64/exp.c b/src/emu/bus/ep64/exp.c
index c5e0cfb175f..be7003617a7 100644
--- a/src/emu/bus/ep64/exp.c
+++ b/src/emu/bus/ep64/exp.c
@@ -85,6 +85,9 @@ void ep64_expansion_bus_slot_device::device_reset()
// SLOT_INTERFACE( ep64_expansion_bus_cards )
//-------------------------------------------------
+// slot devices
+#include "exdos.h"
+
SLOT_INTERFACE_START( ep64_expansion_bus_cards )
SLOT_INTERFACE("exdos", EP64_EXDOS)
SLOT_INTERFACE_END
diff --git a/src/emu/bus/ep64/exp.h b/src/emu/bus/ep64/exp.h
index 7f20fbe71db..e823aa6df85 100644
--- a/src/emu/bus/ep64/exp.h
+++ b/src/emu/bus/ep64/exp.h
@@ -142,9 +142,6 @@ protected:
extern const device_type EP64_EXPANSION_BUS_SLOT;
-// slot devices
-#include "exdos.h"
-
SLOT_INTERFACE_EXTERN( ep64_expansion_bus_cards );
diff --git a/src/emu/bus/ieee488/ieee488.c b/src/emu/bus/ieee488/ieee488.c
index 326cd5cf9b3..fc4d613a9d2 100644
--- a/src/emu/bus/ieee488/ieee488.c
+++ b/src/emu/bus/ieee488/ieee488.c
@@ -370,6 +370,15 @@ UINT8 ieee488_device::get_data()
// SLOT_INTERFACE( cbm_ieee488_devices )
//-------------------------------------------------
+// slot devices
+#include "c2031.h"
+#include "c2040.h"
+#include "c8280.h"
+#include "d9060.h"
+#include "hardbox.h"
+#include "shark.h"
+#include "softbox.h"
+
SLOT_INTERFACE_START( cbm_ieee488_devices )
SLOT_INTERFACE("c2040", C2040)
SLOT_INTERFACE("c3040", C3040)
diff --git a/src/emu/bus/ieee488/ieee488.h b/src/emu/bus/ieee488/ieee488.h
index 300098a1f1e..cbafda8608f 100644
--- a/src/emu/bus/ieee488/ieee488.h
+++ b/src/emu/bus/ieee488/ieee488.h
@@ -249,15 +249,6 @@ extern const device_type IEEE488;
extern const device_type IEEE488_SLOT;
-// slot devices
-#include "c2031.h"
-#include "c2040.h"
-#include "c8280.h"
-#include "d9060.h"
-#include "hardbox.h"
-#include "shark.h"
-#include "softbox.h"
-
SLOT_INTERFACE_EXTERN( cbm_ieee488_devices );
diff --git a/src/emu/bus/isbx/isbx.c b/src/emu/bus/isbx/isbx.c
index f4e026f1aa8..7a8a172b060 100644
--- a/src/emu/bus/isbx/isbx.c
+++ b/src/emu/bus/isbx/isbx.c
@@ -71,6 +71,10 @@ void isbx_slot_device::device_start()
// SLOT_INTERFACE( isbx_cards )
//-------------------------------------------------
+// slot devices
+#include "compis_fdc.h"
+#include "isbc_218a.h"
+
SLOT_INTERFACE_START( isbx_cards )
SLOT_INTERFACE("fdc", COMPIS_FDC)
SLOT_INTERFACE("fdc_218a", ISBC_218A)
diff --git a/src/emu/bus/isbx/isbx.h b/src/emu/bus/isbx/isbx.h
index 05596b2f2d4..5e2abe67beb 100644
--- a/src/emu/bus/isbx/isbx.h
+++ b/src/emu/bus/isbx/isbx.h
@@ -147,10 +147,6 @@ protected:
extern const device_type ISBX_SLOT;
-// slot devices
-#include "compis_fdc.h"
-#include "isbc_218a.h"
-
SLOT_INTERFACE_EXTERN( isbx_cards );
diff --git a/src/emu/bus/pet/exp.c b/src/emu/bus/pet/exp.c
index 33f2ccef16a..d955069912b 100644
--- a/src/emu/bus/pet/exp.c
+++ b/src/emu/bus/pet/exp.c
@@ -194,6 +194,10 @@ int pet_expansion_slot_device::phi2()
// SLOT_INTERFACE( pet_expansion_cards )
//-------------------------------------------------
+// slot devices
+#include "64k.h"
+#include "superpet.h"
+
SLOT_INTERFACE_START( pet_expansion_cards )
SLOT_INTERFACE("64k", PET_64K)
SLOT_INTERFACE("superpet", SUPERPET)
diff --git a/src/emu/bus/pet/exp.h b/src/emu/bus/pet/exp.h
index a871a53c8a2..fc6ac6a42f9 100644
--- a/src/emu/bus/pet/exp.h
+++ b/src/emu/bus/pet/exp.h
@@ -135,10 +135,6 @@ protected:
extern const device_type PET_EXPANSION_SLOT;
-// slot devices
-#include "64k.h"
-#include "superpet.h"
-
SLOT_INTERFACE_EXTERN( pet_expansion_cards );
diff --git a/src/emu/bus/plus4/exp.c b/src/emu/bus/plus4/exp.c
index 10c24911558..6ee8212c236 100644
--- a/src/emu/bus/plus4/exp.c
+++ b/src/emu/bus/plus4/exp.c
@@ -198,6 +198,11 @@ void plus4_expansion_slot_device::cd_w(address_space &space, offs_t offset, UINT
// SLOT_INTERFACE( plus4_expansion_cards )
//-------------------------------------------------
+// slot devices
+#include "c1551.h"
+#include "sid.h"
+#include "std.h"
+
SLOT_INTERFACE_START( plus4_expansion_cards )
SLOT_INTERFACE("c1551", C1551)
SLOT_INTERFACE("sid", PLUS4_SID)
diff --git a/src/emu/bus/plus4/exp.h b/src/emu/bus/plus4/exp.h
index 3688c36a287..16bcb8096bf 100644
--- a/src/emu/bus/plus4/exp.h
+++ b/src/emu/bus/plus4/exp.h
@@ -175,11 +175,6 @@ protected:
extern const device_type PLUS4_EXPANSION_SLOT;
-// slot devices
-#include "c1551.h"
-#include "sid.h"
-#include "std.h"
-
SLOT_INTERFACE_EXTERN( plus4_expansion_cards );
diff --git a/src/emu/bus/s100/s100.h b/src/emu/bus/s100/s100.h
index f213cc15289..3c4a273c207 100644
--- a/src/emu/bus/s100/s100.h
+++ b/src/emu/bus/s100/s100.h
@@ -274,13 +274,4 @@ public:
};
-// slot devices
-#include "dj2db.h"
-#include "djdma.h"
-#include "mm65k16s.h"
-#include "nsmdsa.h"
-#include "nsmdsad.h"
-#include "wunderbus.h"
-
-
#endif
diff --git a/src/emu/bus/vic10/exp.c b/src/emu/bus/vic10/exp.c
index 4fe8dc5cc54..4b698463325 100644
--- a/src/emu/bus/vic10/exp.c
+++ b/src/emu/bus/vic10/exp.c
@@ -236,6 +236,9 @@ WRITE_LINE_MEMBER( vic10_expansion_slot_device::p0_w ) { if (m_card != NULL) m_c
// SLOT_INTERFACE( vic10_expansion_cards )
//-------------------------------------------------
+// slot devices
+#include "std.h"
+
SLOT_INTERFACE_START( vic10_expansion_cards )
// the following need ROMs from the software list
SLOT_INTERFACE_INTERNAL("standard", VIC10_STD)
diff --git a/src/emu/bus/vic10/exp.h b/src/emu/bus/vic10/exp.h
index 828cb182f86..36d92009625 100644
--- a/src/emu/bus/vic10/exp.h
+++ b/src/emu/bus/vic10/exp.h
@@ -172,9 +172,6 @@ protected:
extern const device_type VIC10_EXPANSION_SLOT;
-// slot devices
-#include "std.h"
-
SLOT_INTERFACE_EXTERN( vic10_expansion_cards );
diff --git a/src/emu/bus/vic20/exp.c b/src/emu/bus/vic20/exp.c
index 5c99fd7c80f..a40eadaa053 100644
--- a/src/emu/bus/vic20/exp.c
+++ b/src/emu/bus/vic20/exp.c
@@ -11,6 +11,7 @@
#include "emu.h"
#include "exp.h"
+#include "formats\imageutl.h"
#include "emuopts.h"
@@ -210,6 +211,15 @@ void vic20_expansion_slot_device::cd_w(address_space &space, offs_t offset, UINT
// SLOT_INTERFACE( vic20_expansion_cards )
//-------------------------------------------------
+// slot devices
+#include "megacart.h"
+#include "std.h"
+#include "vic1010.h"
+#include "vic1110.h"
+#include "vic1111.h"
+#include "vic1112.h"
+#include "vic1210.h"
+
SLOT_INTERFACE_START( vic20_expansion_cards )
SLOT_INTERFACE("exp", VIC1010)
SLOT_INTERFACE("3k", VIC1210)
diff --git a/src/emu/bus/vic20/exp.h b/src/emu/bus/vic20/exp.h
index c1c7389be60..aa9db53acfe 100644
--- a/src/emu/bus/vic20/exp.h
+++ b/src/emu/bus/vic20/exp.h
@@ -162,15 +162,6 @@ protected:
extern const device_type VIC20_EXPANSION_SLOT;
-// slot devices
-#include "megacart.h"
-#include "std.h"
-#include "vic1010.h"
-#include "vic1110.h"
-#include "vic1111.h"
-#include "vic1112.h"
-#include "vic1210.h"
-
SLOT_INTERFACE_EXTERN( vic20_expansion_cards );
diff --git a/src/emu/bus/vidbrain/exp.c b/src/emu/bus/vidbrain/exp.c
index e1259ba52d2..4334d23591b 100644
--- a/src/emu/bus/vidbrain/exp.c
+++ b/src/emu/bus/vidbrain/exp.c
@@ -253,6 +253,11 @@ WRITE_LINE_MEMBER( videobrain_expansion_slot_device::extres_w ) { m_out_extres_f
// SLOT_INTERFACE_START( vidbrain_expansion_cards )
//-------------------------------------------------
+// slot devices
+#include "std.h"
+#include "money_minder.h"
+#include "timeshare.h"
+
SLOT_INTERFACE_START( vidbrain_expansion_cards )
SLOT_INTERFACE_INTERNAL("standard", VB_STD)
SLOT_INTERFACE_INTERNAL("moneyminder", VB_MONEY_MINDER)
diff --git a/src/emu/bus/vidbrain/exp.h b/src/emu/bus/vidbrain/exp.h
index db856a5ad56..a80c3686438 100644
--- a/src/emu/bus/vidbrain/exp.h
+++ b/src/emu/bus/vidbrain/exp.h
@@ -173,11 +173,6 @@ protected:
extern const device_type VIDEOBRAIN_EXPANSION_SLOT;
-// slot devices
-#include "std.h"
-#include "money_minder.h"
-#include "timeshare.h"
-
SLOT_INTERFACE_EXTERN( vidbrain_expansion_cards );
diff --git a/src/emu/bus/vip/exp.c b/src/emu/bus/vip/exp.c
index 511dd0814e0..c5d66804266 100644
--- a/src/emu/bus/vip/exp.c
+++ b/src/emu/bus/vip/exp.c
@@ -197,6 +197,15 @@ WRITE_LINE_MEMBER( vip_expansion_slot_device::run_w ) { if (m_card != NULL) m_ca
// SLOT_INTERFACE vip_expansion_cards )
//-------------------------------------------------
+// slot devices
+#include "vp550.h"
+#include "vp570.h"
+#include "vp575.h"
+#include "vp585.h"
+#include "vp590.h"
+#include "vp595.h"
+#include "vp700.h"
+
SLOT_INTERFACE_START( vip_expansion_cards )
SLOT_INTERFACE("super", VP550)
//SLOT_INTERFACE("eprom", VP560)
diff --git a/src/emu/bus/vip/exp.h b/src/emu/bus/vip/exp.h
index c4f95fc62d8..3d9f8711f67 100644
--- a/src/emu/bus/vip/exp.h
+++ b/src/emu/bus/vip/exp.h
@@ -158,15 +158,6 @@ protected:
extern const device_type VIP_EXPANSION_SLOT;
-// slot devices
-#include "vp550.h"
-#include "vp570.h"
-#include "vp575.h"
-#include "vp585.h"
-#include "vp590.h"
-#include "vp595.h"
-#include "vp700.h"
-
SLOT_INTERFACE_EXTERN( vip_expansion_cards );
diff --git a/src/emu/bus/wangpc/wangpc.c b/src/emu/bus/wangpc/wangpc.c
index 1b7fe913e6c..4574fdbe832 100644
--- a/src/emu/bus/wangpc/wangpc.c
+++ b/src/emu/bus/wangpc/wangpc.c
@@ -334,6 +334,16 @@ device_wangpcbus_card_interface::~device_wangpcbus_card_interface()
// SLOT_INTERFACE( wangpc_cards )
//-------------------------------------------------
+// slot devices
+#include "emb.h"
+#include "lic.h"
+#include "lvc.h"
+#include "mcc.h"
+#include "mvc.h"
+#include "rtc.h"
+#include "tig.h"
+#include "wdc.h"
+
SLOT_INTERFACE_START( wangpc_cards )
SLOT_INTERFACE("emb", WANGPC_EMB) // extended memory board
SLOT_INTERFACE("lic", WANGPC_LIC) // local interconnect option card
diff --git a/src/emu/bus/wangpc/wangpc.h b/src/emu/bus/wangpc/wangpc.h
index 45e8ab79033..4dba30e47c1 100644
--- a/src/emu/bus/wangpc/wangpc.h
+++ b/src/emu/bus/wangpc/wangpc.h
@@ -207,16 +207,6 @@ public:
};
-// slot devices
-#include "emb.h"
-#include "lic.h"
-#include "lvc.h"
-#include "mcc.h"
-#include "mvc.h"
-#include "rtc.h"
-#include "tig.h"
-#include "wdc.h"
-
SLOT_INTERFACE_EXTERN( wangpc_cards );