diff --git a/src/gsi/gsi/gsiSerialisation.h b/src/gsi/gsi/gsiSerialisation.h
index 768e3dd23..5a2bbad28 100644
--- a/src/gsi/gsi/gsiSerialisation.h
+++ b/src/gsi/gsi/gsiSerialisation.h
@@ -37,7 +37,7 @@ namespace gsi
 // ------------------------------------------------------------
 //  SerialArgs definition
 
-class AdaptorBase;
+class GSI_PUBLIC AdaptorBase;
 
 /**
  *  @brief Copy the contents of adaptor-provided data to the given type X
@@ -650,7 +650,7 @@ public:
  *  @brief Generic string adaptor implementation
  */
 template <class X> 
-class StringAdaptorImpl 
+class GSI_PUBLIC StringAdaptorImpl
   : public StringAdaptor
 {
 };
@@ -659,7 +659,7 @@ class StringAdaptorImpl
  *  @brief Specialization for QByteArray
  */
 template <>
-class StringAdaptorImpl<QByteArray>
+class GSI_PUBLIC StringAdaptorImpl<QByteArray>
   : public StringAdaptor
 {
 public:
@@ -729,7 +729,7 @@ private:
  *  @brief Specialization for QString
  */
 template <>
-class StringAdaptorImpl<QString>
+class GSI_PUBLIC StringAdaptorImpl<QString>
   : public StringAdaptor
 {
 public:
@@ -801,7 +801,7 @@ private:
  *  @brief Specialization for QStringRef
  */
 template <>
-class StringAdaptorImpl<QStringRef>
+class GSI_PUBLIC StringAdaptorImpl<QStringRef>
   : public StringAdaptor
 {
 public:
@@ -875,7 +875,7 @@ private:
  *  @brief Specialization for std::string
  */
 template <>
-class StringAdaptorImpl<std::string>
+class GSI_PUBLIC StringAdaptorImpl<std::string>
   : public StringAdaptor
 {
 public:
@@ -945,7 +945,7 @@ private:
  *  @brief Specialization for const unsigned char *
  */
 template <class CP>
-class StringAdaptorImplCCP
+class GSI_PUBLIC StringAdaptorImplCCP
   : public StringAdaptor
 {
 public:
@@ -1019,7 +1019,7 @@ private:
  *  @brief Specialization for const char *
  */
 template <>
-class StringAdaptorImpl<const char *>
+class GSI_PUBLIC StringAdaptorImpl<const char *>
   : public StringAdaptorImplCCP<const char *>
 {
 public:
@@ -1033,7 +1033,7 @@ public:
  *  @brief Specialization for const unsigned char *
  */
 template <>
-class StringAdaptorImpl<const unsigned char *>
+class GSI_PUBLIC StringAdaptorImpl<const unsigned char *>
   : public StringAdaptorImplCCP<const unsigned char *>
 {
 public:
@@ -1047,7 +1047,7 @@ public:
  *  @brief Specialization for const signed char *
  */
 template <>
-class StringAdaptorImpl<const signed char *>
+class GSI_PUBLIC StringAdaptorImpl<const signed char *>
   : public StringAdaptorImplCCP<const signed char *>
 {
 public:
@@ -1103,7 +1103,7 @@ public:
  *  @brief Generic string adaptor implementation
  */
 template <class X> 
-class VariantAdaptorImpl 
+class GSI_PUBLIC VariantAdaptorImpl
   : public VariantAdaptor
 {
 };
@@ -1112,7 +1112,7 @@ class VariantAdaptorImpl
  *  @brief Specialization for QVariant
  */
 template <>
-class VariantAdaptorImpl<QVariant>
+class GSI_PUBLIC VariantAdaptorImpl<QVariant>
   : public VariantAdaptor
 {
 public:
@@ -1182,7 +1182,7 @@ private:
  *  @brief Specialization for tl::Variant
  */
 template <>
-class VariantAdaptorImpl<tl::Variant>
+class GSI_PUBLIC VariantAdaptorImpl<tl::Variant>
   : public VariantAdaptor
 {
 public:
@@ -1359,7 +1359,7 @@ public:
  *  @brief Implementation of the generic iterator adaptor for a specific container
  */
 template <class Cont>
-class VectorAdaptorIteratorImpl
+class GSI_PUBLIC VectorAdaptorIteratorImpl
   : public VectorAdaptorIterator
 {
 public:
@@ -1434,7 +1434,7 @@ void push_vector (QSet<X> &v, const X &x)
  *  @brief Implementation of the generic adaptor for a specific container
  */
 template <class Cont>
-class VectorAdaptorImpl 
+class GSI_PUBLIC VectorAdaptorImpl
   : public VectorAdaptor
 {
 public:
@@ -1709,7 +1709,7 @@ struct map_access<QHash<X, Y> >
  *  @brief Implementation of the generic iterator adaptor for a specific container
  */
 template <class Cont>
-class MapAdaptorIteratorImpl
+class GSI_PUBLIC MapAdaptorIteratorImpl
   : public MapAdaptorIterator
 {
 public:
@@ -1745,7 +1745,7 @@ private:
  *  @brief Implementation of the generic adaptor for a specific container
  */
 template <class Cont>
-class MapAdaptorImpl 
+class GSI_PUBLIC MapAdaptorImpl
   : public MapAdaptor
 {
 public:
diff --git a/src/tl/tl/tlXMLParser.h b/src/tl/tl/tlXMLParser.h
index 6a1ae3015..168c7e31e 100644
--- a/src/tl/tl/tlXMLParser.h
+++ b/src/tl/tl/tlXMLParser.h
@@ -150,7 +150,7 @@ public:
  */
 
 template <class Obj>
-class XMLReaderProxy
+class TL_PUBLIC XMLReaderProxy
   : public XMLReaderProxyBase
 {
 public:
@@ -412,7 +412,7 @@ private:
 // -----------------------------------------------------------------
 //  The C++ structure definition interface (for use cases see tlXMLParser.ut)
 
-class XMLElementBase;
+class TL_PUBLIC XMLElementBase;
 
 struct pass_by_value_tag { 
   pass_by_value_tag () { } 
@@ -714,7 +714,7 @@ private:
  */
 
 template <class Obj, class Parent, class Read, class Write>
-class XMLElement 
+class TL_PUBLIC XMLElement
   : public XMLElementBase
 {
 public:
@@ -819,7 +819,7 @@ private:
  */
 
 template <class Obj, class Parent, class Read, class Write>
-class XMLElementWithParentRef 
+class TL_PUBLIC XMLElementWithParentRef
   : public XMLElementBase
 {
 public:
@@ -933,7 +933,7 @@ private:
  */
 
 template <class Value, class Parent, class Read, class Write, class Converter>
-class XMLMember 
+class TL_PUBLIC XMLMember
   : public XMLElementBase
 {
 public:
@@ -1024,7 +1024,7 @@ private:
  */
 
 template <class Value, class Parent, class Write, class Converter>
-class XMLWildcardMember 
+class TL_PUBLIC XMLWildcardMember
   : public XMLElementBase
 {
 public:
@@ -1092,7 +1092,7 @@ private:
  */
 
 template <class Obj>
-class XMLStruct 
+class TL_PUBLIC XMLStruct
   : public XMLElementBase
 {
 public: