diff --git a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSFace.tex b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSFace.tex
index 7c2e1469aa8..3f8c4c8b01e 100644
--- a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSFace.tex
+++ b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSFace.tex
@@ -27,10 +27,7 @@ items class, see the \ccc{HalfedgeDSItems} concept.
 A face optionally stores a reference to an incident halfedge that
 points to the face.  A type tag indicates whether the related member
 functions are supported. 
-Figure~\ccTexHtml{\ref{figureHalfedgeDSOptionalMethods} 
-on page \pageref{figureHalfedgeDSOptionalMethods}}{}\begin{ccHtmlOnly}
-  <A HREF="Concept_HalfedgeDS.html#figureHalfedgeDSOptionalMethods">&#x261E;</A>
-\end{ccHtmlOnly}
+Figure~\ref{figureHalfedgeDSOptionalMethods} 
 depicts the relationship between a halfedge and its incident
 halfedges, vertices, and faces.
 
diff --git a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSHalfedge.tex b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSHalfedge.tex
index a6581c4dec4..c1f09b94a39 100644
--- a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSHalfedge.tex
+++ b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSHalfedge.tex
@@ -33,27 +33,18 @@ along the open region. A halfedge optionally stores a reference to the
 previous halfedge along the face, a reference to an incident vertex,
 and a reference to an incident face. Type tags indicate whether the
 related member functions are supported.
-Figure~\ccTexHtml{\ref{figureHalfedgeDSOptionalMethods}}{}\begin{ccHtmlOnly}
-  <A HREF="#figureHalfedgeDSOptionalMethods">&#x261E;</A>
-\end{ccHtmlOnly}
+Figure~\ref{figureHalfedgeDSOptionalMethods}
 depicts the relationship between a halfedge and its incident
 halfedges, vertices, and faces.
 
-\begin{ccTexOnly}
     \begin{figure}[bht]
+\begin{ccTexOnly}
         \begin{center}
           \parbox{\textwidth}{%
               \includegraphics[width=\textwidth]%
                   {HalfedgeDS_ref/fig/hds_optional}%
           }
         \end{center}
-        \caption{The three classes \protect\ccc{Vertex}, 
-          \protect\ccc{Halfedge}, and 
-          \protect\ccc{Face} of the halfedge data structure. Member
-          functions with shaded background are mandatory. The others
-          are optionally supported.}
-        \label{figureHalfedgeDSOptionalMethods}
-    \end{figure}
 \end{ccTexOnly}
 
 \begin{ccHtmlOnly}
@@ -62,13 +53,15 @@ halfedges, vertices, and faces.
     <A HREF="fig/hds_optional.gif">
         <img src="fig/hds_optional_small.gif" 
              alt="Class Diagram"></A><BR>
-    <A HREF="fig/hds_optional.gif">Figure:</A>
-    The three classes <I>Vertex</I>, <I>Halfedge</I>, and 
-          <I>Face</I> of the halfedge data structure. Member
-          functions with shaded background are mandatory. The others
-          are optionally supported.
     </CENTER>
 \end{ccHtmlOnly}
+        \caption{The three classes \protect\ccc{Vertex}, 
+          \protect\ccc{Halfedge}, and 
+          \protect\ccc{Face} of the halfedge data structure. Member
+          functions with shaded background are mandatory. The others
+          are optionally supported.}
+        \label{figureHalfedgeDSOptionalMethods}
+    \end{figure}
 
 For the protection of the integrity of the data structure classes such
 as \ccc{CGAL::Polyhedron_3} are allowed to redefine the modifying member
diff --git a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSVertex.tex b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSVertex.tex
index 04a2c8b1005..d1cead99789 100644
--- a/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSVertex.tex
+++ b/HalfedgeDS/doc_tex/HalfedgeDS_ref/HalfedgeDSVertex.tex
@@ -24,15 +24,10 @@ type in the \ccc{HalfedgeDS} concept. It is also required in
 the \ccc{Vertex_wrapper<Refs,Traits>} member class template of an
 items class, see the \ccc{HalfedgeDSItems} concept.
 
-%  FIXME : hardcoded links !? 
-
 A vertex optionally stores a reference to an incident halfedge that
 points to the vertex. A type tag indicates whether the related member
 functions are supported. 
-Figure~\ccTexHtml{\ref{figureHalfedgeDSOptionalMethods} 
-on page \pageref{figureHalfedgeDSOptionalMethods}}{}\begin{ccHtmlOnly}
-  <A HREF="Concept_HalfedgeDS.html#figureHalfedgeDSOptionalMethods">&#x261E;</A>
-\end{ccHtmlOnly}
+Figure~\ref{figureHalfedgeDSOptionalMethods} 
 depicts the relationship between a halfedge and its incident
 halfedges, vertices, and faces.