diff --git a/lapack-netlib/SRC/cgecxx.c b/lapack-netlib/SRC/cgecxx.c
index 40f4308aef..f34992d47e 100644
--- a/lapack-netlib/SRC/cgecxx.c
+++ b/lapack-netlib/SRC/cgecxx.c
@@ -255,7 +255,6 @@ typedef struct Namelist Namelist;
 */
 
 
-
 /* Table of constant values */
 
 static integer c_n1 = -1;
@@ -298,7 +297,7 @@ static integer c__1 = 1;
 	    complex *, integer *), cswap_(integer *, complex *, integer *, 
 	    complex *, integer *);
     extern real scnrm2_(integer *, complex *, integer *), clange_(char *, 
-	    integer *, integer *, complex *, integer *, complex *);
+	    integer *, integer *, complex *, integer *, real *);
     extern integer icamax_(integer *, complex *, integer *);
     integer jdesel;
     extern /* Subroutine */ void cgeqrf_(integer *, integer *, complex *, 
@@ -627,11 +626,11 @@ static integer c__1 = 1;
 
 	}
 
-	if (*lwork < lwkmin && ! lquery) {
+	if ((*lwork < lwkmin) && ! lquery) {
 	    *info = -26;
-	} else if (*lrwork < lrwkmin && ! lquery) {
+	} else if ((*lrwork < lrwkmin) && ! lquery) {
 	    *info = -28;
-	} else if (*liwork < liwkmin && ! lquery) {
+	} else if ((*liwork < liwkmin) && ! lquery) {
 	    *info = -30;
 	}
     }
@@ -1031,7 +1030,7 @@ static integer c__1 = 1;
 
     if (f2cmin(mresid,nresid) != 0) {
 	*fnrmk = clange_("F", &mresid, &nresid, &a[*k + 1 + (*k + 1) * a_dim1]
-		, lda, &work[1]);
+		, lda, &rwork[1]);
     } else {
 	*fnrmk = 0.f;
     }
diff --git a/lapack-netlib/SRC/cgecxx.f b/lapack-netlib/SRC/cgecxx.f
index 7bda3deda5..70b300351f 100644
--- a/lapack-netlib/SRC/cgecxx.f
+++ b/lapack-netlib/SRC/cgecxx.f
@@ -1627,7 +1627,7 @@ SUBROUTINE CGECXX( FACT, USESD, M, N,
 *
       IF( MIN( MRESID, NRESID ).NE.0 ) THEN
          FNRMK = CLANGE( 'F',  MRESID, NRESID, A( K+1, K+1 ),
-     $                   LDA, WORK )
+     $                   LDA, RWORK )
       ELSE
          FNRMK = ZERO
       END IF
diff --git a/lapack-netlib/SRC/zgecxx.c b/lapack-netlib/SRC/zgecxx.c
index e3729f0352..1de3a2c1d8 100644
--- a/lapack-netlib/SRC/zgecxx.c
+++ b/lapack-netlib/SRC/zgecxx.c
@@ -258,7 +258,6 @@ typedef struct Namelist Namelist;
 */
 
 
-
 /* Table of constant values */
 
 static integer c_n1 = -1;
@@ -312,13 +311,14 @@ static integer c__1 = 1;
     doublereal safmin;
     extern /* Subroutine */ void xerbla_(char *, integer *, ftnlen);
     extern doublereal zlange_(char *, integer *, integer *, doublecomplex *, 
-	    integer *, doublecomplex *);
+	    integer *, doublereal *);
     integer mresid, nresid;
     extern integer izamax_(integer *, doublecomplex *, integer *);
+    integer kmaxls;
     extern /* Subroutine */ void zgeqrf_(integer *, integer *, doublecomplex *,
 	     integer *, doublecomplex *, doublecomplex *, integer *, integer *
 	    );
-    integer kmaxls, lwkmin;
+    integer lwkmin;
     extern /* Subroutine */ void zlacpy_(char *, integer *, integer *, 
 	    doublecomplex *, integer *, doublecomplex *, integer *);
     logical usetol, lquery;
@@ -634,9 +634,9 @@ static integer c__1 = 1;
 
 	if (*lwork < lwkmin && ! lquery) {
 	    *info = -26;
-	} else if (*lrwork < lrwkmin && ! lquery) {
+	} else if ((*lrwork < lrwkmin) && ! lquery) {
 	    *info = -28;
-	} else if (*liwork < liwkmin && ! lquery) {
+	} else if ((*liwork < liwkmin) && ! lquery) {
 	    *info = -30;
 	}
     }
@@ -1036,7 +1036,7 @@ static integer c__1 = 1;
 
     if (f2cmin(mresid,nresid) != 0) {
 	*fnrmk = zlange_("F", &mresid, &nresid, &a[*k + 1 + (*k + 1) * a_dim1]
-		, lda, &work[1]);
+		, lda, &rwork[1]);
     } else {
 	*fnrmk = 0.;
     }
diff --git a/lapack-netlib/SRC/zgecxx.f b/lapack-netlib/SRC/zgecxx.f
index c5a4cff118..f764676c3f 100644
--- a/lapack-netlib/SRC/zgecxx.f
+++ b/lapack-netlib/SRC/zgecxx.f
@@ -962,6 +962,8 @@ SUBROUTINE ZGECXX( FACT, USESD, M, N,
 *  =====================================================================
 *
 *     .. Parameters ..
+      INTEGER            DP
+      PARAMETER          ( DP = KIND( 0.0D0 ) )
       DOUBLE PRECISION   ZERO, TWO, MINUSONE
       PARAMETER          ( ZERO = 0.0D+0, TWO = 2.0D+0,
      $                   MINUSONE = -1.0D+0 )
@@ -989,7 +991,7 @@ SUBROUTINE ZGECXX( FACT, USESD, M, N,
      $                   ILAENV, LSAME
 *     ..
 *     .. Intrinsic Functions ..
-      INTRINSIC          DBLE, DCMPLX, MAX, MIN
+      INTRINSIC          CMPLX, DBLE, MAX, MIN
 *     ..
 *     .. Executable Statements ..
 *
@@ -1248,7 +1250,7 @@ SUBROUTINE ZGECXX( FACT, USESD, M, N,
       END IF
 *
       IF( INFO.EQ.0 ) THEN
-         WORK( 1 ) = DCMPLX( LWKOPT )
+         WORK( 1 ) = CMPLX( LWKOPT, KIND=DP )
          RWORK( 1 ) = DBLE( LRWKOPT )
          IWORK( 1 ) = LIWKOPT
       END IF
@@ -1627,7 +1629,7 @@ SUBROUTINE ZGECXX( FACT, USESD, M, N,
 *
       IF( MIN( MRESID, NRESID ).NE.0 ) THEN
          FNRMK = ZLANGE( 'F',  MRESID, NRESID, A( K+1, K+1 ),
-     $                   LDA, WORK )
+     $                   LDA, RWORK )
       ELSE
          FNRMK = ZERO
       END IF
@@ -1767,7 +1769,7 @@ SUBROUTINE ZGECXX( FACT, USESD, M, N,
 *
       END IF
 *
-      WORK( 1 ) = DCMPLX( LWKOPT )
+      WORK( 1 ) = CMPLX( LWKOPT, KIND=DP )
       RWORK( 1 ) = DBLE( LRWKOPT )
       IWORK( 1 ) = LIWKOPT
 *