Index: TemplateFieldContainer_h.txt
===================================================================
--- TemplateFieldContainer_h.txt	(revision 489)
+++ TemplateFieldContainer_h.txt	(working copy)
@@ -47,13 +47,17 @@
 OSG_BEGIN_NAMESPACE
 
 /*! \brief @!Classname!@ class. See \ref
+@@if isInLibrary
            Page@!Libname!@@!Classname!@ for a description.
+@@else
+           Page@!Classname!@ for a description.
+@@endif
 */
 
 @@if isInLibrary
 class OSG_@!LIBNAME!@_DLLMAPPING @!Classname!@ : public @!Classname!@Base
 @@else
-class OSG_@!LIBNAME!@_DLLMAPPING @!Classname!@ : public @!Classname!@Base
+class @!Classname!@ : public @!Classname!@Base
 @@endif
 {
   protected:
Index: TemplateFieldContainerFields_h.txt
===================================================================
--- TemplateFieldContainerFields_h.txt	(revision 489)
+++ TemplateFieldContainerFields_h.txt	(working copy)
@@ -117,8 +117,12 @@
     enum                        { Convertible = NotConvertible };
 @@if PointerField
 
+@@if isInLibrary
     static OSG_@!LIBNAME!@_DLLMAPPING
                      DataType &getType (void);
+@@else
+    static DataType &getType (void);
+@@endif
 
 @@endif
 @@if SFPointerField
@@ -148,7 +152,9 @@
 #endif
 
 #ifndef OSG_COMPILE@!CLASSNAME!@INST
+@@if isInLibrary
 OSG_FIELD_DLLEXPORT_DECL1(SField, @!Classname!@Ptr, OSG_@!LIBNAME!@_DLLTMPLMAPPING)
+@@endif
 #endif
 @@endif
 
@@ -161,9 +167,11 @@
 typedef MFieldAdaptor<@!Classname!@Ptr, MFFieldContainerPtr> MF@!Classname!@Ptr;
 #endif
 
+@@if isInLibrary
 #ifndef OSG_COMPILE@!CLASSNAME!@INST
 OSG_FIELD_DLLEXPORT_DECL1(MField, @!Classname!@Ptr, OSG_@!LIBNAME!@_DLLTMPLMAPPING)
 #endif
+@@endif
 
 @@endif
 OSG_END_NAMESPACE