diff --git a/src/main/java/org/apache/commons/math4/analysis/integration/BaseAbstractUnivariateIntegrator.java b/src/main/java/org/apache/commons/math4/analysis/integration/BaseAbstractUnivariateIntegrator.java
index 1f89468fc..fadb1d003 100644
--- a/src/main/java/org/apache/commons/math4/analysis/integration/BaseAbstractUnivariateIntegrator.java
+++ b/src/main/java/org/apache/commons/math4/analysis/integration/BaseAbstractUnivariateIntegrator.java
@@ -18,10 +18,8 @@ package org.apache.commons.math4.analysis.integration;
 
 import org.apache.commons.math4.analysis.UnivariateFunction;
 import org.apache.commons.math4.analysis.solvers.UnivariateSolverUtils;
-import org.apache.commons.math4.exception.MathIllegalArgumentException;
 import org.apache.commons.math4.exception.MaxCountExceededException;
 import org.apache.commons.math4.exception.NotStrictlyPositiveException;
-import org.apache.commons.math4.exception.NullArgumentException;
 import org.apache.commons.math4.exception.NumberIsTooSmallException;
 import org.apache.commons.math4.exception.TooManyEvaluationsException;
 import org.apache.commons.math4.util.IntegerSequence;
@@ -227,8 +225,10 @@ public abstract class BaseAbstractUnivariateIntegrator implements UnivariateInte
      * @param f the integrand function
      * @param lower the min bound for the interval
      * @param upper the upper bound for the interval
