Further eliminate file-relative includes.

Analyser/Static/FAT12/StaticAnalyser.cpp

@@ -8,12 +8,12 @@
 
 #include "StaticAnalyser.hpp"
 
-#include "../Enterprise/StaticAnalyser.hpp"
-#include "../PCCompatible/StaticAnalyser.hpp"
+#include "Analyser/Static/Enterprise/StaticAnalyser.hpp"
+#include "Analyser/Static/PCCompatible/StaticAnalyser.hpp"
 
-#include "../../../Storage/Disk/Track/TrackSerialiser.hpp"
-#include "../../../Storage/Disk/Encodings/MFM/Constants.hpp"
-#include "../../../Storage/Disk/Encodings/MFM/SegmentParser.hpp"
+#include "Storage/Disk/Track/TrackSerialiser.hpp"
+#include "Storage/Disk/Encodings/MFM/Constants.hpp"
+#include "Storage/Disk/Encodings/MFM/SegmentParser.hpp"
 
 
 Analyser::Static::TargetList Analyser::Static::FAT12::GetTargets(

Analyser/Static/MSX/Cartridge.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../../Storage/Cartridge/Cartridge.hpp"
+#include "Storage/Cartridge/Cartridge.hpp"
 
 namespace Analyser::Static::MSX {
 

Analyser/Static/MSX/StaticAnalyser.cpp

@@ -12,8 +12,8 @@
 #include "Tape.hpp"
 #include "Target.hpp"
 
-#include "../Disassembler/Z80.hpp"
-#include "../Disassembler/AddressMapper.hpp"
+#include "Analyser/Static/Disassembler/Z80.hpp"
+#include "Analyser/Static//Disassembler/AddressMapper.hpp"
 
 #include <algorithm>
 

Analyser/Static/MSX/StaticAnalyser.hpp

@@ -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::MSX {

Analyser/Static/MSX/Tape.cpp

@@ -8,7 +8,7 @@
 
 #include "Tape.hpp"
 
-#include "../../../Storage/Tape/Parsers/MSX.hpp"
+#include "Storage/Tape/Parsers/MSX.hpp"
 
 using namespace Analyser::Static::MSX;
 

Analyser/Static/MSX/Tape.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../../Storage/Tape/Tape.hpp"
+#include "Storage/Tape/Tape.hpp"
 
 #include <string>
 #include <vector>

Analyser/Static/MSX/Target.hpp

@@ -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::MSX {

Analyser/Static/Macintosh/StaticAnalyser.hpp

@@ -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::Macintosh {

Analyser/Static/Macintosh/Target.hpp

@@ -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::Macintosh {
 

Analyser/Static/Oric/StaticAnalyser.cpp

@@ -11,10 +11,10 @@
 #include "Tape.hpp"
 #include "Target.hpp"
 
-#include "../Disassembler/6502.hpp"
-#include "../Disassembler/AddressMapper.hpp"
+#include "Analyser/Static/Disassembler/6502.hpp"
+#include "Analyser/Static/Disassembler/AddressMapper.hpp"
 
-#include "../../../Storage/Disk/Encodings/MFM/Parser.hpp"
+#include "Storage/Disk/Encodings/MFM/Parser.hpp"
 
 #include <cstring>
 

Analyser/Static/Oric/StaticAnalyser.hpp

@@ -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::Oric {

Analyser/Static/Oric/Tape.cpp

@@ -7,7 +7,7 @@
 //
 
 #include "Tape.hpp"
-#include "../../../Storage/Tape/Parsers/Oric.hpp"
+#include "Storage/Tape/Parsers/Oric.hpp"
 
 using namespace Analyser::Static::Oric;
 

Analyser/Static/Oric/Tape.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../../Storage/Tape/Tape.hpp"
+#include "Storage/Tape/Tape.hpp"
 
 #include <string>
 #include <vector>

Analyser/Static/Oric/Target.hpp

@@ -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::Oric {

Analyser/Static/PCCompatible/StaticAnalyser.hpp

@@ -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::PCCompatible {

Analyser/Static/PCCompatible/Target.hpp

@@ -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::PCCompatible {
 

Analyser/Static/Sega/StaticAnalyser.hpp

@@ -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::Sega {

Analyser/Static/Sega/Target.hpp

@@ -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::Sega {
 

Analyser/Static/ZX8081/StaticAnalyser.cpp

@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "Target.hpp"
-#include "../../../Storage/Tape/Parsers/ZX8081.hpp"
+#include "Storage/Tape/Parsers/ZX8081.hpp"
 
 static std::vector<Storage::Data::ZX8081::File> GetFiles(Storage::Tape::TapeSerialiser &serialiser) {
 	std::vector<Storage::Data::ZX8081::File> files;

Analyser/Static/ZX8081/StaticAnalyser.hpp

@@ -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::ZX8081 {

Analyser/Static/ZX8081/Target.hpp

@@ -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::ZX8081 {

Analyser/Static/ZXSpectrum/StaticAnalyser.cpp

@@ -8,9 +8,9 @@
 
 #include "StaticAnalyser.hpp"
 
-#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"
 

Analyser/Static/ZXSpectrum/StaticAnalyser.hpp

@@ -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::ZXSpectrum {

Analyser/Static/ZXSpectrum/Target.hpp

@@ -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::ZXSpectrum {
 

ClockReceiver/JustInTime.hpp

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "ClockReceiver.hpp"
-#include "../Concurrency/AsyncTaskQueue.hpp"
+#include "Concurrency/AsyncTaskQueue.hpp"
 #include "ClockingHintSource.hpp"
 #include "ForceInline.hpp"
 

Components/1770/1770.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../Storage/Disk/Controller/MFMDiskController.hpp"
+#include "Storage/Disk/Controller/MFMDiskController.hpp"
 
 namespace WD {
 

Components/5380/ncr5380.hpp

@@ -8,11 +8,9 @@
 
 #pragma once
 
+#include "Storage/MassStorage/SCSI/SCSI.hpp"
 #include <cstdint>
 
-#include "../../Storage/MassStorage/SCSI/SCSI.hpp"
-
-
 namespace NCR::NCR5380 {
 
 /*!

Components/6522/6522.hpp

@@ -8,12 +8,10 @@
 
 #pragma once
 
+#include "Components/6522/Implementation/6522Storage.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
 #include <cstdint>
 
-#include "Implementation/6522Storage.hpp"
-
-#include "../../ClockReceiver/ClockReceiver.hpp"
-
 namespace MOS::MOS6522 {
 
 enum Port {

Components/6522/Implementation/IRQDelegatePortHandler.cpp

@@ -6,7 +6,7 @@
 //  Copyright 2017 Thomas Harte. All rights reserved.
 //
 
-#include "../6522.hpp"
+#include "Components/6522/6522.hpp"
 
 using namespace MOS::MOS6522;
 

Components/6526/6526.hpp

@@ -11,7 +11,7 @@
 #include <cstdint>
 
 #include "Implementation/6526Storage.hpp"
-#include "../Serial/Line.hpp"
+#include "Components/Serial/Line.hpp"
 
 namespace MOS::MOS6526 {
 

Components/6532/6532.hpp

@@ -8,11 +8,11 @@
 
 #pragma once
 
+#include "ClockReceiver/ClockReceiver.hpp"
+
 #include <cstdint>
 #include <cstdio>
 
-#include "../../ClockReceiver/ClockReceiver.hpp"
-
 namespace MOS {
 
 /*!

Components/6845/CRTC6845.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
 
 #include <cstdint>
 #include <cstdio>

Components/6850/6850.hpp

@@ -9,10 +9,10 @@
 #pragma once
 
 #include <cstdint>
-#include "../../ClockReceiver/ClockReceiver.hpp"
-#include "../../ClockReceiver/ForceInline.hpp"
-#include "../../ClockReceiver/ClockingHintSource.hpp"
-#include "../Serial/Line.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ForceInline.hpp"
+#include "ClockReceiver/ClockingHintSource.hpp"
+#include "Components/Serial/Line.hpp"
 
 namespace Motorola::ACIA {
 

Components/68901/MFP68901.hpp

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../ClockReceiver/ClockReceiver.hpp"
-#include "../../ClockReceiver/ClockingHintSource.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ClockingHintSource.hpp"
 
 #include <cstdint>
 

Components/8272/i8272.hpp

@@ -11,7 +11,7 @@
 #include "CommandDecoder.hpp"
 #include "Status.hpp"
 
-#include "../../Storage/Disk/Controller/MFMDiskController.hpp"
+#include "Storage/Disk/Controller/MFMDiskController.hpp"
 
 #include <cstdint>
 #include <memory>

Components/9918/Implementation/ClockConverter.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../9918.hpp"
+#include "Components/9918/9918.hpp"
 #include "PersonalityTraits.hpp"
 #include "LineLayout.hpp"
 

Components/DiskII/DiskII.hpp

@@ -8,13 +8,13 @@
 
 #pragma once
 
-#include "../../ClockReceiver/ClockReceiver.hpp"
-#include "../../ClockReceiver/ClockingHintSource.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ClockingHintSource.hpp"
 
-#include "../../Storage/Disk/Disk.hpp"
-#include "../../Storage/Disk/Drive.hpp"
+#include "Storage/Disk/Disk.hpp"
+#include "Storage/Disk/Drive.hpp"
 
-#include "../../Activity/Observer.hpp"
+#include "Activity/Observer.hpp"
 
 #include <array>
 #include <cstdint>

Components/DiskII/IWM.hpp

@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "../../Activity/Observer.hpp"
+#include "Activity/Observer.hpp"
 
-#include "../../ClockReceiver/ClockReceiver.hpp"
-#include "../../ClockReceiver/ClockingHintSource.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ClockingHintSource.hpp"
 
-#include "../../Storage/Disk/Drive.hpp"
+#include "Storage/Disk/Drive.hpp"
 
 #include <cstdint>
 

Components/OPx/Implementation/LowFrequencyOscillator.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../../Numeric/LFSR.hpp"
+#include "Numeric/LFSR.hpp"
 
 namespace Yamaha::OPL {
 

Components/RP5C01/RP5C01.cpp

@@ -8,7 +8,7 @@
 
 #include "RP5C01.hpp"
 
-#include "../../Numeric/NumericCoder.hpp"
+#include "Numeric/NumericCoder.hpp"
 
 #include <ctime>
 

Components/RP5C01/RP5C01.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
 
 #include <array>
 #include <cstdint>

Components/Serial/Line.hpp

@@ -9,9 +9,9 @@
 #pragma once
 
 #include <vector>
-#include "../../Storage/Storage.hpp"
-#include "../../ClockReceiver/ClockReceiver.hpp"
-#include "../../ClockReceiver/ForceInline.hpp"
+#include "Storage/Storage.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ForceInline.hpp"
 
 namespace Serial {
 

Concurrency/AsyncTaskQueue.hpp

@@ -14,7 +14,7 @@
 #include <thread>
 #include <vector>
 
-#include "../ClockReceiver/TimeTypes.hpp"
+#include "ClockReceiver/TimeTypes.hpp"
 
 namespace Concurrency {
 

Configurable/Configurable.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../Reflection/Struct.hpp"
+#include "Reflection/Struct.hpp"
 
 #include <memory>
 

Configurable/StandardOptions.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../Reflection/Enum.hpp"
+#include "Reflection/Enum.hpp"
 
 namespace Configurable {
 

Inputs/QuadratureMouse/QuadratureMouse.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../Mouse.hpp"
+#include "Inputs/Mouse.hpp"
 #include <atomic>
 
 namespace Inputs {

InstructionSets/ARM/Executor.hpp

@@ -11,7 +11,7 @@
 #include "BarrelShifter.hpp"
 #include "OperationMapper.hpp"
 #include "Registers.hpp"
-#include "../../Numeric/Carry.hpp"
+#include "Numeric/Carry.hpp"
 
 namespace InstructionSet::ARM {
 

InstructionSets/ARM/OperationMapper.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../Reflection/Dispatcher.hpp"
+#include "Reflection/Dispatcher.hpp"
 #include "BarrelShifter.hpp"
 
 namespace InstructionSet::ARM {

InstructionSets/CachingExecutor.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../Numeric/Sizes.hpp"
+#include "Numeric/Sizes.hpp"
 
 #include <array>
 #include <cstdint>

InstructionSets/Disassembler.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../Numeric/Sizes.hpp"
+#include "Numeric/Sizes.hpp"
 
 #include <list>
 #include <map>

InstructionSets/M50740/Executor.hpp

@@ -10,8 +10,8 @@
 
 #include "Instruction.hpp"
 #include "Parser.hpp"
-#include "../CachingExecutor.hpp"
-#include "../../ClockReceiver/ClockReceiver.hpp"
+#include "InstructionSets/CachingExecutor.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
 
 #include <array>
 #include <cstdint>

InstructionSets/M50740/Instruction.hpp

@@ -12,7 +12,7 @@
 #include <iomanip>
 #include <string>
 #include <sstream>
-#include "../AccessType.hpp"
+#include "InstructionSets/AccessType.hpp"
 
 namespace InstructionSet::M50740 {
 

InstructionSets/M50740/Parser.hpp

@@ -10,7 +10,7 @@
 
 #include <cstdint>
 #include "Decoder.hpp"
-#include "../AccessType.hpp"
+#include "InstructionSets/AccessType.hpp"
 
 namespace InstructionSet::M50740 {
 

InstructionSets/M68k/Decoder.hpp

@@ -10,7 +10,7 @@
 
 #include "Instruction.hpp"
 #include "Model.hpp"
-#include "../../Numeric/Sizes.hpp"
+#include "Numeric/Sizes.hpp"
 
 namespace InstructionSet::M68k {
 

InstructionSets/M68k/Implementation/ExecutorImplementation.hpp

@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include "../Perform.hpp"
-#include "../ExceptionVectors.hpp"
+#include "InstructionSets/M68k/Perform.hpp"
+#include "InstructionSets/M68k/ExceptionVectors.hpp"
 
 #include <cassert>
 

InstructionSets/M68k/Implementation/PerformImplementation.hpp

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../../Numeric/Carry.hpp"
-#include "../ExceptionVectors.hpp"
+#include "Numeric/Carry.hpp"
+#include "InstructionSets/M68k/ExceptionVectors.hpp"
 
 #include <algorithm>
 #include <cassert>

InstructionSets/M68k/Perform.hpp

@@ -11,7 +11,7 @@
 #include "Model.hpp"
 #include "Instruction.hpp"
 #include "Status.hpp"
-#include "../../Numeric/RegisterSizes.hpp"
+#include "Numeric/RegisterSizes.hpp"
 
 namespace InstructionSet::M68k {
 

InstructionSets/x86/Flags.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../Numeric/Carry.hpp"
+#include "Numeric/Carry.hpp"
 
 namespace InstructionSet::x86 {
 

InstructionSets/x86/Implementation/Arithmetic.hpp

@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "../AccessType.hpp"
-#include "../Interrupts.hpp"
-#include "../Perform.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
+#include "InstructionSets/x86/Interrupts.hpp"
+#include "InstructionSets/x86/Perform.hpp"
 
-#include "../../../Numeric/Carry.hpp"
+#include "Numeric/Carry.hpp"
 
 namespace InstructionSet::x86::Primitive {
 

InstructionSets/x86/Implementation/BCD.hpp

@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../AccessType.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
 
-#include "../../../Numeric/RegisterSizes.hpp"
+#include "Numeric/RegisterSizes.hpp"
 
 namespace InstructionSet::x86::Primitive {
 

InstructionSets/x86/Implementation/FlowControl.hpp

@@ -10,7 +10,7 @@
 
 #include "Resolver.hpp"
 #include "Stack.hpp"
-#include "../AccessType.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
 
 #include <type_traits>
 

InstructionSets/x86/Implementation/InOut.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../AccessType.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
 
 namespace InstructionSet::x86::Primitive {
 

InstructionSets/x86/Implementation/LoadStore.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../AccessType.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
 
 #include <utility>
 

InstructionSets/x86/Implementation/Logical.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../AccessType.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
 
 namespace InstructionSet::x86::Primitive {
 

InstructionSets/x86/Implementation/PerformImplementation.hpp

@@ -20,8 +20,8 @@
 #include "ShiftRoll.hpp"
 #include "Stack.hpp"
 
-#include "../Interrupts.hpp"
-#include "../AccessType.hpp"
+#include "InstructionSets/x86/Interrupts.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
 
 //
 // Comments throughout headers above come from the 1997 edition of the

InstructionSets/x86/Implementation/Repetition.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../AccessType.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
 
 namespace InstructionSet::x86::Primitive {
 

InstructionSets/x86/Implementation/Resolver.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../AccessType.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
 
 namespace InstructionSet::x86 {
 

InstructionSets/x86/Implementation/ShiftRoll.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../AccessType.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
 
 namespace InstructionSet::x86::Primitive {
 

InstructionSets/x86/Implementation/Stack.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../AccessType.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
 
 #include <type_traits>
 

InstructionSets/x86/Instruction.cpp

@@ -8,7 +8,7 @@
 
 #include "Instruction.hpp"
 
-#include "../../Numeric/Carry.hpp"
+#include "Numeric/Carry.hpp"
 
 #include <cassert>
 #include <iomanip>

Machines/Acorn/Archimedes/Archimedes.hpp

@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../../Configurable/Configurable.hpp"
-#include "../../../Configurable/StandardOptions.hpp"
-#include "../../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <memory>
 

Machines/Acorn/Archimedes/FloppyDisc.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../../Components/1770/1770.hpp"
+#include "Components/1770/1770.hpp"
 
 namespace Archimedes {
 

Machines/Acorn/Archimedes/KeyboardMapper.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../KeyboardMachine.hpp"
+#include "Machines/KeyboardMachine.hpp"
 #include "Keyboard.hpp"
 
 namespace Archimedes {

Machines/Acorn/Electron/Electron.hpp

@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../../Configurable/Configurable.hpp"
-#include "../../../Configurable/StandardOptions.hpp"
-#include "../../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <memory>
 

Machines/Acorn/Electron/Keyboard.hpp

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../KeyboardMachine.hpp"
-#include "../../Utility/Typer.hpp"
+#include "Machines/KeyboardMachine.hpp"
+#include "Machines/Utility/Typer.hpp"
 
 namespace Electron {
 

Machines/Acorn/Electron/Plus3.hpp

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../../Components/1770/1770.hpp"
-#include "../../../Activity/Observer.hpp"
+#include "Components/1770/1770.hpp"
+#include "Activity/Observer.hpp"
 
 namespace Electron {
 

Machines/Acorn/Electron/Tape.hpp

@@ -10,9 +10,9 @@
 
 #include <cstdint>
 
-#include "../../../ClockReceiver/ClockReceiver.hpp"
-#include "../../../Storage/Tape/Tape.hpp"
-#include "../../../Storage/Tape/Parsers/Acorn.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "Storage/Tape/Tape.hpp"
+#include "Storage/Tape/Parsers/Acorn.hpp"
 #include "Interrupts.hpp"
 
 namespace Electron {

Machines/Amiga/Amiga.hpp

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../Analyser/Static/StaticAnalyser.hpp"
-#include "../ROMMachine.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <memory>
 

Machines/Amiga/Blitter.hpp

@@ -13,7 +13,7 @@
 #include <string>
 #include <vector>
 
-#include "../../ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
 #include "BlitterSequencer.hpp"
 #include "DMADevice.hpp"
 

Machines/Amiga/Keyboard.hpp

@@ -8,11 +8,12 @@
 
 #pragma once
 
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "Components/Serial/Line.hpp"
+#include "Machines/KeyboardMachine.hpp"
+
 #include <array>
 #include <cstdint>
-#include "../KeyboardMachine.hpp"
-#include "../../Components/Serial/Line.hpp"
-#include "../../ClockReceiver/ClockReceiver.hpp"
 
 namespace Amiga {
 

Machines/Amiga/MemoryMap.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../Analyser/Static/Amiga/Target.hpp"
+#include "Analyser/Static/Amiga/Target.hpp"
 
 #include <array>
 #include <cassert>

Machines/Amiga/MouseJoystick.hpp

@@ -11,8 +11,8 @@
 #include <array>
 #include <atomic>
 
-#include "../../Inputs/Joystick.hpp"
-#include "../../Inputs/Mouse.hpp"
+#include "Inputs/Joystick.hpp"
+#include "Inputs/Mouse.hpp"
 
 namespace Amiga {
 

Machines/AmstradCPC/AmstradCPC.hpp

@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../Configurable/Configurable.hpp"
-#include "../../Configurable/StandardOptions.hpp"
-#include "../../Analyser/Static/StaticAnalyser.hpp"
-#include "../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <memory>
 

Machines/AmstradCPC/FDC.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../Components/8272/i8272.hpp"
+#include "Components/8272/i8272.hpp"
 
 namespace Amstrad {
 

Machines/AmstradCPC/Keyboard.hpp

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../KeyboardMachine.hpp"
-#include "../Utility/Typer.hpp"
+#include "Machines/KeyboardMachine.hpp"
+#include "Machines/Utility/Typer.hpp"
 
 namespace AmstradCPC {
 

Machines/Apple/ADB/Bus.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../../ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
 
 #include <bitset>
 #include <cstddef>

Machines/Apple/ADB/Keyboard.hpp

@@ -9,8 +9,8 @@
 #pragma once
 
 #include "ReactiveDevice.hpp"
-#include "../../../Inputs/Keyboard.hpp"
-#include "../../KeyboardMachine.hpp"
+#include "Inputs/Keyboard.hpp"
+#include "Machines/KeyboardMachine.hpp"
 
 #include <array>
 #include <cstdint>

Machines/Apple/ADB/Mouse.hpp

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "ReactiveDevice.hpp"
-#include "../../../Inputs/Mouse.hpp"
+#include "Inputs/Mouse.hpp"
 
 namespace Apple::ADB {
 

Machines/Apple/AppleII/AppleII.hpp

@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../../Configurable/Configurable.hpp"
-#include "../../../Configurable/StandardOptions.hpp"
-#include "../../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <memory>
 

Machines/Apple/AppleII/Card.hpp

@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../../../Processors/6502/6502.hpp"
-#include "../../../ClockReceiver/ClockReceiver.hpp"
-#include "../../../Activity/Observer.hpp"
+#include "Processors/6502/6502.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "Activity/Observer.hpp"
 
 namespace Apple::II {
 

Machines/Apple/AppleII/DiskIICard.hpp

@@ -9,11 +9,11 @@
 #pragma once
 
 #include "Card.hpp"
-#include "../../ROMMachine.hpp"
+#include "Machines/ROMMachine.hpp"
 
-#include "../../../Components/DiskII/DiskII.hpp"
-#include "../../../Storage/Disk/Disk.hpp"
-#include "../../../ClockReceiver/ClockingHintSource.hpp"
+#include "Components/DiskII/DiskII.hpp"
+#include "Storage/Disk/Disk.hpp"
+#include "ClockReceiver/ClockingHintSource.hpp"
 
 #include <cstdint>
 #include <memory>

Machines/Apple/AppleII/Joystick.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../../Inputs/Joystick.hpp"
+#include "Inputs/Joystick.hpp"
 
 #include <memory>
 #include <vector>

Machines/Apple/AppleII/Mockingboard.hpp

@@ -10,7 +10,7 @@
 
 #include "Card.hpp"
 
-#include "../../../Components/6522/6522.hpp"
+#include "Components/6522/6522.hpp"
 
 namespace Apple::II {
 

Machines/Apple/AppleII/VideoSwitches.hpp

@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../../../ClockReceiver/ClockReceiver.hpp"
-#include "../../../ClockReceiver/DeferredQueue.hpp"
-#include "../../ROMMachine.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/DeferredQueue.hpp"
+#include "Machines/ROMMachine.hpp"
 
 namespace Apple::II {
 

Machines/Apple/AppleIIgs/ADB.hpp

@@ -10,11 +10,11 @@
 
 #include <cstdint>
 #include <vector>
-#include "../../../InstructionSets/M50740/Executor.hpp"
+#include "InstructionSets/M50740/Executor.hpp"
 
-#include "../ADB/Bus.hpp"
-#include "../ADB/Mouse.hpp"
-#include "../ADB/Keyboard.hpp"
+#include "Machines/Apple/ADB/Bus.hpp"
+#include "Machines/Apple/ADB/Mouse.hpp"
+#include "Machines/Apple/ADB/Keyboard.hpp"
 
 namespace Apple::IIgs::ADB {
 

Machines/Apple/AppleIIgs/AppleIIgs.hpp

@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../../Configurable/Configurable.hpp"
-#include "../../../Configurable/StandardOptions.hpp"
-#include "../../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <memory>
 

Machines/Apple/AppleIIgs/MemoryMap.hpp

@@ -14,8 +14,8 @@
 #include <cstdint>
 #include <vector>
 
-#include "../AppleII/LanguageCardSwitches.hpp"
-#include "../AppleII/AuxiliaryMemorySwitches.hpp"
+#include "Machines/Apple/AppleII/LanguageCardSwitches.hpp"
+#include "Machines/Apple/AppleII/AuxiliaryMemorySwitches.hpp"
 
 namespace Apple::IIgs {
 

Machines/Apple/Macintosh/Keyboard.hpp

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../KeyboardMachine.hpp"
-#include "../../../ClockReceiver/ClockReceiver.hpp"
+#include "Machines/KeyboardMachine.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
 
 #include <mutex>
 #include <vector>

Machines/Apple/Macintosh/Macintosh.hpp

@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../../Configurable/Configurable.hpp"
-#include "../../../Configurable/StandardOptions.hpp"
-#include "../../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 namespace Apple::Macintosh {
 

Machines/Atari/2600/Atari2600.cpp

@@ -11,9 +11,9 @@
 #include <algorithm>
 #include <cstdio>
 
-#include "../../MachineTypes.hpp"
+#include "Machines/MachineTypes.hpp"
 
-#include "../../../Analyser/Static/Atari2600/Target.hpp"
+#include "Analyser/Static/Atari2600/Target.hpp"
 
 #include "Cartridges/Atari8k.hpp"
 #include "Cartridges/Atari16k.hpp"