diff --git a/libs/evoral/evoral/TimeConverter.hpp b/libs/evoral/evoral/TimeConverter.hpp
index 29576c6ee8..5572876cef 100644
--- a/libs/evoral/evoral/TimeConverter.hpp
+++ b/libs/evoral/evoral/TimeConverter.hpp
@@ -35,7 +35,7 @@ namespace Evoral {
  *    from() converts a time _origin_b + b into an offset from _origin_b in units of A.
  */
 template<typename A, typename B>
-class LIBEVORAL_API TimeConverter {
+class LIBEVORAL_TEMPLATE_API TimeConverter {
 public:
 	TimeConverter () : _origin_b (0) {}
 	TimeConverter (B ob) : _origin_b (ob) {}
@@ -65,16 +65,12 @@ protected:
  *  going on.
  */
 template<typename A, typename B>
-class /*LIBEVORAL_API*/ IdentityConverter : public TimeConverter<A,B> {
+class LIBEVORAL_TEMPLATE_API IdentityConverter : public TimeConverter<A,B> {
   public:
-	LIBEVORAL_API /* Added by JE - 27-10-2013 */IdentityConverter() {}
-
-	LIBEVORAL_API /* Added by JE - 27-10-2013 */B to(A a)   const;
-	LIBEVORAL_API /* Added by JE - 27-10-2013 */A from(B b) const;
-/* Changed by JE - 27-10-2013. Was formerly. . .
-	B to(A a)   const { return static_cast<B>(a); }
-	A from(B b) const { return static_cast<A>(b); }
-*/
+	IdentityConverter() {}
+	
+	B to(A a)   const;
+	A from(B b) const;
 };