diff --git a/src/Battling/Models/Creature.hpp b/src/Battling/Models/Creature.hpp
index 8fb5b9d..8f515e0 100644
--- a/src/Battling/Models/Creature.hpp
+++ b/src/Battling/Models/Creature.hpp
@@ -1,7 +1,7 @@
 #ifndef CREATURELIB_BATTLECREATURE_HPP
 #define CREATURELIB_BATTLECREATURE_HPP
 
-#include "../../GenericTemplates.cpp"
+#include "../../GenericTemplates.hpp"
 #include "../../Library/CreatureData/CreatureSpecies.hpp"
 #include "../../Library/Items/Item.hpp"
 #include "../ScriptHandling/ScriptAggregator.hpp"
diff --git a/src/Core/StatisticSet.hpp b/src/Core/StatisticSet.hpp
index a28d26e..7fe0606 100644
--- a/src/Core/StatisticSet.hpp
+++ b/src/Core/StatisticSet.hpp
@@ -2,7 +2,7 @@
 #define CREATURELIB_STATISTICSET_HPP
 #include <exception>
 #include <stdint.h>
-#include "../GenericTemplates.cpp"
+#include "../GenericTemplates.hpp"
 #include "Exceptions/NotReachableException.hpp"
 #include "Statistic.hpp"
 
diff --git a/src/GenericTemplates.cpp b/src/GenericTemplates.hpp
similarity index 100%
rename from src/GenericTemplates.cpp
rename to src/GenericTemplates.hpp
diff --git a/src/Library/Attacks/AttackData.hpp b/src/Library/Attacks/AttackData.hpp
index e97c448..910af39 100644
--- a/src/Library/Attacks/AttackData.hpp
+++ b/src/Library/Attacks/AttackData.hpp
@@ -3,7 +3,7 @@
 
 #include <string>
 #include <unordered_set>
-#include "../../GenericTemplates.cpp"
+#include "../../GenericTemplates.hpp"
 #include "AttackCategory.hpp"
 #include "AttackTarget.hpp"
 
diff --git a/src/Library/CreatureData/SpeciesVariant.hpp b/src/Library/CreatureData/SpeciesVariant.hpp
index 28a8131..770b57e 100644
--- a/src/Library/CreatureData/SpeciesVariant.hpp
+++ b/src/Library/CreatureData/SpeciesVariant.hpp
@@ -5,7 +5,7 @@
 #include <vector>
 #include "../../Core/Random.hpp"
 #include "../../Core/StatisticSet.hpp"
-#include "../../GenericTemplates.cpp"
+#include "../../GenericTemplates.hpp"
 #include "CreatureMoves.hpp"
 #include "LearnableAttacks.hpp"
 
diff --git a/src/Library/Items/Item.hpp b/src/Library/Items/Item.hpp
index 48600f3..4d4b8f6 100644
--- a/src/Library/Items/Item.hpp
+++ b/src/Library/Items/Item.hpp
@@ -3,7 +3,7 @@
 
 #include <string>
 #include <unordered_set>
-#include "../../GenericTemplates.cpp"
+#include "../../GenericTemplates.hpp"
 #include "BattleItemCategory.hpp"
 #include "ItemCategory.hpp"