diff --git a/docs/gen_reference_doc.py b/docs/gen_reference_doc.py
index e8c3bc141..595ecb8f2 100644
--- a/docs/gen_reference_doc.py
+++ b/docs/gen_reference_doc.py
@@ -504,7 +504,7 @@ for filename in files:
 			if verbose: print 'xx    %s' % l
 			continue
 
-		if 'TORRENT_EXPORT ' in l or l.startswith('inline ') or internal:
+		if 'TORRENT_EXPORT ' in l or l.startswith('inline ') or l.startswith('template') or internal:
 			if l.startswith('class ') or l.startswith('struct '):
 				if not l.endswith(';'):
 					current_class, lno = parse_class(lno -1, lines, filename)
@@ -797,7 +797,7 @@ for cat in categories:
 	enums = categories[cat]['enums']
 
 	if 'overview' in categories[cat]:
-		out.write('%s\n%s' % (heading(cat, '='), categories[cat]['overview']))
+		out.write('%s\n%s\n' % (heading(cat, '='), categories[cat]['overview']))
 
 	for c in classes:
 
diff --git a/include/libtorrent/bencode.hpp b/include/libtorrent/bencode.hpp
index f9efc715b..715a2cde4 100644
--- a/include/libtorrent/bencode.hpp
+++ b/include/libtorrent/bencode.hpp
@@ -420,11 +420,11 @@ namespace libtorrent
 	// 
 	// If ``bdecode()`` encounters invalid encoded data in the range given to it
 	// it will throw libtorrent_exception.
-	template<class OutIt> TORRENT_EXPORT int bencode(OutIt out, const entry& e)
+	template<class OutIt> int bencode(OutIt out, const entry& e)
 	{
 		return detail::bencode_recursive(out, e);
 	}
-	template<class InIt> TORRENT_EXPORT entry bdecode(InIt start, InIt end)
+	template<class InIt> entry bdecode(InIt start, InIt end)
 	{
 		entry e;
 		bool err = false;
@@ -435,7 +435,7 @@ namespace libtorrent
 		if (err) return entry();
 		return e;
 	}
-	template<class InIt> TORRENT_EXPORT entry bdecode(InIt start, InIt end, int& len)
+	template<class InIt> entry bdecode(InIt start, InIt end, int& len)
 	{
 		entry e;
 		bool err = false;
diff --git a/include/libtorrent/create_torrent.hpp b/include/libtorrent/create_torrent.hpp
index 4a60d2dee..af9ad261d 100644
--- a/include/libtorrent/create_torrent.hpp
+++ b/include/libtorrent/create_torrent.hpp
@@ -387,11 +387,10 @@ namespace libtorrent
 	// 
 	// The ``flags`` argument should be the same as the flags passed to the `create_torrent`_
 	// constructor.
-	template <class Pred> TORRENT_EXPORT void add_files(file_storage& fs, std::string const& file, Pred p, boost::uint32_t flags = 0)
+	template <class Pred> void add_files(file_storage& fs, std::string const& file, Pred p, boost::uint32_t flags = 0)
 	{
 		detail::add_files_impl(fs, parent_path(complete(file)), filename(file), p, flags);
 	}
-
 	inline void add_files(file_storage& fs, std::string const& file, boost::uint32_t flags = 0)
 	{
 		detail::add_files_impl(fs, parent_path(complete(file)), filename(file)