--- tvision/include/compatlayer.h
+++ tvision/include/compatlayer.h
@@ -812,10 +812,6 @@
    #define _GNU_SOURCE
    #define CLY_getline getline
   #endif
-  // Avoid including libintl.h, we have the prototypes
-  // This is a temporal workaround.
-  #undef  _LIBINTL_H
-  #define _LIBINTL_H 1
  #endif
 
  /* Solaris using gcc but not glibc */
--- tvision/include/tv/inputln.h
+++ tvision/include/tv/inputln.h
@@ -201,7 +201,7 @@
      { return name; }
 
 protected:
- TInputLine::TInputLine(StreamableInit) :
+ TInputLine(StreamableInit) :
    TInputLineBaseT<char,TDrawBuffer>(streamableInit) {}
 
 public:
--- tvision/classes/tinputli.cc
+++ tvision/classes/tinputli.cc
@@ -75,9 +75,6 @@
  modeOptions=defaultModeOptions;
 }
 
-template class TInputLineBaseT<char,TDrawBuffer>;
-template class TInputLineBaseT<uint16,TDrawBufferU16>;
-
 template <typename T, typename D>
 TInputLineBaseT<T,D>::TInputLineBaseT(const TRect& bounds, int aMaxLen, TValidator *aValid) :
   TInputLineBase(bounds,aMaxLen,aValid)
@@ -656,3 +653,5 @@
  return True;
 }
 
+template class TInputLineBaseT<char,TDrawBuffer>;
+template class TInputLineBaseT<uint16,TDrawBufferU16>;