instantiation.diff

diff --git a/src/base_media_base.h b/src/base_media_base.h
index d5de6c373..7614118b7 100644
--- a/src/base_media_base.h
+++ b/src/base_media_base.h
@@ -219,6 +219,11 @@ public:
 	static bool HasSet(const ContentInfo *ci, bool md5sum);
 };
 
+template <class Tbase_set> /* static */ const char *BaseMedia<Tbase_set>::ini_set;
+template <class Tbase_set> /* static */ const Tbase_set *BaseMedia<Tbase_set>::used_set;
+template <class Tbase_set> /* static */ Tbase_set *BaseMedia<Tbase_set>::available_sets;
+template <class Tbase_set> /* static */ Tbase_set *BaseMedia<Tbase_set>::duplicate_sets;
+
 /**
  * Check whether there's a base set matching some information.
  * @param ci The content info to compare it to.
diff --git a/src/base_media_func.h b/src/base_media_func.h
index e3678d5a1..f45956f76 100644
--- a/src/base_media_func.h
+++ b/src/base_media_func.h
@@ -17,11 +17,6 @@
 #include "ini_type.h"
 #include "string_func.h"
 
-template <class Tbase_set> /* static */ const char *BaseMedia<Tbase_set>::ini_set;
-template <class Tbase_set> /* static */ const Tbase_set *BaseMedia<Tbase_set>::used_set;
-template <class Tbase_set> /* static */ Tbase_set *BaseMedia<Tbase_set>::available_sets;
-template <class Tbase_set> /* static */ Tbase_set *BaseMedia<Tbase_set>::duplicate_sets;
-
 /**
  * Try to read a single piece of metadata and return false if it doesn't exist.
  * @param name the name of the item to fetch.
diff --git a/src/core/smallstack_type.hpp b/src/core/smallstack_type.hpp
index 31edba081..55e695dfa 100644
--- a/src/core/smallstack_type.hpp
+++ b/src/core/smallstack_type.hpp
@@ -283,4 +283,10 @@ protected:
 	}
 };
 
+// Oh dear.
+template <typename Titem, typename Tindex, Titem Tinvalid, Tindex Tgrowth_step, Tindex Tmax_size>
+typename SmallStack<Titem, Tindex, Tinvalid, Tgrowth_step, Tmax_size>::SmallStackPool
+SmallStack<Titem, Tindex, Tinvalid, Tgrowth_step, Tmax_size>::_pool;
+
+
 #endif