-     * @throws NullArgumentException if {@code f} is {@code null}.
-     * @throws MathIllegalArgumentException if {@code min >= max}.
+     * @throws org.apache.commons.math4.exception.NullArgumentException
+     * if {@code f} is {@code null}.
+     * @throws org.apache.commons.math4.exception.MathIllegalArgumentException
+     * if {@code min >= max}.
      */
     protected void setup(final int maxEval,
                          final UnivariateFunction f,
diff --git a/src/main/java/org/apache/commons/math4/analysis/integration/IterativeLegendreGaussIntegrator.java b/src/main/java/org/apache/commons/math4/analysis/integration/IterativeLegendreGaussIntegrator.java
index 310b29082..332fc3e5a 100644
--- a/src/main/java/org/apache/commons/math4/analysis/integration/IterativeLegendreGaussIntegrator.java
+++ b/src/main/java/org/apache/commons/math4/analysis/integration/IterativeLegendreGaussIntegrator.java
@@ -19,10 +19,7 @@ package org.apache.commons.math4.analysis.integration;
 import org.apache.commons.math4.analysis.UnivariateFunction;
 import org.apache.commons.math4.analysis.integration.gauss.GaussIntegrator;
 import org.apache.commons.math4.analysis.integration.gauss.GaussIntegratorFactory;
-import org.apache.commons.math4.exception.MathIllegalArgumentException;
-import org.apache.commons.math4.exception.MaxCountExceededException;
 import org.apache.commons.math4.exception.NotStrictlyPositiveException;
-import org.apache.commons.math4.exception.NumberIsTooSmallException;
 import org.apache.commons.math4.exception.TooManyEvaluationsException;
 import org.apache.commons.math4.exception.util.LocalizedFormats;
 import org.apache.commons.math4.util.FastMath;
@@ -62,8 +59,9 @@ public class IterativeLegendreGaussIntegrator
      * @param maximalIterationCount Maximum number of iterations.
      * @throws NotStrictlyPositiveException if minimal number of iterations
      * or number of points are not strictly positive.
-     * @throws NumberIsTooSmallException if maximal number of iterations
-     * is smaller than or equal to the minimal number of iterations.
+     * @throws org.apache.commons.math4.exception.NumberIsTooSmallException
+     * if the maximal number of iterations is smaller than or equal to the
+     * minimal number of iterations.
      */
     public IterativeLegendreGaussIntegrator(final int n,
                                             final double relativeAccuracy,
@@ -100,8 +98,9 @@ public class IterativeLegendreGaussIntegrator
      * @param maximalIterationCount Maximum number of iterations.
      * @throws NotStrictlyPositiveException if minimal number of iterations
      * is not strictly positive.
-     * @throws NumberIsTooSmallException if maximal number of iterations
-     * is smaller than or equal to the minimal number of iterations.
+     * @throws org.apache.commons.math4.exception.NumberIsTooSmallException
+     * if the maximal number of iterations is smaller than or equal to the
+     * minimal number of iterations.
      * @throws NotStrictlyPositiveException if {@code n < 1}.
      */
     public IterativeLegendreGaussIntegrator(final int n,
diff --git a/src/main/java/org/apache/commons/math4/analysis/solvers/BaseAbstractUnivariateSolver.java b/src/main/java/org/apache/commons/math4/analysis/solvers/BaseAbstractUnivariateSolver.java
index 650a3824c..c08811e01 100644
--- a/src/main/java/org/apache/commons/math4/analysis/solvers/BaseAbstractUnivariateSolver.java
+++ b/src/main/java/org/apache/commons/math4/analysis/solvers/BaseAbstractUnivariateSolver.java
@@ -19,9 +19,6 @@ package org.apache.commons.math4.analysis.solvers;
 
 import org.apache.commons.math4.analysis.UnivariateFunction;
 import org.apache.commons.math4.exception.MaxCountExceededException;
-import org.apache.commons.math4.exception.NoBracketingException;
-import org.apache.commons.math4.exception.NullArgumentException;
-import org.apache.commons.math4.exception.NumberIsTooLargeException;
 import org.apache.commons.math4.exception.TooManyEvaluationsException;
 import org.apache.commons.math4.util.IntegerSequence;
 import org.apache.commons.math4.util.MathUtils;
@@ -173,7 +170,8 @@ public abstract class BaseAbstractUnivariateSolver<FUNC extends UnivariateFuncti
      * @param max Upper bound for the interval.
      * @param startValue Start value to use.
      * @param maxEval Maximum number of evaluations.
-     * @exception NullArgumentException if f is null
+     * @throws org.apache.commons.math4.exception.NullArgumentException
+     * if {@code f} is {@code null}.
      */
     protected void setup(int maxEval,
                          FUNC f,
@@ -220,8 +218,9 @@ public abstract class BaseAbstractUnivariateSolver<FUNC extends UnivariateFuncti
      * @return the root.
      * @throws TooManyEvaluationsException if the maximal number of evaluations
      * is exceeded.
-     * @throws NoBracketingException if the initial search interval does not bracket
-     * a root and the solver requires it.
+     * @throws org.apache.commons.math4.exception.NoBracketingException
+     * if the initial search interval does not bracket a root and the
+     * solver requires it.
      */
     protected abstract double doSolve();
 
@@ -257,7 +256,8 @@ public abstract class BaseAbstractUnivariateSolver<FUNC extends UnivariateFuncti
      *
      * @param lower Lower endpoint.
      * @param upper Upper endpoint.
-     * @throws NumberIsTooLargeException if {@code lower >= upper}.
+     * @throws org.apache.commons.math4.exception.NumberIsTooLargeException
+     * if {@code lower >= upper}.
      */
     protected void verifyInterval(final double lower,
                                   final double upper) {
@@ -270,8 +270,8 @@ public abstract class BaseAbstractUnivariateSolver<FUNC extends UnivariateFuncti
      * @param lower Lower endpoint.
      * @param initial Initial value.
      * @param upper Upper endpoint.
-     * @throws NumberIsTooLargeException if {@code lower >= initial} or
-     * {@code initial >= upper}.
+     * @throws org.apache.commons.math4.exception.NumberIsTooLargeException
+     * if {@code lower >= initial} or {@code initial >= upper}.
      */
     protected void verifySequence(final double lower,
                                   final double initial,
@@ -285,9 +285,10 @@ public abstract class BaseAbstractUnivariateSolver<FUNC extends UnivariateFuncti
      *
      * @param lower Lower endpoint.
      * @param upper Upper endpoint.
-     * @throws NullArgumentException if the function has not been set.
-     * @throws NoBracketingException if the function has the same sign at
-     * the endpoints.
+     * @throws org.apache.commons.math4.exception.NullArgumentException
+     * if the function has not been set.
+     * @throws org.apache.commons.math4.exception.NoBracketingException
+     * if the function has the same sign at the endpoints.
      */
     protected void verifyBracketing(final double lower,
                                     final double upper) {
diff --git a/src/main/java/org/apache/commons/math4/util/IterationManager.java b/src/main/java/org/apache/commons/math4/util/IterationManager.java
index bd29ed7ba..91accb8ad 100644
--- a/src/main/java/org/apache/commons/math4/util/IterationManager.java
+++ b/src/main/java/org/apache/commons/math4/util/IterationManager.java
@@ -19,8 +19,6 @@ package org.apache.commons.math4.util;
 import java.util.Collection;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.apache.commons.math4.exception.MaxCountExceededException;
-
 /**
  * This abstract class provides a general framework for managing iterative
  * algorithms. The maximum number of iterations can be set, and methods are
@@ -42,8 +40,8 @@ public class IterationManager {
      * Creates a new instance of this class.
      *
      * @param maxIterations Maximum number of iterations.
-     * {@link MaxCountExceededException} will be raised at
-     * counter exhaustion.
+     * {@link org.apache.commons.math4.exception.MaxCountExceededException}
+     * will be raised at counter exhaustion.
      */
     public IterationManager(final int maxIterations) {
         this(maxIterations, null);
@@ -55,8 +53,8 @@ public class IterationManager {
      * @param maxIterations the maximum number of iterations
      * @param callback the function to be called when the maximum number of
      * iterations has been reached.
-     * If {@code null}, {@link MaxCountExceededException} will be raised at
-     * counter exhaustion.
+     * If {@code null}, {@link org.apache.commons.math4.exception.MaxCountExceededException}
+     * will be raised at counter exhaustion.
      *
      * @since 3.1
      */
@@ -149,8 +147,8 @@ public class IterationManager {
      * maximum number of iterations is reached. This method should be called at
      * the beginning of a new iteration.
      *
-     * @throws MaxCountExceededException if the maximum number of iterations is
-     * reached.
+     * @throws org.apache.commons.math4.exception.MaxCountExceededException
+     * if the maximum number of iterations is reached.
      */
     public void incrementIterationCount() {
         iterations.increment();