Eliminate file-relative paths.

2026-04-19 19:16:34 +00:00 · 2025-02-28 12:30:25 -05:00
parent 091d19caf5
commit 0823fc32fe
143 changed files with 609 additions and 610 deletions
@@ -8,8 +8,8 @@

 #pragma once

-#include "../../../../Machines/DynamicMachine.hpp"
-#include "../../../../Configurable/Configurable.hpp"
+#include "Machines/DynamicMachine.hpp"
+#include "Configurable/Configurable.hpp"

 #include <memory>
 #include <vector>
@@ -8,7 +8,7 @@

 #pragma once

-#include "../../../../Machines/DynamicMachine.hpp"
+#include "Machines/DynamicMachine.hpp"

 #include <memory>
 #include <vector>
@@ -8,8 +8,8 @@

 #pragma once

-#include "../../../../Machines/DynamicMachine.hpp"
-#include "../../../../Machines/KeyboardMachine.hpp"
+#include "Machines/DynamicMachine.hpp"
+#include "Machines/KeyboardMachine.hpp"

 #include <memory>
 #include <vector>
@@ -8,8 +8,8 @@

 #pragma once

-#include "../../../../Machines/MediaTarget.hpp"
-#include "../../../../Machines/DynamicMachine.hpp"
+#include "Machines/MediaTarget.hpp"
+#include "Machines/DynamicMachine.hpp"

 #include <memory>
 #include <vector>
@@ -8,9 +8,9 @@

 #pragma once

-#include "../../../../Concurrency/AsyncTaskQueue.hpp"
-#include "../../../../Machines/MachineTypes.hpp"
-#include "../../../../Machines/DynamicMachine.hpp"
+#include "Concurrency/AsyncTaskQueue.hpp"
+#include "Machines/MachineTypes.hpp"
+#include "Machines/DynamicMachine.hpp"

 #include "MultiSpeaker.hpp"

@@ -8,8 +8,8 @@

 #pragma once

-#include "../../../../Machines/DynamicMachine.hpp"
-#include "../../../../Outputs/Speaker/Speaker.hpp"
+#include "Machines/DynamicMachine.hpp"
+#include "Outputs/Speaker/Speaker.hpp"

 #include <memory>
 #include <mutex>
@@ -7,7 +7,7 @@
 //

 #include "MultiMachine.hpp"
-#include "../../../Outputs/Log.hpp"
+#include "Outputs/Log.hpp"

 #include <algorithm>

@@ -8,14 +8,14 @@

 #pragma once

-#include "../../../Machines/DynamicMachine.hpp"
+#include "Machines/DynamicMachine.hpp"

-#include "Implementation/MultiProducer.hpp"
-#include "Implementation/MultiConfigurable.hpp"
-#include "Implementation/MultiProducer.hpp"
-#include "Implementation/MultiJoystickMachine.hpp"
-#include "Implementation/MultiKeyboardMachine.hpp"
-#include "Implementation/MultiMediaTarget.hpp"
+#include "Analyser/Dynamic/MultiMachine/Implementation/MultiProducer.hpp"
+#include "Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurable.hpp"
+#include "Analyser/Dynamic/MultiMachine/Implementation/MultiProducer.hpp"
+#include "Analyser/Dynamic/MultiMachine/Implementation/MultiJoystickMachine.hpp"
+#include "Analyser/Dynamic/MultiMachine/Implementation/MultiKeyboardMachine.hpp"
+#include "Analyser/Dynamic/MultiMachine/Implementation/MultiMediaTarget.hpp"

 #include <memory>
 #include <mutex>
@@ -8,9 +8,9 @@

 #include "Disk.hpp"

-#include "../../../Storage/Disk/Controller/DiskController.hpp"
-#include "../../../Storage/Disk/Encodings/MFM/Parser.hpp"
-#include "../../../Numeric/CRC.hpp"
+#include "Storage/Disk/Controller/DiskController.hpp"
+#include "Storage/Disk/Encodings/MFM/Parser.hpp"
+#include "Numeric/CRC.hpp"

 #include <algorithm>
 #include <cstring>
@@ -9,7 +9,7 @@
 #pragma once

 #include "File.hpp"
