diff --git a/include/aoc/DiskFragmenter.hpp b/include/aoc/DiskFragmenter.hpp
index 7a16338..4413138 100644
--- a/include/aoc/DiskFragmenter.hpp
+++ b/include/aoc/DiskFragmenter.hpp
@@ -30,8 +30,8 @@ class DiskFragmenter
     virtual void processDataLine(const std::string& line) override;
     virtual void finish() override;
 private:
-    typedef std::vector<Interval> Intervals;
-    typedef std::array<size_t, 10> DigitIndexArray;
+    using Intervals = std::vector<Interval>;
+    using DigitIndexArray = std::array<size_t, 10>;
     void moveFileBlocks(const std::string& line);
     void moveWholeFiles(const std::string& line);
     void AddNewEmptySpaces(Intervals& emptySpaces, const std::string& line, size_t& front, const size_t back,
diff --git a/include/aoc/GuardGallivant.hpp b/include/aoc/GuardGallivant.hpp
index 1ad59ef..414254f 100644
--- a/include/aoc/GuardGallivant.hpp
+++ b/include/aoc/GuardGallivant.hpp
@@ -30,8 +30,8 @@ class GuardGallivant
     virtual const int getPuzzleDay() const override;
     virtual void finish() override;
 private:
-    typedef Grid<bool> VisitGrid;
-    typedef Grid<std::bitset<4>> PathGrid;
+    using VisitGrid = Grid<bool>;
+    using PathGrid = Grid<std::bitset<4>>;
     static constexpr size_t getStartDirectionIndex();
     static constexpr char getStartChar();
     static constexpr char getObstructionChar();
diff --git a/include/aoc/ReindeerMaze.hpp b/include/aoc/ReindeerMaze.hpp
index 3d0d648..69d0e60 100644
--- a/include/aoc/ReindeerMaze.hpp
+++ b/include/aoc/ReindeerMaze.hpp
@@ -34,7 +34,7 @@ class ReindeerMaze
     virtual const int getPuzzleDay() const override;
     virtual void finish() override;
 private:
-    typedef std::map<int, std::pair<int, int>> VertexAttachedPositions;
+    using VertexAttachedPositions = std::map<int, std::pair<int, int>>;
     static constexpr char getStartChar();
     static constexpr char getEndChar();
     static constexpr char getWallChar();