diff --git a/src/movegen.cpp b/src/movegen.cpp
index eed551e0a..c3be5e001 100644
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -48,20 +48,6 @@ void movelist_buf::mlb_shutdown()
 	}
 }
 
-template<GenType T>
-MoveList<T>::MoveList(const Position& pos)
-{
-    this->mlb = get_thread_mlb(pos);
-    this->moveList = this->mlb->acquire();
-    this->last = generate<T>(pos, this->moveList);
-}
-
-template<GenType T>
-MoveList<T>::~MoveList()
-{
-    this->mlb->release(this->moveList);
-}
-
 namespace {
 
   template<MoveType T>
@@ -541,12 +527,6 @@ template ExtMove* generate<QUIETS>(const Position&, ExtMove*);
 template ExtMove* generate<EVASIONS>(const Position&, ExtMove*);
 template ExtMove* generate<QUIET_CHECKS>(const Position&, ExtMove*);
 template ExtMove* generate<NON_EVASIONS>(const Position&, ExtMove*);
-template struct MoveList<CAPTURES>;
-template struct MoveList<QUIETS>;
-template struct MoveList<EVASIONS>;
-template struct MoveList<QUIET_CHECKS>;
-template struct MoveList<NON_EVASIONS>;
-template struct MoveList<LEGAL>;
 
 /// generate<LEGAL> generates all the legal moves in the given position
 
diff --git a/src/movegen.h b/src/movegen.h
index 8990cf1a0..a92c423ac 100644
--- a/src/movegen.h
+++ b/src/movegen.h
@@ -28,6 +28,8 @@ namespace Stockfish {
 class Position;
 class movelist_buf;
 
+movelist_buf* get_thread_mlb( const Position& pos );
+
 enum GenType {
   CAPTURES,
   QUIETS,
@@ -144,8 +146,18 @@ ExtMove* generate(const Position& pos, ExtMove* moveList);
 template<GenType T>
 struct MoveList {
 
-  explicit MoveList(const Position& pos);
-  ~MoveList();
+  explicit MoveList(const Position& pos)
+  {
+    this->mlb = get_thread_mlb(pos);
+    this->moveList = this->mlb->acquire();
+    this->last = generate<T>(pos, this->moveList);
+  }
+
+  ~MoveList()
+  {
+    this->mlb->release(this->moveList);
+  }
+
   const ExtMove* begin() const { return moveList; }
   const ExtMove* end() const { return last; }
   size_t size() const { return last - moveList; }
@@ -159,7 +171,6 @@ struct MoveList {
     ExtMove* moveList = nullptr;
 };
 
-movelist_buf* get_thread_mlb( const Position& pos );
 } // namespace Stockfish