diff --git a/src/java/org/apache/poi/POIOLE2TextExtractor.java b/src/java/org/apache/poi/POIOLE2TextExtractor.java
index c0f4cbd1d7..a42ced76f3 100644
--- a/src/java/org/apache/poi/POIOLE2TextExtractor.java
+++ b/src/java/org/apache/poi/POIOLE2TextExtractor.java
@@ -28,10 +28,10 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem;
  * You will typically find the implementation of
  *  a given format's text extractor under
  *  org.apache.poi.[format].extractor .
- * @see org.apache.poi.hssf.extractor.ExcelExtractor
- * @see org.apache.poi.hslf.extractor.PowerPointExtractor
- * @see org.apache.poi.hdgf.extractor.VisioTextExtractor
- * @see org.apache.poi.hwpf.extractor.WordExtractor
+ * @see <a href="https://poi.apache.org/apidocs/org/apache/poi/hssf/extractor/ExcelExtractor.html">org.apache.poi.hssf.extractor.ExcelExtractor</a>
+ * @see <a href="https://poi.apache.org/apidocs/org/apache/poi/hslf/extractor/PowerPointExtractor.html">org.apache.poi.hslf.extractor.PowerPointExtractor</a>
+ * @see <a href="https://poi.apache.org/apidocs/org/apache/poi/hdgf/extractor/VisioTextExtractor.html">org.apache.poi.hdgf.extractor.VisioTextExtractor</a>
+ * @see <a href="https://poi.apache.org/apidocs/org/apache/poi/hwpf/extractor/WordExtractor.html">org.apache.poi.hwpf.extractor.WordExtractor</a>
  */
 public abstract class POIOLE2TextExtractor extends POITextExtractor {
 	/**
diff --git a/src/java/org/apache/poi/POITextExtractor.java b/src/java/org/apache/poi/POITextExtractor.java
index e18078b461..7ea997c764 100644
--- a/src/java/org/apache/poi/POITextExtractor.java
+++ b/src/java/org/apache/poi/POITextExtractor.java
@@ -25,10 +25,10 @@ import java.io.IOException;
  * You will typically find the implementation of
  *  a given format's text extractor under
  *  org.apache.poi.[format].extractor .
- * @see org.apache.poi.hssf.extractor.ExcelExtractor
- * @see org.apache.poi.hslf.extractor.PowerPointExtractor
- * @see org.apache.poi.hdgf.extractor.VisioTextExtractor
- * @see org.apache.poi.hwpf.extractor.WordExtractor
+ * @see <a href="https://poi.apache.org/apidocs/org/apache/poi/hssf/extractor/ExcelExtractor.html">org.apache.poi.hssf.extractor.ExcelExtractor</a>
+ * @see <a href="https://poi.apache.org/apidocs/org/apache/poi/hslf/extractor/PowerPointExtractor.html">org.apache.poi.hslf.extractor.PowerPointExtractor</a>
+ * @see <a href="https://poi.apache.org/apidocs/org/apache/poi/hdgf/extractor/VisioTextExtractor.html">org.apache.poi.hdgf.extractor.VisioTextExtractor</a>
+ * @see <a href="https://poi.apache.org/apidocs/org/apache/poi/hwpf/extractor/WordExtractor.html">org.apache.poi.hwpf.extractor.WordExtractor</a>
  */
 public abstract class POITextExtractor implements Closeable {
 	/** The POIDocument that's open */
diff --git a/src/java/org/apache/poi/poifs/crypt/package.html b/src/java/org/apache/poi/poifs/crypt/package.html
index 977cf8b5a9..0cc2d4b67a 100644
--- a/src/java/org/apache/poi/poifs/crypt/package.html
+++ b/src/java/org/apache/poi/poifs/crypt/package.html
@@ -27,7 +27,7 @@
 <ul>
 <li>This package contains common functions for both current implemented cipher modes.</li>
 <li>the {@link org.apache.poi.poifs.crypt.standard standard} package is part of the base poi jar and contains classes for the standard encryption ...</li>
-<li>the {@link org.apache.poi.poifs.crypt.agile agile} package is part of the poi ooxml jar and the provides agile encryption support.</li>
+<li>the <a href="https://poi.apache.org/apidocs/org/apache/poi/poifs/crypt/agile/package-summary.html">agile</a> package is part of the poi ooxml jar and the provides agile encryption support.</li>
 </ul>
 
 <h2>Related Documentation</h2>
@@ -39,6 +39,6 @@ Some implementations informations can be found under:
 
 <!-- Put @see and @since tags down here. -->
 @see org.apache.poi.poifs.crypt.standard
-@see org.apache.poi.poifs.crypt.agile
+@see <a href="https://poi.apache.org/apidocs/org/apache/poi/poifs/crypt/agile/package-summary.html">org.apache.poi.poifs.crypt.agile</a>
 </body>
 </html>
diff --git a/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java b/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java
index 21fa576384..8d0811d249 100644
--- a/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java
+++ b/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java
@@ -36,7 +36,7 @@ import org.apache.poi.ss.usermodel.Workbook;
 /**
  * An alternative workbook evaluator that saves memory in situations where a single workbook is
  * concurrently and independently evaluated many times.  With standard formula evaluation, around
- * 90% of memory consumption is due to loading of the {@link HSSFWorkbook} or {@link org.apache.poi.xssf.usermodel.XSSFWorkbook}.
+ * 90% of memory consumption is due to loading of the {@link HSSFWorkbook} or <a href="https://poi.apache.org/apidocs/org/apache/poi/xssf/usermodel/XSSFWorkbook.html">XSSFWorkbook</a>.
  * This class enables a 'master workbook' to be loaded just once and shared between many evaluation
  * clients.  Each evaluation client creates its own {@link ForkedEvaluator} and can set cell values
  * that will be used for local evaluations (and don't disturb evaluations on other evaluators).
diff --git a/src/java/org/apache/poi/ss/usermodel/ClientAnchor.java b/src/java/org/apache/poi/ss/usermodel/ClientAnchor.java
index aa21e2150d..639fd0c89b 100644
--- a/src/java/org/apache/poi/ss/usermodel/ClientAnchor.java
+++ b/src/java/org/apache/poi/ss/usermodel/ClientAnchor.java
@@ -123,7 +123,7 @@ public interface ClientAnchor {
      * 
      * Note - XSSF and HSSF have a slightly different coordinate
      *  system, values in XSSF are larger by a factor of
-     *  {@link org.apache.poi.xssf.usermodel.XSSFShape#EMU_PER_PIXEL}
+     *  {@link org.apache.poi.util.Units#EMU_PER_PIXEL}
      *
      * @return the x coordinate within the first cell
      */
@@ -134,7 +134,7 @@ public interface ClientAnchor {
      *
      * Note - XSSF and HSSF have a slightly different coordinate
      *  system, values in XSSF are larger by a factor of
-     *  {@link org.apache.poi.xssf.usermodel.XSSFShape#EMU_PER_PIXEL}
+     *  {@link org.apache.poi.util.Units#EMU_PER_PIXEL}
      *
      * @param dx1 the x coordinate within the first cell
      */
@@ -145,7 +145,7 @@ public interface ClientAnchor {
      *
      * Note - XSSF and HSSF have a slightly different coordinate
      *  system, values in XSSF are larger by a factor of
-     *  {@link org.apache.poi.xssf.usermodel.XSSFShape#EMU_PER_PIXEL}
+     *  {@link org.apache.poi.util.Units#EMU_PER_PIXEL}
      *
      * @return the y coordinate within the first cell
      */
@@ -156,7 +156,7 @@ public interface ClientAnchor {
      *
      * Note - XSSF and HSSF have a slightly different coordinate
      *  system, values in XSSF are larger by a factor of
-     *  {@link org.apache.poi.xssf.usermodel.XSSFShape#EMU_PER_PIXEL}
+     *  {@link org.apache.poi.util.Units#EMU_PER_PIXEL}
      *
      * @param dy1 the y coordinate within the first cell
      */
@@ -167,7 +167,7 @@ public interface ClientAnchor {
      *
      * Note - XSSF and HSSF have a slightly different coordinate
      *  system, values in XSSF are larger by a factor of
-     *  {@link org.apache.poi.xssf.usermodel.XSSFShape#EMU_PER_PIXEL}
+     *  {@link org.apache.poi.util.Units#EMU_PER_PIXEL}
      *
      * @return the y coordinate within the second cell
      */
@@ -178,7 +178,7 @@ public interface ClientAnchor {
      *
      * Note - XSSF and HSSF have a slightly different coordinate
      *  system, values in XSSF are larger by a factor of
-     *  {@link org.apache.poi.xssf.usermodel.XSSFShape#EMU_PER_PIXEL}
+     *  {@link org.apache.poi.util.Units#EMU_PER_PIXEL}
      *
      * @param dy2 the y coordinate within the second cell
      */
@@ -189,7 +189,7 @@ public interface ClientAnchor {
      *
      * Note - XSSF and HSSF have a slightly different coordinate
      *  system, values in XSSF are larger by a factor of
-     *  {@link org.apache.poi.xssf.usermodel.XSSFShape#EMU_PER_PIXEL}
+     *  {@link org.apache.poi.util.Units#EMU_PER_PIXEL}
      *
      * @return the x coordinate within the second cell
      */
@@ -200,7 +200,7 @@ public interface ClientAnchor {
      *
      * Note - XSSF and HSSF have a slightly different coordinate
      *  system, values in XSSF are larger by a factor of
-     *  {@link org.apache.poi.xssf.usermodel.XSSFShape#EMU_PER_PIXEL}
+     *  {@link org.apache.poi.util.Units#EMU_PER_PIXEL}
      *
      * @param dx2 the x coordinate within the second cell
      */
diff --git a/src/java/org/apache/poi/util/XMLHelper.java b/src/java/org/apache/poi/util/XMLHelper.java
index 3e97cee0b3..ac617adda8 100644
--- a/src/java/org/apache/poi/util/XMLHelper.java
+++ b/src/java/org/apache/poi/util/XMLHelper.java
@@ -22,7 +22,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
 
 /**
  * Helper methods for working with javax.xml classes.
- * @see SAXHelper
+ * @see <a href="https://poi.apache.org/apidocs/org/apache/poi/util/SAXHelper.html">org.apache.poi.util.SAXHelper</a>
  */
 public final class XMLHelper
 {