From 3cfd31d798780a03a8b31ff8e57a59227b35c267 Mon Sep 17 00:00:00 2001 From: AJR Date: Sat, 20 Nov 2021 18:10:46 -0500 Subject: Miscellaneous #include cleanup --- src/devices/bus/coco/coco_dwsock.h | 2 +- src/devices/bus/hp80_io/82900.cpp | 1 - src/devices/bus/hp80_io/82937.cpp | 1 - src/devices/bus/hp80_io/82939.cpp | 1 - src/devices/bus/hp9845_io/98034.cpp | 1 - src/devices/bus/hp_ipc_io/82919.cpp | 1 - src/devices/bus/nubus/nubus_image.h | 2 +- src/devices/cpu/cosmac/cosmac.cpp | 1 - src/devices/machine/mb89374.h | 2 +- src/devices/machine/s3c44b0.cpp | 2 -- src/emu/output.cpp | 2 -- src/mame/drivers/atlantis.cpp | 1 - src/mame/drivers/cms.cpp | 1 - src/mame/drivers/compc.cpp | 2 -- src/mame/drivers/europc.cpp | 2 -- src/mame/drivers/stv.cpp | 2 -- src/mame/includes/megadriv.h | 1 - src/mame/machine/m1comm.h | 2 +- src/mame/machine/m2comm.h | 2 +- src/mame/machine/s32comm.h | 2 +- 20 files changed, 6 insertions(+), 25 deletions(-) diff --git a/src/devices/bus/coco/coco_dwsock.h b/src/devices/bus/coco/coco_dwsock.h index 56e82e01f81..6cbcc106488 100644 --- a/src/devices/bus/coco/coco_dwsock.h +++ b/src/devices/bus/coco/coco_dwsock.h @@ -3,7 +3,7 @@ #ifndef MAME_BUS_COCO_COCO_DWSOCKH_H #define MAME_BUS_COCO_COCO_DWSOCKH_H -#include "osdcore.h" +#include "osdfile.h" //************************************************************************** // MACROS / CONSTANTS diff --git a/src/devices/bus/hp80_io/82900.cpp b/src/devices/bus/hp80_io/82900.cpp index a488f8bfce7..72b9c08c092 100644 --- a/src/devices/bus/hp80_io/82900.cpp +++ b/src/devices/bus/hp80_io/82900.cpp @@ -10,7 +10,6 @@ #include "emu.h" #include "82900.h" -#include "coreutil.h" // Debugging #define VERBOSE 0 diff --git a/src/devices/bus/hp80_io/82937.cpp b/src/devices/bus/hp80_io/82937.cpp index 087855f7bec..24fae1d68c6 100644 --- a/src/devices/bus/hp80_io/82937.cpp +++ b/src/devices/bus/hp80_io/82937.cpp @@ -18,7 +18,6 @@ #include "emu.h" #include "82937.h" -#include "coreutil.h" // Debugging #define VERBOSE 0 diff --git a/src/devices/bus/hp80_io/82939.cpp b/src/devices/bus/hp80_io/82939.cpp index 5633b3c45e2..4649758f753 100644 --- a/src/devices/bus/hp80_io/82939.cpp +++ b/src/devices/bus/hp80_io/82939.cpp @@ -16,7 +16,6 @@ #include "emu.h" #include "82939.h" -#include "coreutil.h" // Debugging #define VERBOSE 0 diff --git a/src/devices/bus/hp9845_io/98034.cpp b/src/devices/bus/hp9845_io/98034.cpp index d76101f003c..b629617a0da 100644 --- a/src/devices/bus/hp9845_io/98034.cpp +++ b/src/devices/bus/hp9845_io/98034.cpp @@ -15,7 +15,6 @@ #include "emu.h" #include "98034.h" -#include "coreutil.h" // Debugging //#define VERBOSE 1 diff --git a/src/devices/bus/hp_ipc_io/82919.cpp b/src/devices/bus/hp_ipc_io/82919.cpp index f9b5024d4c3..e5835ebafc7 100644 --- a/src/devices/bus/hp_ipc_io/82919.cpp +++ b/src/devices/bus/hp_ipc_io/82919.cpp @@ -14,7 +14,6 @@ #include "emu.h" #include "82919.h" -#include "coreutil.h" // Debugging #define VERBOSE 0 diff --git a/src/devices/bus/nubus/nubus_image.h b/src/devices/bus/nubus/nubus_image.h index c6dcf6db388..ae9257ac0c4 100644 --- a/src/devices/bus/nubus/nubus_image.h +++ b/src/devices/bus/nubus/nubus_image.h @@ -6,7 +6,7 @@ #pragma once #include "nubus.h" -#include "osdcore.h" +#include "osdfile.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/cpu/cosmac/cosmac.cpp b/src/devices/cpu/cosmac/cosmac.cpp index 978c4e76fc8..12babfb3bbe 100644 --- a/src/devices/cpu/cosmac/cosmac.cpp +++ b/src/devices/cpu/cosmac/cosmac.cpp @@ -18,7 +18,6 @@ TODO: #include "emu.h" #include "debugger.h" #include "cosmac.h" -#include "coreutil.h" // permit our enums to be saved ALLOW_SAVE_TYPE(cosmac_device::cosmac_mode); diff --git a/src/devices/machine/mb89374.h b/src/devices/machine/mb89374.h index c70781b49aa..4ea6878641f 100644 --- a/src/devices/machine/mb89374.h +++ b/src/devices/machine/mb89374.h @@ -35,7 +35,7 @@ Data Link Controller #pragma once -#include "osdcore.h" +#include "osdfile.h" class mb89374_device : public device_t, diff --git a/src/devices/machine/s3c44b0.cpp b/src/devices/machine/s3c44b0.cpp index bf3a1ed811c..746c6ba0e32 100644 --- a/src/devices/machine/s3c44b0.cpp +++ b/src/devices/machine/s3c44b0.cpp @@ -15,8 +15,6 @@ #include "cpu/arm7/arm7core.h" #include "screen.h" -#include "coreutil.h" - #include diff --git a/src/emu/output.cpp b/src/emu/output.cpp index 3fe5d7629a4..95b92cfc5d0 100644 --- a/src/emu/output.cpp +++ b/src/emu/output.cpp @@ -11,8 +11,6 @@ #include "emu.h" #include "output.h" -#include "coreutil.h" - #include diff --git a/src/mame/drivers/atlantis.cpp b/src/mame/drivers/atlantis.cpp index 0555fc2c328..3ebb3a5867d 100644 --- a/src/mame/drivers/atlantis.cpp +++ b/src/mame/drivers/atlantis.cpp @@ -52,7 +52,6 @@ #include "machine/pci-ide.h" #include "video/zeus2.h" #include "machine/timekpr.h" -#include "coreutil.h" #include "emupal.h" diff --git a/src/mame/drivers/cms.cpp b/src/mame/drivers/cms.cpp index f80fc0bf391..8c9b5389276 100644 --- a/src/mame/drivers/cms.cpp +++ b/src/mame/drivers/cms.cpp @@ -50,7 +50,6 @@ #include "machine/input_merger.h" #include "machine/m3002.h" #include "bus/acorn/bus.h" -#include "coreutil.h" class cms_state : public driver_device diff --git a/src/mame/drivers/compc.cpp b/src/mame/drivers/compc.cpp index 3b5eb7902fa..8e1888e5297 100644 --- a/src/mame/drivers/compc.cpp +++ b/src/mame/drivers/compc.cpp @@ -36,8 +36,6 @@ Options: 8087 FPU #include "machine/nvram.h" #include "machine/pckeybrd.h" -#include "coreutil.h" - class compc_state : public driver_device { diff --git a/src/mame/drivers/europc.cpp b/src/mame/drivers/europc.cpp index 67a531a092b..71d6450d5fd 100644 --- a/src/mame/drivers/europc.cpp +++ b/src/mame/drivers/europc.cpp @@ -38,8 +38,6 @@ #include "machine/pckeybrd.h" #include "machine/ram.h" -#include "coreutil.h" - class europc_pc_state : public driver_device { diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp index 4e8c9f3860e..24aad976904 100644 --- a/src/mame/drivers/stv.cpp +++ b/src/mame/drivers/stv.cpp @@ -54,8 +54,6 @@ #include "softlist.h" #include "speaker.h" -#include "coreutil.h" - #include "critcrsh.lh" #include "segabill.lh" #include "segabillv.lh" diff --git a/src/mame/includes/megadriv.h b/src/mame/includes/megadriv.h index ddaecb717e8..d480df8819e 100644 --- a/src/mame/includes/megadriv.h +++ b/src/mame/includes/megadriv.h @@ -5,7 +5,6 @@ #pragma once -#include "coreutil.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "sound/sn76496.h" diff --git a/src/mame/machine/m1comm.h b/src/mame/machine/m1comm.h index 96f5b13180b..451c6e9b436 100644 --- a/src/mame/machine/m1comm.h +++ b/src/mame/machine/m1comm.h @@ -7,7 +7,7 @@ #define M1COMM_SIMULATION -#include "osdcore.h" +#include "osdfile.h" #include "cpu/z80/z80.h" #include "machine/am9517a.h" #include "machine/mb89374.h" diff --git a/src/mame/machine/m2comm.h b/src/mame/machine/m2comm.h index 8b8e719faee..06b58c20242 100644 --- a/src/mame/machine/m2comm.h +++ b/src/mame/machine/m2comm.h @@ -7,7 +7,7 @@ #define M2COMM_SIMULATION -#include "osdcore.h" +#include "osdfile.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/mame/machine/s32comm.h b/src/mame/machine/s32comm.h index 933a3686c57..43ac35bd9c7 100644 --- a/src/mame/machine/s32comm.h +++ b/src/mame/machine/s32comm.h @@ -7,7 +7,7 @@ #define S32COMM_SIMULATION -#include "osdcore.h" +#include "osdfile.h" //************************************************************************** -- cgit v1.2.3