diff --git a/unsupported/Eigen/NonLinear b/unsupported/Eigen/NonLinear
index 7a4006aef..9c617b04d 100644
--- a/unsupported/Eigen/NonLinear
+++ b/unsupported/Eigen/NonLinear
@@ -132,13 +132,13 @@ Scalar ei_enorm ( int n, const Scalar *x ){
 #include "src/NonLinear/lmstr.h"
 #include "src/NonLinear/lmdif.h"
 #include "src/NonLinear/hybrj.h"
-#include "src/NonLinear/chkder.h"
 #include "src/NonLinear/MathFunctions.h"
 #include "src/NonLinear/lmder1.h"
 #include "src/NonLinear/lmstr1.h"
 #include "src/NonLinear/hybrd1.h"
 #include "src/NonLinear/hybrj1.h"
 #include "src/NonLinear/lmdif1.h"
+#include "src/NonLinear/chkder.h"
 
 //@}
 
diff --git a/unsupported/Eigen/src/NonLinear/hybrd.h b/unsupported/Eigen/src/NonLinear/hybrd.h
index e8179a25d..f7770c4c4 100644
--- a/unsupported/Eigen/src/NonLinear/hybrd.h
+++ b/unsupported/Eigen/src/NonLinear/hybrd.h
@@ -12,7 +12,7 @@ int hybrd_template(minpack_func_nn fcn, void *p, int n, Scalar *x, Scalar *
     int fjac_offset;
 
     /* Local variables */
-    int i__, j, l, jm1, iwa[1];
+    int i, j, l, jm1, iwa[1];
     Scalar sum;
     int sing;
     int iter;
@@ -142,8 +142,8 @@ L70:
 
     /*        form (q transpose)*fvec and store in qtf. */
 
-    for (i__ = 1; i__ <= n; ++i__) {
-        qtf[i__] = fvec[i__];
+    for (i = 1; i <= n; ++i) {
+        qtf[i] = fvec[i];
         /* L80: */
     }
     for (j = 1; j <= n; ++j) {
@@ -151,13 +151,13 @@ L70:
             goto L110;
         }
         sum = 0.;
-        for (i__ = j; i__ <= n; ++i__) {
-            sum += fjac[i__ + j * ldfjac] * qtf[i__];
+        for (i = j; i <= n; ++i) {
+            sum += fjac[i + j * ldfjac] * qtf[i];
             /* L90: */
         }
         temp = -sum / fjac[j + j * ldfjac];
-        for (i__ = j; i__ <= n; ++i__) {
-            qtf[i__] += fjac[i__ + j * ldfjac] * temp;
+        for (i = j; i <= n; ++i) {
+            qtf[i] += fjac[i + j * ldfjac] * temp;
             /* L100: */
         }
 L110:
@@ -174,9 +174,9 @@ L110:
         if (jm1 < 1) {
             goto L140;
         }
-        for (i__ = 1; i__ <= jm1; ++i__) {
-            r__[l] = fjac[i__ + j * ldfjac];
-            l = l + n - i__;
+        for (i = 1; i <= jm1; ++i) {
+            r__[l] = fjac[i + j * ldfjac];
+            l = l + n - i;
             /* L130: */
         }
 L140:
@@ -258,14 +258,14 @@ L190:
     /*           compute the scaled predicted reduction. */
 
     l = 1;
-    for (i__ = 1; i__ <= n; ++i__) {
+    for (i = 1; i <= n; ++i) {
         sum = 0.;
-        for (j = i__; j <= n; ++j) {
+        for (j = i; j <= n; ++j) {
             sum += r__[l] * wa1[j];
             ++l;
             /* L210: */
         }
-        wa3[i__] = qtf[i__] + sum;
+        wa3[i] = qtf[i] + sum;
         /* L220: */
     }
     temp = ei_enorm<Scalar>(n, &wa3[1]);
@@ -367,8 +367,8 @@ L260:
 
     for (j = 1; j <= n; ++j) {
         sum = 0.;
-        for (i__ = 1; i__ <= n; ++i__) {
-            sum += fjac[i__ + j * ldfjac] * wa4[i__];
+        for (i = 1; i <= n; ++i) {
+            sum += fjac[i + j * ldfjac] * wa4[i];
             /* L270: */
         }
         wa2[j] = (sum - wa3[j]) / pnorm;
diff --git a/unsupported/Eigen/src/NonLinear/hybrj.h b/unsupported/Eigen/src/NonLinear/hybrj.h
index dcac33dba..02e798121 100644
--- a/unsupported/Eigen/src/NonLinear/hybrj.h
+++ b/unsupported/Eigen/src/NonLinear/hybrj.h
@@ -13,7 +13,7 @@ int hybrj_template(minpack_funcder_nn fcn, void *p, int n, Scalar *x, Scalar *
     int fjac_offset;
 
     /* Local variables */
-    int i__, j, l, jm1, iwa[1];
+    int i, j, l, jm1, iwa[1];
     Scalar sum;
     int sing;
     int iter;
@@ -137,8 +137,8 @@ L70:
 
     /*        form (q transpose)*fvec and store in qtf. */
 
-    for (i__ = 1; i__ <= n; ++i__) {
-        qtf[i__] = fvec[i__];
+    for (i = 1; i <= n; ++i) {
+        qtf[i] = fvec[i];
         /* L80: */
     }
     for (j = 1; j <= n; ++j) {
@@ -146,13 +146,13 @@ L70:
             goto L110;
         }
         sum = 0.;
-        for (i__ = j; i__ <= n; ++i__) {
-            sum += fjac[i__ + j * ldfjac] * qtf[i__];
+        for (i = j; i <= n; ++i) {
+            sum += fjac[i + j * ldfjac] * qtf[i];
             /* L90: */
         }
         temp = -sum / fjac[j + j * ldfjac];
-        for (i__ = j; i__ <= n; ++i__) {
-            qtf[i__] += fjac[i__ + j * ldfjac] * temp;
+        for (i = j; i <= n; ++i) {
+            qtf[i] += fjac[i + j * ldfjac] * temp;
             /* L100: */
         }
 L110:
@@ -169,9 +169,9 @@ L110:
         if (jm1 < 1) {
             goto L140;
         }
-        for (i__ = 1; i__ <= jm1; ++i__) {
-            r__[l] = fjac[i__ + j * ldfjac];
-            l = l + n - i__;
+        for (i = 1; i <= jm1; ++i) {
+            r__[l] = fjac[i + j * ldfjac];
+            l = l + n - i;
             /* L130: */
         }
 L140:
@@ -252,14 +252,14 @@ L190:
     /*           compute the scaled predicted reduction. */
 
     l = 1;
-    for (i__ = 1; i__ <= n; ++i__) {
+    for (i = 1; i <= n; ++i) {
         sum = 0.;
-        for (j = i__; j <= n; ++j) {
+        for (j = i; j <= n; ++j) {
             sum += r__[l] * wa1[j];
             ++l;
             /* L210: */
         }
-        wa3[i__] = qtf[i__] + sum;
+        wa3[i] = qtf[i] + sum;
         /* L220: */
     }
     temp = ei_enorm<Scalar>(n, &wa3[1]);
@@ -365,8 +365,8 @@ L260:
 
     for (j = 1; j <= n; ++j) {
         sum = 0.;
-        for (i__ = 1; i__ <= n; ++i__) {
-            sum += fjac[i__ + j * ldfjac] * wa4[i__];
+        for (i = 1; i <= n; ++i) {
+            sum += fjac[i + j * ldfjac] * wa4[i];
             /* L270: */
         }
         wa2[j] = (sum - wa3[j]) / pnorm;
diff --git a/unsupported/Eigen/src/NonLinear/lmder.h b/unsupported/Eigen/src/NonLinear/lmder.h
index a0807dc4e..57c1038fa 100644
--- a/unsupported/Eigen/src/NonLinear/lmder.h
+++ b/unsupported/Eigen/src/NonLinear/lmder.h
@@ -13,7 +13,7 @@ int lmder_template(minpack_funcder_mn fcn, void *p, int m, int n, Scalar *x,
     int fjac_offset;
 
     /* Local variables */
-    int i__, j, l;
+    int i, j, l;
     Scalar par, sum;
     int iter;
     Scalar temp, temp1, temp2;
@@ -141,8 +141,8 @@ L80:
     /*        form (q transpose)*fvec and store the first n components in */
     /*        qtf. */
 
-    for (i__ = 1; i__ <= m; ++i__) {
-        wa4[i__] = fvec[i__];
+    for (i = 1; i <= m; ++i) {
+        wa4[i] = fvec[i];
         /* L90: */
     }
     for (j = 1; j <= n; ++j) {
@@ -150,13 +150,13 @@ L80:
             goto L120;
         }
         sum = 0.;
-        for (i__ = j; i__ <= m; ++i__) {
-            sum += fjac[i__ + j * ldfjac] * wa4[i__];
+        for (i = j; i <= m; ++i) {
+            sum += fjac[i + j * ldfjac] * wa4[i];
             /* L100: */
         }
         temp = -sum / fjac[j + j * ldfjac];
-        for (i__ = j; i__ <= m; ++i__) {
-            wa4[i__] += fjac[i__ + j * ldfjac] * temp;
+        for (i = j; i <= m; ++i) {
+            wa4[i] += fjac[i + j * ldfjac] * temp;
             /* L110: */
         }
 L120:
@@ -177,8 +177,8 @@ L120:
             goto L150;
         }
         sum = 0.;
-        for (i__ = 1; i__ <= j; ++i__) {
-            sum += fjac[i__ + j * ldfjac] * (qtf[i__] / fnorm);
+        for (i = 1; i <= j; ++i) {
+            sum += fjac[i + j * ldfjac] * (qtf[i] / fnorm);
             /* L140: */
         }
         /* Computing MAX */
@@ -254,8 +254,8 @@ L200:
         wa3[j] = 0.;
         l = ipvt[j];
         temp = wa1[l];
-        for (i__ = 1; i__ <= j; ++i__) {
-            wa3[i__] += fjac[i__ + j * ldfjac] * temp;
+        for (i = 1; i <= j; ++i) {
+            wa3[i] += fjac[i + j * ldfjac] * temp;
             /* L220: */
         }
         /* L230: */
@@ -314,8 +314,8 @@ L260:
         wa2[j] = diag[j] * x[j];
         /* L270: */
     }
-    for (i__ = 1; i__ <= m; ++i__) {
-        fvec[i__] = wa4[i__];
+    for (i = 1; i <= m; ++i) {
+        fvec[i] = wa4[i];
         /* L280: */
     }
     xnorm = ei_enorm<Scalar>(n, &wa2[1]);
diff --git a/unsupported/Eigen/src/NonLinear/lmdif.h b/unsupported/Eigen/src/NonLinear/lmdif.h
index 0d44dbf6a..27b725171 100644
--- a/unsupported/Eigen/src/NonLinear/lmdif.h
+++ b/unsupported/Eigen/src/NonLinear/lmdif.h
@@ -14,7 +14,7 @@ int lmdif_template(minpack_func_mn fcn, void *p, int m, int n, Scalar *x,
     int fjac_offset;
 
     /* Local variables */
-    int i__, j, l;
+    int i, j, l;
     Scalar par, sum;
     int iter;
     Scalar temp, temp1, temp2;
@@ -143,8 +143,8 @@ L80:
     /*        form (q transpose)*fvec and store the first n components in */
     /*        qtf. */
 
-    for (i__ = 1; i__ <= m; ++i__) {
-        wa4[i__] = fvec[i__];
+    for (i = 1; i <= m; ++i) {
+        wa4[i] = fvec[i];
         /* L90: */
     }
     for (j = 1; j <= n; ++j) {
@@ -152,13 +152,13 @@ L80:
             goto L120;
         }
         sum = 0.;
-        for (i__ = j; i__ <= m; ++i__) {
-            sum += fjac[i__ + j * ldfjac] * wa4[i__];
+        for (i = j; i <= m; ++i) {
+            sum += fjac[i + j * ldfjac] * wa4[i];
             /* L100: */
         }
         temp = -sum / fjac[j + j * ldfjac];
-        for (i__ = j; i__ <= m; ++i__) {
-            wa4[i__] += fjac[i__ + j * ldfjac] * temp;
+        for (i = j; i <= m; ++i) {
+            wa4[i] += fjac[i + j * ldfjac] * temp;
             /* L110: */
         }
 L120:
@@ -179,8 +179,8 @@ L120:
             goto L150;
         }
         sum = 0.;
-        for (i__ = 1; i__ <= j; ++i__) {
-            sum += fjac[i__ + j * ldfjac] * (qtf[i__] / fnorm);
+        for (i = 1; i <= j; ++i) {
+            sum += fjac[i + j * ldfjac] * (qtf[i] / fnorm);
             /* L140: */
         }
         /* Computing MAX */
@@ -256,8 +256,8 @@ L200:
         wa3[j] = 0.;
         l = ipvt[j];
         temp = wa1[l];
-        for (i__ = 1; i__ <= j; ++i__) {
-            wa3[i__] += fjac[i__ + j * ldfjac] * temp;
+        for (i = 1; i <= j; ++i) {
+            wa3[i] += fjac[i + j * ldfjac] * temp;
             /* L220: */
         }
         /* L230: */
@@ -316,8 +316,8 @@ L260:
         wa2[j] = diag[j] * x[j];
         /* L270: */
     }
-    for (i__ = 1; i__ <= m; ++i__) {
-        fvec[i__] = wa4[i__];
+    for (i = 1; i <= m; ++i) {
+        fvec[i] = wa4[i];
         /* L280: */
     }
     xnorm = ei_enorm<Scalar>(n, &wa2[1]);
diff --git a/unsupported/Eigen/src/NonLinear/lmstr.h b/unsupported/Eigen/src/NonLinear/lmstr.h
index 2f4549063..d2810ab31 100644
--- a/unsupported/Eigen/src/NonLinear/lmstr.h
+++ b/unsupported/Eigen/src/NonLinear/lmstr.h
@@ -13,7 +13,7 @@ int lmstr_template(minpack_funcderstr_mn fcn, void *p, int m, int n, Scalar *x,
     int fjac_offset;
 
     /* Local variables */
-    int i__, j, l;
+    int i, j, l;
     Scalar par, sum;
     int sing;
     int iter;
@@ -101,18 +101,18 @@ L40:
 
     for (j = 1; j <= n; ++j) {
         qtf[j] = 0.;
-        for (i__ = 1; i__ <= n; ++i__) {
-            fjac[i__ + j * ldfjac] = 0.;
+        for (i = 1; i <= n; ++i) {
+            fjac[i + j * ldfjac] = 0.;
             /* L50: */
         }
         /* L60: */
     }
     iflag = 2;
-    for (i__ = 1; i__ <= m; ++i__) {
+    for (i = 1; i <= m; ++i) {
         if ((*fcn)(p, m, n, &x[1], &fvec[1], &wa3[1], iflag) < 0) {
             goto L340;
         }
-        temp = fvec[i__];
+        temp = fvec[i];
         rwupdt(n, &fjac[fjac_offset], ldfjac, &wa3[1], &qtf[1], &temp, &wa1[
                 1], &wa2[1]);
         ++iflag;
@@ -142,13 +142,13 @@ L40:
             goto L110;
         }
         sum = 0.;
-        for (i__ = j; i__ <= n; ++i__) {
-            sum += fjac[i__ + j * ldfjac] * qtf[i__];
+        for (i = j; i <= n; ++i) {
+            sum += fjac[i + j * ldfjac] * qtf[i];
             /* L90: */
         }
         temp = -sum / fjac[j + j * ldfjac];
-        for (i__ = j; i__ <= n; ++i__) {
-            qtf[i__] += fjac[i__ + j * ldfjac] * temp;
+        for (i = j; i <= n; ++i) {
+            qtf[i] += fjac[i + j * ldfjac] * temp;
             /* L100: */
         }
 L110:
@@ -201,8 +201,8 @@ L170:
             goto L190;
         }
         sum = 0.;
-        for (i__ = 1; i__ <= j; ++i__) {
-            sum += fjac[i__ + j * ldfjac] * (qtf[i__] / fnorm);
+        for (i = 1; i <= j; ++i) {
+            sum += fjac[i + j * ldfjac] * (qtf[i] / fnorm);
             /* L180: */
         }
         /* Computing MAX */
@@ -278,8 +278,8 @@ L240:
         wa3[j] = 0.;
         l = ipvt[j];
         temp = wa1[l];
-        for (i__ = 1; i__ <= j; ++i__) {
-            wa3[i__] += fjac[i__ + j * ldfjac] * temp;
+        for (i = 1; i <= j; ++i) {
+            wa3[i] += fjac[i + j * ldfjac] * temp;
             /* L260: */
         }
         /* L270: */
@@ -339,8 +339,8 @@ L300:
         wa2[j] = diag[j] * x[j];
         /* L310: */
     }
-    for (i__ = 1; i__ <= m; ++i__) {
-        fvec[i__] = wa4[i__];
+    for (i = 1; i <= m; ++i) {
+        fvec[i] = wa4[i];
         /* L320: */
     }
     xnorm = ei_enorm<Scalar>(n, &wa2[1]);