From 35c86ad6bf99ef88f0db78bc89cd3f8c27f3af0b Mon Sep 17 00:00:00 2001 From: Mihai Parparita Date: Fri, 3 Nov 2023 00:21:33 -0700 Subject: [PATCH] Clean up #includes Result of running IWYU (https://include-what-you-use.org/) and applying most of the suggestions about unncessary includes and forward declarations. Was motivated by observing that was being included in ppcopcodes.cpp even though it was unused (found while researching the use of threads), but seems generally good to help with build times and correctness. --- core/hostevents_sdl.cpp | 2 +- core/timermanager.cpp | 1 - cpu/ppc/poweropcodes.cpp | 10 ++-------- cpu/ppc/ppcexec.cpp | 2 -- cpu/ppc/ppcfpopcodes.cpp | 10 +--------- cpu/ppc/ppcmmu.cpp | 2 +- cpu/ppc/ppcmmu.h | 4 ++-- cpu/ppc/ppcopcodes.cpp | 9 --------- devices/common/adb/adb.cpp | 4 ---- devices/common/adb/adbbus.cpp | 1 + devices/common/adb/adbbus.h | 1 - devices/common/adb/adbdevice.cpp | 2 +- devices/common/adb/adbdevice.h | 3 --- devices/common/adb/adbkeyboard.cpp | 3 +++ devices/common/adb/adbkeyboard.h | 5 +++-- devices/common/adb/adbmouse.cpp | 3 +++ devices/common/adb/adbmouse.h | 3 ++- devices/common/ata/atabasedevice.cpp | 2 +- devices/common/ata/atabasedevice.h | 3 ++- devices/common/ata/atapibasedevice.h | 1 - devices/common/ata/atapicdrom.cpp | 3 ++- devices/common/ata/idechannel.cpp | 1 + devices/common/dbdma.cpp | 2 ++ devices/common/dbdma.h | 4 ++-- devices/common/i2c/i2cprom.cpp | 1 - devices/common/nvram.cpp | 1 - devices/common/ofnvram.cpp | 2 +- devices/common/ofnvram.h | 5 ++--- devices/common/pci/bandit.cpp | 1 - devices/common/pci/bandit.h | 2 +- devices/common/pci/dec21154.cpp | 1 - devices/common/pci/pcibridge.cpp | 4 +++- devices/common/pci/pcibridge.h | 3 --- devices/common/pci/pcidevice.cpp | 2 -- devices/common/pci/pcihost.cpp | 1 + devices/common/pci/pcihost.h | 2 -- devices/common/scsi/mesh.cpp | 1 + devices/common/scsi/mesh.h | 5 +++-- devices/common/scsi/sc53c94.cpp | 1 + devices/common/scsi/sc53c94.h | 5 +++-- devices/common/scsi/scsicdrom.cpp | 1 - devices/common/scsi/scsihd.cpp | 2 -- devices/common/scsi/scsihd.h | 1 - devices/common/viacuda.cpp | 2 +- devices/common/viacuda.h | 5 +++-- devices/deviceregistry.cpp | 1 - devices/deviceregistry.h | 3 ++- devices/floppy/superdrive.cpp | 1 - devices/floppy/swim3.cpp | 2 +- devices/floppy/swim3.h | 5 +++-- devices/ioctrl/amic.h | 12 +++++++----- devices/ioctrl/ohare.cpp | 1 + devices/memctrl/memctrlbase.cpp | 1 + devices/memctrl/memctrlbase.h | 4 ++-- devices/memctrl/mpc106.cpp | 3 --- devices/memctrl/mpc106.h | 2 -- devices/memctrl/platinum.cpp | 1 - devices/sound/awacs.cpp | 2 -- devices/sound/awacs.h | 5 +++-- devices/sound/burgundy.cpp | 1 - devices/storage/blockstoragedevice.cpp | 2 -- devices/video/atimach64gx.h | 1 - devices/video/atirage.cpp | 3 --- devices/video/pdmonboard.h | 4 +++- devices/video/videoctrl.cpp | 1 + devices/video/videoctrl.h | 5 +++-- machines/machinebase.cpp | 1 - machines/machinebase.h | 5 +++-- machines/machinecatalyst.cpp | 7 ++++--- machines/machinefactory.cpp | 4 ++-- machines/machinefactory.h | 6 ++---- machines/machinegazelle.cpp | 5 ++++- machines/machinegossamer.cpp | 4 ++-- machines/machinepdm.cpp | 2 ++ machines/machineproperties.cpp | 2 +- machines/machineproperties.h | 4 +--- machines/machinetnt.cpp | 5 ++--- machines/machineyosemite.cpp | 1 + main.cpp | 5 +---- utils/profiler.cpp | 1 - 80 files changed, 102 insertions(+), 139 deletions(-) diff --git a/core/hostevents_sdl.cpp b/core/hostevents_sdl.cpp index 355f6c9..1f245d0 100644 --- a/core/hostevents_sdl.cpp +++ b/core/hostevents_sdl.cpp @@ -20,8 +20,8 @@ along with this program. If not, see . */ #include +#include #include -#include #include EventManager* EventManager::event_manager; diff --git a/core/timermanager.cpp b/core/timermanager.cpp index 6dc8089..da11e8a 100644 --- a/core/timermanager.cpp +++ b/core/timermanager.cpp @@ -25,7 +25,6 @@ along with this program. If not, see . #include "timermanager.h" #include -#include TimerManager* TimerManager::timer_manager; diff --git a/cpu/ppc/poweropcodes.cpp b/cpu/ppc/poweropcodes.cpp index e78bd78..9721b6e 100644 --- a/cpu/ppc/poweropcodes.cpp +++ b/cpu/ppc/poweropcodes.cpp @@ -24,13 +24,7 @@ along with this program. If not, see . #include "ppcemu.h" #include "ppcmmu.h" -#include -#include -#include -#include -#include -#include -#include +#include // Affects the XER register's SO and OV Bits @@ -158,7 +152,7 @@ void dppc_interpreter::power_lscbx() { //ppc_result_d = 0xFFFFFFFF; bitmask = 0xFF000000; shift_amount = 24; - } + } else { bitmask >>= 8; shift_amount -= 8; diff --git a/cpu/ppc/ppcexec.cpp b/cpu/ppc/ppcexec.cpp index 5c926d0..013b9fc 100644 --- a/cpu/ppc/ppcexec.cpp +++ b/cpu/ppc/ppcexec.cpp @@ -25,14 +25,12 @@ along with this program. If not, see . #include "ppcmmu.h" #include -#include #include #include #include #include #include #include -#include using namespace std; using namespace dppc_interpreter; diff --git a/cpu/ppc/ppcfpopcodes.cpp b/cpu/ppc/ppcfpopcodes.cpp index 45e6223..1041fa1 100644 --- a/cpu/ppc/ppcfpopcodes.cpp +++ b/cpu/ppc/ppcfpopcodes.cpp @@ -23,18 +23,10 @@ along with this program. If not, see . #include "ppcemu.h" #include "ppcmmu.h" -#include -#include -#include +#include #include #include -#include #include -#include -#include -#include -#include -#include // Used for FP calcs uint64_t ppc_result64_b; diff --git a/cpu/ppc/ppcmmu.cpp b/cpu/ppc/ppcmmu.cpp index e9cb9ea..7287fea 100644 --- a/cpu/ppc/ppcmmu.cpp +++ b/cpu/ppc/ppcmmu.cpp @@ -22,13 +22,13 @@ along with this program. If not, see . /** @file PowerPC Memory Management Unit emulation. */ #include +#include #include #include "ppcemu.h" #include "ppcmmu.h" #include #include -#include #include #include diff --git a/cpu/ppc/ppcmmu.h b/cpu/ppc/ppcmmu.h index 3456189..3bb749e 100644 --- a/cpu/ppc/ppcmmu.h +++ b/cpu/ppc/ppcmmu.h @@ -26,10 +26,10 @@ along with this program. If not, see . #include -#include #include #include -#include + +class MMIODevice; /* Uncomment this to exhaustive MMU integrity checks. */ //#define MMU_INTEGRITY_CHECKS diff --git a/cpu/ppc/ppcopcodes.cpp b/cpu/ppc/ppcopcodes.cpp index babe83e..4dc5578 100644 --- a/cpu/ppc/ppcopcodes.cpp +++ b/cpu/ppc/ppcopcodes.cpp @@ -25,16 +25,7 @@ along with this program. If not, see . #include #include "ppcemu.h" #include "ppcmmu.h" -#include #include -#include -#include -#include -#include -#include -#include -#include -#include #include uint32_t crf_d; diff --git a/devices/common/adb/adb.cpp b/devices/common/adb/adb.cpp index 1f4aefa..bfec300 100644 --- a/devices/common/adb/adb.cpp +++ b/devices/common/adb/adb.cpp @@ -26,10 +26,6 @@ along with this program. If not, see . */ #include -#include - -#include -#include #if 0 #include diff --git a/devices/common/adb/adbbus.cpp b/devices/common/adb/adbbus.cpp index 4899439..c67a379 100644 --- a/devices/common/adb/adbbus.cpp +++ b/devices/common/adb/adbbus.cpp @@ -22,6 +22,7 @@ along with this program. If not, see . /** @file Apple Desktop Bus emulation. */ #include +#include #include #include diff --git a/devices/common/adb/adbbus.h b/devices/common/adb/adbbus.h index 2fc1941..baa91eb 100644 --- a/devices/common/adb/adbbus.h +++ b/devices/common/adb/adbbus.h @@ -24,7 +24,6 @@ along with this program. If not, see . #ifndef ADB_BUS_H #define ADB_BUS_H -#include #include #include diff --git a/devices/common/adb/adbdevice.cpp b/devices/common/adb/adbdevice.cpp index 41cfa3e..281322a 100644 --- a/devices/common/adb/adbdevice.cpp +++ b/devices/common/adb/adbdevice.cpp @@ -23,7 +23,7 @@ along with this program. If not, see . #include #include -#include +#include #include AdbDevice::AdbDevice(std::string name) { diff --git a/devices/common/adb/adbdevice.h b/devices/common/adb/adbdevice.h index 49f68c1..e015266 100644 --- a/devices/common/adb/adbdevice.h +++ b/devices/common/adb/adbdevice.h @@ -24,11 +24,8 @@ along with this program. If not, see . #ifndef ADB_DEVICE_H #define ADB_DEVICE_H -#include #include -#include -#include #include /** Common ADB device addresses/types. */ diff --git a/devices/common/adb/adbkeyboard.cpp b/devices/common/adb/adbkeyboard.cpp index ce81522..53e008e 100644 --- a/devices/common/adb/adbkeyboard.cpp +++ b/devices/common/adb/adbkeyboard.cpp @@ -22,7 +22,10 @@ along with this program. If not, see . /** @file Apple Desktop Bus Keyboard emulation. */ #include +#include #include +#include +#include AdbKeyboard::AdbKeyboard(std::string name) : AdbDevice(name) { EventManager::get_instance()->add_keyboard_handler(this, &AdbKeyboard::event_handler); diff --git a/devices/common/adb/adbkeyboard.h b/devices/common/adb/adbkeyboard.h index fbebd2b..c68201f 100644 --- a/devices/common/adb/adbkeyboard.h +++ b/devices/common/adb/adbkeyboard.h @@ -24,13 +24,14 @@ along with this program. If not, see . #ifndef ADB_KEYBOARD_H #define ADB_KEYBOARD_H -#include #include #include #include #include +class KeyboardEvent; + class AdbKeyboard : public AdbDevice { public: AdbKeyboard(std::string name); @@ -55,4 +56,4 @@ private: bool changed = false; }; -#endif // ADB_KEYBOARD_H \ No newline at end of file +#endif // ADB_KEYBOARD_H diff --git a/devices/common/adb/adbmouse.cpp b/devices/common/adb/adbmouse.cpp index 05e81cf..9bbd0d0 100644 --- a/devices/common/adb/adbmouse.cpp +++ b/devices/common/adb/adbmouse.cpp @@ -22,7 +22,10 @@ along with this program. If not, see . /** @file Apple Desktop Bus Mouse emulation. */ #include +#include #include +#include +#include AdbMouse::AdbMouse(std::string name) : AdbDevice(name) { EventManager::get_instance()->add_mouse_handler(this, &AdbMouse::event_handler); diff --git a/devices/common/adb/adbmouse.h b/devices/common/adb/adbmouse.h index 48e4b40..dcaaa68 100644 --- a/devices/common/adb/adbmouse.h +++ b/devices/common/adb/adbmouse.h @@ -24,13 +24,14 @@ along with this program. If not, see . #ifndef ADB_MOUSE_H #define ADB_MOUSE_H -#include #include #include #include #include +class MouseEvent; + class AdbMouse : public AdbDevice { public: AdbMouse(std::string name); diff --git a/devices/common/ata/atabasedevice.cpp b/devices/common/ata/atabasedevice.cpp index 7426b26..efa7727 100644 --- a/devices/common/ata/atabasedevice.cpp +++ b/devices/common/ata/atabasedevice.cpp @@ -23,7 +23,7 @@ along with this program. If not, see . #include #include -#include +#include #include #include diff --git a/devices/common/ata/atabasedevice.h b/devices/common/ata/atabasedevice.h index 497783c..aaf9363 100644 --- a/devices/common/ata/atabasedevice.h +++ b/devices/common/ata/atabasedevice.h @@ -25,13 +25,14 @@ along with this program. If not, see . #define ATA_BASE_DEVICE_H #include -#include #include #include "endianswap.h" #include #include +class IdeChannel; + class AtaBaseDevice : public HWComponent, public AtaInterface { public: diff --git a/devices/common/ata/atapibasedevice.h b/devices/common/ata/atapibasedevice.h index ec07290..c54225f 100644 --- a/devices/common/ata/atapibasedevice.h +++ b/devices/common/ata/atapibasedevice.h @@ -25,7 +25,6 @@ along with this program. If not, see . #define ATAPI_BASE_DEVICE_H #include -#include #include #include diff --git a/devices/common/ata/atapicdrom.cpp b/devices/common/ata/atapicdrom.cpp index 2cb9e34..0adcc09 100644 --- a/devices/common/ata/atapicdrom.cpp +++ b/devices/common/ata/atapicdrom.cpp @@ -23,6 +23,7 @@ along with this program. If not, see . #include #include +#include #include // ATAPI CDROM reuses SCSI commands (sic!) #include #include @@ -279,7 +280,7 @@ uint16_t AtapiCdrom::get_data() { // For Mode 1 CD-ROMs: int area_start; int area_end = 0; - + ret_data = 0xffff; if (this->sector_areas & 0x80) { diff --git a/devices/common/ata/idechannel.cpp b/devices/common/ata/idechannel.cpp index 8c1b9af..e544fb2 100644 --- a/devices/common/ata/idechannel.cpp +++ b/devices/common/ata/idechannel.cpp @@ -32,6 +32,7 @@ along with this program. If not, see . #include #include #include +#include #include #include diff --git a/devices/common/dbdma.cpp b/devices/common/dbdma.cpp index 95df6ad..41dd23d 100644 --- a/devices/common/dbdma.cpp +++ b/devices/common/dbdma.cpp @@ -24,6 +24,8 @@ along with this program. If not, see . #include #include #include +#include +#include #include #include diff --git a/devices/common/dbdma.h b/devices/common/dbdma.h index 36eeb9e..ae66674 100644 --- a/devices/common/dbdma.h +++ b/devices/common/dbdma.h @@ -30,10 +30,10 @@ along with this program. If not, see . #define DB_DMA_H #include -#include #include -#include + +class InterruptCtrl; /** DBDMA Channel registers offsets */ enum DMAReg : uint32_t { diff --git a/devices/common/i2c/i2cprom.cpp b/devices/common/i2c/i2cprom.cpp index 571236d..63dbfb2 100644 --- a/devices/common/i2c/i2cprom.cpp +++ b/devices/common/i2c/i2cprom.cpp @@ -26,7 +26,6 @@ along with this program. If not, see . #include #include -#include I2CProm::I2CProm(uint8_t dev_addr, int size) { diff --git a/devices/common/nvram.cpp b/devices/common/nvram.cpp index 04c398e..3910762 100644 --- a/devices/common/nvram.cpp +++ b/devices/common/nvram.cpp @@ -26,7 +26,6 @@ along with this program. If not, see . #include #include #include -#include #include /** @file Non-volatile RAM implementation. diff --git a/devices/common/ofnvram.cpp b/devices/common/ofnvram.cpp index b79cf76..bdb1d12 100644 --- a/devices/common/ofnvram.cpp +++ b/devices/common/ofnvram.cpp @@ -22,8 +22,8 @@ along with this program. If not, see . /** Utilities for working with Apple Open Firmware and CHRP NVRAM partitions. */ #include +#include #include -#include #include #include diff --git a/devices/common/ofnvram.h b/devices/common/ofnvram.h index 337192a..358e70e 100644 --- a/devices/common/ofnvram.h +++ b/devices/common/ofnvram.h @@ -24,15 +24,14 @@ along with this program. If not, see . #ifndef OF_NVRAM_H #define OF_NVRAM_H -#include - #include -#include #include #include #include #include +class NVram; + /** ========== Apple Open Firmware 1.x/2.x partition definitions. ========== */ #define OF_NVRAM_OFFSET 0x1800 #define OF_NVRAM_SIG 0x1275 diff --git a/devices/common/pci/bandit.cpp b/devices/common/pci/bandit.cpp index 0861e61..1d24da2 100644 --- a/devices/common/pci/bandit.cpp +++ b/devices/common/pci/bandit.cpp @@ -27,7 +27,6 @@ along with this program. If not, see . #include #include #include -#include #include diff --git a/devices/common/pci/bandit.h b/devices/common/pci/bandit.h index 1fe87f5..2e518e6 100644 --- a/devices/common/pci/bandit.h +++ b/devices/common/pci/bandit.h @@ -124,7 +124,7 @@ public: private: uint32_t base_addr; - unique_ptr my_pci_device; + std::unique_ptr my_pci_device; }; /** diff --git a/devices/common/pci/dec21154.cpp b/devices/common/pci/dec21154.cpp index 011ab70..46845ab 100644 --- a/devices/common/pci/dec21154.cpp +++ b/devices/common/pci/dec21154.cpp @@ -24,7 +24,6 @@ along with this program. If not, see . #include #include #include -#include #include #include diff --git a/devices/common/pci/pcibridge.cpp b/devices/common/pci/pcibridge.cpp index 75fb76a..e05a5a1 100644 --- a/devices/common/pci/pcibridge.cpp +++ b/devices/common/pci/pcibridge.cpp @@ -20,7 +20,9 @@ along with this program. If not, see . */ #include -#include +#include +#include +#include PCIBridge::PCIBridge(std::string name) : PCIDevice(name) { diff --git a/devices/common/pci/pcibridge.h b/devices/common/pci/pcibridge.h index d03654a..8beba48 100644 --- a/devices/common/pci/pcibridge.h +++ b/devices/common/pci/pcibridge.h @@ -22,14 +22,11 @@ along with this program. If not, see . #ifndef PCI_BRIDGE_H #define PCI_BRIDGE_H -#include #include #include #include #include -#include -#include /** PCI configuration space registers offsets */ enum { diff --git a/devices/common/pci/pcidevice.cpp b/devices/common/pci/pcidevice.cpp index af9d0b9..f261e3b 100644 --- a/devices/common/pci/pcidevice.cpp +++ b/devices/common/pci/pcidevice.cpp @@ -20,9 +20,7 @@ along with this program. If not, see . */ #include -#include #include -#include #include #include diff --git a/devices/common/pci/pcihost.cpp b/devices/common/pci/pcihost.cpp index 295c2d2..5930d9f 100644 --- a/devices/common/pci/pcihost.cpp +++ b/devices/common/pci/pcihost.cpp @@ -22,6 +22,7 @@ along with this program. If not, see . #include #include #include +#include #include #include #include diff --git a/devices/common/pci/pcihost.h b/devices/common/pci/pcihost.h index 5a2e264..edcca0b 100644 --- a/devices/common/pci/pcihost.h +++ b/devices/common/pci/pcihost.h @@ -23,10 +23,8 @@ along with this program. If not, see . #define PCI_HOST_H #include -#include #include -#include #include #include #include diff --git a/devices/common/scsi/mesh.cpp b/devices/common/scsi/mesh.cpp index 4c349e6..a3b3cca 100644 --- a/devices/common/scsi/mesh.cpp +++ b/devices/common/scsi/mesh.cpp @@ -24,6 +24,7 @@ along with this program. If not, see . #include #include #include +#include #include #include #include diff --git a/devices/common/scsi/mesh.h b/devices/common/scsi/mesh.h index 6f28dc0..2030f04 100644 --- a/devices/common/scsi/mesh.h +++ b/devices/common/scsi/mesh.h @@ -25,12 +25,13 @@ along with this program. If not, see . #define MESH_H #include -#include -#include #include #include +class InterruptCtrl; +class ScsiBus; + // Chip ID returned by the MESH cell inside the Heathrow ASIC #define HeathrowMESHID 4 diff --git a/devices/common/scsi/sc53c94.cpp b/devices/common/scsi/sc53c94.cpp index b88fa01..5ba5283 100644 --- a/devices/common/scsi/sc53c94.cpp +++ b/devices/common/scsi/sc53c94.cpp @@ -22,6 +22,7 @@ along with this program. If not, see . /** @file NCR53C94/Am53CF94 SCSI controller emulation. */ #include +#include #include #include #include diff --git a/devices/common/scsi/sc53c94.h b/devices/common/scsi/sc53c94.h index ed95b3b..747d51d 100644 --- a/devices/common/scsi/sc53c94.h +++ b/devices/common/scsi/sc53c94.h @@ -29,13 +29,14 @@ along with this program. If not, see . #ifndef SC_53C94_H #define SC_53C94_H -#include #include -#include #include #include +class DmaBidirChannel; +class InterruptCtrl; + #define DATA_FIFO_MAX 16 /** 53C94 read registers */ diff --git a/devices/common/scsi/scsicdrom.cpp b/devices/common/scsi/scsicdrom.cpp index 515f192..5e74c8d 100644 --- a/devices/common/scsi/scsicdrom.cpp +++ b/devices/common/scsi/scsicdrom.cpp @@ -30,7 +30,6 @@ along with this program. If not, see . #include #include -#include #include using namespace std; diff --git a/devices/common/scsi/scsihd.cpp b/devices/common/scsi/scsihd.cpp index f025c50..695636e 100644 --- a/devices/common/scsi/scsihd.cpp +++ b/devices/common/scsi/scsihd.cpp @@ -25,13 +25,11 @@ along with this program. If not, see . #include #include #include -#include #include #include #include #include -#include #include #define HDD_SECTOR_SIZE 512 diff --git a/devices/common/scsi/scsihd.h b/devices/common/scsi/scsihd.h index 3d57f2b..98f7118 100644 --- a/devices/common/scsi/scsihd.h +++ b/devices/common/scsi/scsihd.h @@ -29,7 +29,6 @@ along with this program. If not, see . #include #include #include -#include #include class ScsiHardDisk : public ScsiDevice { diff --git a/devices/common/viacuda.cpp b/devices/common/viacuda.cpp index dd804e5..da91f32 100644 --- a/devices/common/viacuda.cpp +++ b/devices/common/viacuda.cpp @@ -24,6 +24,7 @@ along with this program. If not, see . #include #include +#include #include #include #include @@ -32,7 +33,6 @@ along with this program. If not, see . #include #include -#include #include #include diff --git a/devices/common/viacuda.h b/devices/common/viacuda.h index 1422690..45079d6 100644 --- a/devices/common/viacuda.h +++ b/devices/common/viacuda.h @@ -43,14 +43,15 @@ along with this program. If not, see . #ifndef VIACUDA_H #define VIACUDA_H -#include #include -#include #include #include #include +class AdbBus; +class InterruptCtrl; + #define VIA_CLOCK_HZ 783360 /** VIA register offsets. */ diff --git a/devices/deviceregistry.cpp b/devices/deviceregistry.cpp index 3c285ef..ef35f7e 100644 --- a/devices/deviceregistry.cpp +++ b/devices/deviceregistry.cpp @@ -24,7 +24,6 @@ along with this program. If not, see . #include #include -#include #include bool DeviceRegistry::add(const std::string name, DeviceDescription desc) diff --git a/devices/deviceregistry.h b/devices/deviceregistry.h index 30e0fea..28c114a 100644 --- a/devices/deviceregistry.h +++ b/devices/deviceregistry.h @@ -24,7 +24,6 @@ along with this program. If not, see . #ifndef DEVICE_REGISTRY_H #define DEVICE_REGISTRY_H -#include #include #include @@ -33,6 +32,8 @@ along with this program. If not, see . #include #include +class HWComponent; + typedef std::function ()> CreateFunc; struct DeviceDescription { diff --git a/devices/floppy/superdrive.cpp b/devices/floppy/superdrive.cpp index b57b40b..db1aff6 100644 --- a/devices/floppy/superdrive.cpp +++ b/devices/floppy/superdrive.cpp @@ -27,7 +27,6 @@ along with this program. If not, see . #include #include -#include using namespace MacSuperdrive; diff --git a/devices/floppy/swim3.cpp b/devices/floppy/swim3.cpp index 3b8c886..5f1fc6e 100644 --- a/devices/floppy/swim3.cpp +++ b/devices/floppy/swim3.cpp @@ -23,6 +23,7 @@ along with this program. If not, see . #include #include +#include #include #include #include @@ -31,7 +32,6 @@ along with this program. If not, see . #include #include -#include #include #include diff --git a/devices/floppy/swim3.h b/devices/floppy/swim3.h index 156dfb6..e12ccc6 100644 --- a/devices/floppy/swim3.h +++ b/devices/floppy/swim3.h @@ -24,14 +24,15 @@ along with this program. If not, see . #ifndef SWIM3_H #define SWIM3_H -#include #include -#include #include #include #include +class DmaBidirChannel; +class InterruptCtrl; + /** SWIM3 registers offsets. */ namespace Swim3 { diff --git a/devices/ioctrl/amic.h b/devices/ioctrl/amic.h index df91a0c..7ba8c8a 100644 --- a/devices/ioctrl/amic.h +++ b/devices/ioctrl/amic.h @@ -24,13 +24,9 @@ along with this program. If not, see . #ifndef AMIC_H #define AMIC_H +#include #include #include -#include -#include -#include -#include -#include #include #include #include @@ -38,6 +34,12 @@ along with this program. If not, see . #include #include +class EsccController; +class MaceController; +class Sc53C94; +class ViaCuda; +namespace Swim3 { class Swim3Ctrl; } + /** Interrupt related constants. */ /** CPU interrupt register bits. */ diff --git a/devices/ioctrl/ohare.cpp b/devices/ioctrl/ohare.cpp index 4695530..ed34ba8 100644 --- a/devices/ioctrl/ohare.cpp +++ b/devices/ioctrl/ohare.cpp @@ -20,6 +20,7 @@ along with this program. If not, see . */ #include +#include #include #include #include diff --git a/devices/memctrl/memctrlbase.cpp b/devices/memctrl/memctrlbase.cpp index 09ea7a9..4d64501 100644 --- a/devices/memctrl/memctrlbase.cpp +++ b/devices/memctrl/memctrlbase.cpp @@ -20,6 +20,7 @@ along with this program. If not, see . */ #include +#include #include // to shut up MSVC errors (: #include diff --git a/devices/memctrl/memctrlbase.h b/devices/memctrl/memctrlbase.h index 209bff1..2cda8fd 100644 --- a/devices/memctrl/memctrlbase.h +++ b/devices/memctrl/memctrlbase.h @@ -22,12 +22,12 @@ along with this program. If not, see . #ifndef MEMORY_CONTROLLER_BASE_H #define MEMORY_CONTROLLER_BASE_H -#include - #include #include #include +class MMIODevice; + // Common DRAM capacities. enum { DRAM_CAP_2MB = (1 << 21), diff --git a/devices/memctrl/mpc106.cpp b/devices/memctrl/mpc106.cpp index 461bd73..055fd8c 100644 --- a/devices/memctrl/mpc106.cpp +++ b/devices/memctrl/mpc106.cpp @@ -22,17 +22,14 @@ along with this program. If not, see . /** MPC106 (Grackle) emulation. */ #include -#include #include #include #include #include -#include #include #include #include -#include MPC106::MPC106() : MemCtrlBase(), PCIDevice("Grackle"), PCIHost() { diff --git a/devices/memctrl/mpc106.h b/devices/memctrl/mpc106.h index 252ae3d..f0e4623 100644 --- a/devices/memctrl/mpc106.h +++ b/devices/memctrl/mpc106.h @@ -34,14 +34,12 @@ along with this program. If not, see . #ifndef MPC106_H #define MPC106_H -#include #include #include #include #include #include -#include /** Grackle configuration space registers. */ enum GrackleReg : uint32_t { diff --git a/devices/memctrl/platinum.cpp b/devices/memctrl/platinum.cpp index 98c0d9f..7e275cf 100644 --- a/devices/memctrl/platinum.cpp +++ b/devices/memctrl/platinum.cpp @@ -27,7 +27,6 @@ along with this program. If not, see . #include #include -#include using namespace Platinum; diff --git a/devices/sound/awacs.cpp b/devices/sound/awacs.cpp index 241fc50..254b55d 100644 --- a/devices/sound/awacs.cpp +++ b/devices/sound/awacs.cpp @@ -32,9 +32,7 @@ along with this program. If not, see . #include #include -#include #include -#include AwacsBase::AwacsBase(std::string name) { diff --git a/devices/sound/awacs.h b/devices/sound/awacs.h index c3f28cd..f701016 100644 --- a/devices/sound/awacs.h +++ b/devices/sound/awacs.h @@ -28,15 +28,16 @@ along with this program. If not, see . #ifndef AWAC_H #define AWAC_H -#include #include #include -#include #include #include #include +class DmaOutChannel; +class SoundServer; + /** Base class for the AWACs codecs. */ class AwacsBase : public HWComponent { public: diff --git a/devices/sound/burgundy.cpp b/devices/sound/burgundy.cpp index 3edac7c..97be2d8 100644 --- a/devices/sound/burgundy.cpp +++ b/devices/sound/burgundy.cpp @@ -27,7 +27,6 @@ along with this program. If not, see . #include #include #include -#include BurgundyCodec::BurgundyCodec(std::string name) : MacioSndCodec(name) { diff --git a/devices/storage/blockstoragedevice.cpp b/devices/storage/blockstoragedevice.cpp index 7a542ef..52379b3 100644 --- a/devices/storage/blockstoragedevice.cpp +++ b/devices/storage/blockstoragedevice.cpp @@ -22,9 +22,7 @@ along with this program. If not, see . /** @file Block storage device implementation. */ #include -#include -#include #include using namespace std; diff --git a/devices/video/atimach64gx.h b/devices/video/atimach64gx.h index c58e0ef..d5efac6 100644 --- a/devices/video/atimach64gx.h +++ b/devices/video/atimach64gx.h @@ -25,7 +25,6 @@ along with this program. If not, see . #define ATI_MACH64_GX_H #include -#include #include #include diff --git a/devices/video/atirage.cpp b/devices/video/atirage.cpp index 4ab00d2..1d038b0 100644 --- a/devices/video/atirage.cpp +++ b/devices/video/atirage.cpp @@ -29,10 +29,7 @@ along with this program. If not, see . #include #include -#include -#include #include -#include /* Mach64 post dividers. */ static const int mach64_post_div[8] = { diff --git a/devices/video/pdmonboard.h b/devices/video/pdmonboard.h index 57a2638..2209804 100644 --- a/devices/video/pdmonboard.h +++ b/devices/video/pdmonboard.h @@ -24,11 +24,13 @@ along with this program. If not, see . #ifndef PDM_ONBOARD_H #define PDM_ONBOARD_H -#include #include #include +class HMC; +class InterruptCtrl; + #define PDM_VMODE_OFF 0x1F /** Max. size of our framebuffer in bytes (RGB 13-inch, 16 bpp) */ diff --git a/devices/video/videoctrl.cpp b/devices/video/videoctrl.cpp index 1ea902f..da2ff9c 100644 --- a/devices/video/videoctrl.cpp +++ b/devices/video/videoctrl.cpp @@ -22,6 +22,7 @@ along with this program. If not, see . /** @file Video Conroller base class implementation. */ #include +#include #include #include diff --git a/devices/video/videoctrl.h b/devices/video/videoctrl.h index 6442fe8..3fd6be7 100644 --- a/devices/video/videoctrl.h +++ b/devices/video/videoctrl.h @@ -24,13 +24,14 @@ along with this program. If not, see . #ifndef VIDEO_CTRL_H #define VIDEO_CTRL_H -#include -#include #include #include #include +class InterruptCtrl; +class WindowEvent; + class VideoCtrlBase { public: VideoCtrlBase(int width = 640, int height = 480); diff --git a/machines/machinebase.cpp b/machines/machinebase.cpp index 82dae6b..8f33a6f 100644 --- a/machines/machinebase.cpp +++ b/machines/machinebase.cpp @@ -24,7 +24,6 @@ along with this program. If not, see . #include #include -#include #include std::unique_ptr gMachineObj = 0; diff --git a/machines/machinebase.h b/machines/machinebase.h index 6eed511..a2df568 100644 --- a/machines/machinebase.h +++ b/machines/machinebase.h @@ -27,12 +27,13 @@ along with this program. If not, see . #ifndef MACHINE_BASE_H #define MACHINE_BASE_H -#include - #include #include #include +class HWComponent; +enum HWCompType : uint64_t; + class MachineBase { public: MachineBase(std::string name); diff --git a/machines/machinecatalyst.cpp b/machines/machinecatalyst.cpp index 7958359..c2199ad 100644 --- a/machines/machinecatalyst.cpp +++ b/machines/machinecatalyst.cpp @@ -22,15 +22,16 @@ along with this program. If not, see . /** @file Constructs a Catalyst (Power Macintosh 7200) machine. */ #include -#include -#include +#include +#include +#include #include #include #include #include #include +#include -#include #include int initialize_catalyst(std::string& id) diff --git a/machines/machinefactory.cpp b/machines/machinefactory.cpp index f6b9fcc..78492e2 100644 --- a/machines/machinefactory.cpp +++ b/machines/machinefactory.cpp @@ -24,6 +24,7 @@ along with this program. If not, see . Author: Max Poliakovski */ +#include #include #include #include @@ -36,11 +37,10 @@ along with this program. If not, see . #include #include #include -#include +#include #include #include #include -#include #include #include diff --git a/machines/machinefactory.h b/machines/machinefactory.h index e5d6e58..565981a 100644 --- a/machines/machinefactory.h +++ b/machines/machinefactory.h @@ -27,18 +27,16 @@ along with this program. If not, see . #ifndef MACHINE_FACTORY_H #define MACHINE_FACTORY_H -#include -#include #include -#include -#include #include #include #include using namespace std; +struct DeviceDescription; + struct MachineDescription { string name; string description; diff --git a/machines/machinegazelle.cpp b/machines/machinegazelle.cpp index 064e92d..932a41f 100644 --- a/machines/machinegazelle.cpp +++ b/machines/machinegazelle.cpp @@ -24,12 +24,15 @@ along with this program. If not, see . */ #include +#include #include +#include #include -#include #include #include #include +#include +#include // TODO: move it to /cpu/ppc int get_cpu_pll_value(const uint64_t cpu_freq_hz) { diff --git a/machines/machinegossamer.cpp b/machines/machinegossamer.cpp index 9c528d0..9284633 100644 --- a/machines/machinegossamer.cpp +++ b/machines/machinegossamer.cpp @@ -25,10 +25,11 @@ along with this program. If not, see . */ #include +#include +#include #include #include #include -#include #include #include #include @@ -37,7 +38,6 @@ along with this program. If not, see . #include #include -#include #include // Bit definitions for the Gossamer system register at 0xFF000004 diff --git a/machines/machinepdm.cpp b/machines/machinepdm.cpp index d2de4eb..be91e70 100644 --- a/machines/machinepdm.cpp +++ b/machines/machinepdm.cpp @@ -25,7 +25,9 @@ along with this program. If not, see . */ #include +#include #include +#include #include #include #include diff --git a/machines/machineproperties.cpp b/machines/machineproperties.cpp index 8ae7d55..107b63a 100644 --- a/machines/machineproperties.cpp +++ b/machines/machineproperties.cpp @@ -20,8 +20,8 @@ along with this program. If not, see . */ #include "machineproperties.h" +#include -#include #include #include #include diff --git a/machines/machineproperties.h b/machines/machineproperties.h index 7805b91..52f20b1 100644 --- a/machines/machineproperties.h +++ b/machines/machineproperties.h @@ -19,14 +19,12 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include - #include #include #include -#include #include #include +#include #ifndef MACHINE_PROPERTIES_H #define MACHINE_PROPERTIES_H diff --git a/machines/machinetnt.cpp b/machines/machinetnt.cpp index 36a8e42..01942e5 100644 --- a/machines/machinetnt.cpp +++ b/machines/machinetnt.cpp @@ -22,15 +22,14 @@ along with this program. If not, see . /** @file Constructs a TNT (Power Macintosh 7500, 8500 etc) machine. */ #include -#include -#include +#include +#include #include #include #include #include #include -#include #include int initialize_tnt(std::string& id) diff --git a/machines/machineyosemite.cpp b/machines/machineyosemite.cpp index a60ff33..ef6606a 100644 --- a/machines/machineyosemite.cpp +++ b/machines/machineyosemite.cpp @@ -25,6 +25,7 @@ along with this program. If not, see . #include #include #include +#include #include #include diff --git a/main.cpp b/main.cpp index dad9947..c6103ff 100644 --- a/main.cpp +++ b/main.cpp @@ -26,18 +26,15 @@ along with this program. If not, see . #include #include #include +#include #include -#include #include #include #include #include #include -#include #include -#include -#include #include #include diff --git a/utils/profiler.cpp b/utils/profiler.cpp index 708bc24..65dac50 100644 --- a/utils/profiler.cpp +++ b/utils/profiler.cpp @@ -21,7 +21,6 @@ along with this program. If not, see . #include "profiler.h" #include -#include #include /** global profiler object */