diff --git a/GCryptLib/include/GCrypt/Block.h b/GCryptLib/include/GCrypt/Block.h
index a112fcc..d796fd1 100644
--- a/GCryptLib/include/GCrypt/Block.h
+++ b/GCryptLib/include/GCrypt/Block.h
@@ -205,10 +205,6 @@ namespace Leonetienne::GCrypt {
       std::array<T, 16> data;
   };
 
-  // Instantiate templates
-  template class Basic_Block<std::uint32_t>;
-  template class Basic_Block<std::uint16_t>;
-
   //! This a full-sized 512-bit block
   typedef Basic_Block<std::uint32_t> Block;
 
diff --git a/GCryptLib/src/Block.cpp b/GCryptLib/src/Block.cpp
index 3e3ef9d..0302ae9 100644
--- a/GCryptLib/src/Block.cpp
+++ b/GCryptLib/src/Block.cpp
@@ -828,7 +828,11 @@ namespace Leonetienne::GCrypt {
 #pragma GCC pop_options
 #endif
 
+  // Instantiate templates
+  template class Basic_Block<std::uint32_t>;
+  template class Basic_Block<std::uint16_t>;
 }
 
+
 #undef MAT_INDEX