diff --git a/src/current/include/preproc/symtable.xsl b/src/current/include/preproc/symtable.xsl
index 55a4b04d..513424ca 100644
--- a/src/current/include/preproc/symtable.xsl
+++ b/src/current/include/preproc/symtable.xsl
@@ -660,7 +660,12 @@
 
   <preproc:sym name="{@yields}" type="rate"
     extclass="{$external}"
-    local="{@local}" dtype="float" dim="0" tex="{@sym}" />
+    local="{@local}" dtype="float" dim="0" tex="{@sym}">
+
+    <xsl:if test="@preproc:generated = 'true'">
+      <xsl:attribute name="local" select="'true'" />
+    </xsl:if>
+  </preproc:sym>
 
   <xsl:apply-templates mode="preproc:symtable" />
 </xsl:template>
@@ -710,7 +715,12 @@
 
   <preproc:sym name="{@generates}"
     parent="{$parent/@yields}"
-    type="gen" dtype="float" dim="{$dim}" desc="{@desc}" tex="{@sym}" />
+    type="gen" dtype="float" dim="{$dim}" desc="{@desc}" tex="{@sym}">
+
+    <xsl:if test="@preproc:generated = 'true'">
+      <xsl:attribute name="local" select="'true'" />
+    </xsl:if>
+  </preproc:sym>
 
   <xsl:apply-templates mode="preproc:symtable" />
 </xsl:template>
@@ -721,11 +731,18 @@
   <xsl:variable name="external"  select="boolean( @external='true' )" />
   <xsl:variable name="terminate" select="boolean( @terminate='true' )" />
 
+  <xsl:variable name="is-generated" as="xs:boolean"
+                select="@preproc:generated = 'true'" />
+
   <preproc:sym name=":class:{@as}"
     extclass="{$external}" terminate="{$terminate}"
     type="class" dim="?" desc="{@desc}" yields="{@yields}"
     orig-name="{@as}">
 
+    <xsl:if test="$is-generated">
+      <xsl:attribute name="local" select="'true'" />
+    </xsl:if>
+
     <!-- copy preprocessor metadata to symbol for easy reference -->
     <xsl:sequence select="@preproc:*" />
   </preproc:sym>
@@ -743,6 +760,13 @@
         <xsl:attribute name="preproc:generated" select="'true'" />
       </xsl:if>
 
+      <!-- we only want to mark as local if $is-generated, not
+           @preproc:yields-generated, beacuse otherwise class yield lookups
+           would not always work in packages -->
+      <xsl:if test="$is-generated">
+        <xsl:attribute name="local" select="'true'" />
+      </xsl:if>
+
       <xsl:sequence select="@preproc:*" />
     </preproc:sym>
   </xsl:if>
diff --git a/src/current/include/preproc/template.xsl b/src/current/include/preproc/template.xsl
index 67870960..a7cd137d 100644
--- a/src/current/include/preproc/template.xsl
+++ b/src/current/include/preproc/template.xsl
@@ -421,7 +421,9 @@
   </xsl:message>
 
   <!-- generate template -->
-  <lv:template name="{$name}" desc="Inline template" preproc:from-inline="{$name}">
+  <lv:template name="{$name}" desc="Inline template"
+               preproc:from-inline="{$name}"
+               preproc:generated="true">
     <!-- generate params (from both our own attrs and any for-each sets) -->
     <xsl:variable name="params">
       <params>
diff --git a/src/symtable/symbols.xsl b/src/symtable/symbols.xsl
index e5ecfb56..b9dd0893 100644
--- a/src/symtable/symbols.xsl
+++ b/src/symtable/symbols.xsl
@@ -381,7 +381,13 @@
   <preproc:sym type="tpl"
                name="{@name}"
                dim="0"
-               desc="{@desc}" />
+               desc="{@desc}">
+    <if test="@preproc:generated = 'true'">
+      <attribute name="local" select="'true'" />
+    </if>
+
+    <sequence select="@preproc:*" />
+  </preproc:sym>
 </template>