Remove timer_device from emu.h and move it out of src/emu (nw)

scripts/src/emu.lua

@@ -178,8 +178,6 @@ files {
 	MAME_DIR .. "src/emu/speaker.h",
 	MAME_DIR .. "src/emu/tilemap.cpp",
 	MAME_DIR .. "src/emu/tilemap.h",
-	MAME_DIR .. "src/emu/timer.cpp",
-	MAME_DIR .. "src/emu/timer.h",
 	MAME_DIR .. "src/emu/uiinput.cpp",
 	MAME_DIR .. "src/emu/uiinput.h",
 	MAME_DIR .. "src/emu/validity.cpp",

scripts/src/machine.lua

@@ -31,6 +31,8 @@ files {
 	MAME_DIR .. "src/devices/machine/legscsi.h",
 	MAME_DIR .. "src/devices/machine/terminal.cpp",
 	MAME_DIR .. "src/devices/machine/terminal.h",
+	MAME_DIR .. "src/devices/machine/timer.cpp",
+	MAME_DIR .. "src/devices/machine/timer.h",
 }
 files {
 	MAME_DIR .. "src/devices/imagedev/bitbngr.cpp",

src/devices/bus/cgenie/expansion/floppy.h

@@ -12,6 +12,7 @@
 #pragma once
 
 #include "expansion.h"
+#include "machine/timer.h"
 #include "machine/wd_fdc.h"
 #include "bus/generic/slot.h"
 

src/devices/bus/dmv/k806.h

@@ -7,6 +7,8 @@
 
 #include "dmvbus.h"
 #include "cpu/mcs48/mcs48.h"
+#include "machine/timer.h"
+
 
 
 //**************************************************************************

src/devices/bus/isa/pgc.h

@@ -8,6 +8,7 @@
 
 
 #include "cpu/i86/i86.h"
+#include "machine/timer.h"
 #include "isa.h"
 
 //**************************************************************************

src/devices/bus/newbrain/eim.h

@@ -17,6 +17,7 @@
 #include "machine/adc0808.h"
 #include "machine/z80ctc.h"
 #include "machine/ram.h"
+#include "machine/timer.h"
 
 
 

src/devices/bus/ti99/peb/evpc.h

@@ -18,6 +18,7 @@
 #pragma once
 
 #include "peribox.h"
+#include "machine/timer.h"
 #include "video/v9938.h"
 #include "sound/sn76496.h"
 #include "bus/ti99/ti99defs.h"

src/devices/machine/74166.h

@@ -23,6 +23,8 @@
 
 #pragma once
 
+#include "machine/timer.h"
+
 
 //**************************************************************************
 //  INTERFACE CONFIGURATION MACROS

src/devices/machine/stvcd.cpp

@@ -27,6 +27,7 @@
 #include "imagedev/chd_cd.h"
 #include "includes/saturn.h"
 #include "cdrom.h"
+#include "machine/timer.h"
 #include "sound/cdda.h"
 #include "debugger.h"
 #include "coreutil.h"

src/devices/machine/timer.cpp

@@ -9,6 +9,7 @@
 ***************************************************************************/
 
 #include "emu.h"
+#include "machine/timer.h"
 #include "screen.h"
 
 

src/devices/machine/timer.h

@@ -10,12 +10,8 @@
 
 #pragma once
 
-#ifndef __EMU_H__
-#error Dont include this file directly; include emu.h instead.
-#endif
-
-#ifndef MAME_EMU_TIMER_H
-#define MAME_EMU_TIMER_H
+#ifndef MAME_MACHINE_TIMER_H
+#define MAME_MACHINE_TIMER_H
 
 
 
@@ -153,4 +149,4 @@ private:
 DECLARE_DEVICE_TYPE(TIMER, timer_device)
 
 
-#endif // MAME_EMU_TIMER_H
+#endif // MAME_MACHINE_TIMER_H

src/devices/video/315_5313.h

@@ -8,6 +8,7 @@
 
 #include "video/315_5124.h"
 #include "cpu/m68000/m68000.h"
+#include "machine/timer.h"
 
 
 #define MCFG_SEGA315_5313_IS_PAL(_bool) \

src/emu/emu.h

@@ -82,7 +82,6 @@ typedef void (*machine_config_constructor)(machine_config &config, device_t *own
 #include "dinvram.h"
 #include "didisasm.h"
 #include "schedule.h"
-#include "timer.h"
 #include "dinetwork.h"
 
 // machine and driver configuration

src/mame/audio/cage.h

@@ -12,6 +12,7 @@
 #pragma once
 
 #include "machine/gen_latch.h"
+#include "machine/timer.h"
 #include "sound/dmadac.h"
 
 #define CAGE_IRQ_REASON_DATA_READY      (1)

src/mame/audio/dcs.h

@@ -14,6 +14,7 @@
 #include "cpu/adsp2100/adsp2100.h"
 #include "sound/dmadac.h"
 #include "machine/bankdev.h"
+#include "machine/timer.h"
 
 #define MCFG_DCS2_AUDIO_DRAM_IN_MB(_dram_in_mb) \
 	dcs_audio_device::static_set_dram_in_mb(*device, _dram_in_mb);

src/mame/audio/rax.h

@@ -12,6 +12,7 @@
 
 #include "cpu/adsp2100/adsp2100.h"
 #include "machine/gen_latch.h"
+#include "machine/timer.h"
 #include "sound/dmadac.h"
 
 

src/mame/audio/segasnd.h

@@ -11,6 +11,7 @@
 #pragma once
 
 #include "cpu/mcs48/mcs48.h"
+#include "machine/timer.h"
 
 
 class speech_sound_device : public device_t, public device_sound_interface

src/mame/drivers/a6809.cpp

@@ -53,6 +53,7 @@ enter  show next address
 #include "cpu/m6809/m6809.h"
 #include "machine/6522via.h"
 #include "machine/keyboard.h"
+#include "machine/timer.h"
 #include "video/saa5050.h"
 #include "video/mc6845.h"
 #include "imagedev/cassette.h"

src/mame/drivers/a7800.cpp

@@ -98,6 +98,7 @@
 
 #include "emu.h"
 #include "cpu/m6502/m6502.h"
+#include "machine/timer.h"
 #include "sound/tiaintf.h"
 #include "sound/tiasound.h"
 #include "machine/mos6530n.h"

src/mame/drivers/acommand.cpp

@@ -59,6 +59,7 @@ JALCF1   BIN     1,048,576  02-07-99  1:11a JALCF1.BIN
 
 #include "emu.h"
 #include "cpu/m68000/m68000.h"
+#include "machine/timer.h"
 #include "sound/okim6295.h"
 #include "video/ms1_tmap.h"
 #include "screen.h"

src/mame/drivers/acrnsys1.cpp

@@ -50,6 +50,7 @@ Note that left-most digit is not wired up, and therefore will always be blank.
 #include "cpu/m6502/m6502.h"
 #include "machine/ins8154.h"
 #include "machine/74145.h"
+#include "machine/timer.h"
 #include "imagedev/cassette.h"
 #include "sound/wave.h"
 #include "speaker.h"

src/mame/drivers/airraid.cpp

@@ -153,6 +153,7 @@ Stephh's notes (based on the game Z80 code and some tests) :
 #include "video/airraid_dev.h"
 
 #include "cpu/z80/z80.h"
+#include "machine/timer.h"
 #include "sound/ym2151.h"
 #include "speaker.h"
 

src/mame/drivers/allied.cpp

@@ -47,6 +47,7 @@ ToDo:
 #include "cpu/m6502/m6504.h"
 #include "machine/mos6530.h"
 #include "machine/6821pia.h"
+#include "machine/timer.h"
 #include "allied.lh"
 
 class allied_state : public genpin_class

src/mame/drivers/alphatro.cpp

@@ -35,6 +35,7 @@
 #include "machine/bankdev.h"
 #include "machine/upd765.h"
 #include "machine/i8257.h"
+#include "machine/timer.h"
 #include "bus/generic/carts.h"
 #include "bus/generic/slot.h"
 #include "sound/beep.h"

src/mame/drivers/ampro.cpp

@@ -29,6 +29,7 @@ ToDo:
 #include "machine/z80dart.h"
 #include "machine/wd_fdc.h"
 #include "machine/clock.h"
+#include "machine/timer.h"
 #include "softlist.h"
 
 class ampro_state : public driver_device

src/mame/drivers/apple2.cpp

@@ -44,6 +44,7 @@ II Plus: RAM options reduced to 16/32/48 KB.
 
 #include "machine/74259.h"
 #include "machine/bankdev.h"
+#include "machine/timer.h"
 #include "imagedev/flopdrv.h"
 
 #include "bus/a2bus/a2alfam2.h"

src/mame/drivers/apple2e.cpp

@@ -111,6 +111,7 @@ Address bus A0-A11 is Y0-Y11
 #include "machine/mos6551.h"
 #include "machine/ram.h"
 #include "machine/sonydriv.h"
+#include "machine/timer.h"
 
 #include "bus/a2bus/a2bus.h"
 #include "bus/a2bus/a2diskii.h"

src/mame/drivers/applix.cpp

@@ -42,6 +42,7 @@
 #include "cpu/z80/z80.h"
 #include "imagedev/cassette.h"
 #include "machine/6522via.h"
+#include "machine/timer.h"
 #include "machine/wd_fdc.h"
 #include "sound/dac.h"
 #include "sound/volt_reg.h"

src/mame/drivers/aristmk4.cpp

@@ -327,6 +327,7 @@
 #include "sound/samples.h"
 #include "machine/mc146818.h" // DALLAS1287 is functionally compatible.
 #include "machine/nvram.h"
+#include "machine/timer.h"
 #include "screen.h"
 #include "speaker.h"
 

src/mame/drivers/astrcorp.cpp

@@ -41,6 +41,7 @@ To do:
 #include "machine/eepromser.h"
 #include "machine/nvram.h"
 #include "machine/ticket.h"
+#include "machine/timer.h"
 #include "sound/okim6295.h"
 #include "screen.h"
 #include "speaker.h"

src/mame/drivers/atari400.cpp

@@ -45,6 +45,7 @@
 #include "cpu/m6502/m6502.h"
 #include "machine/6821pia.h"
 #include "machine/ram.h"
+#include "machine/timer.h"
 #include "machine/atarifdc.h"
 #include "sound/dac.h"
 #include "sound/pokey.h"

src/mame/drivers/atari_s1.cpp

@@ -47,6 +47,7 @@ ToDo:
 #include "machine/genpin.h"
 
 #include "cpu/m6800/m6800.h"
+#include "machine/timer.h"
 #include "machine/watchdog.h"
 #include "sound/dac.h"
 #include "sound/volt_reg.h"

src/mame/drivers/atari_s2.cpp

@@ -25,6 +25,7 @@ ToDo:
 #include "machine/genpin.h"
 
 #include "cpu/m6800/m6800.h"
+#include "machine/timer.h"
 #include "machine/watchdog.h"
 #include "sound/dac.h"
 #include "sound/volt_reg.h"

src/mame/drivers/babbage.cpp

@@ -24,6 +24,7 @@
 
 #include "emu.h"
 #include "cpu/z80/z80.h"
+#include "machine/timer.h"
 #include "machine/z80ctc.h"
 #include "machine/z80pio.h"
 #include "cpu/z80/z80daisy.h"

src/mame/drivers/bartop52.cpp

@@ -21,6 +21,7 @@
 #include "includes/atari400.h"
 
 #include "cpu/m6502/m6502.h"
+#include "machine/timer.h"
 #include "sound/spkrdev.h"
 #include "sound/pokey.h"
 #include "video/gtia.h"

src/mame/drivers/beezer.cpp

@@ -26,6 +26,7 @@
 #include "emu.h"
 #include "cpu/m6809/m6809.h"
 #include "machine/input_merger.h"
+#include "machine/timer.h"
 #include "machine/watchdog.h"
 #include "machine/bankdev.h"
 #include "machine/6522via.h"

src/mame/drivers/binbug.cpp

@@ -57,6 +57,7 @@
 #include "cpu/z80/z80.h"
 #include "imagedev/cassette.h"
 #include "imagedev/snapquik.h"
+#include "machine/timer.h"
 #include "machine/z80ctc.h"
 #include "machine/z80pio.h"
 #include "sound/wave.h"

src/mame/drivers/blitz68k.cpp

@@ -47,6 +47,7 @@ To Do:
 #include "emu.h"
 #include "cpu/m68000/m68000.h"
 #include "machine/nvram.h"
+#include "machine/timer.h"
 #include "sound/saa1099.h"
 #include "video/mc6845.h"
 #include "video/ramdac.h"

src/mame/drivers/bmcpokr.cpp

@@ -22,6 +22,7 @@ Other:  BMC B816140 (CPLD)
 #include "sound/okim6295.h"
 #include "machine/nvram.h"
 #include "machine/ticket.h"
+#include "machine/timer.h"
 #include "screen.h"
 #include "speaker.h"
 

src/mame/drivers/bml3.cpp

@@ -20,6 +20,7 @@
 #include "machine/6821pia.h"
 #include "machine/6850acia.h"
 #include "machine/clock.h"
+#include "machine/timer.h"
 #include "sound/2203intf.h"
 #include "sound/spkrdev.h"
 #include "sound/wave.h"

src/mame/drivers/by17.cpp

@@ -22,6 +22,7 @@ ToDo:
 #include "machine/genpin.h"
 #include "cpu/m6800/m6800.h"
 #include "machine/6821pia.h"
+#include "machine/timer.h"
 #include "by17.lh"
 #include "by17_pwerplay.lh"
 #include "by17_matahari.lh"

src/mame/drivers/by35.cpp

@@ -71,6 +71,7 @@ ToDo:
 
 #include "cpu/m6800/m6800.h"
 #include "machine/6821pia.h"
+#include "machine/timer.h"
 #include "sound/discrete.h"
 #include "render.h"
 #include "speaker.h"

src/mame/drivers/by6803.cpp

@@ -25,6 +25,7 @@ ToDo:
 #include "cpu/m6800/m6801.h"
 //#include "cpu/m6809/m6809.h"
 #include "machine/6821pia.h"
+#include "machine/timer.h"
 //#include "audio/midway.h"
 //#include "by6803.lh"
 

src/mame/drivers/byvid.cpp

@@ -42,6 +42,7 @@ ToDo (granny):
 #include "cpu/m6809/m6809.h"
 #include "machine/6821pia.h"
 #include "machine/nvram.h"
+#include "machine/timer.h"
 #include "sound/beep.h"
 #include "sound/dac.h"
 #include "sound/volt_reg.h"

src/mame/drivers/chesstrv.cpp

@@ -12,6 +12,7 @@
 
 #include "emu.h"
 #include "cpu/f8/f8.h"
+#include "machine/timer.h"
 #include "chesstrv.lh"
 #include "borisdpl.lh"
 

src/mame/drivers/chexx.cpp

@@ -18,6 +18,7 @@ Electro-mechanical bubble hockey games:
 #include "emu.h"
 #include "cpu/m6502/m6502.h"
 #include "machine/6522via.h"
+#include "machine/timer.h"
 #include "sound/ay8910.h"
 #include "sound/digitalk.h"
 #include "speaker.h"

src/mame/drivers/chinagat.cpp

@@ -76,6 +76,7 @@ Dip locations and factory settings verified with China Gate US manual.
 #include "cpu/m6809/m6809.h"
 #include "cpu/mcs48/mcs48.h"
 #include "cpu/z80/z80.h"
+#include "machine/timer.h"
 #include "sound/2203intf.h"
 #include "sound/okim6295.h"
 #include "sound/ym2151.h"

src/mame/drivers/compis.cpp

@@ -62,6 +62,7 @@
 #include "machine/pic8259.h"
 #include "machine/pit8253.h"
 #include "machine/ram.h"
+#include "machine/timer.h"
 #include "machine/z80dart.h"
 
 #define I80186_TAG      "ic1"

src/mame/drivers/coolridr.cpp

@@ -285,6 +285,7 @@ to the same bank as defined through A20.
 #include "cpu/m68000/m68000.h"
 #include "cpu/sh2/sh2.h"
 #include "machine/nvram.h"
+#include "machine/timer.h"
 #include "sound/scsp.h"
 #include "rendlay.h"
 #include "screen.h"

src/mame/drivers/csplayh5.cpp

@@ -36,6 +36,7 @@
 #include "machine/tmp68301.h"
 #include "machine/idectrl.h"
 #include "machine/idehd.h"
+#include "machine/timer.h"
 #include "video/v9938.h"
 #include "audio/nichisnd.h"
 

src/mame/drivers/cxgz80.cpp

@@ -25,6 +25,7 @@ Chess 2001:
 
 #include "emu.h"
 #include "cpu/z80/z80.h"
+#include "machine/timer.h"
 #include "sound/dac.h"
 #include "sound/volt_reg.h"
 #include "speaker.h"

src/mame/drivers/d6800.cpp

@@ -43,6 +43,7 @@
 #include "imagedev/cassette.h"
 #include "imagedev/snapquik.h"
 #include "machine/6821pia.h"
+#include "machine/timer.h"
 #include "sound/beep.h"
 #include "sound/wave.h"
 #include "screen.h"

src/mame/drivers/dblcrown.cpp

@@ -49,6 +49,7 @@
 #include "sound/ay8910.h"
 #include "machine/i8255.h"
 #include "machine/nvram.h"
+#include "machine/timer.h"
 #include "machine/watchdog.h"
 #include "screen.h"
 #include "speaker.h"

src/mame/drivers/ddealer.cpp

@@ -114,6 +114,7 @@
 
 #include "emu.h"
 #include "cpu/m68000/m68000.h"
+#include "machine/timer.h"
 #include "sound/2203intf.h"
 #include "screen.h"
 #include "speaker.h"

src/mame/drivers/ddenlovr.cpp

@@ -123,6 +123,7 @@ Notes:
 #include "machine/gen_latch.h"
 #include "machine/msm6242.h"
 #include "machine/nvram.h"
+#include "machine/timer.h"
 
 #include "speaker.h"
 

src/mame/drivers/dfruit.cpp

@@ -21,6 +21,7 @@
 #include "cpu/z80/z80.h"
 #include "machine/i8255.h"
 #include "machine/tc009xlvc.h"
+#include "machine/timer.h"
 #include "sound/2203intf.h"
 #include "screen.h"
 #include "speaker.h"

src/mame/drivers/didact.cpp

@@ -53,6 +53,7 @@
 #include "machine/74145.h"   // For the md6802 and e100
 #include "machine/clock.h"   // For candela
 #include "machine/ram.h"     // For candela
+#include "machine/timer.h"
 #include "machine/wd_fdc.h"  // For candela
 #include "video/dm9368.h"    // For the mp68a
 #include "video/mc6845.h"    // For candela

src/mame/drivers/dolphunk.cpp

@@ -83,6 +83,7 @@
 #include "emu.h"
 #include "cpu/s2650/s2650.h"
 #include "imagedev/cassette.h"
+#include "machine/timer.h"
 #include "sound/spkrdev.h"
 #include "sound/wave.h"
 #include "speaker.h"

src/mame/drivers/dooyong.cpp

@@ -77,6 +77,7 @@ are almost identical, except for much darker BG layer colors).
 #include "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
 #include "machine/gen_latch.h"
+#include "machine/timer.h"
 #include "sound/2203intf.h"
 #include "sound/okim6295.h"
 #include "sound/ym2151.h"

src/mame/drivers/dotrikun.cpp

@@ -28,6 +28,7 @@ TODO:
 
 #include "emu.h"
 #include "cpu/z80/z80.h"
+#include "machine/timer.h"
 #include "screen.h"
 
 #include "dotrikun.lh"

src/mame/drivers/dvk_kcgd.cpp

@@ -21,6 +21,7 @@
 #include "cpu/t11/t11.h"
 #include "machine/clock.h"
 #include "machine/ms7004.h"
+#include "machine/timer.h"
 #include "screen.h"
 
 

src/mame/drivers/dvk_ksm.cpp

@@ -59,6 +59,7 @@ ksm|DVK KSM,
 #include "machine/i8255.h"
 #include "machine/ms7004.h"
 #include "machine/pic8259.h"
+#include "machine/timer.h"
 #include "screen.h"
 
 

src/mame/drivers/eacc.cpp

@@ -52,6 +52,7 @@
 #include "eacc.lh"
 #include "machine/6821pia.h"
 #include "machine/nvram.h"
+#include "machine/timer.h"
 
 
 class eacc_state : public driver_device

src/mame/drivers/ecoinfr.cpp

@@ -41,6 +41,7 @@
 #include "emu.h"
 #include "cpu/z80/z80.h"
 #include "machine/i8251.h"
+#include "machine/timer.h"
 #include "ecoinfr.lh"
 #include "machine/steppers.h" // stepper motor
 #include "video/awpvid.h" // drawing reels

src/mame/drivers/exelv.cpp

@@ -57,6 +57,7 @@ TODO:
 #include "cpu/tms7000/tms7000.h"
 //#include "imagedev/cassette.h"
 #include "machine/spchrom.h"
+#include "machine/timer.h"
 #include "sound/tms5220.h"
 #include "video/tms3556.h"
 

src/mame/drivers/expro02.cpp

@@ -210,6 +210,7 @@ TODO:
 #include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 #include "machine/kaneko_hit.h"
+#include "machine/timer.h"
 #include "machine/watchdog.h"
 #include "video/kaneko_tmap.h"
 #include "video/kaneko_spr.h"

src/mame/drivers/fastinvaders.cpp

@@ -15,6 +15,7 @@ http://www.citylan.it/wiki/index.php/Fast_Invaders_%288275_version%29
 #include "cpu/i8085/i8085.h"
 #include "machine/i8257.h"
 #include "machine/pic8259.h"
+#include "machine/timer.h"
 #include "video/i8275.h"
 #include "video/mc6845.h"
 #include "screen.h"

src/mame/drivers/fc100.cpp

@@ -41,6 +41,7 @@ TODO:
 #include "machine/buffer.h"
 #include "machine/clock.h"
 #include "machine/i8251.h"
+#include "machine/timer.h"
 #include "sound/ay8910.h"
 #include "sound/wave.h"
 #include "video/mc6847.h"

src/mame/drivers/fidel6502.cpp

@@ -420,6 +420,7 @@ I/O is via TTL, very similar to Designer Display
 #include "machine/6821pia.h"
 #include "machine/i8255.h"
 #include "machine/nvram.h"
+#include "machine/timer.h"
 #include "sound/volt_reg.h"
 #include "speaker.h"
 

src/mame/drivers/fidel68k.cpp

@@ -163,6 +163,7 @@ B0000x-xxxxxx: see V7, -800000
 #include "cpu/m68000/m68000.h"
 #include "machine/ram.h"
 #include "machine/nvram.h"
+#include "machine/timer.h"
 #include "sound/volt_reg.h"
 #include "speaker.h"
 

src/mame/drivers/fidelz80.cpp

@@ -495,6 +495,7 @@ expect that the software reads these once on startup only.
 #include "cpu/mcs48/mcs48.h"
 #include "machine/i8255.h"
 #include "machine/i8243.h"
+#include "machine/timer.h"
 #include "machine/z80pio.h"
 #include "sound/beep.h"
 #include "sound/volt_reg.h"

src/mame/drivers/fireball.cpp

@@ -18,6 +18,7 @@
 
 #include "cpu/mcs51/mcs51.h"
 #include "machine/eepromser.h"
+#include "machine/timer.h"
 #include "sound/ay8910.h"
 #include "speaker.h"
 

src/mame/drivers/firebeat.cpp

@@ -146,6 +146,7 @@ Keyboard Mania 2nd Mix - dongle, program CD, audio CD
 #include "machine/intelfsh.h"
 #include "machine/midikbd.h"
 #include "machine/rtc65271.h"
+#include "machine/timer.h"
 #include "sound/cdda.h"
 #include "sound/rf5c400.h"
 #include "sound/ymz280b.h"

src/mame/drivers/firefox.cpp

@@ -37,6 +37,7 @@ but requires a special level III player for proper control. Video: CAV. Audio: A
 #include "machine/ldvp931.h"
 #include "machine/6532riot.h"
 #include "machine/gen_latch.h"
+#include "machine/timer.h"
 #include "machine/watchdog.h"
 #include "machine/x2212.h"
 #include "speaker.h"

src/mame/drivers/fk1.cpp

@@ -14,6 +14,7 @@
 #include "machine/pit8253.h"
 #include "machine/i8251.h"
 #include "machine/ram.h"
+#include "machine/timer.h"
 #include "screen.h"
 
 

src/mame/drivers/fp1100.cpp

@@ -55,6 +55,7 @@
 #include "emu.h"
 #include "cpu/z80/z80.h"
 #include "cpu/upd7810/upd7810.h"
+#include "machine/timer.h"
 #include "video/mc6845.h"
 #include "sound/beep.h"
 #include "bus/centronics/ctronics.h"

src/mame/drivers/fresh.cpp

@@ -23,6 +23,7 @@ rom 5 and 6 are prg roms
 
 #include "emu.h"
 #include "cpu/m68000/m68000.h"
+#include "machine/timer.h"
 #include "sound/ym2413.h"
 #include "screen.h"
 #include "speaker.h"

src/mame/drivers/galgames.cpp

@@ -37,6 +37,7 @@ Notes:
 #include "cpu/m68000/m68000.h"
 #include "cpu/pic16c5x/pic16c5x.h"
 #include "machine/eepromser.h"
+#include "machine/timer.h"
 #include "machine/watchdog.h"
 #include "sound/okim6295.h"
 #include "video/cesblit.h"

src/mame/drivers/galpani3.cpp

@@ -67,6 +67,7 @@ Dumped by Uki
 #include "cpu/m68000/m68000.h"
 #include "machine/eepromser.h"
 #include "machine/kaneko_toybox.h"
+#include "machine/timer.h"
 #include "machine/watchdog.h"
 #include "sound/ymz280b.h"
 #include "video/kaneko_grap2.h"

src/mame/drivers/gimix.cpp

@@ -33,6 +33,7 @@
 #include "machine/terminal.h"
 #include "machine/bankdev.h"
 #include "machine/ram.h"
+#include "machine/timer.h"
 #include "formats/flex_dsk.h"
 #include "softlist.h"
 

src/mame/drivers/glasgow.cpp

@@ -44,6 +44,7 @@ ToDo:
 
 #include "emu.h"
 #include "cpu/m68000/m68000.h"
+#include "machine/timer.h"
 #include "sound/beep.h"
 #include "speaker.h"
 

src/mame/drivers/goupil.cpp

@@ -28,6 +28,7 @@
 #include "machine/6522via.h"
 #include "machine/6850acia.h"
 #include "machine/i8279.h"
+#include "machine/timer.h"
 #include "machine/wd_fdc.h"
 #include "video/ef9364.h"
 #include "video/mc6845.h"

src/mame/drivers/gp_1.cpp

@@ -25,6 +25,7 @@ ToDo:
 #include "cpu/z80/z80.h"
 #include "cpu/z80/z80daisy.h"
 #include "machine/i8255.h"
+#include "machine/timer.h"
 #include "machine/z80ctc.h"
 #include "sound/sn76477.h"
 #include "speaker.h"

src/mame/drivers/gp_2.cpp

@@ -38,6 +38,7 @@ ToDo:
 #include "cpu/z80/z80.h"
 #include "cpu/z80/z80daisy.h"
 #include "machine/i8255.h"
+#include "machine/timer.h"
 #include "machine/z80ctc.h"
 #include "gp_2.lh"
 

src/mame/drivers/gunpey.cpp

@@ -190,6 +190,7 @@ Release:                         November 1999
 
 #include "emu.h"
 #include "cpu/nec/nec.h"
+#include "machine/timer.h"
 #include "sound/okim6295.h"
 #include "sound/ymz280b.h"
 #include "screen.h"

src/mame/drivers/h8.cpp

@@ -51,6 +51,7 @@ TODO:
 #include "cpu/i8085/i8085.h"
 #include "machine/i8251.h"
 #include "machine/clock.h"
+#include "machine/timer.h"
 #include "imagedev/cassette.h"
 #include "sound/beep.h"
 #include "sound/wave.h"

src/mame/drivers/h89.cpp

@@ -23,6 +23,7 @@
 #include "bus/rs232/rs232.h"
 #include "cpu/z80/z80.h"
 #include "machine/ins8250.h"
+#include "machine/timer.h"
 
 #define RS232_TAG "rs232"
 

src/mame/drivers/halleys.cpp

@@ -167,6 +167,7 @@ Video sync   6 F   Video sync                 Post   6 F   Post
 #include "cpu/m6809/m6809.h"
 #include "cpu/z80/z80.h"
 #include "machine/gen_latch.h"
+#include "machine/timer.h"
 #include "sound/ay8910.h"
 #include "screen.h"
 #include "speaker.h"

src/mame/drivers/hankin.cpp

@@ -20,6 +20,7 @@ ToDo:
 
 #include "cpu/m6800/m6800.h"
 #include "machine/6821pia.h"
+#include "machine/timer.h"
 #include "sound/dac.h"
 #include "sound/volt_reg.h"
 #include "speaker.h"

src/mame/drivers/harddriv.cpp

@@ -328,6 +328,7 @@ Notes:
 #include "includes/harddriv.h"
 
 #include "includes/slapstic.h"
+#include "machine/timer.h"
 #include "machine/watchdog.h"
 #include "sound/volt_reg.h"
 #include "speaker.h"

src/mame/drivers/hh_amis2k.cpp

@@ -25,6 +25,7 @@
 
 #include "emu.h"
 #include "cpu/amis2000/amis2000.h"
+#include "machine/timer.h"
 #include "sound/spkrdev.h"
 #include "speaker.h"
 

src/mame/drivers/hh_cop400.cpp

@@ -14,6 +14,7 @@
 #include "emu.h"
 #include "cpu/cop400/cop400.h"
 
+#include "machine/timer.h"
 #include "sound/spkrdev.h"
 #include "sound/dac.h"
 #include "sound/volt_reg.h"

src/mame/drivers/hh_hmcs40.cpp

@@ -93,6 +93,7 @@
 #include "cpu/hmcs40/hmcs40.h"
 #include "cpu/cop400/cop400.h"
 #include "machine/gen_latch.h"
+#include "machine/timer.h"
 #include "sound/spkrdev.h"
 #include "rendlay.h"
 #include "screen.h"

src/mame/drivers/hh_melps4.cpp

@@ -10,6 +10,7 @@
 #include "emu.h"
 
 #include "cpu/melps4/m58846.h"
+#include "machine/timer.h"
 #include "sound/spkrdev.h"
 
 #include "rendlay.h"

src/mame/drivers/hh_pic16.cpp

@@ -47,6 +47,7 @@
 #include "emu.h"
 #include "cpu/pic16c5x/pic16c5x.h"
 #include "machine/clock.h"
+#include "machine/timer.h"
 #include "sound/spkrdev.h"
 #include "speaker.h"
 

src/mame/drivers/hh_tms1k.cpp

@@ -142,6 +142,7 @@
 #include "includes/hh_tms1k.h"
 
 #include "machine/tms1024.h"
+#include "machine/timer.h"
 #include "sound/beep.h"
 #include "sound/s14001a.h"
 #include "sound/sn76477.h"

src/mame/drivers/hp64k.cpp

@@ -156,6 +156,7 @@
 #include "machine/com8116.h"
 #include "machine/i8251.h"
 #include "machine/rescap.h"
+#include "machine/timer.h"
 #include "machine/wd_fdc.h"
 #include "sound/beep.h"
 #include "video/i8275.h"

src/mame/drivers/hp80.cpp

@@ -11,6 +11,7 @@
 #include "screen.h"
 #include "cpu/capricorn/capricorn.h"
 #include "speaker.h"
+#include "machine/timer.h"
 #include "sound/beep.h"
 #include "sound/dac.h"
 #include "sound/volt_reg.h"

src/mame/drivers/hp9845.cpp

@@ -40,6 +40,7 @@
 
 #include "bus/hp_optroms/hp_optrom.h"
 #include "bus/hp9845_io/hp9845_io.h"
+#include "machine/timer.h"
 
 #include "render.h"
 #include "softlist.h"

src/mame/drivers/hvyunit.cpp

@@ -63,6 +63,7 @@ To Do:
 #include "cpu/z80/z80.h"
 #include "cpu/mcs51/mcs51.h"
 #include "machine/gen_latch.h"
+#include "machine/timer.h"
 #include "sound/2203intf.h"
 #include "video/kan_pand.h"
 #include "screen.h"