diff --git a/AdventOfCode2024.cpp b/AdventOfCode2024.cpp
index 3600603..1b979e0 100644
--- a/AdventOfCode2024.cpp
+++ b/AdventOfCode2024.cpp
@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/Program.h>
+#include <aoc/Program.hpp>
 
 int main()
 {
diff --git a/include/aoc/CeresSearch.h b/include/aoc/CeresSearch.hpp
similarity index 97%
rename from include/aoc/CeresSearch.h
rename to include/aoc/CeresSearch.hpp
index 568df15..5247409 100644
--- a/include/aoc/CeresSearch.h
+++ b/include/aoc/CeresSearch.hpp
@@ -17,7 +17,7 @@
 
 #include <vector>
 
-#include "LinesSolver.h"
+#include <aoc/LinesSolver.hpp>
 
 class CeresSearch :
     public LinesSolver
diff --git a/include/aoc/GuardGallivant.h b/include/aoc/GuardGallivant.hpp
similarity index 97%
rename from include/aoc/GuardGallivant.h
rename to include/aoc/GuardGallivant.hpp
index 160f4dc..78f952c 100644
--- a/include/aoc/GuardGallivant.h
+++ b/include/aoc/GuardGallivant.hpp
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "LinesSolver.h"
+#include <aoc/LinesSolver.hpp>
 
 class GuardGallivant :
     public LinesSolver
diff --git a/include/aoc/HistorianHysteria.h b/include/aoc/HistorianHysteria.hpp
similarity index 97%
rename from include/aoc/HistorianHysteria.h
rename to include/aoc/HistorianHysteria.hpp
index 5c17e9a..37f6c11 100644
--- a/include/aoc/HistorianHysteria.h
+++ b/include/aoc/HistorianHysteria.hpp
@@ -17,7 +17,7 @@
 
 #include <set>
 
-#include <aoc/Solver.h>
+#include <aoc/Solver.hpp>
 
 class HistorianHysteria
     : public Solver
diff --git a/include/aoc/LinesSolver.h b/include/aoc/LinesSolver.hpp
similarity index 95%
rename from include/aoc/LinesSolver.h
rename to include/aoc/LinesSolver.hpp
index b58ed7c..78ea1b4 100644
--- a/include/aoc/LinesSolver.h
+++ b/include/aoc/LinesSolver.hpp
@@ -17,8 +17,8 @@
 
 #include <vector>
 
-#include "Solver.h"
-#include "Point2.h"
+#include <aoc/Point2.hpp>
+#include <aoc/Solver.hpp>
 
 class LinesSolver :
     public Solver
diff --git a/include/aoc/MullCharState.h b/include/aoc/MullCharState.hpp
similarity index 97%
rename from include/aoc/MullCharState.h
rename to include/aoc/MullCharState.hpp
index 9e30ca6..9c17e36 100644
--- a/include/aoc/MullCharState.h
+++ b/include/aoc/MullCharState.hpp
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <aoc/StringState.h>
+#include <aoc/StringState.hpp>
 
 class MullCharState
     : public StringState
diff --git a/include/aoc/MullData.h b/include/aoc/MullData.hpp
similarity index 100%
rename from include/aoc/MullData.h
rename to include/aoc/MullData.hpp
diff --git a/include/aoc/MullDataState.h b/include/aoc/MullDataState.hpp
similarity index 93%
rename from include/aoc/MullDataState.h
rename to include/aoc/MullDataState.hpp
index 7b6d782..3cad1bf 100644
--- a/include/aoc/MullDataState.h
+++ b/include/aoc/MullDataState.hpp
@@ -15,8 +15,8 @@
 
 #pragma once
 
-#include <aoc/MullData.h>
-#include <aoc/StringState.h>
+#include <aoc/MullData.hpp>
+#include <aoc/StringState.hpp>
 
 class MullDataState
     : public StringState
diff --git a/include/aoc/MullDoOpenState.h b/include/aoc/MullDoOpenState.hpp
similarity index 97%
rename from include/aoc/MullDoOpenState.h
rename to include/aoc/MullDoOpenState.hpp
index e4d448b..6a67332 100644
--- a/include/aoc/MullDoOpenState.h
+++ b/include/aoc/MullDoOpenState.hpp
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <aoc/MullDataState.h>
+#include <aoc/MullDataState.hpp>
 
 class MullDoOpenState
     : public MullDataState
diff --git a/include/aoc/MullEntryState.h b/include/aoc/MullEntryState.hpp
similarity index 97%
rename from include/aoc/MullEntryState.h
rename to include/aoc/MullEntryState.hpp
index f6382d4..948f6c9 100644
--- a/include/aoc/MullEntryState.h
+++ b/include/aoc/MullEntryState.hpp
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <aoc/StringState.h>
+#include <aoc/StringState.hpp>
 
 class MullEntryState
     : public StringState
diff --git a/include/aoc/MullFactorState.h b/include/aoc/MullFactorState.hpp
similarity index 97%
rename from include/aoc/MullFactorState.h
rename to include/aoc/MullFactorState.hpp
index 790fb99..d588db7 100644
--- a/include/aoc/MullFactorState.h
+++ b/include/aoc/MullFactorState.hpp
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <aoc/MullDataState.h>
+#include <aoc/MullDataState.hpp>
 
 class MullFactorState
     : public MullDataState
diff --git a/include/aoc/MullItOver.h b/include/aoc/MullItOver.hpp
similarity index 92%
rename from include/aoc/MullItOver.h
rename to include/aoc/MullItOver.hpp
index 9ef289e..9a26c64 100644
--- a/include/aoc/MullItOver.h
+++ b/include/aoc/MullItOver.hpp
@@ -15,9 +15,9 @@
 
 #pragma once
 
-#include <aoc/MullData.h>
-#include <aoc/MullStates.h>
-#include <aoc/Solver.h>
+#include <aoc/MullData.hpp>
+#include <aoc/MullStates.hpp>
+#include <aoc/Solver.hpp>
 
 class MullItOver
     : public Solver
diff --git a/include/aoc/MullStates.h b/include/aoc/MullStates.hpp
similarity index 88%
rename from include/aoc/MullStates.h
rename to include/aoc/MullStates.hpp
index 5c3c26e..727fe21 100644
--- a/include/aoc/MullStates.h
+++ b/include/aoc/MullStates.hpp
@@ -15,11 +15,11 @@
 
 #pragma once
 
-#include <aoc/MullCharState.h>
-#include <aoc/MullDoOpenState.h>
-#include <aoc/MullEntryState.h>
-#include <aoc/MullFactorState.h>
-#include <aoc/MullToggleCloseState.h>
+#include <aoc/MullCharState.hpp>
+#include <aoc/MullDoOpenState.hpp>
+#include <aoc/MullEntryState.hpp>
+#include <aoc/MullFactorState.hpp>
+#include <aoc/MullToggleCloseState.hpp>
 
 class MullStates
 {
diff --git a/include/aoc/MullToggleCloseState.h b/include/aoc/MullToggleCloseState.hpp
similarity index 97%
rename from include/aoc/MullToggleCloseState.h
rename to include/aoc/MullToggleCloseState.hpp
index 401c5b3..950d55f 100644
--- a/include/aoc/MullToggleCloseState.h
+++ b/include/aoc/MullToggleCloseState.hpp
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <aoc/MullDataState.h>
+#include <aoc/MullDataState.hpp>
 
 class MullToggleCloseState
     : public MullDataState
diff --git a/include/aoc/Point2.h b/include/aoc/Point2.hpp
similarity index 100%
rename from include/aoc/Point2.h
rename to include/aoc/Point2.hpp
diff --git a/include/aoc/PrintQueue.h b/include/aoc/PrintQueue.hpp
similarity index 98%
rename from include/aoc/PrintQueue.h
rename to include/aoc/PrintQueue.hpp
index 5b27e11..fa3f185 100644
--- a/include/aoc/PrintQueue.h
+++ b/include/aoc/PrintQueue.hpp
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "Solver.h"
+#include <aoc/Solver.hpp>
 
 class PrintQueue :
     public Solver
diff --git a/include/aoc/Program.h b/include/aoc/Program.hpp
similarity index 100%
rename from include/aoc/Program.h
rename to include/aoc/Program.hpp
diff --git a/include/aoc/RedNosedReportData.h b/include/aoc/RedNosedReportData.hpp
similarity index 97%
rename from include/aoc/RedNosedReportData.h
rename to include/aoc/RedNosedReportData.hpp
index 3a6cffc..7592b44 100644
--- a/include/aoc/RedNosedReportData.h
+++ b/include/aoc/RedNosedReportData.hpp
@@ -17,7 +17,7 @@
 
 #include<vector>
 
-#include <aoc/Slope.h>
+#include <aoc/Slope.hpp>
 
 class RedNosedReportData
 {
diff --git a/include/aoc/RedNosedReports.h b/include/aoc/RedNosedReports.hpp
similarity index 92%
rename from include/aoc/RedNosedReports.h
rename to include/aoc/RedNosedReports.hpp
index b1f1763..d3f145f 100644
--- a/include/aoc/RedNosedReports.h
+++ b/include/aoc/RedNosedReports.hpp
@@ -15,9 +15,9 @@
 
 #pragma once
 
-#include <aoc/Slope.h>
-#include <aoc/Solver.h>
-#include <aoc/RedNosedReportData.h>
+#include <aoc/RedNosedReportData.hpp>
+#include <aoc/Slope.hpp>
+#include <aoc/Solver.hpp>
 
 class RedNosedReports
     : public Solver
diff --git a/include/aoc/Slope.h b/include/aoc/Slope.hpp
similarity index 100%
rename from include/aoc/Slope.h
rename to include/aoc/Slope.hpp
diff --git a/include/aoc/Solver.h b/include/aoc/Solver.hpp
similarity index 100%
rename from include/aoc/Solver.h
rename to include/aoc/Solver.hpp
diff --git a/include/aoc/SolverEngine.h b/include/aoc/SolverEngine.hpp
similarity index 97%
rename from include/aoc/SolverEngine.h
rename to include/aoc/SolverEngine.hpp
index ffd751b..b5c404e 100644
--- a/include/aoc/SolverEngine.h
+++ b/include/aoc/SolverEngine.hpp
@@ -20,7 +20,7 @@
 #include <memory>
 #include <vector>
 
-#include <aoc/Solver.h>
+#include <aoc/Solver.hpp>
 
 class SolverEngine
 {
diff --git a/include/aoc/StringState.h b/include/aoc/StringState.hpp
similarity index 96%
rename from include/aoc/StringState.h
rename to include/aoc/StringState.hpp
index 2f0c9cc..88c5199 100644
--- a/include/aoc/StringState.h
+++ b/include/aoc/StringState.hpp
@@ -17,7 +17,7 @@
 
 #include <vector>
 
-#include <aoc/StringStateMachine.h>
+#include <aoc/StringStateMachine.hpp>
 
 class StringStateMachine;
 
diff --git a/include/aoc/StringStateMachine.h b/include/aoc/StringStateMachine.hpp
similarity index 97%
rename from include/aoc/StringStateMachine.h
rename to include/aoc/StringStateMachine.hpp
index 1324fc0..dc67d7f 100644
--- a/include/aoc/StringStateMachine.h
+++ b/include/aoc/StringStateMachine.hpp
@@ -17,7 +17,7 @@
 
 #include <string>
 
-#include <aoc/StringState.h>
+#include <aoc/StringState.hpp>
 
 class StringState;
 
diff --git a/src/CeresSearch.cpp b/src/CeresSearch.cpp
index 7cbd49d..b851eb6 100644
--- a/src/CeresSearch.cpp
+++ b/src/CeresSearch.cpp
@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/CeresSearch.h>
+#include <aoc/CeresSearch.hpp>
 
 std::string CeresSearch::getPuzzleName() const
 {
diff --git a/src/GuardGallivant.cpp b/src/GuardGallivant.cpp
index 34115c0..d0a784d 100644
--- a/src/GuardGallivant.cpp
+++ b/src/GuardGallivant.cpp
@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/GuardGallivant.h>
+#include <aoc/GuardGallivant.hpp>
 
 std::string GuardGallivant::getPuzzleName() const
 {
diff --git a/src/HistorianHysteria.cpp b/src/HistorianHysteria.cpp
index 60d1251..f21bbf4 100644
--- a/src/HistorianHysteria.cpp
+++ b/src/HistorianHysteria.cpp
@@ -15,7 +15,7 @@
 
 #include <iostream>
 
-#include <aoc/HistorianHysteria.h>
+#include <aoc/HistorianHysteria.hpp>
 
 std::string HistorianHysteria::getPuzzleName() const
 {
diff --git a/src/LinesSolver.cpp b/src/LinesSolver.cpp
index 62d2351..967d701 100644
--- a/src/LinesSolver.cpp
+++ b/src/LinesSolver.cpp
@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/LinesSolver.h>
+#include <aoc/LinesSolver.hpp>
 
 void LinesSolver::processDataLine(const std::string& line)
 {
diff --git a/src/MullCharState.cpp b/src/MullCharState.cpp
index 9bc86af..a34508f 100644
--- a/src/MullCharState.cpp
+++ b/src/MullCharState.cpp
@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/MullCharState.h>
+#include <aoc/MullCharState.hpp>
 
 MullCharState::MullCharState(const char expected)
     : expected_{ expected }, successState_{}, failState_{} {}
diff --git a/src/MullData.cpp b/src/MullData.cpp
index de04f94..1a9b73b 100644
--- a/src/MullData.cpp
+++ b/src/MullData.cpp
@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/MullData.h>
+#include <aoc/MullData.hpp>
 
 MullData::MullData()
     : isEnabled_{ true }, factor1_{ 0 }, factor2_{ 0 }, part1_{ 0 }, part2_{ 0 } {};
diff --git a/src/MullDataState.cpp b/src/MullDataState.cpp
index 488d789..d05f9d8 100644
--- a/src/MullDataState.cpp
+++ b/src/MullDataState.cpp
@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/MullDataState.h>
+#include <aoc/MullDataState.hpp>
 
 void MullDataState::setData(MullData& data)
 {
diff --git a/src/MullDoOpenState.cpp b/src/MullDoOpenState.cpp
index 8c12477..2ab1fa3 100644
--- a/src/MullDoOpenState.cpp
+++ b/src/MullDoOpenState.cpp
@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/MullDoOpenState.h>
+#include <aoc/MullDoOpenState.hpp>
 
 void MullDoOpenState::next(StringStateMachine* stateMachine)
 {
diff --git a/src/MullEntryState.cpp b/src/MullEntryState.cpp
index 3d42946..5fe33bf 100644
--- a/src/MullEntryState.cpp
+++ b/src/MullEntryState.cpp
@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/MullEntryState.h>
+#include <aoc/MullEntryState.hpp>
 
 void MullEntryState::enter(StringStateMachine* stateMachine)
 {
diff --git a/src/MullFactorState.cpp b/src/MullFactorState.cpp
index 5d63478..d87482f 100644
--- a/src/MullFactorState.cpp
+++ b/src/MullFactorState.cpp
@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/MullFactorState.h>
+#include <aoc/MullFactorState.hpp>
 
 MullFactorState::MullFactorState(const char expected, const int index)
     : expected_{ expected }, index_{ index }, successState_{}, failState_{} {}
diff --git a/src/MullItOver.cpp b/src/MullItOver.cpp
index a71cb83..d26b8ba 100644
--- a/src/MullItOver.cpp
+++ b/src/MullItOver.cpp
@@ -13,8 +13,9 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/MullItOver.h>
-#include <aoc/StringStateMachine.h>
+#include <aoc/MullItOver.hpp>
+
+#include <aoc/StringStateMachine.hpp>
 
 MullItOver::MullItOver()
     : Solver{}, data_{}, states_ {
diff --git a/src/MullStates.cpp b/src/MullStates.cpp
index 180c09f..38a9c2a 100644
--- a/src/MullStates.cpp
+++ b/src/MullStates.cpp
@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/MullStates.h>
+#include <aoc/MullStates.hpp>
 
 MullStates::MullStates(MullData& data)
 {
diff --git a/src/MullToggleCloseState.cpp b/src/MullToggleCloseState.cpp
index 404814b..2f1b216 100644
--- a/src/MullToggleCloseState.cpp
+++ b/src/MullToggleCloseState.cpp
@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/MullToggleCloseState.h>
+#include <aoc/MullToggleCloseState.hpp>
 
 MullToggleCloseState::MullToggleCloseState(const bool isEnabler)
     : isEnabler_{ isEnabler }, successState_{} {}
diff --git a/src/Point2.cpp b/src/Point2.cpp
index a33e0e1..d419f58 100644
--- a/src/Point2.cpp
+++ b/src/Point2.cpp
@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/Point2.h>
+#include <aoc/Point2.hpp>
 
 const Point2 Point2::left{ -1, 0 };
 const Point2 Point2::right{ 1, 0 };
diff --git a/src/PrintQueue.cpp b/src/PrintQueue.cpp
index 8e6de66..9f6f3bb 100644
--- a/src/PrintQueue.cpp
+++ b/src/PrintQueue.cpp
@@ -13,12 +13,12 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include <aoc/PrintQueue.hpp>
+
 #include <algorithm>
 #include <sstream>
 #include <vector>
 
-#include <aoc/PrintQueue.h>
-
 PrintQueue::PrintQueue()
     : Solver{}, pageNoMapIndex_{ 0 }, isProcessingOrderingRules_{ true }, orderingRules_{}
 {
diff --git a/src/Program.cpp b/src/Program.cpp
index 0a53ea3..1b020db 100644
--- a/src/Program.cpp
+++ b/src/Program.cpp
@@ -13,19 +13,20 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include <aoc/Program.hpp>
+
 #include <iostream>
 #include <memory>
 
-#include <aoc/Program.h>
-#include <aoc/SolverEngine.h>
+#include <aoc/SolverEngine.hpp>
 
 // Solver implementations in day order.
-#include <aoc/HistorianHysteria.h>
-#include <aoc/RedNosedReports.h>
-#include <aoc/MullItOver.h>
-#include <aoc/CeresSearch.h>
-#include <aoc/PrintQueue.h>
-#include <aoc/GuardGallivant.h>
+#include <aoc/HistorianHysteria.hpp>
+#include <aoc/RedNosedReports.hpp>
+#include <aoc/MullItOver.hpp>
+#include <aoc/CeresSearch.hpp>
+#include <aoc/PrintQueue.hpp>
+#include <aoc/GuardGallivant.hpp>
 
 void Program::run()
 {
diff --git a/src/RedNosedReports.cpp b/src/RedNosedReports.cpp
index b71cb08..31f1663 100644
--- a/src/RedNosedReports.cpp
+++ b/src/RedNosedReports.cpp
@@ -13,12 +13,12 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include <aoc/RedNosedReports.hpp>
+
 #include <iostream>
 #include <sstream>
 #include <vector>
 
-#include <aoc/RedNosedReports.h>
-
 std::string RedNosedReports::getPuzzleName() const
 {
     return "Day 2: Red-Nosed Reports";
diff --git a/src/Solver.cpp b/src/Solver.cpp
index 96f361e..35f1fc4 100644
--- a/src/Solver.cpp
+++ b/src/Solver.cpp
@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/Solver.h>
+#include <aoc/Solver.hpp>
 
 Solver::Solver()
     : part1{ 0 }, part2{ 0 } {}
diff --git a/src/SolverEngine.cpp b/src/SolverEngine.cpp
index da30b26..71ee045 100644
--- a/src/SolverEngine.cpp
+++ b/src/SolverEngine.cpp
@@ -13,11 +13,11 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include <aoc/SolverEngine.hpp>
+
 #include <fstream>
 #include <iostream>
 
-#include <aoc/SolverEngine.h>
-
 SolverEngine::SolverEngine(const std::vector<std::string>& inputPaths)
     : inputPaths_{ inputPaths } {}
 
diff --git a/src/StringStateMachine.cpp b/src/StringStateMachine.cpp
index 9db2dee..5bdb256 100644
--- a/src/StringStateMachine.cpp
+++ b/src/StringStateMachine.cpp
@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aoc/StringStateMachine.h>
+#include <aoc/StringStateMachine.hpp>
 
 StringStateMachine::StringStateMachine(const std::string& line, StringState& entryState)
 {
diff --git a/tests/include/aocTests/Part1TestContext.h b/tests/include/aocTests/Part1TestContext.hpp
similarity index 96%
rename from tests/include/aocTests/Part1TestContext.h
rename to tests/include/aocTests/Part1TestContext.hpp
index a3de57e..1b50e77 100644
--- a/tests/include/aocTests/Part1TestContext.h
+++ b/tests/include/aocTests/Part1TestContext.hpp
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <aocTests/TestContext.h>
+#include <aocTests/TestContext.hpp>
 
 class Part1TestContext
     : public TestContext
diff --git a/tests/include/aocTests/Part2TestContext.h b/tests/include/aocTests/Part2TestContext.hpp
similarity index 96%
rename from tests/include/aocTests/Part2TestContext.h
rename to tests/include/aocTests/Part2TestContext.hpp
index a7bf364..80a79d0 100644
--- a/tests/include/aocTests/Part2TestContext.h
+++ b/tests/include/aocTests/Part2TestContext.hpp
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <aocTests/TestContext.h>
+#include <aocTests/TestContext.hpp>
 
 class Part2TestContext
     : public TestContext
diff --git a/tests/include/aocTests/TestContext.h b/tests/include/aocTests/TestContext.hpp
similarity index 97%
rename from tests/include/aocTests/TestContext.h
rename to tests/include/aocTests/TestContext.hpp
index a515dd7..7219fff 100644
--- a/tests/include/aocTests/TestContext.h
+++ b/tests/include/aocTests/TestContext.hpp
@@ -18,7 +18,7 @@
 #include <string>
 #include <vector>
 
-#include <aoc/Solver.h>
+#include <aoc/Solver.hpp>
 
 class TestContext
 {
diff --git a/tests/src/Part1TestContext.cpp b/tests/src/Part1TestContext.cpp
index 8739144..260baa4 100644
--- a/tests/src/Part1TestContext.cpp
+++ b/tests/src/Part1TestContext.cpp
@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aocTests/Part1TestContext.h>
+#include <aocTests/Part1TestContext.hpp>
 
 Part1TestContext::Part1TestContext(std::vector<std::string> inputPaths)
     : TestContext{ inputPaths } {}
diff --git a/tests/src/Part2TestContext.cpp b/tests/src/Part2TestContext.cpp
index 455dab4..d5d02b0 100644
--- a/tests/src/Part2TestContext.cpp
+++ b/tests/src/Part2TestContext.cpp
@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aocTests/Part2TestContext.h>
+#include <aocTests/Part2TestContext.hpp>
 
 Part2TestContext::Part2TestContext(std::vector<std::string> inputPaths)
     : TestContext{ inputPaths } {}
diff --git a/tests/src/TestCases.cpp b/tests/src/TestCases.cpp
index 6a2f51f..493b9b3 100644
--- a/tests/src/TestCases.cpp
+++ b/tests/src/TestCases.cpp
@@ -15,12 +15,12 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <aoc/Solver.h>
-#include <aoc/SolverEngine.h>
-#include <aoc/HistorianHysteria.h>
+#include <aoc/Solver.hpp>
+#include <aoc/SolverEngine.hpp>
+#include <aoc/HistorianHysteria.hpp>
 
-#include <aocTests/Part1TestContext.h>
-#include <aocTests/Part2TestContext.h>
+#include <aocTests/Part1TestContext.hpp>
+#include <aocTests/Part2TestContext.hpp>
 
 #define REQUIRE_MESSAGE(cond, msg) if (!(cond)) { INFO(msg); REQUIRE(cond); }
 
diff --git a/tests/src/TestContext.cpp b/tests/src/TestContext.cpp
index 0d89ae6..6818caf 100644
--- a/tests/src/TestContext.cpp
+++ b/tests/src/TestContext.cpp
@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License along with
 // this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <aocTests/TestContext.h>
+#include <aocTests/TestContext.hpp>
 
 TestContext::TestContext(std::vector<std::string> inputPaths)
     : inputPaths_{ inputPaths } {}