diff --git a/Analyser/Static/StaticAnalyser.hpp b/Analyser/Static/StaticAnalyser.hpp
index acfe1d9f9..f17bfaf37 100644
--- a/Analyser/Static/StaticAnalyser.hpp
+++ b/Analyser/Static/StaticAnalyser.hpp
@@ -66,7 +66,7 @@ struct Target {
 	Media media;
 	float confidence = 0.5f;
 };
-typedef std::vector<std::unique_ptr<Target>> TargetList;
+using TargetList = std::vector<std::unique_ptr<Target>>;
 
 /*!
 	Attempts, through any available means, to return a list of potential targets for the file with the given name.
diff --git a/ClockReceiver/TimeTypes.hpp b/ClockReceiver/TimeTypes.hpp
index 1f7b1cc69..8f2e256fc 100644
--- a/ClockReceiver/TimeTypes.hpp
+++ b/ClockReceiver/TimeTypes.hpp
@@ -12,8 +12,8 @@
 
 namespace Time {
 
-typedef double Seconds;
-typedef int64_t Nanos;
+using Seconds = double;
+using Nanos = int64_t;
 
 inline Nanos nanos_now() {
 	return std::chrono::duration_cast<std::chrono::nanoseconds>(
diff --git a/Machines/ROMMachine.hpp b/Machines/ROMMachine.hpp
index 6fcaf9b1f..f490bec30 100644
--- a/Machines/ROMMachine.hpp
+++ b/Machines/ROMMachine.hpp
@@ -27,7 +27,7 @@ namespace ROMMachine {
 	return a vector of unique_ptrs that either contain the contents of the ROM from @c names that corresponds by
 	index, or else are @c nullptr.
 */
-typedef std::function<ROM::Map(const ROM::Request &)> ROMFetcher;
+using ROMFetcher = std::function<ROM::Map(const ROM::Request &)>;
 
 enum class Error {
 	MissingROMs,
diff --git a/Storage/MassStorage/SCSI/SCSI.hpp b/Storage/MassStorage/SCSI/SCSI.hpp
index 3d1c5d8e6..f69efb363 100644
--- a/Storage/MassStorage/SCSI/SCSI.hpp
+++ b/Storage/MassStorage/SCSI/SCSI.hpp
@@ -20,7 +20,7 @@ namespace SCSI {
 
 /// Provides the current state of the SCSI bus, being comprised of a bitwise combination
 /// of zero or more of the @c BusState flags defined below.
-typedef int BusState;
+using BusState = int;
 
 constexpr BusState DefaultBusState = 0;
 
diff --git a/Storage/TargetPlatforms.hpp b/Storage/TargetPlatforms.hpp
index 32b784544..ba9f2ccd4 100644
--- a/Storage/TargetPlatforms.hpp
+++ b/Storage/TargetPlatforms.hpp
@@ -10,7 +10,7 @@
 
 namespace TargetPlatform {
 
-typedef int IntType;
+using IntType = int;
 
 // The below is somehwat overspecified because some of the file formats already supported by this
 // emulator can self-specify platforms beyond those the emulator otherwise implements.