diff --git a/xsl/doxygen/collect.xsl b/xsl/doxygen/collect.xsl
index 2c08355..083e4bf 100644
--- a/xsl/doxygen/collect.xsl
+++ b/xsl/doxygen/collect.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet        xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:output method="xml" version="1.0" indent="yes" standalone="yes" />
  
   <xsl:param name="doxygen.xml.path">./</xsl:param>
@@ -19,12 +19,36 @@
 
       <!-- Load all doxgen generated xml files -->
       <xsl:for-each select="doxygen/compound">
-        <xsl:copy-of select="document( concat($doxygen.xml.path, '/',
-                             @refid, '.xml' ) )/doxygen/*" />
+        <xsl:variable name="id">
+          <xsl:choose>
+            <xsl:when test="@refid">
+              <xsl:value-of select="@refid"/>
+            </xsl:when>
+            <xsl:when test="@id">
+              <xsl:value-of select="@id"/>
+            </xsl:when>
+          </xsl:choose>
+        </xsl:variable>
+        <xsl:if test="$id">
+          <xsl:copy-of select="document( concat($doxygen.xml.path, '/',
+                               $id, '.xml' ) )/doxygen/*" />
+        </xsl:if>
       </xsl:for-each>
       <xsl:for-each select="doxygenindex/compound">
-        <xsl:copy-of select="document( concat($doxygen.xml.path, '/',
-                             @refid, '.xml' ) )/doxygen/*" />
+        <xsl:variable name="id">
+          <xsl:choose>
+            <xsl:when test="@refid">
+              <xsl:value-of select="@refid"/>
+            </xsl:when>
+            <xsl:when test="@id">
+              <xsl:value-of select="@id"/>
+            </xsl:when>
+          </xsl:choose>
+        </xsl:variable>
+        <xsl:if test="$id">
+          <xsl:copy-of select="document( concat($doxygen.xml.path, '/',
+                               $id, '.xml' ) )/doxygen/*" />
+        </xsl:if>
       </xsl:for-each>
     </doxygen>
   </xsl:template>