diff --git a/Machines/AmstradCPC/AmstradCPC.cpp b/Machines/AmstradCPC/AmstradCPC.cpp
index 459a1b88f..6d0a88267 100644
--- a/Machines/AmstradCPC/AmstradCPC.cpp
+++ b/Machines/AmstradCPC/AmstradCPC.cpp
@@ -691,11 +691,11 @@ class FDC: public Intel::i8272::i8272 {
 			get_drive().set_motor_on(on);
 		}
 
-        void select_drive(int) {
-            // TODO: support more than one drive. (and in set_disk)
+		void select_drive(int) {
+			// TODO: support more than one drive. (and in set_disk)
 		}
 
-        void set_disk(std::shared_ptr<Storage::Disk::Disk> disk, int) {
+		void set_disk(std::shared_ptr<Storage::Disk::Disk> disk, int) {
 			get_drive().set_disk(disk);
 		}
 
@@ -1075,7 +1075,7 @@ template <bool has_fdc> class ConcreteMachine:
 			return !media.tapes.empty() || (!media.disks.empty() && has_fdc);
 		}
 
-        void set_component_prefers_clocking(ClockingHint::Source *, ClockingHint::Preference) final {
+		void set_component_prefers_clocking(ClockingHint::Source *, ClockingHint::Preference) final {
 			fdc_is_sleeping_ = fdc_.preferred_clocking() == ClockingHint::Preference::None;
 			tape_player_is_sleeping_ = tape_player_.preferred_clocking() == ClockingHint::Preference::None;
 		}
diff --git a/Machines/MSX/DiskROM.cpp b/Machines/MSX/DiskROM.cpp
index a0c990954..b5df05b8b 100644
--- a/Machines/MSX/DiskROM.cpp
+++ b/Machines/MSX/DiskROM.cpp
@@ -24,7 +24,7 @@ void DiskROM::write(uint16_t address, uint8_t value, bool) {
 		break;
 		case 0x7ffc: {
 			const int selected_head = value & 1;
-            for_all_drives([selected_head] (Storage::Disk::Drive &drive, size_t) {
+			for_all_drives([selected_head] (Storage::Disk::Drive &drive, size_t) {
 				drive.set_head(selected_head);
 			});
 		} break;
@@ -32,7 +32,7 @@ void DiskROM::write(uint16_t address, uint8_t value, bool) {
 			set_drive(1 << (value & 1));
 
 			const bool drive_motor = value & 0x80;
-            for_all_drives([drive_motor] (Storage::Disk::Drive &drive, size_t) {
+			for_all_drives([drive_motor] (Storage::Disk::Drive &drive, size_t) {
 				drive.set_motor_on(drive_motor);
 			});
 		} break;
diff --git a/Storage/Disk/DiskImage/Formats/STX.cpp b/Storage/Disk/DiskImage/Formats/STX.cpp
index 0b8edf267..6aafc04fd 100644
--- a/Storage/Disk/DiskImage/Formats/STX.cpp
+++ b/Storage/Disk/DiskImage/Formats/STX.cpp
@@ -384,7 +384,7 @@ class TrackConstructor {
 		const std::vector<uint8_t> &track_data_;
 		const std::vector<Sector> &sectors_;
 		const size_t track_size_;
-        const uint16_t first_sync_;
+		const uint16_t first_sync_;
 };
 
 }