diff --git a/src/CalcManager/Ratpack/CalcErr.h b/src/CalcManager/Ratpack/CalcErr.h
index 9e4223e6..5f7ae524 100644
--- a/src/CalcManager/Ratpack/CalcErr.h
+++ b/src/CalcManager/Ratpack/CalcErr.h
@@ -38,7 +38,7 @@
 // This format is based loosely on an OLE HRESULT and is compatible with the
 // SUCCEEDED and FAILED macros as well as the HRESULT_CODE macro
 
-typedef int32_t ResultCode;
+using ResultCode = int32_t;
 
 // CALC_E_DIVIDEBYZERO
 //
diff --git a/src/CalcManager/UnitConverter.h b/src/CalcManager/UnitConverter.h
index 0ee06ae3..44255816 100644
--- a/src/CalcManager/UnitConverter.h
+++ b/src/CalcManager/UnitConverter.h
@@ -156,13 +156,12 @@ namespace UnitConversionManager
         std::wstring targetCurrencyCode;
     };
 
-    typedef std::tuple<std::vector<UnitConversionManager::Unit>, UnitConversionManager::Unit, UnitConversionManager::Unit> CategorySelectionInitializer;
-    typedef std::unordered_map<
+    using CategorySelectionInitializer = std::tuple<std::vector<UnitConversionManager::Unit>, UnitConversionManager::Unit, UnitConversionManager::Unit>;
+    using UnitToUnitToConversionDataMap = std::unordered_map<
         UnitConversionManager::Unit,
         std::unordered_map<UnitConversionManager::Unit, UnitConversionManager::ConversionData, UnitConversionManager::UnitHash>,
-        UnitConversionManager::UnitHash>
-        UnitToUnitToConversionDataMap;
-    typedef std::unordered_map<int, std::vector<UnitConversionManager::Unit>> CategoryToUnitVectorMap;
+        UnitConversionManager::UnitHash>;
+    using CategoryToUnitVectorMap = std::unordered_map<int, std::vector<UnitConversionManager::Unit>>;
 
     class IViewModelCurrencyCallback
     {
diff --git a/src/GraphingInterfaces/IGraphAnalyzer.h b/src/GraphingInterfaces/IGraphAnalyzer.h
index 5e6233b6..0e832163 100644
--- a/src/GraphingInterfaces/IGraphAnalyzer.h
+++ b/src/GraphingInterfaces/IGraphAnalyzer.h
@@ -11,7 +11,7 @@
 
 namespace Graphing::Analyzer
 {
-    typedef unsigned int NativeAnalysisType; // PerformAnalysisType
+    using NativeAnalysisType = unsigned int; // PerformAnalysisType
 
     struct IGraphAnalyzer : public NonCopyable, public NonMoveable
     {