diff --git a/xsl/annotation.xsl b/xsl/annotation.xsl
index 853f401..4dae89f 100644
--- a/xsl/annotation.xsl
+++ b/xsl/annotation.xsl
@@ -7,6 +7,7 @@
   <xsl:key name="libraries" match="library" use="@name"/>
   <xsl:key name="macros" match="macro" use="@name"/>
   <xsl:key name="headers" match="header" use="@name"/>
+  <xsl:key name="named-entities" match="class|struct|union|function|overloaded-function|macro|library|*[attribute::id]" use="@name|@id"/>
 
   <xsl:template match="function|overloaded-function" mode="generate.id">
     <xsl:variable name="name" select="normalize-space(@name)"/>
@@ -16,7 +17,7 @@
                                     'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX')"/>
                       
     <xsl:choose>
-      <xsl:when test="count(key('functions', $name))=1
+      <xsl:when test="count(key('named-entities', $name))=1
                       and ($translated-name=$name)">
         <xsl:value-of select="$name"/>
       </xsl:when>
diff --git a/xsl/lookup.xsl b/xsl/lookup.xsl
index aa88745..733573b 100644
--- a/xsl/lookup.xsl
+++ b/xsl/lookup.xsl
@@ -2,10 +2,22 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
 
+  <xsl:param name="boost.max.id.length">26</xsl:param>
+
   <!-- Generate an ID for the entity referenced -->
   <xsl:template name="generate.id">
     <xsl:param name="node" select="."/>
-    <xsl:apply-templates select="$node" mode="generate.id"/>
+    <xsl:variable name="id">
+      <xsl:apply-templates select="$node" mode="generate.id"/>
+    </xsl:variable>
+    <xsl:choose>
+      <xsl:when test="string-length($id) &gt; $boost.max.id.length">
+        <xsl:value-of select="generate-id($node)"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="string($id)"/>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
 
   <xsl:template match="*" mode="generate.id">
diff --git a/xsl/type.xsl b/xsl/type.xsl
index 0bdf473..2179030 100644
--- a/xsl/type.xsl
+++ b/xsl/type.xsl
@@ -13,12 +13,17 @@
   <xsl:param name="boost.compact.enum">1</xsl:param>
 
   <xsl:template match="class|struct|union" mode="generate.id">
-    <xsl:value-of select="local-name(.)"/>
-    <xsl:text>.</xsl:text>
-    <xsl:call-template name="fully-qualified-name">
-      <xsl:with-param name="node" select="."/>
-      <xsl:with-param name="separator" select="'.'"/>
-    </xsl:call-template>
+    <xsl:choose>
+      <xsl:when test="count(key('named-entities', @name))=1">
+        <xsl:value-of select="@name"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="fully-qualified-name">
+          <xsl:with-param name="node" select="."/>
+          <xsl:with-param name="separator" select="'.'"/>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
 
   <xsl:template match="enum" mode="generate.id">