-#include "../../../Storage/Disk/Disk.hpp"
+#include "Storage/Disk/Disk.hpp"

 namespace Analyser::Static::Acorn {

@@ -12,7 +12,7 @@
 #include "Tape.hpp"
 #include "Target.hpp"

-#include "../../../Numeric/StringSimilarity.hpp"
+#include "Numeric/StringSimilarity.hpp"

 #include <algorithm>
 #include <map>
@@ -8,8 +8,8 @@

 #pragma once

-#include "../StaticAnalyser.hpp"
-#include "../../../Storage/TargetPlatforms.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Storage/TargetPlatforms.hpp"
 #include <string>

 namespace Analyser::Static::Acorn {
@@ -10,8 +10,8 @@

 #include <deque>

-#include "../../../Numeric/CRC.hpp"
-#include "../../../Storage/Tape/Parsers/Acorn.hpp"
+#include "Numeric/CRC.hpp"
+#include "Storage/Tape/Parsers/Acorn.hpp"

 using namespace Analyser::Static::Acorn;

@@ -8,10 +8,10 @@

 #pragma once

-#include <memory>
-
 #include "File.hpp"
-#include "../../../Storage/Tape/Tape.hpp"
+#include "Storage/Tape/Tape.hpp"
+
+#include <vector>

 namespace Analyser::Static::Acorn {

@@ -8,8 +8,8 @@

 #pragma once

-#include "../../../Reflection/Struct.hpp"
-#include "../StaticAnalyser.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Reflection/Struct.hpp"
 #include <string>

 namespace Analyser::Static::Acorn {
@@ -8,8 +8,8 @@

 #pragma once

-#include "../StaticAnalyser.hpp"
-#include "../../../Storage/TargetPlatforms.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Storage/TargetPlatforms.hpp"
 #include <string>

 namespace Analyser::Static::Amiga {
@@ -8,8 +8,8 @@

 #pragma once

-#include "../../../Reflection/Struct.hpp"
-#include "../StaticAnalyser.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Reflection/Struct.hpp"

 namespace Analyser::Static::Amiga {

@@ -8,15 +8,15 @@

 #include "StaticAnalyser.hpp"

-#include <algorithm>
-#include <cstring>
-
-#include "../../../Storage/Disk/Parsers/CPM.hpp"
-#include "../../../Storage/Disk/Encodings/MFM/Parser.hpp"
-#include "../../../Storage/Tape/Parsers/Spectrum.hpp"
+#include "Storage/Disk/Parsers/CPM.hpp"
+#include "Storage/Disk/Encodings/MFM/Parser.hpp"
+#include "Storage/Tape/Parsers/Spectrum.hpp"

 #include "Target.hpp"

+#include <algorithm>
+#include <cstring>
+
 namespace {

 bool strcmp_insensitive(const char *a, const char *b) {
@@ -8,8 +8,8 @@

 #pragma once

-#include "../StaticAnalyser.hpp"
-#include "../../../Storage/TargetPlatforms.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Storage/TargetPlatforms.hpp"
 #include <string>

 namespace Analyser::Static::AmstradCPC {
@@ -8,9 +8,9 @@

 #pragma once

-#include "../../../Reflection/Enum.hpp"
-#include "../../../Reflection/Struct.hpp"
-#include "../StaticAnalyser.hpp"
+#include "Reflection/Enum.hpp"
+#include "Reflection/Struct.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
 #include <string>

 namespace Analyser::Static::AmstradCPC {
@@ -8,8 +8,8 @@

 #pragma once

-#include "../StaticAnalyser.hpp"
-#include "../../../Storage/TargetPlatforms.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Storage/TargetPlatforms.hpp"
 #include <string>

 namespace Analyser::Static::AppleII {
@@ -8,9 +8,9 @@

 #pragma once

-#include "../../../Reflection/Enum.hpp"
-#include "../../../Reflection/Struct.hpp"
-#include "../StaticAnalyser.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Reflection/Enum.hpp"
+#include "Reflection/Struct.hpp"

 namespace Analyser::Static::AppleII {

@@ -8,8 +8,8 @@

 #pragma once

-#include "../StaticAnalyser.hpp"
-#include "../../../Storage/TargetPlatforms.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Storage/TargetPlatforms.hpp"
 #include <string>

 namespace Analyser::Static::AppleIIgs {
@@ -8,9 +8,9 @@

 #pragma once

-#include "../../../Reflection/Enum.hpp"
-#include "../../../Reflection/Struct.hpp"
-#include "../StaticAnalyser.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Reflection/Enum.hpp"
+#include "Reflection/Struct.hpp"

 namespace Analyser::Static::AppleIIgs {

@@ -10,7 +10,7 @@

 #include "Target.hpp"

-#include "../Disassembler/6502.hpp"
+#include "Analyser/Static/Disassembler/6502.hpp"

 using namespace Analyser::Static::Atari2600;
 using Target = Analyser::Static::Atari2600::Target;
@@ -8,8 +8,8 @@

 #pragma once

-#include "../StaticAnalyser.hpp"
-#include "../../../Storage/TargetPlatforms.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Storage/TargetPlatforms.hpp"
 #include <string>

 namespace Analyser::Static::Atari2600 {
@@ -8,7 +8,7 @@

 #pragma once

-#include "../StaticAnalyser.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"

 namespace Analyser::Static::Atari2600 {

@@ -8,8 +8,8 @@

 #pragma once

-#include "../StaticAnalyser.hpp"
-#include "../../../Storage/TargetPlatforms.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Storage/TargetPlatforms.hpp"
 #include <string>

 namespace Analyser::Static::AtariST {
@@ -8,8 +8,8 @@

 #pragma once

-#include "../../../Reflection/Struct.hpp"
-#include "../StaticAnalyser.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Reflection/Struct.hpp"

 namespace Analyser::Static::AtariST {

@@ -8,8 +8,8 @@

 #pragma once

-#include "../StaticAnalyser.hpp"
-#include "../../../Storage/TargetPlatforms.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Storage/TargetPlatforms.hpp"
 #include <string>

 namespace Analyser::Static::Coleco {
@@ -7,14 +7,14 @@
 //

 #include "Disk.hpp"
-#include "../../../Storage/Disk/Controller/DiskController.hpp"
-#include "../../../Storage/Disk/Encodings/CommodoreGCR.hpp"
-#include "../../../Storage/Data/Commodore.hpp"
+#include "Storage/Disk/Controller/DiskController.hpp"
+#include "Storage/Disk/Encodings/CommodoreGCR.hpp"
+#include "Storage/Data/Commodore.hpp"

-#include <limits>
-#include <vector>
 #include <array>
+#include <limits>
 #include <unordered_map>
+#include <vector>

 using namespace Analyser::Static::Commodore;

@@ -8,7 +8,7 @@

 #pragma once

-#include "../../../Storage/Disk/Disk.hpp"
+#include "Storage/Disk/Disk.hpp"
 #include "File.hpp"

 #include <vector>
@@ -12,11 +12,11 @@
 #include "File.hpp"
 #include "Tape.hpp"
 #include "Target.hpp"
-#include "../../../Storage/Cartridge/Encodings/CommodoreROM.hpp"
-#include "../../../Outputs/Log.hpp"
+#include "Storage/Cartridge/Encodings/CommodoreROM.hpp"
+#include "Outputs/Log.hpp"

-#include "../Disassembler/6502.hpp"
-#include "../Disassembler/AddressMapper.hpp"
+#include "Analyser/Static/Disassembler/6502.hpp"
+#include "Analyser/Static/Disassembler/AddressMapper.hpp"

 #include <algorithm>
 #include <cstring>
@@ -8,8 +8,8 @@

 #pragma once

-#include "../StaticAnalyser.hpp"
-#include "../../../Storage/TargetPlatforms.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Storage/TargetPlatforms.hpp"
 #include <string>

 namespace Analyser::Static::Commodore {
@@ -7,8 +7,7 @@
 //

 #include "Tape.hpp"
-
-#include "../../../Storage/Tape/Parsers/Commodore.hpp"
+#include "Storage/Tape/Parsers/Commodore.hpp"

 using namespace Analyser::Static::Commodore;

@@ -8,8 +8,8 @@

 #pragma once

-#include "../../../Storage/Tape/Tape.hpp"
-#include "../../../Storage/TargetPlatforms.hpp"
+#include "Storage/Tape/Tape.hpp"
+#include "Storage/TargetPlatforms.hpp"
 #include "File.hpp"

 namespace Analyser::Static::Commodore {
@@ -8,9 +8,9 @@

 #pragma once

-#include "../../../Reflection/Enum.hpp"
-#include "../../../Reflection/Struct.hpp"
-#include "../StaticAnalyser.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Reflection/Enum.hpp"
+#include "Reflection/Struct.hpp"
 #include <string>

 namespace Analyser::Static::Commodore {
@@ -8,14 +8,14 @@

 #include "StaticAnalyser.hpp"

-#include "../AppleII/Target.hpp"
-#include "../AppleIIgs/Target.hpp"
-#include "../Oric/Target.hpp"
-#include "../Disassembler/6502.hpp"
-#include "../Disassembler/AddressMapper.hpp"
+#include "Analyser/Static/AppleII/Target.hpp"
+#include "Analyser/Static//AppleIIgs/Target.hpp"
+#include "Analyser/Static//Oric/Target.hpp"
+#include "Analyser/Static//Disassembler/6502.hpp"
+#include "Analyser/Static//Disassembler/AddressMapper.hpp"

-#include "../../../Storage/Disk/Track/TrackSerialiser.hpp"
-#include "../../../Storage/Disk/Encodings/AppleGCR/SegmentParser.hpp"
+#include "Storage/Disk/Track/TrackSerialiser.hpp"
+#include "Storage/Disk/Encodings/AppleGCR/SegmentParser.hpp"

 namespace {

@@ -8,8 +8,8 @@

 #pragma once

-#include "../StaticAnalyser.hpp"
-#include "../../../Storage/TargetPlatforms.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Storage/TargetPlatforms.hpp"
 #include <string>

 namespace Analyser::Static::DiskII {
@@ -9,7 +9,7 @@
 #include "StaticAnalyser.hpp"
 #include "Target.hpp"

-#include "../../../Storage/Disk/Parsers/FAT.hpp"
+#include "Storage/Disk/Parsers/FAT.hpp"

 #include <algorithm>

@@ -8,8 +8,8 @@

 #pragma once

-#include "../StaticAnalyser.hpp"
-#include "../../../Storage/TargetPlatforms.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Storage/TargetPlatforms.hpp"
 #include <string>

 namespace Analyser::Static::Enterprise {
@@ -8,9 +8,9 @@

 #pragma once

-#include "../../../Reflection/Enum.hpp"
-#include "../../../Reflection/Struct.hpp"
-#include "../StaticAnalyser.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Reflection/Enum.hpp"
+#include "Reflection/Struct.hpp"

 #include <string>

@@ -8,8 +8,8 @@

 #pragma once

-#include "../StaticAnalyser.hpp"
-#include "../../../Storage/TargetPlatforms.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Storage/TargetPlatforms.hpp"
 #include <string>

 namespace Analyser::Static::FAT12 {
@@ -15,76 +15,76 @@
 #include <iterator>

 // Analysers
-#include "Acorn/StaticAnalyser.hpp"
-#include "Amiga/StaticAnalyser.hpp"
-#include "AmstradCPC/StaticAnalyser.hpp"
-#include "AppleII/StaticAnalyser.hpp"
-#include "AppleIIgs/StaticAnalyser.hpp"
-#include "Atari2600/StaticAnalyser.hpp"
-#include "AtariST/StaticAnalyser.hpp"
-#include "Coleco/StaticAnalyser.hpp"
-#include "Commodore/StaticAnalyser.hpp"
-#include "DiskII/StaticAnalyser.hpp"
-#include "Enterprise/StaticAnalyser.hpp"
-#include "FAT12/StaticAnalyser.hpp"
-#include "Macintosh/StaticAnalyser.hpp"
-#include "MSX/StaticAnalyser.hpp"
-#include "Oric/StaticAnalyser.hpp"
-#include "PCCompatible/StaticAnalyser.hpp"
-#include "Sega/StaticAnalyser.hpp"
-#include "ZX8081/StaticAnalyser.hpp"
-#include "ZXSpectrum/StaticAnalyser.hpp"
+#include "Analyser/Static/Acorn/StaticAnalyser.hpp"
+#include "Analyser/Static/Amiga/StaticAnalyser.hpp"
+#include "Analyser/Static/AmstradCPC/StaticAnalyser.hpp"
+#include "Analyser/Static/AppleII/StaticAnalyser.hpp"
+#include "Analyser/Static/AppleIIgs/StaticAnalyser.hpp"
+#include "Analyser/Static/Atari2600/StaticAnalyser.hpp"
+#include "Analyser/Static/AtariST/StaticAnalyser.hpp"
+#include "Analyser/Static/Coleco/StaticAnalyser.hpp"
+#include "Analyser/Static/Commodore/StaticAnalyser.hpp"
+#include "Analyser/Static/DiskII/StaticAnalyser.hpp"
+#include "Analyser/Static/Enterprise/StaticAnalyser.hpp"
+#include "Analyser/Static/FAT12/StaticAnalyser.hpp"
+#include "Analyser/Static/Macintosh/StaticAnalyser.hpp"
+#include "Analyser/Static/MSX/StaticAnalyser.hpp"
+#include "Analyser/Static/Oric/StaticAnalyser.hpp"
+#include "Analyser/Static/PCCompatible/StaticAnalyser.hpp"
+#include "Analyser/Static/Sega/StaticAnalyser.hpp"
+#include "Analyser/Static/ZX8081/StaticAnalyser.hpp"
+#include "Analyser/Static/ZXSpectrum/StaticAnalyser.hpp"

 // Cartridges
-#include "../../Storage/Cartridge/Formats/BinaryDump.hpp"
-#include "../../Storage/Cartridge/Formats/PRG.hpp"
+#include "Storage/Cartridge/Formats/BinaryDump.hpp"
+#include "Storage/Cartridge/Formats/PRG.hpp"

 // Disks
-#include "../../Storage/Disk/DiskImage/Formats/2MG.hpp"
-#include "../../Storage/Disk/DiskImage/Formats/AcornADF.hpp"
-#include "../../Storage/Disk/DiskImage/Formats/AmigaADF.hpp"
-#include "../../Storage/Disk/DiskImage/Formats/AppleDSK.hpp"
-#include "../../Storage/Disk/DiskImage/Formats/CPCDSK.hpp"
-#include "../../Storage/Disk/DiskImage/Formats/D64.hpp"
-#include "../../Storage/Disk/DiskImage/Formats/G64.hpp"
-#include "../../Storage/Disk/DiskImage/Formats/DMK.hpp"
-#include "../../Storage/Disk/DiskImage/Formats/FAT12.hpp"
-#include "../../Storage/Disk/DiskImage/Formats/HFE.hpp"
-#include "../../Storage/Disk/DiskImage/Formats/IPF.hpp"
-#include "../../Storage/Disk/DiskImage/Formats/IMD.hpp"
-#include "../../Storage/Disk/DiskImage/Formats/MacintoshIMG.hpp"
-#include "../../Storage/Disk/DiskImage/Formats/MSA.hpp"
-#include "../../Storage/Disk/DiskImage/Formats/NIB.hpp"
-#include "../../Storage/Disk/DiskImage/Formats/OricMFMDSK.hpp"
-#include "../../Storage/Disk/DiskImage/Formats/PCBooter.hpp"
-#include "../../Storage/Disk/DiskImage/Formats/SSD.hpp"
-#include "../../Storage/Disk/DiskImage/Formats/STX.hpp"
-#include "../../Storage/Disk/DiskImage/Formats/WOZ.hpp"
+#include "Storage/Disk/DiskImage/Formats/2MG.hpp"
+#include "Storage/Disk/DiskImage/Formats/AcornADF.hpp"
+#include "Storage/Disk/DiskImage/Formats/AmigaADF.hpp"
+#include "Storage/Disk/DiskImage/Formats/AppleDSK.hpp"
+#include "Storage/Disk/DiskImage/Formats/CPCDSK.hpp"
+#include "Storage/Disk/DiskImage/Formats/D64.hpp"
+#include "Storage/Disk/DiskImage/Formats/G64.hpp"
+#include "Storage/Disk/DiskImage/Formats/DMK.hpp"
+#include "Storage/Disk/DiskImage/Formats/FAT12.hpp"
+#include "Storage/Disk/DiskImage/Formats/HFE.hpp"
+#include "Storage/Disk/DiskImage/Formats/IPF.hpp"
+#include "Storage/Disk/DiskImage/Formats/IMD.hpp"
+#include "Storage/Disk/DiskImage/Formats/MacintoshIMG.hpp"
+#include "Storage/Disk/DiskImage/Formats/MSA.hpp"
+#include "Storage/Disk/DiskImage/Formats/NIB.hpp"
+#include "Storage/Disk/DiskImage/Formats/OricMFMDSK.hpp"
+#include "Storage/Disk/DiskImage/Formats/PCBooter.hpp"
+#include "Storage/Disk/DiskImage/Formats/SSD.hpp"
+#include "Storage/Disk/DiskImage/Formats/STX.hpp"
+#include "Storage/Disk/DiskImage/Formats/WOZ.hpp"

 // Mass Storage Devices (i.e. usually, hard disks)
-#include "../../Storage/MassStorage/Formats/DAT.hpp"
-#include "../../Storage/MassStorage/Formats/DSK.hpp"
-#include "../../Storage/MassStorage/Formats/HDV.hpp"
-#include "../../Storage/MassStorage/Formats/HFV.hpp"
+#include "Storage/MassStorage/Formats/DAT.hpp"
+#include "Storage/MassStorage/Formats/DSK.hpp"
+#include "Storage/MassStorage/Formats/HDV.hpp"
+#include "Storage/MassStorage/Formats/HFV.hpp"

 // State Snapshots
-#include "../../Storage/State/SNA.hpp"
-#include "../../Storage/State/SZX.hpp"
-#include "../../Storage/State/Z80.hpp"
+#include "Storage/State/SNA.hpp"
+#include "Storage/State/SZX.hpp"
+#include "Storage/State/Z80.hpp"

 // Tapes
-#include "../../Storage/Tape/Formats/CAS.hpp"
-#include "../../Storage/Tape/Formats/CommodoreTAP.hpp"
-#include "../../Storage/Tape/Formats/CSW.hpp"
-#include "../../Storage/Tape/Formats/OricTAP.hpp"
-#include "../../Storage/Tape/Formats/TapePRG.hpp"
-#include "../../Storage/Tape/Formats/TapeUEF.hpp"
-#include "../../Storage/Tape/Formats/TZX.hpp"
-#include "../../Storage/Tape/Formats/ZX80O81P.hpp"
-#include "../../Storage/Tape/Formats/ZXSpectrumTAP.hpp"
+#include "Storage/Tape/Formats/CAS.hpp"
+#include "Storage/Tape/Formats/CommodoreTAP.hpp"
+#include "Storage/Tape/Formats/CSW.hpp"
+#include "Storage/Tape/Formats/OricTAP.hpp"
+#include "Storage/Tape/Formats/TapePRG.hpp"
+#include "Storage/Tape/Formats/TapeUEF.hpp"
+#include "Storage/Tape/Formats/TZX.hpp"
+#include "Storage/Tape/Formats/ZX80O81P.hpp"
+#include "Storage/Tape/Formats/ZXSpectrumTAP.hpp"

 // Target Platform Types
-#include "../../Storage/TargetPlatforms.hpp"
+#include "Storage/TargetPlatforms.hpp"

 template<class> inline constexpr bool always_false_v = false;

@@ -8,14 +8,14 @@

 #pragma once

-#include "../Machines.hpp"
+#include "Analyser/Machines.hpp"

-#include "../../Storage/Cartridge/Cartridge.hpp"
-#include "../../Storage/Disk/Disk.hpp"
-#include "../../Storage/MassStorage/MassStorageDevice.hpp"
-#include "../../Storage/Tape/Tape.hpp"
-#include "../../Storage/TargetPlatforms.hpp"
-#include "../../Reflection/Struct.hpp"
+#include "Storage/Cartridge/Cartridge.hpp"
+#include "Storage/Disk/Disk.hpp"
+#include "Storage/MassStorage/MassStorageDevice.hpp"
+#include "Storage/Tape/Tape.hpp"
+#include "Storage/TargetPlatforms.hpp"
+#include "Reflection/Struct.hpp"

 #include <memory>
 #include <string>
@@ -8,7 +8,7 @@

 #pragma once

-#include "../Outputs/ScanTarget.hpp"
+#include "Outputs/ScanTarget.hpp"

 #include <cmath>

@@ -8,8 +8,8 @@

 #include "1770.hpp"

-#include "../../Storage/Disk/Encodings/MFM/Constants.hpp"
-#include "../../Outputs/Log.hpp"
+#include "Storage/Disk/Encodings/MFM/Constants.hpp"
+#include "Outputs/Log.hpp"

 namespace {
 Log::Logger<Log::Source::WDFDC> logger;
@@ -8,7 +8,7 @@

 #include "ncr5380.hpp"

-#include "../../Outputs/Log.hpp"
+#include "Outputs/Log.hpp"

 namespace {
 Log::Logger<Log::Source::NCR5380> logger;
@@ -6,7 +6,7 @@
 //  Copyright 2017 Thomas Harte. All rights reserved.
 //

-#include "../../../Outputs/Log.hpp"
+#include "Outputs/Log.hpp"

 // As-yet unimplemented (incomplete list):
 //
@@ -10,8 +10,8 @@

 #include <array>

-#include "../../../ClockReceiver/ClockReceiver.hpp"
-#include "../../../Outputs/Log.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "Outputs/Log.hpp"

 namespace MOS::MOS6526 {

@@ -8,11 +8,11 @@

 #pragma once

-#include "../../ClockReceiver/ClockReceiver.hpp"
-#include "../../Concurrency/AsyncTaskQueue.hpp"
-#include "../../Outputs/CRT/CRT.hpp"
-#include "../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp"
-#include "../../Outputs/Speaker/Implementation/BufferSource.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "Concurrency/AsyncTaskQueue.hpp"
+#include "Outputs/CRT/CRT.hpp"
+#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp"
+#include "Outputs/Speaker/Implementation/BufferSource.hpp"

 namespace MOS::MOS6560 {

@@ -11,7 +11,7 @@
 #include <algorithm>
 #include <cstring>

-#include "../../Outputs/Log.hpp"
+#include "Outputs/Log.hpp"

 namespace {

@@ -8,7 +8,7 @@

 #include "i8272.hpp"

-#include "../../Outputs/Log.hpp"
+#include "Outputs/Log.hpp"

 namespace {

@@ -8,7 +8,7 @@

 #include "z8530.hpp"

-#include "../../Outputs/Log.hpp"
+#include "Outputs/Log.hpp"

 using namespace Zilog::SCC;

@@ -8,8 +8,8 @@

 #pragma once

-#include "../../Outputs/CRT/CRT.hpp"
-#include "../../ClockReceiver/ClockReceiver.hpp"
+#include "Outputs/CRT/CRT.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"

 #include <cstdint>

@@ -6,12 +6,13 @@
 //  Copyright 2017 Thomas Harte. All rights reserved.
 //

-#include "../9918.hpp"
+#include "Components/9918/9918.hpp"
+
+#include "Outputs/Log.hpp"

 #include <cassert>
 #include <cstring>
 #include <cstdlib>
-#include "../../../Outputs/Log.hpp"

 using namespace TI::TMS;

@@ -10,9 +10,9 @@

 #include "ClockConverter.hpp"

-#include "../../../ClockReceiver/ClockReceiver.hpp"
-#include "../../../Numeric/BitReverse.hpp"
-#include "../../../Outputs/CRT/CRT.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "Numeric/BitReverse.hpp"
+#include "Outputs/CRT/CRT.hpp"

 #include "AccessEnums.hpp"
 #include "LineBuffer.hpp"
@@ -8,10 +8,10 @@

 #pragma once

-#include "../../Outputs/Speaker/Implementation/BufferSource.hpp"
-#include "../../Concurrency/AsyncTaskQueue.hpp"
+#include "Outputs/Speaker/Implementation/BufferSource.hpp"
+#include "Concurrency/AsyncTaskQueue.hpp"

-#include "../../Reflection/Struct.hpp"
+#include "Reflection/Struct.hpp"

 namespace GI::AY38910 {

@@ -8,8 +8,8 @@

 #pragma once

-#include "../../Outputs/Speaker/Implementation/BufferSource.hpp"
-#include "../../Concurrency/AsyncTaskQueue.hpp"
+#include "Outputs/Speaker/Implementation/BufferSource.hpp"
+#include "Concurrency/AsyncTaskQueue.hpp"

 namespace Audio {

@@ -8,7 +8,7 @@

 #include "IWM.hpp"

-#include "../../Outputs/Log.hpp"
+#include "Outputs/Log.hpp"

 using namespace Apple;

@@ -8,7 +8,7 @@

 #include "I2C.hpp"

-#include "../../Outputs/Log.hpp"
+#include "Outputs/Log.hpp"

 using namespace I2C;

@@ -8,8 +8,8 @@

 #pragma once

-#include "../../Outputs/Speaker/Implementation/BufferSource.hpp"
-#include "../../Concurrency/AsyncTaskQueue.hpp"
+#include "Outputs/Speaker/Implementation/BufferSource.hpp"
+#include "Concurrency/AsyncTaskQueue.hpp"

 namespace Konami {

@@ -8,8 +8,8 @@

 #pragma once

-#include "../../../Outputs/Speaker/Implementation/BufferSource.hpp"
-#include "../../../Concurrency/AsyncTaskQueue.hpp"
+#include "Outputs/Speaker/Implementation/BufferSource.hpp"
+#include "Concurrency/AsyncTaskQueue.hpp"

 namespace Yamaha::OPL {

@@ -8,8 +8,8 @@

 #pragma once

-#include "../../Outputs/Speaker/Implementation/BufferSource.hpp"
-#include "../../Concurrency/AsyncTaskQueue.hpp"
+#include "Outputs/Speaker/Implementation/BufferSource.hpp"
+#include "Concurrency/AsyncTaskQueue.hpp"

 namespace TI {

@@ -8,8 +8,8 @@

 #include "Executor.hpp"

-#include "../../Machines/Utility/MemoryFuzzer.hpp"
-#include "../../Outputs/Log.hpp"
+#include "Machines/Utility/MemoryFuzzer.hpp"
+#include "Outputs/Log.hpp"

 #include <algorithm>
 #include <cassert>
@@ -15,23 +15,23 @@
 #include "MemoryController.hpp"
 #include "Sound.hpp"

-#include "../../../Configurable/Configurable.hpp"
+#include "Configurable/Configurable.hpp"

-#include "../../AudioProducer.hpp"
-#include "../../KeyboardMachine.hpp"
-#include "../../MediaTarget.hpp"
-#include "../../MouseMachine.hpp"
-#include "../../ScanProducer.hpp"
-#include "../../TimedMachine.hpp"
+#include "Machines/AudioProducer.hpp"
+#include "Machines/KeyboardMachine.hpp"
+#include "Machines/MediaTarget.hpp"
+#include "Machines/MouseMachine.hpp"
+#include "Machines/ScanProducer.hpp"
+#include "Machines/TimedMachine.hpp"

-#include "../../../Activity/Source.hpp"
+#include "Activity/Source.hpp"

-#include "../../../InstructionSets/ARM/Disassembler.hpp"
-#include "../../../InstructionSets/ARM/Executor.hpp"
-#include "../../../Outputs/Log.hpp"
-#include "../../../Components/I2C/I2C.hpp"
+#include "InstructionSets/ARM/Disassembler.hpp"
+#include "InstructionSets/ARM/Executor.hpp"
+#include "Outputs/Log.hpp"
+#include "Components/I2C/I2C.hpp"

-#include "../../../Analyser/Static/Acorn/Target.hpp"
+#include "Analyser/Static/Acorn/Target.hpp"

 #include <algorithm>
 #include <array>
@@ -8,8 +8,8 @@

 #pragma once

-#include "../../../Components/I2C/I2C.hpp"
-#include "../../../Outputs/Log.hpp"
+#include "Components/I2C/I2C.hpp"
+#include "Outputs/Log.hpp"

 #include <array>

@@ -14,9 +14,9 @@
 #include "Sound.hpp"
 #include "Video.hpp"

-#include "../../../Outputs/Log.hpp"
-#include "../../../Activity/Observer.hpp"
-#include "../../../ClockReceiver/ClockingHintSource.hpp"
+#include "Outputs/Log.hpp"
+#include "Activity/Observer.hpp"
+#include "ClockReceiver/ClockingHintSource.hpp"

 namespace Archimedes {

@@ -10,8 +10,8 @@

 #include "HalfDuplexSerial.hpp"

-#include "../../../Outputs/Log.hpp"
-#include "../../../Inputs/Mouse.hpp"
+#include "Outputs/Log.hpp"
+#include "Inputs/Mouse.hpp"

 #include <bitset>

@@ -12,9 +12,9 @@
 #include "Video.hpp"
 #include "Sound.hpp"

-#include "../../../InstructionSets/ARM/Registers.hpp"
-#include "../../../Outputs/Log.hpp"
-#include "../../../Activity/Observer.hpp"
+#include "InstructionSets/ARM/Registers.hpp"
+#include "Outputs/Log.hpp"
+#include "Activity/Observer.hpp"

 namespace Archimedes {

@@ -8,8 +8,8 @@

 #pragma once

-#include "../../../Concurrency/AsyncTaskQueue.hpp"
-#include "../../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp"
+#include "Concurrency/AsyncTaskQueue.hpp"
+#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp"

 #include <array>
 #include <cstdint>
@@ -8,8 +8,8 @@

 #pragma once

-#include "../../../Outputs/Log.hpp"
-#include "../../../Outputs/CRT/CRT.hpp"
+#include "Outputs/Log.hpp"
+#include "Outputs/CRT/CRT.hpp"

 #include <array>
 #include <cassert>
@@ -8,24 +8,24 @@

 #include "Electron.hpp"

-#include "../../../Activity/Source.hpp"
-#include "../../MachineTypes.hpp"
-#include "../../../Configurable/Configurable.hpp"
+#include "Activity/Source.hpp"
+#include "Machines/MachineTypes.hpp"
+#include "Configurable/Configurable.hpp"

-#include "../../../ClockReceiver/ClockReceiver.hpp"
-#include "../../../ClockReceiver/ForceInline.hpp"
-#include "../../../Configurable/StandardOptions.hpp"
-#include "../../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp"
-#include "../../../Processors/6502/6502.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ForceInline.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp"
+#include "Processors/6502/6502.hpp"

-#include "../../../Storage/MassStorage/SCSI/SCSI.hpp"
-#include "../../../Storage/MassStorage/SCSI/DirectAccessDevice.hpp"
-#include "../../../Storage/Tape/Tape.hpp"
+#include "Storage/MassStorage/SCSI/SCSI.hpp"
+#include "Storage/MassStorage/SCSI/DirectAccessDevice.hpp"
+#include "Storage/Tape/Tape.hpp"

-#include "../../Utility/Typer.hpp"
-#include "../../../Analyser/Static/Acorn/Target.hpp"
+#include "Machines/Utility/Typer.hpp"
+#include "Analyser/Static/Acorn/Target.hpp"

-#include "../../../ClockReceiver/JustInTime.hpp"
+#include "ClockReceiver/JustInTime.hpp"

 #include "Interrupts.hpp"
 #include "Keyboard.hpp"
@@ -8,8 +8,8 @@

 #pragma once

-#include "../../../Outputs/Speaker/Implementation/BufferSource.hpp"
-#include "../../../Concurrency/AsyncTaskQueue.hpp"
+#include "Outputs/Speaker/Implementation/BufferSource.hpp"
+#include "Concurrency/AsyncTaskQueue.hpp"

 namespace Electron {

@@ -8,8 +8,8 @@

 #pragma once

-#include "../../../Outputs/CRT/CRT.hpp"
-#include "../../../ClockReceiver/ClockReceiver.hpp"
+#include "Outputs/CRT/CRT.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
 #include "Interrupts.hpp"

 #include <vector>
@@ -8,17 +8,17 @@

 #include "Amiga.hpp"

-#include "../../Activity/Source.hpp"
-#include "../MachineTypes.hpp"
+#include "Activity/Source.hpp"
+#include "Machines/MachineTypes.hpp"

-#include "../../Processors/68000/68000.hpp"
+#include "Processors/68000/68000.hpp"

-#include "../../Analyser/Static/Amiga/Target.hpp"
+#include "Analyser/Static/Amiga/Target.hpp"

-#include "../Utility/MemoryPacker.hpp"
-#include "../Utility/MemoryFuzzer.hpp"
+#include "Machines/Utility/MemoryPacker.hpp"
+#include "Machines/Utility/MemoryFuzzer.hpp"

-#include "../../Outputs/Log.hpp"
+#include "Outputs/Log.hpp"

 #include "Chipset.hpp"
 #include "Keyboard.hpp"
@@ -12,9 +12,9 @@
 #include <cstdint>

 #include "DMADevice.hpp"
-#include "../../ClockReceiver/ClockReceiver.hpp"
-#include "../../Concurrency/AsyncTaskQueue.hpp"
-#include "../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "Concurrency/AsyncTaskQueue.hpp"
+#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp"

 namespace Amiga {

@@ -9,7 +9,7 @@
 #include "Blitter.hpp"

 #include "Minterms.hpp"
-#include "../../Outputs/Log.hpp"
+#include "Outputs/Log.hpp"

 #include <cassert>

@@ -8,7 +8,7 @@

 #include "Chipset.hpp"

-#include "../../Outputs/Log.hpp"
+#include "Outputs/Log.hpp"

 #include <algorithm>
 #include <cassert>
@@ -14,14 +14,14 @@
 #include <cstddef>
 #include <cstdint>

-#include "../../Activity/Source.hpp"
-#include "../../ClockReceiver/ClockingHintSource.hpp"
-#include "../../ClockReceiver/JustInTime.hpp"
-#include "../../Components/6526/6526.hpp"
-#include "../../Outputs/CRT/CRT.hpp"
-#include "../../Processors/68000/68000.hpp"
-#include "../../Storage/Disk/Controller/DiskController.hpp"
-#include "../../Storage/Disk/Drive.hpp"
+#include "Activity/Source.hpp"
+#include "ClockReceiver/ClockingHintSource.hpp"
+#include "ClockReceiver/JustInTime.hpp"
+#include "Components/6526/6526.hpp"
+#include "Outputs/CRT/CRT.hpp"
+#include "Processors/68000/68000.hpp"
+#include "Storage/Disk/Controller/DiskController.hpp"
+#include "Storage/Disk/Drive.hpp"

 #include "Audio.hpp"
 #include "Bitplanes.hpp"
@@ -9,7 +9,7 @@
 #include "Copper.hpp"
 #include "Chipset.hpp"

-#include "../../Outputs/Log.hpp"
+#include "Outputs/Log.hpp"

 using namespace Amiga;

@@ -8,7 +8,7 @@

 #include "Chipset.hpp"

-#include "../../Outputs/Log.hpp"
+#include "Outputs/Log.hpp"

 namespace {
 Log::Logger<Log::Source::AmigaDisk> logger;
@@ -11,28 +11,28 @@
 #include "Keyboard.hpp"
 #include "FDC.hpp"

-#include "../../Processors/Z80/Z80.hpp"
+#include "Processors/Z80/Z80.hpp"

-#include "../../Components/6845/CRTC6845.hpp"
-#include "../../Components/8255/i8255.hpp"
-#include "../../Components/AY38910/AY38910.hpp"
+#include "Components/6845/CRTC6845.hpp"
+#include "Components/8255/i8255.hpp"
+#include "Components/AY38910/AY38910.hpp"

-#include "../Utility/MemoryFuzzer.hpp"
-#include "../Utility/Typer.hpp"
+#include "Machines/Utility/MemoryFuzzer.hpp"
+#include "Machines/Utility/Typer.hpp"

-#include "../../Activity/Source.hpp"
-#include "../MachineTypes.hpp"
+#include "Activity/Source.hpp"
+#include "Machines/MachineTypes.hpp"

-#include "../../Storage/Tape/Tape.hpp"
-#include "../../Storage/Tape/Parsers/Spectrum.hpp"
+#include "Storage/Tape/Tape.hpp"
+#include "Storage/Tape/Parsers/Spectrum.hpp"

-#include "../../ClockReceiver/ForceInline.hpp"
-#include "../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp"
-#include "../../Outputs/CRT/CRT.hpp"
+#include "ClockReceiver/ForceInline.hpp"
+#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp"
+#include "Outputs/CRT/CRT.hpp"

-#include "../../Analyser/Static/AmstradCPC/Target.hpp"
+#include "Analyser/Static/AmstradCPC/Target.hpp"

-#include "../../Numeric/CRC.hpp"
+#include "Numeric/CRC.hpp"

 #include <array>
 #include <cstdint>
@@ -8,7 +8,7 @@

 #include "ReactiveDevice.hpp"

-#include "../../../Outputs/Log.hpp"
+#include "Outputs/Log.hpp"

 using namespace Apple::ADB;

@@ -8,18 +8,18 @@

 #include "AppleII.hpp"

-#include "../../../Activity/Source.hpp"
-#include "../../MachineTypes.hpp"
-#include "../../Utility/MemoryFuzzer.hpp"
-#include "../../Utility/StringSerialiser.hpp"
+#include "Activity/Source.hpp"
+#include "Machines/MachineTypes.hpp"
+#include "Machines/Utility/MemoryFuzzer.hpp"
+#include "Machines/Utility/StringSerialiser.hpp"

-#include "../../../Processors/6502/6502.hpp"
-#include "../../../Components/AudioToggle/AudioToggle.hpp"
-#include "../../../Components/AY38910/AY38910.hpp"
+#include "Processors/6502/6502.hpp"
+#include "Components/AudioToggle/AudioToggle.hpp"
+#include "Components/AY38910/AY38910.hpp"

-#include "../../../Outputs/Speaker/Implementation/CompoundSource.hpp"
-#include "../../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp"
-#include "../../../Outputs/Log.hpp"
+#include "Outputs/Speaker/Implementation/CompoundSource.hpp"
+#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp"
+#include "Outputs/Log.hpp"

 #include "AuxiliaryMemorySwitches.hpp"
 #include "Card.hpp"
@@ -30,13 +30,13 @@
 #include "SCSICard.hpp"
 #include "Video.hpp"

-#include "../../../Analyser/Static/AppleII/Target.hpp"
-#include "../../../ClockReceiver/ForceInline.hpp"
-#include "../../../Configurable/StandardOptions.hpp"
+#include "Analyser/Static/AppleII/Target.hpp"
+#include "ClockReceiver/ForceInline.hpp"
+#include "Configurable/StandardOptions.hpp"

-#include "../../../Storage/MassStorage/SCSI/SCSI.hpp"
-#include "../../../Storage/MassStorage/SCSI/DirectAccessDevice.hpp"
-#include "../../../Storage/MassStorage/Encodings/MacintoshVolume.hpp"
+#include "Storage/MassStorage/SCSI/SCSI.hpp"
+#include "Storage/MassStorage/SCSI/DirectAccessDevice.hpp"
+#include "Storage/MassStorage/Encodings/MacintoshVolume.hpp"

 #include <algorithm>
 #include <array>
@@ -9,15 +9,15 @@
 #pragma once

 #include "Card.hpp"
-#include "../../ROMMachine.hpp"
+#include "Machines/ROMMachine.hpp"

-#include "../../../Components/5380/ncr5380.hpp"
+#include "Components/5380/ncr5380.hpp"

-#include "../../../Storage/MassStorage/SCSI/SCSI.hpp"
-#include "../../../Storage/MassStorage/SCSI/DirectAccessDevice.hpp"
-#include "../../../Storage/MassStorage/MassStorageDevice.hpp"
+#include "Storage/MassStorage/SCSI/SCSI.hpp"
+#include "Storage/MassStorage/SCSI/DirectAccessDevice.hpp"
+#include "Storage/MassStorage/MassStorageDevice.hpp"

-#include "../../../Outputs/Log.hpp"
+#include "Outputs/Log.hpp"

 #include <array>
 #include <memory>
@@ -8,8 +8,8 @@

 #pragma once

-#include "../../../Outputs/CRT/CRT.hpp"
-#include "../../../ClockReceiver/ClockReceiver.hpp"
+#include "Outputs/CRT/CRT.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"

 #include "VideoSwitches.hpp"

@@ -13,10 +13,10 @@
 #include <iostream>

 // TEST.
-#include "../../../InstructionSets/M50740/Parser.hpp"
-#include "../../../InstructionSets/Disassembler.hpp"
+#include "InstructionSets/M50740/Parser.hpp"
+#include "InstructionSets/Disassembler.hpp"

-#include "../../../Outputs/Log.hpp"
+#include "Outputs/Log.hpp"

 using namespace Apple::IIgs::ADB;

@@ -13,27 +13,27 @@
 #include "Video.hpp"
 #include "Sound.hpp"

-#include "../AppleII/Joystick.hpp"
+#include "Machines/Apple/AppleII/Joystick.hpp"

-#include "../../../Activity/Source.hpp"
-#include "../../MachineTypes.hpp"
+#include "Activity/Source.hpp"
+#include "Machines/MachineTypes.hpp"

-#include "../../../Analyser/Static/AppleIIgs/Target.hpp"
+#include "Analyser/Static/AppleIIgs/Target.hpp"

-#include "../../../Processors/65816/65816.hpp"
-#include "../../../Components/8530/z8530.hpp"
-#include "../../../Components/AppleClock/AppleClock.hpp"
-#include "../../../Components/AudioToggle/AudioToggle.hpp"
-#include "../../../Components/DiskII/IWM.hpp"
-#include "../../../Components/DiskII/MacintoshDoubleDensityDrive.hpp"
-#include "../../../Components/DiskII/DiskIIDrive.hpp"
+#include "Processors/65816/65816.hpp"
+#include "Components/8530/z8530.hpp"
+#include "Components/AppleClock/AppleClock.hpp"
+#include "Components/AudioToggle/AudioToggle.hpp"
+#include "Components/DiskII/IWM.hpp"
+#include "Components/DiskII/MacintoshDoubleDensityDrive.hpp"
+#include "Components/DiskII/DiskIIDrive.hpp"

-#include "../../../Outputs/Speaker/Implementation/CompoundSource.hpp"
-#include "../../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp"
+#include "Outputs/Speaker/Implementation/CompoundSource.hpp"
+#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp"

-#include "../../Utility/MemoryFuzzer.hpp"
+#include "Machines/Utility/MemoryFuzzer.hpp"

-#include "../../../ClockReceiver/JustInTime.hpp"
+#include "ClockReceiver/JustInTime.hpp"

 #include <cassert>
 #include <array>
@@ -10,9 +10,9 @@

 #include <atomic>

-#include "../../../ClockReceiver/ClockReceiver.hpp"
-#include "../../../Concurrency/AsyncTaskQueue.hpp"
-#include "../../../Outputs/Speaker/Implementation/BufferSource.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "Concurrency/AsyncTaskQueue.hpp"
+#include "Outputs/Speaker/Implementation/BufferSource.hpp"

 namespace Apple::IIgs::Sound {

@@ -8,9 +8,9 @@

 #pragma once

-#include "../AppleII/VideoSwitches.hpp"
-#include "../../../Outputs/CRT/CRT.hpp"
-#include "../../../ClockReceiver/ClockReceiver.hpp"
+#include "Machines/Apple/AppleII/VideoSwitches.hpp"
+#include "Outputs/CRT/CRT.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"

 namespace Apple::IIgs::Video {

@@ -8,9 +8,9 @@

 #pragma once

-#include "../../../Concurrency/AsyncTaskQueue.hpp"
-#include "../../../ClockReceiver/ClockReceiver.hpp"
-#include "../../../Outputs/Speaker/Implementation/BufferSource.hpp"
+#include "Concurrency/AsyncTaskQueue.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "Outputs/Speaker/Implementation/BufferSource.hpp"

 #include <array>
 #include <atomic>
@@ -9,7 +9,7 @@
 #pragma once

 #include "Audio.hpp"
-#include "../../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp"
+#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp"

 namespace Apple::Macintosh {

@@ -15,36 +15,36 @@
 #include "Keyboard.hpp"
 #include "Video.hpp"

-#include "../../MachineTypes.hpp"
-#include "../../../Activity/Source.hpp"
-#include "../../../Configurable/Configurable.hpp"
+#include "Machines/MachineTypes.hpp"
+#include "Activity/Source.hpp"
+#include "Configurable/Configurable.hpp"

-#include "../../../Inputs/QuadratureMouse/QuadratureMouse.hpp"
-#include "../../../Outputs/Log.hpp"
+#include "Inputs/QuadratureMouse/QuadratureMouse.hpp"
+#include "Outputs/Log.hpp"

-#include "../../../ClockReceiver/JustInTime.hpp"
-#include "../../../ClockReceiver/ClockingHintSource.hpp"
-#include "../../../Configurable/StandardOptions.hpp"
+#include "ClockReceiver/JustInTime.hpp"
+#include "ClockReceiver/ClockingHintSource.hpp"
+#include "Configurable/StandardOptions.hpp"

 //#define LOG_TRACE

-#include "../../../Components/5380/ncr5380.hpp"
-#include "../../../Components/6522/6522.hpp"
-#include "../../../Components/8530/z8530.hpp"
-#include "../../../Components/AppleClock/AppleClock.hpp"
-#include "../../../Components/DiskII/IWM.hpp"
-#include "../../../Components/DiskII/MacintoshDoubleDensityDrive.hpp"
+#include "Components/5380/ncr5380.hpp"
+#include "Components/6522/6522.hpp"
+#include "Components/8530/z8530.hpp"
+#include "Components/AppleClock/AppleClock.hpp"
+#include "Components/DiskII/IWM.hpp"
+#include "Components/DiskII/MacintoshDoubleDensityDrive.hpp"

-#include "../../../Processors/68000/68000.hpp"
+#include "Processors/68000/68000.hpp"

-#include "../../../Storage/MassStorage/SCSI/SCSI.hpp"
-#include "../../../Storage/MassStorage/SCSI/DirectAccessDevice.hpp"
-#include "../../../Storage/MassStorage/Encodings/MacintoshVolume.hpp"
+#include "Storage/MassStorage/SCSI/SCSI.hpp"
+#include "Storage/MassStorage/SCSI/DirectAccessDevice.hpp"
+#include "Storage/MassStorage/Encodings/MacintoshVolume.hpp"

-#include "../../../Analyser/Static/Macintosh/Target.hpp"
+#include "Analyser/Static/Macintosh/Target.hpp"

-#include "../../Utility/MemoryPacker.hpp"
-#include "../../Utility/MemoryFuzzer.hpp"
+#include "Machines/Utility/MemoryPacker.hpp"
+#include "Machines/Utility/MemoryFuzzer.hpp"

 namespace {

@@ -8,8 +8,8 @@

 #pragma once

-#include "../../../Outputs/CRT/CRT.hpp"
-#include "../../../ClockReceiver/ClockReceiver.hpp"
+#include "Outputs/CRT/CRT.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
 #include "DeferredAudio.hpp"
 #include "DriveSpeedAccumulator.hpp"

@@ -13,9 +13,9 @@
 #include "TIA.hpp"
 #include "TIASound.hpp"

-#include "../../../Analyser/Dynamic/ConfidenceCounter.hpp"
-#include "../../../ClockReceiver/ClockReceiver.hpp"
-#include "../../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp"
+#include "Analyser/Dynamic/ConfidenceCounter.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp"

 namespace Atari2600 {

@@ -13,8 +13,8 @@
 #include <cstdint>
 #include <functional>

-#include "../../../Outputs/CRT/CRT.hpp"
-#include "../../../ClockReceiver/ClockReceiver.hpp"
+#include "Outputs/CRT/CRT.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"

 namespace Atari2600 {

@@ -8,8 +8,8 @@

 #pragma once

-#include "../../../Outputs/Speaker/Implementation/BufferSource.hpp"
-#include "../../../Concurrency/AsyncTaskQueue.hpp"
+#include "Outputs/Speaker/Implementation/BufferSource.hpp"
+#include "Concurrency/AsyncTaskQueue.hpp"

 namespace Atari2600 {

@@ -8,33 +8,32 @@

 #include "AtariST.hpp"

-#include "../../MachineTypes.hpp"
-#include "../../../Activity/Source.hpp"
+#include "Machines/MachineTypes.hpp"
+#include "Activity/Source.hpp"

 //#define LOG_TRACE
 //bool should_log = false;
-#include "../../../Processors/68000/68000.hpp"
+#include "Processors/68000/68000.hpp"

-#include "../../../Components/AY38910/AY38910.hpp"
-#include "../../../Components/68901/MFP68901.hpp"
-#include "../../../Components/6850/6850.hpp"
+#include "Components/AY38910/AY38910.hpp"
+#include "Components/68901/MFP68901.hpp"
+#include "Components/6850/6850.hpp"

 #include "DMAController.hpp"
 #include "IntelligentKeyboard.hpp"
 #include "Video.hpp"

-#include "../../../ClockReceiver/JustInTime.hpp"
-#include "../../../ClockReceiver/ForceInline.hpp"
-#include "../../../Configurable/StandardOptions.hpp"
+#include "ClockReceiver/JustInTime.hpp"
+#include "ClockReceiver/ForceInline.hpp"
+#include "Configurable/StandardOptions.hpp"

-#include "../../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp"
+#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp"
+#include "Outputs/Log.hpp"

-#include "../../../Outputs/Log.hpp"
+#include "Machines/Utility/MemoryPacker.hpp"
+#include "Machines/Utility/MemoryFuzzer.hpp"

-#include "../../Utility/MemoryPacker.hpp"
-#include "../../Utility/MemoryFuzzer.hpp"
-
-#include "../../../Analyser/Static/AtariST/Target.hpp"
+#include "Analyser/Static/AtariST/Target.hpp"

 namespace {
 Log::Logger<Log::Source::AtariST> logger;
@@ -8,7 +8,7 @@

 #include "DMAController.hpp"

-#include "../../../Outputs/Log.hpp"
+#include "Outputs/Log.hpp"

 #include <cstdio>

--- a/Show More
+++ b/Show More