ds8874: move to video folder (led driver chip),

misc: remove folder from self #include

scripts/src/machine.lua

@@ -1337,18 +1337,6 @@ if (MACHINES["DS75161A"]~=null) then
 	}
 end
 
----------------------------------------------------
---
---@src/devices/machine/ds8874.h,MACHINES["DS8874"] = true
----------------------------------------------------
-
-if (MACHINES["DS8874"]~=null) then
-	files {
-		MAME_DIR .. "src/devices/machine/ds8874.cpp",
-		MAME_DIR .. "src/devices/machine/ds8874.h",
-	}
-end
-
 ---------------------------------------------------
 --
 --@src/devices/machine/e0516.h,MACHINES["E0516"] = true

scripts/src/video.lua

@@ -199,6 +199,18 @@ if (VIDEOS["DP8350"]~=null) then
 	}
 end
 
+---------------------------------------------------
+--
+--@src/devices/video/ds8874.h,VIDEOS["DS8874"] = true
+---------------------------------------------------
+
+if (VIDEOS["DS8874"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/video/ds8874.cpp",
+		MAME_DIR .. "src/devices/video/ds8874.h",
+	}
+end
+
 --------------------------------------------------
 --
 --@src/devices/video/ef9340_1.h,VIDEOS["EF9340_1"] = true

src/devices/machine/7200fifo.cpp

@@ -11,7 +11,7 @@
 **********************************************************************/
 
 #include "emu.h"
-#include "machine/7200fifo.h"
+#include "7200fifo.h"
 
 
 DEFINE_DEVICE_TYPE(IDT7200, idt7200_device, "idt7200", "IDT7200 FIFO (256x9)")

src/devices/machine/74123.cpp

@@ -9,7 +9,8 @@
  *****************************************************************************/
 
 #include "emu.h"
-#include "machine/74123.h"
+#include "74123.h"
+
 #include "machine/rescap.h"
 
 //#define VERBOSE 1

src/devices/machine/74148.cpp

@@ -41,7 +41,7 @@
 *****************************************************************************/
 
 #include "emu.h"
-#include "machine/74148.h"
+#include "74148.h"
 
 
 DEFINE_DEVICE_TYPE(TTL74148, ttl74148_device, "74148", "74148 TTL")

src/devices/machine/8042kbdc.cpp

@@ -10,7 +10,7 @@
 
 
 #include "emu.h"
-#include "machine/8042kbdc.h"
+#include "8042kbdc.h"
 
 
 /***************************************************************************

src/devices/machine/aicartc.cpp

@@ -10,7 +10,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/aicartc.h"
+#include "aicartc.h"
 
 
 

src/devices/machine/am9513.cpp

@@ -27,7 +27,7 @@
 **********************************************************************/
 
 #include "emu.h"
-#include "machine/am9513.h"
+#include "am9513.h"
 
 #define LOG_MODE  (1U << 1)
 #define LOG_INPUT (1U << 2)

src/devices/machine/am9519.cpp

@@ -4,7 +4,7 @@
 //TODO: rotating priority, cascade
 
 #include "emu.h"
-#include "machine/am9519.h"
+#include "am9519.h"
 
 //#define VERBOSE (LOG_GENERAL)
 #include "logmacro.h"

src/devices/machine/at.cpp

@@ -7,9 +7,11 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/at.h"
+#include "at.h"
+
 #include "cpu/i86/i286.h"
 #include "cpu/i386/i386.h"
+
 #include "softlist_dev.h"
 #include "speaker.h"
 

src/devices/machine/at28c16.cpp

@@ -8,7 +8,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/at28c16.h"
+#include "at28c16.h"
 
 #define AT28C16_DATA_BYTES ( 0x800 )
 #define AT28C16_ID_BYTES ( 0x20 )

src/devices/machine/at28c64b.cpp

@@ -8,7 +8,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/at28c64b.h"
+#include "at28c64b.h"
 
 static constexpr int AT28C64B_DATA_BYTES = 0x10000;
 static constexpr int AT28C64B_ID_BYTES = 0x40;

src/devices/machine/bl_handhelds_menucontrol.cpp

@@ -4,7 +4,7 @@
 // Menu controller, stores / increments menu position etc. used on handhelds that typically have BL on the boot screen (BaoBaoLong?)
 
 #include "emu.h"
-#include "machine/bl_handhelds_menucontrol.h"
+#include "bl_handhelds_menucontrol.h"
 
 DEFINE_DEVICE_TYPE(BL_HANDHELDS_MENUCONTROL, bl_handhelds_menucontrol_device, "blhandheldmenu", "BaoBaoLong Handhelds Menu Controller")
 

src/devices/machine/ch376.cpp

@@ -26,7 +26,7 @@
 
 #include "emu.h"
 #include "emuopts.h"
-#include "machine/ch376.h"
+#include "ch376.h"
 
 #include "multibyte.h"
 

src/devices/machine/chessmachine.cpp

@@ -32,7 +32,7 @@ TODO:
 */
 
 #include "emu.h"
-#include "machine/chessmachine.h"
+#include "chessmachine.h"
 
 
 DEFINE_DEVICE_TYPE(CHESSMACHINE, chessmachine_device, "chessmachine", "Tasc ChessMachine")

src/devices/machine/corvushd.cpp

@@ -65,7 +65,7 @@
 //
 
 #include "emu.h"
-#include "machine/corvushd.h"
+#include "corvushd.h"
 
 #define LOG_RESPONSES (1U << 1)
 

src/devices/machine/cs4031.cpp

@@ -26,7 +26,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/cs4031.h"
+#include "cs4031.h"
 
 #define LOG_REGISTER    (1U << 1)
 #define LOG_MEMORY      (1U << 2)

src/devices/machine/cs8221.cpp

@@ -16,7 +16,8 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/cs8221.h"
+#include "cs8221.h"
+
 #include "machine/ram.h"
 
 #define LOG_REGISTER    (1U << 1)

src/devices/machine/cs8900a.cpp

@@ -1,5 +1,4 @@
 // license:GPL-2.0+
-
 // copyright-holders:Spiro Trikaliotis, Rhett Aultman
 
 /*************************************************************************
@@ -13,7 +12,7 @@
  **************************************************************************/
 
 #include "emu.h"
-#include "machine/cs8900a.h"
+#include "cs8900a.h"
 
 #include <cstring>
 

src/devices/machine/cxd1095.cpp

@@ -17,7 +17,7 @@
 **********************************************************************/
 
 #include "emu.h"
-#include "machine/cxd1095.h"
+#include "cxd1095.h"
 
 //**************************************************************************
 //  GLOBAL VARIABLES

src/devices/machine/dp8573a.cpp

@@ -15,7 +15,7 @@
  */
 
 #include "emu.h"
-#include "machine/dp8573a.h"
+#include "dp8573a.h"
 
 #include "machine/timehelp.h"
 

src/devices/machine/ds1994.cpp

@@ -12,7 +12,7 @@
 // FIXME: convert to device_rtc_interface and remove <ctime>
 
 #include "emu.h"
-#include "machine/ds1994.h"
+#include "ds1994.h"
 
 #include <ctime>
 #include <tuple>

src/devices/machine/ds2401.cpp

@@ -9,7 +9,7 @@
  */
 
 #include "emu.h"
-#include "machine/ds2401.h"
+#include "ds2401.h"
 
 #include <cstdarg>
 

src/devices/machine/eeprom.cpp

@@ -9,7 +9,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/eeprom.h"
+#include "eeprom.h"
 
 #include "multibyte.h"
 

src/devices/machine/eeprompar.cpp

@@ -47,7 +47,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/eeprompar.h"
+#include "eeprompar.h"
 
 //#define VERBOSE 1
 #include "logmacro.h"

src/devices/machine/eepromser.cpp

@@ -112,7 +112,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/eepromser.h"
+#include "eepromser.h"
 
 
 

src/devices/machine/er1400.cpp

@@ -22,7 +22,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/er1400.h"
+#include "er1400.h"
 
 #define VERBOSE 0
 #include "logmacro.h"

src/devices/machine/er2055.cpp

@@ -12,7 +12,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/er2055.h"
+#include "er2055.h"
 
 #include "logmacro.h"
 

src/devices/machine/exorterm.cpp

@@ -17,7 +17,8 @@ TODO
 ****************************************************************************/
 
 #include "emu.h"
-#include "machine/exorterm.h"
+#include "exorterm.h"
+
 #include "speaker.h"
 
 #include "exorterm155.lh"

src/devices/machine/f4702.cpp

@@ -56,7 +56,7 @@
 ****************************************************************************/
 
 #include "emu.h"
-#include "machine/f4702.h"
+#include "f4702.h"
 
 
 //**************************************************************************

src/devices/machine/fdc37c665gt.cpp

@@ -9,7 +9,7 @@ SMSC FDC37C665GT High Performance Multi-Mode Parallel Port Super I/O Floppy Disk
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/fdc37c665gt.h"
+#include "fdc37c665gt.h"
 
 #define LOG_CONFIG (1U << 1) // Show global configuration changes
 

src/devices/machine/fdc37c93x.cpp

@@ -9,7 +9,7 @@ SMSC FDC37C93x Plug and Play Compatible Ultra I/O Controller
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/fdc37c93x.h"
+#include "fdc37c93x.h"
 
 #include "machine/pckeybrd.h"
 

src/devices/machine/genpc.cpp

@@ -4,11 +4,10 @@
 
     machine/genpc.cpp
 
-
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/genpc.h"
+#include "genpc.h"
 
 #include "imagedev/cassette.h"
 #include "machine/i8255.h"

src/devices/machine/i2cmem.cpp

@@ -23,7 +23,7 @@ there are two standard values.
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/i2cmem.h"
+#include "i2cmem.h"
 
 #include <cstdarg>
 

src/devices/machine/ie15.cpp

@@ -12,7 +12,7 @@
 ****************************************************************************/
 
 #include "emu.h"
-#include "machine/ie15.h"
+#include "ie15.h"
 
 #include "emupal.h"
 

src/devices/machine/ie15_kbd.cpp

@@ -8,7 +8,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/ie15_kbd.h"
+#include "ie15_kbd.h"
 
 #include "machine/keyboard.ipp"
 

src/devices/machine/ins8250.cpp

@@ -95,7 +95,7 @@ History:
 **********************************************************************/
 
 #include "emu.h"
-#include "machine/ins8250.h"
+#include "ins8250.h"
 
 #include <algorithm>
 

src/devices/machine/it8705f.cpp

@@ -11,7 +11,7 @@ TODO:
 **************************************************************************************************/
 
 #include "emu.h"
-#include "machine/it8705f.h"
+#include "it8705f.h"
 
 #include "formats/naslite_dsk.h"
 

src/devices/machine/ldp1000.cpp

@@ -12,7 +12,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/ldp1000.h"
+#include "ldp1000.h"
 
 #define DUMP_BCD 1
 #define FIFO_MAX 0x10

src/devices/machine/ldp1450.cpp

@@ -11,7 +11,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/ldp1450.h"
+#include "ldp1450.h"
 
 #define DUMP_BCD 1
 #define FIFO_MAX 0x10

src/devices/machine/lpci.cpp

@@ -2,7 +2,7 @@
 // copyright-holders:Olivier Galibert
 /***************************************************************************
 
-    machine/lpci.c
+    machine/lpci.cpp
 
     Legacy PCI bus
 
@@ -72,7 +72,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/lpci.h"
+#include "lpci.h"
 
 //#define VERBOSE 1
 #include "logmacro.h"

src/devices/machine/m6m80011ap.cpp

@@ -2,8 +2,7 @@
 // copyright-holders:Angelo Salese
 
 #include "emu.h"
-#include "machine/m6m80011ap.h"
-
+#include "m6m80011ap.h"
 
 
 //**************************************************************************

src/devices/machine/mb14241.cpp

@@ -7,7 +7,7 @@
 ****************************************************************************/
 
 #include "emu.h"
-#include "machine/mb14241.h"
+#include "mb14241.h"
 
 
 //-------------------------------------------------

src/devices/machine/mb8421.cpp

@@ -18,7 +18,7 @@
 **********************************************************************/
 
 #include "emu.h"
-#include "machine/mb8421.h"
+#include "mb8421.h"
 
 template class dual_port_mailbox_ram_base<u8, 10, 8>;
 template class dual_port_mailbox_ram_base<u8, 11, 8>;

src/devices/machine/mb87078.cpp

@@ -70,7 +70,7 @@
 *****************************************************************************/
 
 #include "emu.h"
-#include "machine/mb87078.h"
+#include "mb87078.h"
 
 
 /*****************************************************************************

src/devices/machine/mb89363b.cpp

@@ -77,7 +77,7 @@
 */
 
 #include "emu.h"
-#include "machine/mb89363b.h"
+#include "mb89363b.h"
 
 
 DEFINE_DEVICE_TYPE(MB89363B, mb89363b_device, "mb89363b", "Fujitsu MB89363B I/O")

src/devices/machine/mc146818.cpp

@@ -12,7 +12,7 @@
 *********************************************************************/
 
 #include "emu.h"
-#include "machine/mc146818.h"
+#include "mc146818.h"
 
 #include "coreutil.h"
 

src/devices/machine/mc68328.cpp

@@ -9,7 +9,7 @@
 **********************************************************************/
 
 #include "emu.h"
-#include "machine/mc68328.h"
+#include "mc68328.h"
 
 #define LOG_SCR         (1U << 1)
 #define LOG_CS_GRP      (1U << 2)

src/devices/machine/mm58174.cpp

@@ -18,7 +18,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/mm58174.h"
+#include "mm58174.h"
 
 enum
 {

src/devices/machine/mm58274c.cpp

@@ -21,7 +21,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/mm58274c.h"
+#include "mm58274c.h"
 
 enum
 {

src/devices/machine/mpu401.cpp

@@ -39,7 +39,8 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/mpu401.h"
+#include "mpu401.h"
+
 #include "bus/midi/midi.h"
 
 #define M6801_TAG   "mpu6801"

src/devices/machine/msm5001n.cpp

@@ -17,7 +17,7 @@ TODO:
 */
 
 #include "emu.h"
-#include "machine/msm5001n.h"
+#include "msm5001n.h"
 
 
 DEFINE_DEVICE_TYPE(MSM5001N, msm5001n_device, "msm5001n", "OKI MSM5001N LCD Watch")

src/devices/machine/msm6242.cpp

@@ -14,7 +14,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/msm6242.h"
+#include "msm6242.h"
 
 #define LOG_UNMAPPED    (1U << 1)
 #define LOG_IRQ         (1U << 2)

src/devices/machine/msm6253.cpp

@@ -7,7 +7,7 @@
 **********************************************************************/
 
 #include "emu.h"
-#include "machine/msm6253.h"
+#include "msm6253.h"
 
 //**************************************************************************
 //  GLOBAL VARIABLES

src/devices/machine/nvram.cpp

@@ -9,7 +9,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/nvram.h"
+#include "nvram.h"
 
 //**************************************************************************
 //  LIVE DEVICE

src/devices/machine/pc87306.cpp

@@ -11,9 +11,9 @@ TODO:
 **************************************************************************************************/
 
 #include "emu.h"
-#include "bus/isa/isa.h"
+#include "pc87306.h"
+
 //#include "machine/ds128x.h"
-#include "machine/pc87306.h"
 #include "machine/pckeybrd.h"
 
 #define LOG_WARN        (1U << 1) // Show warnings

src/devices/machine/pc_fdc.cpp

@@ -14,7 +14,8 @@
 **********************************************************************/
 
 #include "emu.h"
-#include "machine/pc_fdc.h"
+#include "pc_fdc.h"
+
 #include "imagedev/floppy.h"
 
 //#define VERBOSE (LOG_GENERAL)

src/devices/machine/pic8259.cpp

@@ -14,7 +14,7 @@
 **********************************************************************/
 
 #include "emu.h"
-#include "machine/pic8259.h"
+#include "pic8259.h"
 
 #define LOG_ICW     (1U << 1)
 #define LOG_OCW     (1U << 2)

src/devices/machine/pit8253.cpp

@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #include "emu.h"
-#include "machine/pit8253.h"
+#include "pit8253.h"
 
 
 /***************************************************************************

src/devices/machine/r10696.cpp

@@ -30,7 +30,7 @@
 **********************************************************************/
 
 #include "emu.h"
-#include "machine/r10696.h"
+#include "r10696.h"
 
 //#define VERBOSE 1
 #include "logmacro.h"

src/devices/machine/r10788.cpp

@@ -40,7 +40,7 @@
 **********************************************************************/
 
 #include "emu.h"
-#include "machine/r10788.h"
+#include "r10788.h"
 
 //#define VERBOSE 1
 #include "logmacro.h"

src/devices/machine/ra17xx.cpp

@@ -38,7 +38,7 @@
 **********************************************************************/
 
 #include "emu.h"
-#include "machine/ra17xx.h"
+#include "ra17xx.h"
 
 //#define VERBOSE 1
 #include "logmacro.h"

src/devices/machine/ripple_counter.cpp

@@ -15,7 +15,7 @@
 **********************************************************************/
 
 #include "emu.h"
-#include "machine/ripple_counter.h"
+#include "ripple_counter.h"
 
 //**************************************************************************
 //  GLOBAL VARIABLES

src/devices/machine/rp5h01.cpp

@@ -17,7 +17,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/rp5h01.h"
+#include "rp5h01.h"
 
 // this is the contents of an unprogrammed PROM
 uint8_t const rp5h01_device::s_initial_data[0x10] =

src/devices/machine/rstbuf.cpp

@@ -56,7 +56,7 @@
 **********************************************************************/
 
 #include "emu.h"
-#include "machine/rstbuf.h"
+#include "rstbuf.h"
 
 // device type definition
 DEFINE_DEVICE_TYPE(RST_POS_BUFFER, rst_pos_buffer_device, "rst_pos_buffer", "RST Interrupt Buffer (positive modification)")

src/devices/machine/rtc9701.cpp

@@ -12,7 +12,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/rtc9701.h"
+#include "rtc9701.h"
 
 
 ALLOW_SAVE_TYPE(rtc9701_device::state_t);

src/devices/machine/s2636.cpp

@@ -119,7 +119,7 @@
 *************************************************************/
 
 #include "emu.h"
-#include "machine/s2636.h"
+#include "s2636.h"
 
 #include "screen.h"
 

src/devices/machine/s3520cf.cpp

@@ -15,8 +15,7 @@ TODO:
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/s3520cf.h"
-
+#include "s3520cf.h"
 
 
 //**************************************************************************

src/devices/machine/s3c2400.cpp

@@ -9,7 +9,7 @@
 *******************************************************************************/
 
 #include "emu.h"
-#include "machine/s3c2400.h"
+#include "s3c2400.h"
 
 #include "cpu/arm7/arm7.h"
 #include "cpu/arm7/arm7core.h"

src/devices/machine/s3c2410.cpp

@@ -9,7 +9,7 @@
 *******************************************************************************/
 
 #include "emu.h"
-#include "machine/s3c2410.h"
+#include "s3c2410.h"
 
 #include "cpu/arm7/arm7.h"
 #include "cpu/arm7/arm7core.h"

src/devices/machine/s3c2440.cpp

@@ -9,7 +9,7 @@
 *******************************************************************************/
 
 #include "emu.h"
-#include "machine/s3c2440.h"
+#include "s3c2440.h"
 
 #include "cpu/arm7/arm7.h"
 #include "cpu/arm7/arm7core.h"

src/devices/machine/s3c44b0.cpp

@@ -9,7 +9,7 @@
 *******************************************************************************/
 
 #include "emu.h"
-#include "machine/s3c44b0.h"
+#include "s3c44b0.h"
 
 #include "cpu/arm7/arm7.h"
 #include "cpu/arm7/arm7core.h"

src/devices/machine/scc66470.cpp

@@ -20,6 +20,7 @@
 
 #include "emu.h"
 #include "scc66470.h"
+
 #include "screen.h"
 
 #define CSR_REG  (m_csr)

src/devices/machine/scc68070.cpp

@@ -23,7 +23,7 @@ TODO:
 *******************************************************************************/
 
 #include "emu.h"
-#include "machine/scc68070.h"
+#include "scc68070.h"
 
 #define LOG_I2C         (1U << 1)
 #define LOG_UART        (1U << 2)

src/devices/machine/sda2006.cpp

@@ -2,7 +2,7 @@
 // copyright-holders:Tomasz Slanina
 
 #include "emu.h"
-#include "machine/sda2006.h"
+#include "sda2006.h"
 
 //-------------------------------------------------
 //

src/devices/machine/sensorboard.cpp

@@ -57,7 +57,7 @@ sensor state instead.
 */
 
 #include "emu.h"
-#include "machine/sensorboard.h"
+#include "sensorboard.h"
 
 
 DEFINE_DEVICE_TYPE(SENSORBOARD, sensorboard_device, "sensorboard", "Sensorboard")

src/devices/machine/smpc.cpp

@@ -160,7 +160,7 @@ SMPC NVRAM contents:
 */
 
 #include "emu.h"
-#include "machine/smpc.h"
+#include "smpc.h"
 
 #include "screen.h"
 #include "coreutil.h"

src/devices/machine/stvcd.cpp

@@ -41,7 +41,7 @@ DASM notes:
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/stvcd.h"
+#include "stvcd.h"
 
 #include "coreutil.h"
 #include "multibyte.h"

src/devices/machine/swtpc8212.cpp

@@ -136,8 +136,10 @@ swtp|ct8212|southwest technical products ct8212,
 ****************************************************************************/
 
 #include "emu.h"
-#include "machine/swtpc8212.h"
+#include "swtpc8212.h"
+
 #include "machine/input_merger.h"
+
 #include "screen.h"
 #include "speaker.h"
 

src/devices/machine/tc009xlvc.cpp

@@ -13,7 +13,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/tc009xlvc.h"
+#include "tc009xlvc.h"
 
 #include "emupal.h"
 #include "screen.h"

src/devices/machine/te7750.cpp

@@ -170,7 +170,7 @@
 **********************************************************************/
 
 #include "emu.h"
-#include "machine/te7750.h"
+#include "te7750.h"
 
 //**************************************************************************
 //  GLOBAL VARIABLES

src/devices/machine/terminal.cpp

@@ -1,7 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic
 #include "emu.h"
-#include "machine/terminal.h"
+#include "terminal.h"
+
 #include "screen.h"
 #include "speaker.h"
 

src/devices/machine/ticket.cpp

@@ -2,14 +2,14 @@
 // copyright-holders:Aaron Giles
 /***************************************************************************
 
-    ticket.c
+    ticket.cpp
 
     Generic ticket dispensing device.
 
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/ticket.h"
+#include "ticket.h"
 
 
 //**************************************************************************

src/devices/machine/timekpr.cpp

@@ -15,7 +15,8 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/timekpr.h"
+#include "timekpr.h"
+
 #include "machine/timehelp.h"
 
 #define LOG_TICKS   (1U << 1)

src/devices/machine/timer.cpp

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

src/devices/machine/tmc0999.cpp

@@ -14,7 +14,7 @@ TODO:
 */
 
 #include "emu.h"
-#include "machine/tmc0999.h"
+#include "tmc0999.h"
 
 
 DEFINE_DEVICE_TYPE(TMC0999, tmc0999_device, "tmc0999", "TI TMC0999 RAM")

src/devices/machine/tms1024.cpp

@@ -11,7 +11,7 @@
 */
 
 #include "emu.h"
-#include "machine/tms1024.h"
+#include "tms1024.h"
 
 #define VERBOSE 0
 #include "logmacro.h"
@@ -19,6 +19,7 @@
 DEFINE_DEVICE_TYPE(TMS1024, tms1024_device, "tms1024", "TMS1024 I/O Expander")
 DEFINE_DEVICE_TYPE(TMS1025, tms1025_device, "tms1025", "TMS1025 I/O Expander")
 
+
 //-------------------------------------------------
 //  constructor
 //-------------------------------------------------
@@ -42,7 +43,6 @@ tms1025_device::tms1025_device(const machine_config &mconfig, const char *tag, d
 }
 
 
-
 //-------------------------------------------------
 //  device_start - device-specific startup
 //-------------------------------------------------
@@ -57,7 +57,6 @@ void tms1024_device::device_start()
 }
 
 
-
 //-------------------------------------------------
 //  handlers
 //-------------------------------------------------

src/devices/machine/tube.cpp

@@ -13,7 +13,7 @@
 **********************************************************************/
 
 #include "emu.h"
-#include "machine/tube.h"
+#include "tube.h"
 
 
 

src/devices/machine/upc82c710.cpp

@@ -7,7 +7,7 @@
 **********************************************************************/
 
 #include "emu.h"
-#include "machine/upc82c710.h"
+#include "upc82c710.h"
 
 #define LOG_CFG (1U << 1)
 #define LOG_FDC (1U << 2)

src/devices/machine/upc82c711.cpp

@@ -7,7 +7,7 @@
 **********************************************************************/
 
 #include "emu.h"
-#include "machine/upc82c711.h"
+#include "upc82c711.h"
 
 #define LOG_CFG (1U << 1)
 #define LOG_FDC (1U << 2)

src/devices/machine/upd4991a.cpp

@@ -18,7 +18,7 @@
 **************************************************************************************************/
 
 #include "emu.h"
-#include "machine/upd4991a.h"
+#include "upd4991a.h"
 
 
 //*************************************************************************************************

src/devices/machine/upd4992.cpp

@@ -13,8 +13,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/upd4992.h"
-
+#include "upd4992.h"
 
 
 //**************************************************************************

src/devices/machine/upd71071.cpp

@@ -88,7 +88,7 @@
 */
 
 #include "emu.h"
-#include "machine/upd71071.h"
+#include "upd71071.h"
 
 
 DEFINE_DEVICE_TYPE(UPD71071, upd71071_device, "upd71071", "NEC uPD71071 DMA Controller")

src/devices/machine/v3021.cpp

@@ -95,7 +95,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/v3021.h"
+#include "v3021.h"
 
 
 //**************************************************************************

src/devices/machine/vic_pl192.cpp

@@ -4,7 +4,7 @@
 // ARM PrimeCell PL190/PL192 VIC emulation
 
 #include "emu.h"
-#include "machine/vic_pl192.h"
+#include "vic_pl192.h"
 
 #define VERBOSE (LOG_GENERAL)
 #include "logmacro.h"

src/devices/machine/w83787f.cpp

@@ -10,8 +10,7 @@ Looks similar in design to National PC87306 (including similar reg names)
 **************************************************************************************************/
 
 #include "emu.h"
-#include "bus/isa/isa.h"
-#include "machine/w83787f.h"
+#include "w83787f.h"
 
 #define LOG_WARN        (1U << 1)
 

src/devices/machine/w83977tf.cpp

@@ -15,7 +15,7 @@ TODO:
 **************************************************************************************************/
 
 #include "emu.h"
-#include "machine/w83977tf.h"
+#include "w83977tf.h"
 
 //#include "machine/ds128x.h"
 #include "machine/pckeybrd.h"

src/devices/machine/wd1000.cpp

@@ -7,7 +7,7 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "machine/wd1000.h"
+#include "wd1000.h"
 
 //**************************************************************************
 //  DEVICE DEFINITIONS

src/devices/machine/wd11c00_17.cpp

@@ -7,7 +7,7 @@
 **********************************************************************/
 
 #include "emu.h"
-#include "machine/wd11c00_17.h"
+#include "wd11c00_17.h"
 
 #define VERBOSE 1
 #include "logmacro.h"

src/devices/machine/wd2010.cpp

@@ -36,7 +36,7 @@ UNIMPLEMENTED FEATURES :
  **********************************************************************/
 
 #include "emu.h"
-#include "machine/wd2010.h"
+#include "wd2010.h"
 
 #define VERBOSE 1
 #include "logmacro.h"