diff --git a/lapack-netlib/LAPACKE/src/CMakeLists.txt b/lapack-netlib/LAPACKE/src/CMakeLists.txt
index 26e52acfa..4c13dce0b 100644
--- a/lapack-netlib/LAPACKE/src/CMakeLists.txt
+++ b/lapack-netlib/LAPACKE/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(SOURCES
+set(SOURCES_COMPLEX
 lapacke_cbbcsd.c
 lapacke_cbbcsd_work.c
 lapacke_cbdsqr.c
@@ -78,11 +78,11 @@ lapacke_cgeqrf_work.c
 lapacke_cgeqrfp.c
 lapacke_cgeqrfp_work.c
 lapacke_cgeqrt.c
+lapacke_cgeqrt_work.c
 lapacke_cgeqrt2.c
 lapacke_cgeqrt2_work.c
 lapacke_cgeqrt3.c
 lapacke_cgeqrt3_work.c
-lapacke_cgeqrt_work.c
 lapacke_cgerfs.c
 lapacke_cgerfs_work.c
 lapacke_cgerqf.c
@@ -93,6 +93,8 @@ lapacke_cgesv.c
 lapacke_cgesv_work.c
 lapacke_cgesvd.c
 lapacke_cgesvd_work.c
+lapacke_cgesvdq.c
+lapacke_cgesvdq_work.c
 lapacke_cgesvdx.c
 lapacke_cgesvdx_work.c
 lapacke_cgesvj.c
@@ -129,10 +131,10 @@ lapacke_cggevx.c
 lapacke_cggevx_work.c
 lapacke_cggglm.c
 lapacke_cggglm_work.c
-lapacke_cgghrd.c
-lapacke_cgghrd_work.c
 lapacke_cgghd3.c
 lapacke_cgghd3_work.c
+lapacke_cgghrd.c
+lapacke_cgghrd_work.c
 lapacke_cgglse.c
 lapacke_cgglse_work.c
 lapacke_cggqrf.c
@@ -157,14 +159,14 @@ lapacke_cgttrs.c
 lapacke_cgttrs_work.c
 lapacke_chbev.c
 lapacke_chbev_work.c
-lapacke_chbevd.c
-lapacke_chbevd_work.c
-lapacke_chbevx.c
-lapacke_chbevx_work.c
 lapacke_chbev_2stage.c
 lapacke_chbev_2stage_work.c
+lapacke_chbevd.c
+lapacke_chbevd_work.c
 lapacke_chbevd_2stage.c
 lapacke_chbevd_2stage_work.c
+lapacke_chbevx.c
+lapacke_chbevx_work.c
 lapacke_chbevx_2stage.c
 lapacke_chbevx_2stage_work.c
 lapacke_chbgst.c
@@ -185,18 +187,18 @@ lapacke_cheequb.c
 lapacke_cheequb_work.c
 lapacke_cheev.c
 lapacke_cheev_work.c
-lapacke_cheevd.c
-lapacke_cheevd_work.c
-lapacke_cheevr.c
-lapacke_cheevr_work.c
-lapacke_cheevx.c
-lapacke_cheevx_work.c
 lapacke_cheev_2stage.c
 lapacke_cheev_2stage_work.c
+lapacke_cheevd.c
+lapacke_cheevd_work.c
 lapacke_cheevd_2stage.c
 lapacke_cheevd_2stage_work.c
+lapacke_cheevr.c
+lapacke_cheevr_work.c
 lapacke_cheevr_2stage.c
 lapacke_cheevr_2stage_work.c
+lapacke_cheevx.c
+lapacke_cheevx_work.c
 lapacke_cheevx_2stage.c
 lapacke_cheevx_2stage_work.c
 lapacke_chegst.c
@@ -214,8 +216,8 @@ lapacke_cherfs_work.c
 lapacke_chesv.c
 lapacke_chesv_work.c
 lapacke_chesv_aa.c
-lapacke_chesv_aa_2stage.c
 lapacke_chesv_aa_work.c
+lapacke_chesv_aa_2stage.c
 lapacke_chesv_aa_2stage_work.c
 lapacke_chesv_rk.c
 lapacke_chesv_rk_work.c
@@ -226,35 +228,35 @@ lapacke_cheswapr_work.c
 lapacke_chetrd.c
 lapacke_chetrd_work.c
 lapacke_chetrf.c
-lapacke_chetrf_rook.c
 lapacke_chetrf_work.c
-lapacke_chetrf_rook_work.c
 lapacke_chetrf_aa.c
-lapacke_chetrf_aa_2stage.c
 lapacke_chetrf_aa_work.c
+lapacke_chetrf_aa_2stage.c
 lapacke_chetrf_aa_2stage_work.c
 lapacke_chetrf_rk.c
 lapacke_chetrf_rk_work.c
+lapacke_chetrf_rook.c
+lapacke_chetrf_rook_work.c
 lapacke_chetri.c
+lapacke_chetri_work.c
 lapacke_chetri2.c
 lapacke_chetri2_work.c
-lapacke_chetri_3.c
-lapacke_chetri_3_work.c
 lapacke_chetri2x.c
 lapacke_chetri2x_work.c
-lapacke_chetri_work.c
+lapacke_chetri_3.c
+lapacke_chetri_3_work.c
 lapacke_chetrs.c
-lapacke_chetrs_rook.c
+lapacke_chetrs_work.c
 lapacke_chetrs2.c
 lapacke_chetrs2_work.c
-lapacke_chetrs_work.c
-lapacke_chetrs_rook_work.c
-lapacke_chetrs_aa.c
-lapacke_chetrs_aa_2stage.c
-lapacke_chetrs_aa_work.c
-lapacke_chetrs_aa_2stage_work.c
 lapacke_chetrs_3.c
 lapacke_chetrs_3_work.c
+lapacke_chetrs_aa.c
+lapacke_chetrs_aa_work.c
+lapacke_chetrs_aa_2stage.c
+lapacke_chetrs_aa_2stage_work.c
+lapacke_chetrs_rook.c
+lapacke_chetrs_rook_work.c
 lapacke_chfrk.c
 lapacke_chfrk_work.c
 lapacke_chgeqz.c
@@ -445,52 +447,54 @@ lapacke_csyconv.c
 lapacke_csyconv_work.c
 lapacke_csyequb.c
 lapacke_csyequb_work.c
+lapacke_csyr.c
+lapacke_csyr_work.c
 lapacke_csyrfs.c
 lapacke_csyrfs_work.c
 lapacke_csysv.c
-lapacke_csysv_rook.c
-lapacke_csysv_rook_work.c
 lapacke_csysv_work.c
 lapacke_csysv_aa.c
-lapacke_csysv_aa_2stage.c
 lapacke_csysv_aa_work.c
+lapacke_csysv_aa_2stage.c
 lapacke_csysv_aa_2stage_work.c
 lapacke_csysv_rk.c
 lapacke_csysv_rk_work.c
+lapacke_csysv_rook.c
+lapacke_csysv_rook_work.c
 lapacke_csysvx.c
 lapacke_csysvx_work.c
 lapacke_csyswapr.c
 lapacke_csyswapr_work.c
 lapacke_csytrf.c
 lapacke_csytrf_work.c
-lapacke_csytrf_rook.c
-lapacke_csytrf_rook_work.c
 lapacke_csytrf_aa.c
-lapacke_csytrf_aa_2stage.c
 lapacke_csytrf_aa_work.c
+lapacke_csytrf_aa_2stage.c
 lapacke_csytrf_aa_2stage_work.c
 lapacke_csytrf_rk.c
 lapacke_csytrf_rk_work.c
+lapacke_csytrf_rook.c
+lapacke_csytrf_rook_work.c
 lapacke_csytri.c
+lapacke_csytri_work.c
 lapacke_csytri2.c
 lapacke_csytri2_work.c
-lapacke_csytri_3.c
-lapacke_csytri_3_work.c
 lapacke_csytri2x.c
 lapacke_csytri2x_work.c
-lapacke_csytri_work.c
+lapacke_csytri_3.c
+lapacke_csytri_3_work.c
 lapacke_csytrs.c
-lapacke_csytrs_rook.c
+lapacke_csytrs_work.c
 lapacke_csytrs2.c
 lapacke_csytrs2_work.c
-lapacke_csytrs_work.c
-lapacke_csytrs_rook_work.c
-lapacke_csytrs_aa.c
-lapacke_csytrs_aa_2stage.c
-lapacke_csytrs_aa_work.c
-lapacke_csytrs_aa_2stage_work.c
 lapacke_csytrs_3.c
 lapacke_csytrs_3_work.c
+lapacke_csytrs_aa.c
+lapacke_csytrs_aa_work.c
+lapacke_csytrs_aa_2stage.c
+lapacke_csytrs_aa_2stage_work.c
+lapacke_csytrs_rook.c
+lapacke_csytrs_rook_work.c
 lapacke_ctbcon.c
 lapacke_ctbcon_work.c
 lapacke_ctbrfs.c
@@ -522,9 +526,9 @@ lapacke_ctpcon_work.c
 lapacke_ctpmqrt.c
 lapacke_ctpmqrt_work.c
 lapacke_ctpqrt.c
+lapacke_ctpqrt_work.c
 lapacke_ctpqrt2.c
 lapacke_ctpqrt2_work.c
-lapacke_ctpqrt_work.c
 lapacke_ctprfb.c
 lapacke_ctprfb_work.c
 lapacke_ctprfs.c
@@ -601,14 +605,16 @@ lapacke_cupgtr.c
 lapacke_cupgtr_work.c
 lapacke_cupmtr.c
 lapacke_cupmtr_work.c
+)
+set(SOURCES_DOUBLE
 lapacke_dbbcsd.c
 lapacke_dbbcsd_work.c
 lapacke_dbdsdc.c
 lapacke_dbdsdc_work.c
-lapacke_dbdsvdx.c
-lapacke_dbdsvdx_work.c
 lapacke_dbdsqr.c
 lapacke_dbdsqr_work.c
+lapacke_dbdsvdx.c
+lapacke_dbdsvdx_work.c
 lapacke_ddisna.c
 lapacke_ddisna_work.c
 lapacke_dgbbrd.c
@@ -686,11 +692,11 @@ lapacke_dgeqrf_work.c
 lapacke_dgeqrfp.c
 lapacke_dgeqrfp_work.c
 lapacke_dgeqrt.c
+lapacke_dgeqrt_work.c
 lapacke_dgeqrt2.c
 lapacke_dgeqrt2_work.c
 lapacke_dgeqrt3.c
 lapacke_dgeqrt3_work.c
-lapacke_dgeqrt_work.c
 lapacke_dgerfs.c
 lapacke_dgerfs_work.c
 lapacke_dgerqf.c
@@ -701,6 +707,8 @@ lapacke_dgesv.c
 lapacke_dgesv_work.c
 lapacke_dgesvd.c
 lapacke_dgesvd_work.c
+lapacke_dgesvdq.c
+lapacke_dgesvdq_work.c
 lapacke_dgesvdx.c
 lapacke_dgesvdx_work.c
 lapacke_dgesvj.c
@@ -737,10 +745,10 @@ lapacke_dggevx.c
 lapacke_dggevx_work.c
 lapacke_dggglm.c
 lapacke_dggglm_work.c
-lapacke_dgghrd.c
-lapacke_dgghrd_work.c
 lapacke_dgghd3.c
 lapacke_dgghd3_work.c
+lapacke_dgghrd.c
+lapacke_dgghrd_work.c
 lapacke_dgglse.c
 lapacke_dgglse_work.c
 lapacke_dggqrf.c
@@ -823,10 +831,10 @@ lapacke_dopmtr.c
 lapacke_dopmtr_work.c
 lapacke_dorbdb.c
 lapacke_dorbdb_work.c
-lapacke_dorcsd2by1.c
-lapacke_dorcsd2by1_work.c
 lapacke_dorcsd.c
 lapacke_dorcsd_work.c
+lapacke_dorcsd2by1.c
+lapacke_dorcsd2by1_work.c
 lapacke_dorgbr.c
 lapacke_dorgbr_work.c
 lapacke_dorghr.c
@@ -933,14 +941,14 @@ lapacke_dpttrs.c
 lapacke_dpttrs_work.c
 lapacke_dsbev.c
 lapacke_dsbev_work.c
-lapacke_dsbevd.c
-lapacke_dsbevd_work.c
-lapacke_dsbevx.c
-lapacke_dsbevx_work.c
 lapacke_dsbev_2stage.c
 lapacke_dsbev_2stage_work.c
+lapacke_dsbevd.c
+lapacke_dsbevd_work.c
 lapacke_dsbevd_2stage.c
 lapacke_dsbevd_2stage_work.c
+lapacke_dsbevx.c
+lapacke_dsbevx_work.c
 lapacke_dsbevx_2stage.c
 lapacke_dsbevx_2stage_work.c
 lapacke_dsbgst.c
@@ -1021,18 +1029,18 @@ lapacke_dsyequb.c
 lapacke_dsyequb_work.c
 lapacke_dsyev.c
 lapacke_dsyev_work.c
-lapacke_dsyevd.c
-lapacke_dsyevd_work.c
-lapacke_dsyevr.c
-lapacke_dsyevr_work.c
-lapacke_dsyevx.c
-lapacke_dsyevx_work.c
 lapacke_dsyev_2stage.c
 lapacke_dsyev_2stage_work.c
+lapacke_dsyevd.c
+lapacke_dsyevd_work.c
 lapacke_dsyevd_2stage.c
 lapacke_dsyevd_2stage_work.c
+lapacke_dsyevr.c
+lapacke_dsyevr_work.c
 lapacke_dsyevr_2stage.c
 lapacke_dsyevr_2stage_work.c
+lapacke_dsyevx.c
+lapacke_dsyevx_work.c
 lapacke_dsyevx_2stage.c
 lapacke_dsyevx_2stage_work.c
 lapacke_dsygst.c
@@ -1048,15 +1056,15 @@ lapacke_dsygvx_work.c
 lapacke_dsyrfs.c
 lapacke_dsyrfs_work.c
 lapacke_dsysv.c
-lapacke_dsysv_rook.c
-lapacke_dsysv_rook_work.c
 lapacke_dsysv_work.c
 lapacke_dsysv_aa.c
-lapacke_dsysv_aa_2stage.c
 lapacke_dsysv_aa_work.c
+lapacke_dsysv_aa_2stage.c
 lapacke_dsysv_aa_2stage_work.c
 lapacke_dsysv_rk.c
 lapacke_dsysv_rk_work.c
+lapacke_dsysv_rook.c
+lapacke_dsysv_rook_work.c
 lapacke_dsysvx.c
 lapacke_dsysvx_work.c
 lapacke_dsyswapr.c
@@ -1065,33 +1073,33 @@ lapacke_dsytrd.c
 lapacke_dsytrd_work.c
 lapacke_dsytrf.c
 lapacke_dsytrf_work.c
-lapacke_dsytrf_rook.c
-lapacke_dsytrf_rook_work.c
 lapacke_dsytrf_aa.c
-lapacke_dsytrf_aa_2stage.c
 lapacke_dsytrf_aa_work.c
+lapacke_dsytrf_aa_2stage.c
 lapacke_dsytrf_aa_2stage_work.c
 lapacke_dsytrf_rk.c
 lapacke_dsytrf_rk_work.c
+lapacke_dsytrf_rook.c
+lapacke_dsytrf_rook_work.c
 lapacke_dsytri.c
+lapacke_dsytri_work.c
 lapacke_dsytri2.c
 lapacke_dsytri2_work.c
-lapacke_dsytri_3.c
-lapacke_dsytri_3_work.c
 lapacke_dsytri2x.c
 lapacke_dsytri2x_work.c
-lapacke_dsytri_work.c
+lapacke_dsytri_3.c
+lapacke_dsytri_3_work.c
 lapacke_dsytrs.c
-lapacke_dsytrs_rook.c
+lapacke_dsytrs_work.c
 lapacke_dsytrs2.c
 lapacke_dsytrs2_work.c
-lapacke_dsytrs_aa.c
-lapacke_dsytrs_aa_2stage.c
-lapacke_dsytrs_aa_work.c
-lapacke_dsytrs_aa_2stage_work.c
 lapacke_dsytrs_3.c
 lapacke_dsytrs_3_work.c
-lapacke_dsytrs_work.c
+lapacke_dsytrs_aa.c
+lapacke_dsytrs_aa_work.c
+lapacke_dsytrs_aa_2stage.c
+lapacke_dsytrs_aa_2stage_work.c
+lapacke_dsytrs_rook.c
 lapacke_dsytrs_rook_work.c
 lapacke_dtbcon.c
 lapacke_dtbcon_work.c
@@ -1124,9 +1132,9 @@ lapacke_dtpcon_work.c
 lapacke_dtpmqrt.c
 lapacke_dtpmqrt_work.c
 lapacke_dtpqrt.c
+lapacke_dtpqrt_work.c
 lapacke_dtpqrt2.c
 lapacke_dtpqrt2_work.c
-lapacke_dtpqrt_work.c
 lapacke_dtprfb.c
 lapacke_dtprfb_work.c
 lapacke_dtprfs.c
@@ -1163,15 +1171,21 @@ lapacke_dtrttp.c
 lapacke_dtrttp_work.c
 lapacke_dtzrzf.c
 lapacke_dtzrzf_work.c
+)
+
+set(SOURCES
 lapacke_nancheck.c
+lapacke_ilaver.c
+)
+set(SOURCES_SINGLE
 lapacke_sbbcsd.c
 lapacke_sbbcsd_work.c
 lapacke_sbdsdc.c
 lapacke_sbdsdc_work.c
-lapacke_sbdsvdx.c
-lapacke_sbdsvdx_work.c
 lapacke_sbdsqr.c
 lapacke_sbdsqr_work.c
+lapacke_sbdsvdx.c
+lapacke_sbdsvdx_work.c
 lapacke_sdisna.c
 lapacke_sdisna_work.c
 lapacke_sgbbrd.c
@@ -1249,11 +1263,11 @@ lapacke_sgeqrf_work.c
 lapacke_sgeqrfp.c
 lapacke_sgeqrfp_work.c
 lapacke_sgeqrt.c
+lapacke_sgeqrt_work.c
 lapacke_sgeqrt2.c
 lapacke_sgeqrt2_work.c
 lapacke_sgeqrt3.c
 lapacke_sgeqrt3_work.c
-lapacke_sgeqrt_work.c
 lapacke_sgerfs.c
 lapacke_sgerfs_work.c
 lapacke_sgerqf.c
@@ -1264,6 +1278,8 @@ lapacke_sgesv.c
 lapacke_sgesv_work.c
 lapacke_sgesvd.c
 lapacke_sgesvd_work.c
+lapacke_sgesvdq.c
+lapacke_sgesvdq_work.c
 lapacke_sgesvdx.c
 lapacke_sgesvdx_work.c
 lapacke_sgesvj.c
@@ -1300,10 +1316,10 @@ lapacke_sggevx.c
 lapacke_sggevx_work.c
 lapacke_sggglm.c
 lapacke_sggglm_work.c
-lapacke_sgghrd.c
-lapacke_sgghrd_work.c
 lapacke_sgghd3.c
 lapacke_sgghd3_work.c
+lapacke_sgghrd.c
+lapacke_sgghrd_work.c
 lapacke_sgglse.c
 lapacke_sgglse_work.c
 lapacke_sggqrf.c
@@ -1496,14 +1512,14 @@ lapacke_spttrs.c
 lapacke_spttrs_work.c
 lapacke_ssbev.c
 lapacke_ssbev_work.c
-lapacke_ssbevd.c
-lapacke_ssbevd_work.c
-lapacke_ssbevx.c
-lapacke_ssbevx_work.c
 lapacke_ssbev_2stage.c
 lapacke_ssbev_2stage_work.c
+lapacke_ssbevd.c
+lapacke_ssbevd_work.c
 lapacke_ssbevd_2stage.c
 lapacke_ssbevd_2stage_work.c
+lapacke_ssbevx.c
+lapacke_ssbevx_work.c
 lapacke_ssbevx_2stage.c
 lapacke_ssbevx_2stage_work.c
 lapacke_ssbgst.c
@@ -1580,18 +1596,18 @@ lapacke_ssyequb.c
 lapacke_ssyequb_work.c
 lapacke_ssyev.c
 lapacke_ssyev_work.c
-lapacke_ssyevd.c
-lapacke_ssyevd_work.c
-lapacke_ssyevr.c
-lapacke_ssyevr_work.c
-lapacke_ssyevx.c
-lapacke_ssyevx_work.c
 lapacke_ssyev_2stage.c
 lapacke_ssyev_2stage_work.c
+lapacke_ssyevd.c
+lapacke_ssyevd_work.c
 lapacke_ssyevd_2stage.c
 lapacke_ssyevd_2stage_work.c
+lapacke_ssyevr.c
+lapacke_ssyevr_work.c
 lapacke_ssyevr_2stage.c
 lapacke_ssyevr_2stage_work.c
+lapacke_ssyevx.c
+lapacke_ssyevx_work.c
 lapacke_ssyevx_2stage.c
 lapacke_ssyevx_2stage_work.c
 lapacke_ssygst.c
@@ -1607,8 +1623,6 @@ lapacke_ssygvx_work.c
 lapacke_ssyrfs.c
 lapacke_ssyrfs_work.c
 lapacke_ssysv.c
-lapacke_ssysv_rook.c
-lapacke_ssysv_rook_work.c
 lapacke_ssysv_work.c
 lapacke_ssysv_aa.c
 lapacke_ssysv_aa_work.c
@@ -1616,6 +1630,8 @@ lapacke_ssysv_aa_2stage.c
 lapacke_ssysv_aa_2stage_work.c
 lapacke_ssysv_rk.c
 lapacke_ssysv_rk_work.c
+lapacke_ssysv_rook.c
+lapacke_ssysv_rook_work.c
 lapacke_ssysvx.c
 lapacke_ssysvx_work.c
 lapacke_ssyswapr.c
@@ -1624,33 +1640,33 @@ lapacke_ssytrd.c
 lapacke_ssytrd_work.c
 lapacke_ssytrf.c
 lapacke_ssytrf_work.c
-lapacke_ssytrf_rook.c
-lapacke_ssytrf_rook_work.c
 lapacke_ssytrf_aa.c
-lapacke_ssytrf_aa_2stage.c
 lapacke_ssytrf_aa_work.c
+lapacke_ssytrf_aa_2stage.c
 lapacke_ssytrf_aa_2stage_work.c
 lapacke_ssytrf_rk.c
 lapacke_ssytrf_rk_work.c
+lapacke_ssytrf_rook.c
+lapacke_ssytrf_rook_work.c
 lapacke_ssytri.c
+lapacke_ssytri_work.c
 lapacke_ssytri2.c
 lapacke_ssytri2_work.c
-lapacke_ssytri_3.c
-lapacke_ssytri_3_work.c
 lapacke_ssytri2x.c
 lapacke_ssytri2x_work.c
-lapacke_ssytri_work.c
+lapacke_ssytri_3.c
+lapacke_ssytri_3_work.c
 lapacke_ssytrs.c
-lapacke_ssytrs_rook.c
+lapacke_ssytrs_work.c
 lapacke_ssytrs2.c
 lapacke_ssytrs2_work.c
-lapacke_ssytrs_aa.c
-lapacke_ssytrs_aa_2stage.c
-lapacke_ssytrs_aa_work.c
-lapacke_ssytrs_aa_2stage_work.c
 lapacke_ssytrs_3.c
 lapacke_ssytrs_3_work.c
-lapacke_ssytrs_work.c
+lapacke_ssytrs_aa.c
+lapacke_ssytrs_aa_work.c
+lapacke_ssytrs_aa_2stage.c
+lapacke_ssytrs_aa_2stage_work.c
+lapacke_ssytrs_rook.c
 lapacke_ssytrs_rook_work.c
 lapacke_stbcon.c
 lapacke_stbcon_work.c
@@ -1722,6 +1738,8 @@ lapacke_strttp.c
 lapacke_strttp_work.c
 lapacke_stzrzf.c
 lapacke_stzrzf_work.c
+)
+set(SOURCES_COMPLEX16
 lapacke_zbbcsd.c
 lapacke_zbbcsd_work.c
 lapacke_zbdsqr.c
@@ -1805,11 +1823,11 @@ lapacke_zgeqrf_work.c
 lapacke_zgeqrfp.c
 lapacke_zgeqrfp_work.c
 lapacke_zgeqrt.c
+lapacke_zgeqrt_work.c
 lapacke_zgeqrt2.c
 lapacke_zgeqrt2_work.c
 lapacke_zgeqrt3.c
 lapacke_zgeqrt3_work.c
-lapacke_zgeqrt_work.c
 lapacke_zgerfs.c
 lapacke_zgerfs_work.c
 lapacke_zgerqf.c
@@ -1820,6 +1838,8 @@ lapacke_zgesv.c
 lapacke_zgesv_work.c
 lapacke_zgesvd.c
 lapacke_zgesvd_work.c
+lapacke_zgesvdq.c
+lapacke_zgesvdq_work.c
 lapacke_zgesvdx.c
 lapacke_zgesvdx_work.c
 lapacke_zgesvj.c
@@ -1856,10 +1876,10 @@ lapacke_zggevx.c
 lapacke_zggevx_work.c
 lapacke_zggglm.c
 lapacke_zggglm_work.c
-lapacke_zgghrd.c
-lapacke_zgghrd_work.c
 lapacke_zgghd3.c
 lapacke_zgghd3_work.c
+lapacke_zgghrd.c
+lapacke_zgghrd_work.c
 lapacke_zgglse.c
 lapacke_zgglse_work.c
 lapacke_zggqrf.c
@@ -1884,14 +1904,14 @@ lapacke_zgttrs.c
 lapacke_zgttrs_work.c
 lapacke_zhbev.c
 lapacke_zhbev_work.c
-lapacke_zhbevd.c
-lapacke_zhbevd_work.c
-lapacke_zhbevx.c
-lapacke_zhbevx_work.c
 lapacke_zhbev_2stage.c
 lapacke_zhbev_2stage_work.c
+lapacke_zhbevd.c
+lapacke_zhbevd_work.c
 lapacke_zhbevd_2stage.c
 lapacke_zhbevd_2stage_work.c
+lapacke_zhbevx.c
+lapacke_zhbevx_work.c
 lapacke_zhbevx_2stage.c
 lapacke_zhbevx_2stage_work.c
 lapacke_zhbgst.c
@@ -1912,18 +1932,18 @@ lapacke_zheequb.c
 lapacke_zheequb_work.c
 lapacke_zheev.c
 lapacke_zheev_work.c
-lapacke_zheevd.c
-lapacke_zheevd_work.c
-lapacke_zheevr.c
-lapacke_zheevr_work.c
-lapacke_zheevx.c
-lapacke_zheevx_work.c
 lapacke_zheev_2stage.c
 lapacke_zheev_2stage_work.c
+lapacke_zheevd.c
+lapacke_zheevd_work.c
 lapacke_zheevd_2stage.c
 lapacke_zheevd_2stage_work.c
+lapacke_zheevr.c
+lapacke_zheevr_work.c
 lapacke_zheevr_2stage.c
 lapacke_zheevr_2stage_work.c
+lapacke_zheevx.c
+lapacke_zheevx_work.c
 lapacke_zheevx_2stage.c
 lapacke_zheevx_2stage_work.c
 lapacke_zhegst.c
@@ -1941,8 +1961,8 @@ lapacke_zherfs_work.c
 lapacke_zhesv.c
 lapacke_zhesv_work.c
 lapacke_zhesv_aa.c
-lapacke_zhesv_aa_2stage.c
 lapacke_zhesv_aa_work.c
+lapacke_zhesv_aa_2stage.c
 lapacke_zhesv_aa_2stage_work.c
 lapacke_zhesv_rk.c
 lapacke_zhesv_rk_work.c
@@ -1953,34 +1973,34 @@ lapacke_zheswapr_work.c
 lapacke_zhetrd.c
 lapacke_zhetrd_work.c
 lapacke_zhetrf.c
-lapacke_zhetrf_rook.c
 lapacke_zhetrf_work.c
-lapacke_zhetrf_rook_work.c
 lapacke_zhetrf_aa.c
-lapacke_zhetrf_aa_2stage.c
 lapacke_zhetrf_aa_work.c
+lapacke_zhetrf_aa_2stage.c
 lapacke_zhetrf_aa_2stage_work.c
 lapacke_zhetrf_rk.c
 lapacke_zhetrf_rk_work.c
+lapacke_zhetrf_rook.c
+lapacke_zhetrf_rook_work.c
 lapacke_zhetri.c
+lapacke_zhetri_work.c
 lapacke_zhetri2.c
 lapacke_zhetri2_work.c
-lapacke_zhetri_3.c
-lapacke_zhetri_3_work.c
 lapacke_zhetri2x.c
 lapacke_zhetri2x_work.c
-lapacke_zhetri_work.c
+lapacke_zhetri_3.c
+lapacke_zhetri_3_work.c
 lapacke_zhetrs.c
-lapacke_zhetrs_rook.c
+lapacke_zhetrs_work.c
 lapacke_zhetrs2.c
 lapacke_zhetrs2_work.c
-lapacke_zhetrs_work.c
-lapacke_zhetrs_aa.c
-lapacke_zhetrs_aa_2stage.c
-lapacke_zhetrs_aa_work.c
-lapacke_zhetrs_aa_2stage_work.c
 lapacke_zhetrs_3.c
 lapacke_zhetrs_3_work.c
+lapacke_zhetrs_aa.c
+lapacke_zhetrs_aa_work.c
+lapacke_zhetrs_aa_2stage.c
+lapacke_zhetrs_aa_2stage_work.c
+lapacke_zhetrs_rook.c
 lapacke_zhetrs_rook_work.c
 lapacke_zhfrk.c
 lapacke_zhfrk_work.c
@@ -2172,52 +2192,54 @@ lapacke_zsyconv.c
 lapacke_zsyconv_work.c
 lapacke_zsyequb.c
 lapacke_zsyequb_work.c
+lapacke_zsyr.c
+lapacke_zsyr_work.c
 lapacke_zsyrfs.c
 lapacke_zsyrfs_work.c
 lapacke_zsysv.c
-lapacke_zsysv_rook.c
-lapacke_zsysv_rook_work.c
 lapacke_zsysv_work.c
 lapacke_zsysv_aa.c
-lapacke_zsysv_aa_2stage.c
 lapacke_zsysv_aa_work.c
+lapacke_zsysv_aa_2stage.c
 lapacke_zsysv_aa_2stage_work.c
 lapacke_zsysv_rk.c
 lapacke_zsysv_rk_work.c
+lapacke_zsysv_rook.c
+lapacke_zsysv_rook_work.c
 lapacke_zsysvx.c
 lapacke_zsysvx_work.c
 lapacke_zsyswapr.c
 lapacke_zsyswapr_work.c
 lapacke_zsytrf.c
 lapacke_zsytrf_work.c
-lapacke_zsytrf_rook.c
-lapacke_zsytrf_rook_work.c
 lapacke_zsytrf_aa.c
-lapacke_zsytrf_aa_2stage.c
 lapacke_zsytrf_aa_work.c
+lapacke_zsytrf_aa_2stage.c
 lapacke_zsytrf_aa_2stage_work.c
 lapacke_zsytrf_rk.c
 lapacke_zsytrf_rk_work.c
+lapacke_zsytrf_rook.c
+lapacke_zsytrf_rook_work.c
 lapacke_zsytri.c
+lapacke_zsytri_work.c
 lapacke_zsytri2.c
 lapacke_zsytri2_work.c
-lapacke_zsytri_3.c
-lapacke_zsytri_3_work.c
 lapacke_zsytri2x.c
 lapacke_zsytri2x_work.c
-lapacke_zsytri_work.c
+lapacke_zsytri_3.c
+lapacke_zsytri_3_work.c
 lapacke_zsytrs.c
-lapacke_zsytrs_rook.c
+lapacke_zsytrs_work.c
 lapacke_zsytrs2.c
 lapacke_zsytrs2_work.c
-lapacke_zsytrs_work.c
-lapacke_zsytrs_rook_work.c
-lapacke_zsytrs_aa.c
-lapacke_zsytrs_aa_2stage.c
-lapacke_zsytrs_aa_work.c
-lapacke_zsytrs_aa_2stage_work.c
 lapacke_zsytrs_3.c
 lapacke_zsytrs_3_work.c
+lapacke_zsytrs_aa.c
+lapacke_zsytrs_aa_work.c
+lapacke_zsytrs_aa_2stage.c
+lapacke_zsytrs_aa_2stage_work.c
+lapacke_zsytrs_rook.c
+lapacke_zsytrs_rook_work.c
 lapacke_ztbcon.c
 lapacke_ztbcon_work.c
 lapacke_ztbrfs.c
@@ -2249,9 +2271,9 @@ lapacke_ztpcon_work.c
 lapacke_ztpmqrt.c
 lapacke_ztpmqrt_work.c
 lapacke_ztpqrt.c
+lapacke_ztpqrt_work.c
 lapacke_ztpqrt2.c
 lapacke_ztpqrt2_work.c
-lapacke_ztpqrt_work.c
 lapacke_ztprfb.c
 lapacke_ztprfb_work.c
 lapacke_ztprfs.c
@@ -2328,11 +2350,6 @@ lapacke_zupgtr.c
 lapacke_zupgtr_work.c
 lapacke_zupmtr.c
 lapacke_zupmtr_work.c
-lapacke_zsyr.c
-lapacke_csyr.c
-lapacke_zsyr_work.c
-lapacke_csyr_work.c
-lapacke_ilaver.c
 )
 
 set(DEPRECATED
diff --git a/lapack-netlib/LAPACKE/src/Makefile b/lapack-netlib/LAPACKE/src/Makefile
index 7672f9f73..8060151ae 100644
--- a/lapack-netlib/LAPACKE/src/Makefile
+++ b/lapack-netlib/LAPACKE/src/Makefile
@@ -32,12 +32,21 @@
 ##############################################################################
 # makefile for LAPACKE, used to build lapacke binary.
 #
-# Note: we use multiple OBJ_A, OBJ_B, etc, instead of a single OBJ
+# Note: we use multiple OBJ_S, OBJ_C, etc, instead of a single OBJ
 # to allow build with mingw (argument list too long for the msys ar)
 #
-include ../../make.inc
+TOPSRCDIR = ../..
+include $(TOPSRCDIR)/make.inc
 
-OBJ_A = \
+.SUFFIXES: .c .o
+.c.o:
+	$(CC) $(CFLAGS) -I../include -c -o $@ $<
+
+OBJ = \
+lapacke_ilaver.o \
+lapacke_nancheck.o
+
+OBJ_C = \
 lapacke_cbbcsd.o \
 lapacke_cbbcsd_work.o \
 lapacke_cbdsqr.o \
@@ -82,12 +91,12 @@ lapacke_cgeevx.o \
 lapacke_cgeevx_work.o \
 lapacke_cgehrd.o \
 lapacke_cgehrd_work.o \
+lapacke_cgejsv.o \
+lapacke_cgejsv_work.o \
 lapacke_cgelq.o \
 lapacke_cgelq_work.o \
 lapacke_cgelq2.o \
 lapacke_cgelq2_work.o \
-lapacke_cgejsv.o \
-lapacke_cgejsv_work.o \
 lapacke_cgelqf.o \
 lapacke_cgelqf_work.o \
 lapacke_cgels.o \
@@ -117,11 +126,11 @@ lapacke_cgeqrf_work.o \
 lapacke_cgeqrfp.o \
 lapacke_cgeqrfp_work.o \
 lapacke_cgeqrt.o \
+lapacke_cgeqrt_work.o \
 lapacke_cgeqrt2.o \
 lapacke_cgeqrt2_work.o \
 lapacke_cgeqrt3.o \
 lapacke_cgeqrt3_work.o \
-lapacke_cgeqrt_work.o \
 lapacke_cgerfs.o \
 lapacke_cgerfs_work.o \
 lapacke_cgerqf.o \
@@ -132,6 +141,8 @@ lapacke_cgesv.o \
 lapacke_cgesv_work.o \
 lapacke_cgesvd.o \
 lapacke_cgesvd_work.o \
+lapacke_cgesvdq.o \
+lapacke_cgesvdq_work.o \
 lapacke_cgesvdx.o \
 lapacke_cgesvdx_work.o \
 lapacke_cgesvj.o \
@@ -168,10 +179,10 @@ lapacke_cggevx.o \
 lapacke_cggevx_work.o \
 lapacke_cggglm.o \
 lapacke_cggglm_work.o \
-lapacke_cgghrd.o \
-lapacke_cgghrd_work.o \
 lapacke_cgghd3.o \
 lapacke_cgghd3_work.o \
+lapacke_cgghrd.o \
+lapacke_cgghrd_work.o \
 lapacke_cgglse.o \
 lapacke_cgglse_work.o \
 lapacke_cggqrf.o \
@@ -196,14 +207,14 @@ lapacke_cgttrs.o \
 lapacke_cgttrs_work.o \
 lapacke_chbev.o \
 lapacke_chbev_work.o \
-lapacke_chbevd.o \
-lapacke_chbevd_work.o \
-lapacke_chbevx.o \
-lapacke_chbevx_work.o \
 lapacke_chbev_2stage.o \
 lapacke_chbev_2stage_work.o \
+lapacke_chbevd.o \
+lapacke_chbevd_work.o \
 lapacke_chbevd_2stage.o \
 lapacke_chbevd_2stage_work.o \
+lapacke_chbevx.o \
+lapacke_chbevx_work.o \
 lapacke_chbevx_2stage.o \
 lapacke_chbevx_2stage_work.o \
 lapacke_chbgst.o \
@@ -224,18 +235,18 @@ lapacke_cheequb.o \
 lapacke_cheequb_work.o \
 lapacke_cheev.o \
 lapacke_cheev_work.o \
-lapacke_cheevd.o \
-lapacke_cheevd_work.o \
-lapacke_cheevr.o \
-lapacke_cheevr_work.o \
-lapacke_cheevx.o \
-lapacke_cheevx_work.o \
 lapacke_cheev_2stage.o \
 lapacke_cheev_2stage_work.o \
+lapacke_cheevd.o \
+lapacke_cheevd_work.o \
 lapacke_cheevd_2stage.o \
 lapacke_cheevd_2stage_work.o \
+lapacke_cheevr.o \
+lapacke_cheevr_work.o \
 lapacke_cheevr_2stage.o \
 lapacke_cheevr_2stage_work.o \
+lapacke_cheevx.o \
+lapacke_cheevx_work.o \
 lapacke_cheevx_2stage.o \
 lapacke_cheevx_2stage_work.o \
 lapacke_chegst.o \
@@ -265,35 +276,35 @@ lapacke_cheswapr_work.o \
 lapacke_chetrd.o \
 lapacke_chetrd_work.o \
 lapacke_chetrf.o \
-lapacke_chetrf_rook.o \
 lapacke_chetrf_work.o \
-lapacke_chetrf_rook_work.o \
 lapacke_chetrf_aa.o \
-lapacke_chetrf_aa_2stage.o \
 lapacke_chetrf_aa_work.o \
+lapacke_chetrf_aa_2stage.o \
 lapacke_chetrf_aa_2stage_work.o \
 lapacke_chetrf_rk.o \
 lapacke_chetrf_rk_work.o \
+lapacke_chetrf_rook.o \
+lapacke_chetrf_rook_work.o \
 lapacke_chetri.o \
+lapacke_chetri_work.o \
 lapacke_chetri2.o \
 lapacke_chetri2_work.o \
-lapacke_chetri_3.o \
-lapacke_chetri_3_work.o \
 lapacke_chetri2x.o \
 lapacke_chetri2x_work.o \
-lapacke_chetri_work.o \
+lapacke_chetri_3.o \
+lapacke_chetri_3_work.o \
 lapacke_chetrs.o \
-lapacke_chetrs_rook.o \
+lapacke_chetrs_work.o \
 lapacke_chetrs2.o \
 lapacke_chetrs2_work.o \
-lapacke_chetrs_work.o \
-lapacke_chetrs_rook_work.o \
-lapacke_chetrs_aa.o \
-lapacke_chetrs_aa_2stage.o \
-lapacke_chetrs_aa_work.o \
-lapacke_chetrs_aa_2stage_work.o \
 lapacke_chetrs_3.o \
 lapacke_chetrs_3_work.o \
+lapacke_chetrs_aa.o \
+lapacke_chetrs_aa_work.o \
+lapacke_chetrs_aa_2stage.o \
+lapacke_chetrs_aa_2stage_work.o \
+lapacke_chetrs_rook.o \
+lapacke_chetrs_rook_work.o \
 lapacke_chfrk.o \
 lapacke_chfrk_work.o \
 lapacke_chgeqz.o \
@@ -484,11 +495,11 @@ lapacke_csyconv.o \
 lapacke_csyconv_work.o \
 lapacke_csyequb.o \
 lapacke_csyequb_work.o \
+lapacke_csyr.o \
+lapacke_csyr_work.o \
 lapacke_csyrfs.o \
 lapacke_csyrfs_work.o \
 lapacke_csysv.o \
-lapacke_csysv_rook.o \
-lapacke_csysv_rook_work.o \
 lapacke_csysv_work.o \
 lapacke_csysv_aa.o \
 lapacke_csysv_aa_work.o \
@@ -496,40 +507,42 @@ lapacke_csysv_aa_2stage.o \
 lapacke_csysv_aa_2stage_work.o \
 lapacke_csysv_rk.o \
 lapacke_csysv_rk_work.o \
+lapacke_csysv_rook.o \
+lapacke_csysv_rook_work.o \
 lapacke_csysvx.o \
 lapacke_csysvx_work.o \
 lapacke_csyswapr.o \
 lapacke_csyswapr_work.o \
 lapacke_csytrf.o \
 lapacke_csytrf_work.o \
-lapacke_csytrf_rook.o \
-lapacke_csytrf_rook_work.o \
 lapacke_csytrf_aa.o \
-lapacke_csytrf_aa_2stage.o \
 lapacke_csytrf_aa_work.o \
+lapacke_csytrf_aa_2stage.o \
 lapacke_csytrf_aa_2stage_work.o \
 lapacke_csytrf_rk.o \
 lapacke_csytrf_rk_work.o \
+lapacke_csytrf_rook.o \
+lapacke_csytrf_rook_work.o \
 lapacke_csytri.o \
+lapacke_csytri_work.o \
 lapacke_csytri2.o \
 lapacke_csytri2_work.o \
-lapacke_csytri_3.o \
-lapacke_csytri_3_work.o \
 lapacke_csytri2x.o \
 lapacke_csytri2x_work.o \
-lapacke_csytri_work.o \
+lapacke_csytri_3.o \
+lapacke_csytri_3_work.o \
 lapacke_csytrs.o \
-lapacke_csytrs_rook.o \
+lapacke_csytrs_work.o \
 lapacke_csytrs2.o \
 lapacke_csytrs2_work.o \
-lapacke_csytrs_work.o \
-lapacke_csytrs_rook_work.o \
-lapacke_csytrs_aa.o \
-lapacke_csytrs_aa_2stage.o \
-lapacke_csytrs_aa_work.o \
-lapacke_csytrs_aa_2stage_work.o \
 lapacke_csytrs_3.o \
 lapacke_csytrs_3_work.o \
+lapacke_csytrs_aa.o \
+lapacke_csytrs_aa_work.o \
+lapacke_csytrs_aa_2stage.o \
+lapacke_csytrs_aa_2stage_work.o \
+lapacke_csytrs_rook.o \
+lapacke_csytrs_rook_work.o \
 lapacke_ctbcon.o \
 lapacke_ctbcon_work.o \
 lapacke_ctbrfs.o \
@@ -561,9 +574,9 @@ lapacke_ctpcon_work.o \
 lapacke_ctpmqrt.o \
 lapacke_ctpmqrt_work.o \
 lapacke_ctpqrt.o \
+lapacke_ctpqrt_work.o \
 lapacke_ctpqrt2.o \
 lapacke_ctpqrt2_work.o \
-lapacke_ctpqrt_work.o \
 lapacke_ctprfb.o \
 lapacke_ctprfb_work.o \
 lapacke_ctprfs.o \
@@ -639,15 +652,17 @@ lapacke_cunmtr_work.o \
 lapacke_cupgtr.o \
 lapacke_cupgtr_work.o \
 lapacke_cupmtr.o \
-lapacke_cupmtr_work.o \
+lapacke_cupmtr_work.o
+
+OBJ_D = \
 lapacke_dbbcsd.o \
 lapacke_dbbcsd_work.o \
 lapacke_dbdsdc.o \
 lapacke_dbdsdc_work.o \
-lapacke_dbdsvdx.o \
-lapacke_dbdsvdx_work.o \
 lapacke_dbdsqr.o \
 lapacke_dbdsqr_work.o \
+lapacke_dbdsvdx.o \
+lapacke_dbdsvdx_work.o \
 lapacke_ddisna.o \
 lapacke_ddisna_work.o \
 lapacke_dgbbrd.o \
@@ -725,11 +740,11 @@ lapacke_dgeqrf_work.o \
 lapacke_dgeqrfp.o \
 lapacke_dgeqrfp_work.o \
 lapacke_dgeqrt.o \
+lapacke_dgeqrt_work.o \
 lapacke_dgeqrt2.o \
 lapacke_dgeqrt2_work.o \
 lapacke_dgeqrt3.o \
 lapacke_dgeqrt3_work.o \
-lapacke_dgeqrt_work.o \
 lapacke_dgerfs.o \
 lapacke_dgerfs_work.o \
 lapacke_dgerqf.o \
@@ -740,6 +755,8 @@ lapacke_dgesv.o \
 lapacke_dgesv_work.o \
 lapacke_dgesvd.o \
 lapacke_dgesvd_work.o \
+lapacke_dgesvdq.o \
+lapacke_dgesvdq_work.o \
 lapacke_dgesvdx.o \
 lapacke_dgesvdx_work.o \
 lapacke_dgesvj.o \
@@ -776,10 +793,10 @@ lapacke_dggevx.o \
 lapacke_dggevx_work.o \
 lapacke_dggglm.o \
 lapacke_dggglm_work.o \
-lapacke_dgghrd.o \
-lapacke_dgghrd_work.o \
 lapacke_dgghd3.o \
 lapacke_dgghd3_work.o \
+lapacke_dgghrd.o \
+lapacke_dgghrd_work.o \
 lapacke_dgglse.o \
 lapacke_dgglse_work.o \
 lapacke_dggqrf.o \
@@ -972,14 +989,14 @@ lapacke_dpttrs.o \
 lapacke_dpttrs_work.o \
 lapacke_dsbev.o \
 lapacke_dsbev_work.o \
-lapacke_dsbevd.o \
-lapacke_dsbevd_work.o \
-lapacke_dsbevx.o \
-lapacke_dsbevx_work.o \
 lapacke_dsbev_2stage.o \
 lapacke_dsbev_2stage_work.o \
+lapacke_dsbevd.o \
+lapacke_dsbevd_work.o \
 lapacke_dsbevd_2stage.o \
 lapacke_dsbevd_2stage_work.o \
+lapacke_dsbevx.o \
+lapacke_dsbevx_work.o \
 lapacke_dsbevx_2stage.o \
 lapacke_dsbevx_2stage_work.o \
 lapacke_dsbgst.o \
@@ -1060,18 +1077,18 @@ lapacke_dsyequb.o \
 lapacke_dsyequb_work.o \
 lapacke_dsyev.o \
 lapacke_dsyev_work.o \
-lapacke_dsyevd.o \
-lapacke_dsyevd_work.o \
-lapacke_dsyevr.o \
-lapacke_dsyevr_work.o \
-lapacke_dsyevx.o \
-lapacke_dsyevx_work.o \
 lapacke_dsyev_2stage.o \
 lapacke_dsyev_2stage_work.o \
+lapacke_dsyevd.o \
+lapacke_dsyevd_work.o \
 lapacke_dsyevd_2stage.o \
 lapacke_dsyevd_2stage_work.o \
+lapacke_dsyevr.o \
+lapacke_dsyevr_work.o \
 lapacke_dsyevr_2stage.o \
 lapacke_dsyevr_2stage_work.o \
+lapacke_dsyevx.o \
+lapacke_dsyevx_work.o \
 lapacke_dsyevx_2stage.o \
 lapacke_dsyevx_2stage_work.o \
 lapacke_dsygst.o \
@@ -1087,8 +1104,6 @@ lapacke_dsygvx_work.o \
 lapacke_dsyrfs.o \
 lapacke_dsyrfs_work.o \
 lapacke_dsysv.o \
-lapacke_dsysv_rook.o \
-lapacke_dsysv_rook_work.o \
 lapacke_dsysv_work.o \
 lapacke_dsysv_aa.o \
 lapacke_dsysv_aa_work.o \
@@ -1096,6 +1111,8 @@ lapacke_dsysv_aa_2stage.o \
 lapacke_dsysv_aa_2stage_work.o \
 lapacke_dsysv_rk.o \
 lapacke_dsysv_rk_work.o \
+lapacke_dsysv_rook.o \
+lapacke_dsysv_rook_work.o \
 lapacke_dsysvx.o \
 lapacke_dsysvx_work.o \
 lapacke_dsyswapr.o \
@@ -1104,36 +1121,34 @@ lapacke_dsytrd.o \
 lapacke_dsytrd_work.o \
 lapacke_dsytrf.o \
 lapacke_dsytrf_work.o \
-lapacke_dsytrf_rook.o \
-lapacke_dsytrf_rook_work.o \
 lapacke_dsytrf_aa.o \
 lapacke_dsytrf_aa_work.o \
 lapacke_dsytrf_aa_2stage.o \
 lapacke_dsytrf_aa_2stage_work.o \
 lapacke_dsytrf_rk.o \
 lapacke_dsytrf_rk_work.o \
+lapacke_dsytrf_rook.o \
+lapacke_dsytrf_rook_work.o \
 lapacke_dsytri.o \
+lapacke_dsytri_work.o \
 lapacke_dsytri2.o \
 lapacke_dsytri2_work.o \
-lapacke_dsytri_3.o \
-lapacke_dsytri_3_work.o \
 lapacke_dsytri2x.o \
 lapacke_dsytri2x_work.o \
-lapacke_dsytri_work.o
-
-OBJ_B = \
+lapacke_dsytri_3.o \
+lapacke_dsytri_3_work.o \
 lapacke_dsytrs.o \
-lapacke_dsytrs_rook.o \
+lapacke_dsytrs_work.o \
 lapacke_dsytrs2.o \
 lapacke_dsytrs2_work.o \
-lapacke_dsytrs_work.o \
-lapacke_dsytrs_rook_work.o \
-lapacke_dsytrs_aa.o \
-lapacke_dsytrs_aa_2stage.o \
-lapacke_dsytrs_aa_work.o \
-lapacke_dsytrs_aa_2stage_work.o \
 lapacke_dsytrs_3.o \
 lapacke_dsytrs_3_work.o \
+lapacke_dsytrs_aa.o \
+lapacke_dsytrs_aa_work.o \
+lapacke_dsytrs_aa_2stage.o \
+lapacke_dsytrs_aa_2stage_work.o \
+lapacke_dsytrs_rook.o \
+lapacke_dsytrs_rook_work.o \
 lapacke_dtbcon.o \
 lapacke_dtbcon_work.o \
 lapacke_dtbrfs.o \
@@ -1165,9 +1180,9 @@ lapacke_dtpcon_work.o \
 lapacke_dtpmqrt.o \
 lapacke_dtpmqrt_work.o \
 lapacke_dtpqrt.o \
+lapacke_dtpqrt_work.o \
 lapacke_dtpqrt2.o \
 lapacke_dtpqrt2_work.o \
-lapacke_dtpqrt_work.o \
 lapacke_dtprfb.o \
 lapacke_dtprfb_work.o \
 lapacke_dtprfs.o \
@@ -1203,16 +1218,17 @@ lapacke_dtrttf_work.o \
 lapacke_dtrttp.o \
 lapacke_dtrttp_work.o \
 lapacke_dtzrzf.o \
-lapacke_dtzrzf_work.o \
-lapacke_nancheck.o  \
+lapacke_dtzrzf_work.o
+
+OBJ_S = \
 lapacke_sbbcsd.o \
 lapacke_sbbcsd_work.o \
 lapacke_sbdsdc.o \
 lapacke_sbdsdc_work.o \
-lapacke_sbdsvdx.o \
-lapacke_sbdsvdx_work.o \
 lapacke_sbdsqr.o \
 lapacke_sbdsqr_work.o \
+lapacke_sbdsvdx.o \
+lapacke_sbdsvdx_work.o \
 lapacke_sdisna.o \
 lapacke_sdisna_work.o \
 lapacke_sgbbrd.o \
@@ -1290,11 +1306,11 @@ lapacke_sgeqrf_work.o \
 lapacke_sgeqrfp.o \
 lapacke_sgeqrfp_work.o \
 lapacke_sgeqrt.o \
+lapacke_sgeqrt_work.o \
 lapacke_sgeqrt2.o \
 lapacke_sgeqrt2_work.o \
 lapacke_sgeqrt3.o \
 lapacke_sgeqrt3_work.o \
-lapacke_sgeqrt_work.o \
 lapacke_sgerfs.o \
 lapacke_sgerfs_work.o \
 lapacke_sgerqf.o \
@@ -1305,6 +1321,8 @@ lapacke_sgesv.o \
 lapacke_sgesv_work.o \
 lapacke_sgesvd.o \
 lapacke_sgesvd_work.o \
+lapacke_sgesvdq.o \
+lapacke_sgesvdq_work.o \
 lapacke_sgesvdx.o \
 lapacke_sgesvdx_work.o \
 lapacke_sgesvj.o \
@@ -1341,10 +1359,10 @@ lapacke_sggevx.o \
 lapacke_sggevx_work.o \
 lapacke_sggglm.o \
 lapacke_sggglm_work.o \
-lapacke_sgghrd.o \
-lapacke_sgghrd_work.o \
 lapacke_sgghd3.o \
 lapacke_sgghd3_work.o \
+lapacke_sgghrd.o \
+lapacke_sgghrd_work.o \
 lapacke_sgglse.o \
 lapacke_sgglse_work.o \
 lapacke_sggqrf.o \
@@ -1537,14 +1555,14 @@ lapacke_spttrs.o \
 lapacke_spttrs_work.o \
 lapacke_ssbev.o \
 lapacke_ssbev_work.o \
-lapacke_ssbevd.o \
-lapacke_ssbevd_work.o \
-lapacke_ssbevx.o \
-lapacke_ssbevx_work.o \
 lapacke_ssbev_2stage.o \
 lapacke_ssbev_2stage_work.o \
+lapacke_ssbevd.o \
+lapacke_ssbevd_work.o \
 lapacke_ssbevd_2stage.o \
 lapacke_ssbevd_2stage_work.o \
+lapacke_ssbevx.o \
+lapacke_ssbevx_work.o \
 lapacke_ssbevx_2stage.o \
 lapacke_ssbevx_2stage_work.o \
 lapacke_ssbgst.o \
@@ -1621,18 +1639,18 @@ lapacke_ssyequb.o \
 lapacke_ssyequb_work.o \
 lapacke_ssyev.o \
 lapacke_ssyev_work.o \
-lapacke_ssyevd.o \
-lapacke_ssyevd_work.o \
-lapacke_ssyevr.o \
-lapacke_ssyevr_work.o \
-lapacke_ssyevx.o \
-lapacke_ssyevx_work.o \
 lapacke_ssyev_2stage.o \
 lapacke_ssyev_2stage_work.o \
+lapacke_ssyevd.o \
+lapacke_ssyevd_work.o \
 lapacke_ssyevd_2stage.o \
 lapacke_ssyevd_2stage_work.o \
+lapacke_ssyevr.o \
+lapacke_ssyevr_work.o \
 lapacke_ssyevr_2stage.o \
 lapacke_ssyevr_2stage_work.o \
+lapacke_ssyevx.o \
+lapacke_ssyevx_work.o \
 lapacke_ssyevx_2stage.o \
 lapacke_ssyevx_2stage_work.o \
 lapacke_ssygst.o \
@@ -1648,8 +1666,6 @@ lapacke_ssygvx_work.o \
 lapacke_ssyrfs.o \
 lapacke_ssyrfs_work.o \
 lapacke_ssysv.o \
-lapacke_ssysv_rook.o \
-lapacke_ssysv_rook_work.o \
 lapacke_ssysv_work.o \
 lapacke_ssysv_aa.o \
 lapacke_ssysv_aa_work.o \
@@ -1657,6 +1673,8 @@ lapacke_ssysv_aa_2stage.o \
 lapacke_ssysv_aa_2stage_work.o \
 lapacke_ssysv_rk.o \
 lapacke_ssysv_rk_work.o \
+lapacke_ssysv_rook.o \
+lapacke_ssysv_rook_work.o \
 lapacke_ssysvx.o \
 lapacke_ssysvx_work.o \
 lapacke_ssyswapr.o \
@@ -1665,34 +1683,34 @@ lapacke_ssytrd.o \
 lapacke_ssytrd_work.o \
 lapacke_ssytrf.o \
 lapacke_ssytrf_work.o \
-lapacke_ssytrf_rook.o \
-lapacke_ssytrf_rook_work.o \
 lapacke_ssytrf_aa.o \
 lapacke_ssytrf_aa_work.o \
 lapacke_ssytrf_aa_2stage.o \
 lapacke_ssytrf_aa_2stage_work.o \
 lapacke_ssytrf_rk.o \
 lapacke_ssytrf_rk_work.o \
+lapacke_ssytrf_rook.o \
+lapacke_ssytrf_rook_work.o \
 lapacke_ssytri.o \
+lapacke_ssytri_work.o \
 lapacke_ssytri2.o \
 lapacke_ssytri2_work.o \
-lapacke_ssytri_3.o \
-lapacke_ssytri_3_work.o \
 lapacke_ssytri2x.o \
 lapacke_ssytri2x_work.o \
-lapacke_ssytri_work.o \
+lapacke_ssytri_3.o \
+lapacke_ssytri_3_work.o \
 lapacke_ssytrs.o \
-lapacke_ssytrs_rook.o \
+lapacke_ssytrs_work.o \
 lapacke_ssytrs2.o \
 lapacke_ssytrs2_work.o \
-lapacke_ssytrs_work.o \
-lapacke_ssytrs_rook_work.o \
-lapacke_ssytrs_aa.o \
-lapacke_ssytrs_aa_2stage.o \
-lapacke_ssytrs_aa_work.o \
-lapacke_ssytrs_aa_2stage_work.o \
 lapacke_ssytrs_3.o \
 lapacke_ssytrs_3_work.o \
+lapacke_ssytrs_aa.o \
+lapacke_ssytrs_aa_work.o \
+lapacke_ssytrs_aa_2stage.o \
+lapacke_ssytrs_aa_2stage_work.o \
+lapacke_ssytrs_rook.o \
+lapacke_ssytrs_rook_work.o \
 lapacke_stbcon.o \
 lapacke_stbcon_work.o \
 lapacke_stbrfs.o \
@@ -1762,7 +1780,9 @@ lapacke_strttf_work.o \
 lapacke_strttp.o \
 lapacke_strttp_work.o \
 lapacke_stzrzf.o \
-lapacke_stzrzf_work.o \
+lapacke_stzrzf_work.o
+
+OBJ_Z = \
 lapacke_zbbcsd.o \
 lapacke_zbbcsd_work.o \
 lapacke_zbdsqr.o \
@@ -1846,11 +1866,11 @@ lapacke_zgeqrf_work.o \
 lapacke_zgeqrfp.o \
 lapacke_zgeqrfp_work.o \
 lapacke_zgeqrt.o \
+lapacke_zgeqrt_work.o \
 lapacke_zgeqrt2.o \
 lapacke_zgeqrt2_work.o \
 lapacke_zgeqrt3.o \
 lapacke_zgeqrt3_work.o \
-lapacke_zgeqrt_work.o \
 lapacke_zgerfs.o \
 lapacke_zgerfs_work.o \
 lapacke_zgerqf.o \
@@ -1861,6 +1881,8 @@ lapacke_zgesv.o \
 lapacke_zgesv_work.o \
 lapacke_zgesvd.o \
 lapacke_zgesvd_work.o \
+lapacke_zgesvdq.o \
+lapacke_zgesvdq_work.o \
 lapacke_zgesvdx.o \
 lapacke_zgesvdx_work.o \
 lapacke_zgesvj.o \
@@ -1897,10 +1919,10 @@ lapacke_zggevx.o \
 lapacke_zggevx_work.o \
 lapacke_zggglm.o \
 lapacke_zggglm_work.o \
-lapacke_zgghrd.o \
-lapacke_zgghrd_work.o \
 lapacke_zgghd3.o \
 lapacke_zgghd3_work.o \
+lapacke_zgghrd.o \
+lapacke_zgghrd_work.o \
 lapacke_zgglse.o \
 lapacke_zgglse_work.o \
 lapacke_zggqrf.o \
@@ -1925,14 +1947,14 @@ lapacke_zgttrs.o \
 lapacke_zgttrs_work.o \
 lapacke_zhbev.o \
 lapacke_zhbev_work.o \
-lapacke_zhbevd.o \
-lapacke_zhbevd_work.o \
-lapacke_zhbevx.o \
-lapacke_zhbevx_work.o \
 lapacke_zhbev_2stage.o \
 lapacke_zhbev_2stage_work.o \
+lapacke_zhbevd.o \
+lapacke_zhbevd_work.o \
 lapacke_zhbevd_2stage.o \
 lapacke_zhbevd_2stage_work.o \
+lapacke_zhbevx.o \
+lapacke_zhbevx_work.o \
 lapacke_zhbevx_2stage.o \
 lapacke_zhbevx_2stage_work.o \
 lapacke_zhbgst.o \
@@ -1953,18 +1975,18 @@ lapacke_zheequb.o \
 lapacke_zheequb_work.o \
 lapacke_zheev.o \
 lapacke_zheev_work.o \
-lapacke_zheevd.o \
-lapacke_zheevd_work.o \
-lapacke_zheevr.o \
-lapacke_zheevr_work.o \
-lapacke_zheevx.o \
-lapacke_zheevx_work.o \
 lapacke_zheev_2stage.o \
 lapacke_zheev_2stage_work.o \
+lapacke_zheevd.o \
+lapacke_zheevd_work.o \
 lapacke_zheevd_2stage.o \
 lapacke_zheevd_2stage_work.o \
+lapacke_zheevr.o \
+lapacke_zheevr_work.o \
 lapacke_zheevr_2stage.o \
 lapacke_zheevr_2stage_work.o \
+lapacke_zheevx.o \
+lapacke_zheevx_work.o \
 lapacke_zheevx_2stage.o \
 lapacke_zheevx_2stage_work.o \
 lapacke_zhegst.o \
@@ -1994,35 +2016,35 @@ lapacke_zheswapr_work.o \
 lapacke_zhetrd.o \
 lapacke_zhetrd_work.o \
 lapacke_zhetrf.o \
-lapacke_zhetrf_rook.o \
 lapacke_zhetrf_work.o \
-lapacke_zhetrf_rook_work.o \
 lapacke_zhetrf_aa.o \
-lapacke_zhetrf_aa_2stage.o \
 lapacke_zhetrf_aa_work.o \
+lapacke_zhetrf_aa_2stage.o \
 lapacke_zhetrf_aa_2stage_work.o \
 lapacke_zhetrf_rk.o \
 lapacke_zhetrf_rk_work.o \
+lapacke_zhetrf_rook.o \
+lapacke_zhetrf_rook_work.o \
 lapacke_zhetri.o \
+lapacke_zhetri_work.o \
 lapacke_zhetri2.o \
 lapacke_zhetri2_work.o \
-lapacke_zhetri_3.o \
-lapacke_zhetri_3_work.o \
 lapacke_zhetri2x.o \
 lapacke_zhetri2x_work.o \
-lapacke_zhetri_work.o \
+lapacke_zhetri_3.o \
+lapacke_zhetri_3_work.o \
 lapacke_zhetrs.o \
-lapacke_zhetrs_rook.o \
+lapacke_zhetrs_work.o \
 lapacke_zhetrs2.o \
 lapacke_zhetrs2_work.o \
-lapacke_zhetrs_work.o \
-lapacke_zhetrs_rook_work.o \
-lapacke_zhetrs_aa.o \
-lapacke_zhetrs_aa_2stage.o \
-lapacke_zhetrs_aa_work.o \
-lapacke_zhetrs_aa_2stage_work.o \
 lapacke_zhetrs_3.o \
 lapacke_zhetrs_3_work.o \
+lapacke_zhetrs_aa.o \
+lapacke_zhetrs_aa_work.o \
+lapacke_zhetrs_aa_2stage.o \
+lapacke_zhetrs_aa_2stage_work.o \
+lapacke_zhetrs_rook.o \
+lapacke_zhetrs_rook_work.o \
 lapacke_zhfrk.o \
 lapacke_zhfrk_work.o \
 lapacke_zhgeqz.o \
@@ -2213,11 +2235,11 @@ lapacke_zsyconv.o \
 lapacke_zsyconv_work.o \
 lapacke_zsyequb.o \
 lapacke_zsyequb_work.o \
+lapacke_zsyr.o \
+lapacke_zsyr_work.o \
 lapacke_zsyrfs.o \
 lapacke_zsyrfs_work.o \
 lapacke_zsysv.o \
-lapacke_zsysv_rook.o \
-lapacke_zsysv_rook_work.o \
 lapacke_zsysv_work.o \
 lapacke_zsysv_aa.o \
 lapacke_zsysv_aa_work.o \
@@ -2225,40 +2247,42 @@ lapacke_zsysv_aa_2stage.o \
 lapacke_zsysv_aa_2stage_work.o \
 lapacke_zsysv_rk.o \
 lapacke_zsysv_rk_work.o \
+lapacke_zsysv_rook.o \
+lapacke_zsysv_rook_work.o \
 lapacke_zsysvx.o \
 lapacke_zsysvx_work.o \
 lapacke_zsyswapr.o \
 lapacke_zsyswapr_work.o \
 lapacke_zsytrf.o \
 lapacke_zsytrf_work.o \
-lapacke_zsytrf_rook.o \
-lapacke_zsytrf_rook_work.o \
 lapacke_zsytrf_aa.o \
-lapacke_zsytrf_aa_2stage.o \
 lapacke_zsytrf_aa_work.o \
+lapacke_zsytrf_aa_2stage.o \
 lapacke_zsytrf_aa_2stage_work.o \
 lapacke_zsytrf_rk.o \
 lapacke_zsytrf_rk_work.o \
+lapacke_zsytrf_rook.o \
+lapacke_zsytrf_rook_work.o \
 lapacke_zsytri.o \
+lapacke_zsytri_work.o \
 lapacke_zsytri2.o \
 lapacke_zsytri2_work.o \
-lapacke_zsytri_3.o \
-lapacke_zsytri_3_work.o \
 lapacke_zsytri2x.o \
 lapacke_zsytri2x_work.o \
-lapacke_zsytri_work.o \
+lapacke_zsytri_3.o \
+lapacke_zsytri_3_work.o \
 lapacke_zsytrs.o \
-lapacke_zsytrs_rook.o \
+lapacke_zsytrs_work.o \
 lapacke_zsytrs2.o \
 lapacke_zsytrs2_work.o \
-lapacke_zsytrs_work.o \
-lapacke_zsytrs_rook_work.o \
-lapacke_zsytrs_aa.o \
-lapacke_zsytrs_aa_2stage.o \
-lapacke_zsytrs_aa_work.o \
-lapacke_zsytrs_aa_2stage_work.o \
 lapacke_zsytrs_3.o \
 lapacke_zsytrs_3_work.o \
+lapacke_zsytrs_aa.o \
+lapacke_zsytrs_aa_work.o \
+lapacke_zsytrs_aa_2stage.o \
+lapacke_zsytrs_aa_2stage_work.o \
+lapacke_zsytrs_rook.o \
+lapacke_zsytrs_rook_work.o \
 lapacke_ztbcon.o \
 lapacke_ztbcon_work.o \
 lapacke_ztbrfs.o \
@@ -2290,9 +2314,9 @@ lapacke_ztpcon_work.o \
 lapacke_ztpmqrt.o \
 lapacke_ztpmqrt_work.o \
 lapacke_ztpqrt.o \
+lapacke_ztpqrt_work.o \
 lapacke_ztpqrt2.o \
 lapacke_ztpqrt2_work.o \
-lapacke_ztpqrt_work.o \
 lapacke_ztprfb.o \
 lapacke_ztprfb_work.o \
 lapacke_ztprfs.o \
@@ -2368,12 +2392,7 @@ lapacke_zunmtr_work.o \
 lapacke_zupgtr.o \
 lapacke_zupgtr_work.o \
 lapacke_zupmtr.o \
-lapacke_zupmtr_work.o \
-lapacke_zsyr.o \
-lapacke_csyr.o \
-lapacke_zsyr_work.o \
-lapacke_csyr_work.o \
-lapacke_ilaver.o
+lapacke_zupmtr_work.o
 
 ifdef BUILD_DEPRECATED
 DEPRECATED = \
@@ -2452,27 +2471,29 @@ lapacke_zlagsy.o \
 lapacke_zlagsy_work.o
 endif
 
-all: ../../$(LAPACKELIB)
+.PHONY: all
+all: $(LAPACKELIB)
 
-.PHONY: ../../$(LAPACKELIB)
-
-../../$(LAPACKELIB): $(OBJ_A) $(OBJ_B) $(DEPRECATED) $(EXTENDED) $(MATGEN)
-	$(ARCH) $(ARCHFLAGS) $@ $(OBJ_A)
-	$(ARCH) $(ARCHFLAGS) $@ $(OBJ_B)
+$(LAPACKELIB): $(OBJ) $(OBJ_S) $(OBJ_C) $(OBJ_D) $(OBJ_Z) $(DEPRECATED) $(EXTENDED) $(MATGEN)
+	$(AR) $(ARFLAGS) $@ $(OBJ)
+	$(AR) $(ARFLAGS) $@ $(OBJ_S)
+	$(AR) $(ARFLAGS) $@ $(OBJ_C)
+	$(AR) $(ARFLAGS) $@ $(OBJ_D)
+	$(AR) $(ARFLAGS) $@ $(OBJ_Z)
 ifdef BUILD_DEPRECATED
-	$(ARCH) $(ARCHFLAGS) $@ $(DEPRECATED)
+	$(AR) $(ARFLAGS) $@ $(DEPRECATED)
 endif
 ifdef (USEXBLAS)
-	$(ARCH) $(ARCHFLAGS) $@ $(EXTENDED)
+	$(AR) $(ARFLAGS) $@ $(EXTENDED)
 endif
 ifdef LAPACKE_WITH_TMG
-	$(ARCH) $(ARCHFLAGS) $@ $(MATGEN)
+	$(AR) $(ARFLAGS) $@ $(MATGEN)
 endif
 	$(RANLIB) $@
 
-clean: cleanobj
+.PHONY: clean cleanobj cleanlib
+clean: cleanobj cleanlib
 cleanobj:
 	rm -f *.o
-
-.c.o:
-	$(CC) $(CFLAGS) -I../include -c -o $@ $<
+cleanlib:
+	rm -f $(LAPACKELIB)
diff --git a/lapack-netlib/LAPACKE/src/lapacke_cgejsv.c b/lapack-netlib/LAPACKE/src/lapacke_cgejsv.c
index 7d371f660..41278428b 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_cgejsv.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_cgejsv.c
@@ -124,7 +124,6 @@ lapack_int LAPACKE_cgejsv( int matrix_layout, char joba, char jobu, char jobv,
     float* rwork = NULL;
     lapack_complex_float* cwork = NULL;
     lapack_int i;
-    lapack_int nu, nv;
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
         LAPACKE_xerbla( "LAPACKE_cgejsv", -1 );
         return -1;
@@ -132,8 +131,6 @@ lapack_int LAPACKE_cgejsv( int matrix_layout, char joba, char jobu, char jobv,
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        nu = LAPACKE_lsame( jobu, 'n' ) ? 1 : m;
-        nv = LAPACKE_lsame( jobv, 'n' ) ? 1 : n;
         if( LAPACKE_cge_nancheck( matrix_layout, m, n, a, lda ) ) {
             return -10;
         }
diff --git a/lapack-netlib/LAPACKE/src/lapacke_cgelsd.c b/lapack-netlib/LAPACKE/src/lapacke_cgelsd.c
index 2ee891977..9d022dae6 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_cgelsd.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_cgelsd.c
@@ -75,7 +75,7 @@ lapack_int LAPACKE_cgelsd( int matrix_layout, lapack_int m, lapack_int n,
     if( info != 0 ) {
         goto exit_level_0;
     }
-    liwork = (lapack_int)iwork_query;
+    liwork = iwork_query;
     lrwork = (lapack_int)rwork_query;
     lwork = LAPACK_C2INT( work_query );
     /* Allocate memory for work arrays */
diff --git a/lapack-netlib/LAPACKE/src/lapacke_cgesvdq.c b/lapack-netlib/LAPACKE/src/lapacke_cgesvdq.c
new file mode 100644
index 000000000..91458136c
--- /dev/null
+++ b/lapack-netlib/LAPACKE/src/lapacke_cgesvdq.c
@@ -0,0 +1,106 @@
+/*****************************************************************************
+  Copyright (c) 2014, Intel Corp.
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Intel Corporation nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+  THE POSSIBILITY OF SUCH DAMAGE.
+*****************************************************************************
+* Contents: Native high-level C interface to LAPACK function cgesvdq
+* Author: Intel Corporation
+* Generated November 2018
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+lapack_int LAPACKE_cgesvdq( int matrix_layout, char joba, char jobp,
+                           char jobr, char jobu, char jobv,
+                           lapack_int m, lapack_int n, lapack_complex_float* a,
+                           lapack_int lda, float* s, lapack_complex_float* u, lapack_int ldu,
+                           lapack_complex_float* v, lapack_int ldv, lapack_int* numrank)
+{
+    lapack_int info = 0;
+    lapack_int liwork = -1;
+    lapack_int* iwork = NULL;
+    lapack_int iwork_query;
+    lapack_int lcwork = -1;
+    lapack_complex_float* cwork = NULL;
+    lapack_complex_float cwork_query;
+    lapack_int lrwork = -1;
+    double* rwork = NULL;
+    double rwork_query;
+    lapack_int i;
+    if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
+        LAPACKE_xerbla( "LAPACKE_cgesvdq", -1 );
+        return -1;
+    }
+#ifndef LAPACK_DISABLE_NAN_CHECK
+    if( LAPACKE_get_nancheck() ) {
+        /* Optionally check input matrices for NaNs */
+        if( LAPACKE_cge_nancheck( matrix_layout, m, n, a, lda ) ) {
+            return -6;
+        }
+    }
+#endif
+    /* Query optimal working array(s) size */
+    info = LAPACKE_cgesvdq_work( matrix_layout, joba, jobp, jobr, jobu, jobv,
+                                 m, n, a, lda, s, u, ldu, v, ldv, numrank,
+                                 &iwork_query, liwork, &cwork_query, lcwork,
+                                 &rwork_query, lrwork );
+    if( info != 0 ) {
+        goto exit_level_0;
+    }
+    liwork = iwork_query;
+    lcwork = LAPACK_C2INT(cwork_query);
+    lrwork = (lapack_int)rwork_query;
+    /* Allocate memory for work arrays */
+    iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
+    if( iwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_0;
+    }
+    cwork = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * lcwork );
+    if( cwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_0;
+    }
+    rwork = (double*)LAPACKE_malloc( sizeof(double) * lrwork );
+    if( rwork == NULL ) {
+        info = LAPACK_WORK_MEMORY_ERROR;
+        goto exit_level_0;
+    }
+    /* Call middle-level interface */
+    info = LAPACKE_cgesvdq_work( matrix_layout, joba, jobp, jobr, jobu, jobv,
+                                 m, n, a, lda, s, u, ldu, v, ldv, numrank,
+                                 iwork, liwork, cwork, lcwork, rwork, lrwork );
+
+    /* Release memory and exit */
+    LAPACKE_free( iwork );
+    LAPACKE_free( cwork );
+    LAPACKE_free( rwork );
+exit_level_0:
+    if( info == LAPACK_WORK_MEMORY_ERROR ) {
+        LAPACKE_xerbla( "LAPACKE_cgesvdq", info );
+    }
+    return info;
+}
diff --git a/lapack-netlib/LAPACKE/src/lapacke_cgesvdq_work.c b/lapack-netlib/LAPACKE/src/lapacke_cgesvdq_work.c
new file mode 100644
index 000000000..e86f76e4b
--- /dev/null
+++ b/lapack-netlib/LAPACKE/src/lapacke_cgesvdq_work.c
@@ -0,0 +1,149 @@
+/*****************************************************************************
+  Copyright (c) 2014, Intel Corp.
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Intel Corporation nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+  THE POSSIBILITY OF SUCH DAMAGE.
+*****************************************************************************
+* Contents: Native middle-level C interface to LAPACK function cgesvdq
+* Author: Intel Corporation
+* Generated November 2015
+*****************************************************************************/
+
+#include "lapacke_utils.h"
+
+lapack_int LAPACKE_cgesvdq_work( int matrix_layout, char joba, char jobp,
+                           char jobr, char jobu, char jobv,
+                           lapack_int m, lapack_int n, lapack_complex_float* a,
+                           lapack_int lda, float* s, lapack_complex_float* u, lapack_int ldu,
+                           lapack_complex_float* v, lapack_int ldv, lapack_int* numrank,
+                           lapack_int* iwork, lapack_int liwork,
+                           lapack_complex_float* cwork, lapack_int lcwork,
+                           float* rwork, lapack_int lrwork )
+{
+    lapack_int info = 0;
+    if( matrix_layout == LAPACK_COL_MAJOR ) {
+        /* Call LAPACK function and adjust info */
+        LAPACK_cgesvdq( &joba, &jobp, &jobr, &jobu, &jobv, &m, &n, a, &lda, s, u, &ldu, v, &ldv,
+                       numrank, iwork, &liwork, cwork, &lcwork, rwork, &lrwork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+    } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
+        lapack_int nrows_u = ( LAPACKE_lsame( jobu, 'a' ) ||
+                             LAPACKE_lsame( jobu, 's' ) ) ? m : 1;
+        lapack_int ncols_u = LAPACKE_lsame( jobu, 'a' ) ? m :
+                             (LAPACKE_lsame( jobu, 's' ) ? MIN(m,n) : 1);
+        lapack_int nrows_v = LAPACKE_lsame( jobv, 'a' ) ? n :
+                              ( LAPACKE_lsame( jobv, 's' ) ? MIN(m,n) : 1);
+        lapack_int lda_t = MAX(1,m);
+        lapack_int ldu_t = MAX(1,nrows_u);
+        lapack_int ldv_t = MAX(1,nrows_v);
+        lapack_complex_float* a_t = NULL;
+        lapack_complex_float* u_t = NULL;
+        lapack_complex_float* v_t = NULL;
+        /* Check leading dimension(s) */
+        if( lda < n ) {
+            info = -9;
+            LAPACKE_xerbla( "LAPACKE_cgesvdq_work", info );
+            return info;
+        }
+        if( ldu < ncols_u ) {
+            info = -12;
+            LAPACKE_xerbla( "LAPACKE_cgesvdq_work", info );
+            return info;
+        }
+        if( ldv < n ) {
+            info = -14;
+            LAPACKE_xerbla( "LAPACKE_cgesvdq_work", info );
+            return info;
+        }
+        /* Query optimal working array(s) size if requested */
+        if( lcwork == -1 ) {
+            LAPACK_cgesvdq( &joba, &jobp, &jobr, &jobu, &jobv, &m, &n, a, &lda_t,
+                             s, u, &ldu_t, v, &ldv_t, numrank, iwork, &liwork,
+                             cwork, &lcwork, rwork, &lrwork, &info );
+            return (info < 0) ? (info - 1) : info;
+        }
+        /* Allocate memory for temporary array(s) */
+        a_t = (lapack_complex_float*)LAPACKE_malloc( sizeof(lapack_complex_float) * lda_t * MAX(1,n) );
+        if( a_t == NULL ) {
+            info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+            goto exit_level_0;
+        }
+        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
+            u_t = (lapack_complex_float*)
+                LAPACKE_malloc( sizeof(lapack_complex_float) * ldu_t * MAX(1,ncols_u) );
+            if( u_t == NULL ) {
+                info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+                goto exit_level_1;
+            }
+        }
+        if( LAPACKE_lsame( jobv, 'a' ) || LAPACKE_lsame( jobv, 's' ) ) {
+            v_t = (lapack_complex_float*)
+                LAPACKE_malloc( sizeof(lapack_complex_float) * ldv_t * MAX(1,n) );
+            if( v_t == NULL ) {
+                info = LAPACK_TRANSPOSE_MEMORY_ERROR;
+                goto exit_level_2;
+            }
+        }
+        /* Transpose input matrices */
+        LAPACKE_cge_trans( matrix_layout, m, n, a, lda, a_t, lda_t );
+        /* Call LAPACK function and adjust info */
+            LAPACK_cgesvdq( &joba, &jobp, &jobr, &jobu, &jobv, &m, &n, a, &lda_t,
+                             s, u, &ldu_t, v, &ldv_t, numrank, iwork, &liwork,
+                             cwork, &lcwork, rwork, &lrwork, &info );
+        if( info < 0 ) {
+            info = info - 1;
+        }
+        /* Transpose output matrices */
+        LAPACKE_cge_trans( LAPACK_COL_MAJOR, m, n, a_t, lda_t, a, lda );
+        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
+            LAPACKE_cge_trans( LAPACK_COL_MAJOR, nrows_u, ncols_u, u_t, ldu_t,
+                               u, ldu );
+        }
+        if( LAPACKE_lsame( jobv, 'a' ) || LAPACKE_lsame( jobv, 's' ) ) {
+            LAPACKE_cge_trans( LAPACK_COL_MAJOR, nrows_v, n, v_t, ldv_t, v,
+                               ldv );
+        }
+        /* Release memory and exit */
+        if( LAPACKE_lsame( jobv, 'a' ) || LAPACKE_lsame( jobv, 's' ) ) {
+            LAPACKE_free( v_t );
+        }
+exit_level_2:
+        if( LAPACKE_lsame( jobu, 'a' ) || LAPACKE_lsame( jobu, 's' ) ) {
+            LAPACKE_free( u_t );
+        }
+exit_level_1:
+        LAPACKE_free( a_t );
+exit_level_0:
+        if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
+            LAPACKE_xerbla( "LAPACKE_cgesvdq_work", info );
+        }
+    } else {
+        info = -1;
+        LAPACKE_xerbla( "LAPACKE_cgesvdq_work", info );
+    }
+    return info;
+}
diff --git a/lapack-netlib/LAPACKE/src/lapacke_cggesx.c b/lapack-netlib/LAPACKE/src/lapacke_cggesx.c
index fc939a314..9581691c6 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_cggesx.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_cggesx.c
@@ -91,7 +91,7 @@ lapack_int LAPACKE_cggesx( int matrix_layout, char jobvsl, char jobvsr,
     if( info != 0 ) {
         goto exit_level_2;
     }
-    liwork = (lapack_int)iwork_query;
+    liwork = iwork_query;
     lwork = LAPACK_C2INT( work_query );
     /* Allocate memory for work arrays */
     iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
diff --git a/lapack-netlib/LAPACKE/src/lapacke_chbevd.c b/lapack-netlib/LAPACKE/src/lapacke_chbevd.c
index 024cf2585..b4af255a9 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_chbevd.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_chbevd.c
@@ -67,7 +67,7 @@ lapack_int LAPACKE_chbevd( int matrix_layout, char jobz, char uplo, lapack_int n
     if( info != 0 ) {
         goto exit_level_0;
     }
-    liwork = (lapack_int)iwork_query;
+    liwork = iwork_query;
     lrwork = (lapack_int)rwork_query;
     lwork = LAPACK_C2INT( work_query );
     /* Allocate memory for work arrays */
diff --git a/lapack-netlib/LAPACKE/src/lapacke_chbevd_2stage.c b/lapack-netlib/LAPACKE/src/lapacke_chbevd_2stage.c
index 63f7d8ccb..e8e9a6830 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_chbevd_2stage.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_chbevd_2stage.c
@@ -67,7 +67,7 @@ lapack_int LAPACKE_chbevd_2stage( int matrix_layout, char jobz, char uplo, lapac
     if( info != 0 ) {
         goto exit_level_0;
     }
-    liwork = (lapack_int)iwork_query;
+    liwork = iwork_query;
     lrwork = (lapack_int)rwork_query;
     lwork = LAPACK_C2INT( work_query );
     /* Allocate memory for work arrays */
diff --git a/lapack-netlib/LAPACKE/src/lapacke_chbgvd.c b/lapack-netlib/LAPACKE/src/lapacke_chbgvd.c
index d44f6c622..5a7331d87 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_chbgvd.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_chbgvd.c
@@ -71,7 +71,7 @@ lapack_int LAPACKE_chbgvd( int matrix_layout, char jobz, char uplo, lapack_int n
     if( info != 0 ) {
         goto exit_level_0;
     }
-    liwork = (lapack_int)iwork_query;
+    liwork = iwork_query;
     lrwork = (lapack_int)rwork_query;
     lwork = LAPACK_C2INT( work_query );
     /* Allocate memory for work arrays */
diff --git a/lapack-netlib/LAPACKE/src/lapacke_cheev_work.c b/lapack-netlib/LAPACKE/src/lapacke_cheev_work.c
index 40224607c..f505dfab0 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_cheev_work.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_cheev_work.c
@@ -70,7 +70,7 @@ lapack_int LAPACKE_cheev_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cheev( &jobz, &uplo, &n, a_t, &lda_t, w, work, &lwork, rwork,
                       &info );
@@ -78,7 +78,7 @@ lapack_int LAPACKE_cheev_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
diff --git a/lapack-netlib/LAPACKE/src/lapacke_cheevd.c b/lapack-netlib/LAPACKE/src/lapacke_cheevd.c
index d0dea375b..75fa47915 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_cheevd.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_cheevd.c
@@ -53,7 +53,7 @@ lapack_int LAPACKE_cheevd( int matrix_layout, char jobz, char uplo, lapack_int n
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
@@ -65,7 +65,7 @@ lapack_int LAPACKE_cheevd( int matrix_layout, char jobz, char uplo, lapack_int n
     if( info != 0 ) {
         goto exit_level_0;
     }
-    liwork = (lapack_int)iwork_query;
+    liwork = iwork_query;
     lrwork = (lapack_int)rwork_query;
     lwork = LAPACK_C2INT( work_query );
     /* Allocate memory for work arrays */
diff --git a/lapack-netlib/LAPACKE/src/lapacke_cheevd_2stage.c b/lapack-netlib/LAPACKE/src/lapacke_cheevd_2stage.c
index d87481abf..cb4d34a09 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_cheevd_2stage.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_cheevd_2stage.c
@@ -53,7 +53,7 @@ lapack_int LAPACKE_cheevd_2stage( int matrix_layout, char jobz, char uplo, lapac
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
         /* Optionally check input matrices for NaNs */
-        if( LAPACKE_cge_nancheck( matrix_layout, n, n, a, lda ) ) {
+        if( LAPACKE_che_nancheck( matrix_layout, uplo, n, a, lda ) ) {
             return -5;
         }
     }
@@ -65,7 +65,7 @@ lapack_int LAPACKE_cheevd_2stage( int matrix_layout, char jobz, char uplo, lapac
     if( info != 0 ) {
         goto exit_level_0;
     }
-    liwork = (lapack_int)iwork_query;
+    liwork = iwork_query;
     lrwork = (lapack_int)rwork_query;
     lwork = LAPACK_C2INT( work_query );
     /* Allocate memory for work arrays */
diff --git a/lapack-netlib/LAPACKE/src/lapacke_cheevd_2stage_work.c b/lapack-netlib/LAPACKE/src/lapacke_cheevd_2stage_work.c
index cb51f9ee4..e9e6a5d1d 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_cheevd_2stage_work.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_cheevd_2stage_work.c
@@ -71,7 +71,7 @@ lapack_int LAPACKE_cheevd_2stage_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cheevd_2stage( &jobz, &uplo, &n, a_t, &lda_t, w, work, &lwork, rwork,
                        &lrwork, iwork, &liwork, &info );
@@ -79,7 +79,7 @@ lapack_int LAPACKE_cheevd_2stage_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
diff --git a/lapack-netlib/LAPACKE/src/lapacke_cheevd_work.c b/lapack-netlib/LAPACKE/src/lapacke_cheevd_work.c
index 81869c564..4c5f352a8 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_cheevd_work.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_cheevd_work.c
@@ -71,7 +71,7 @@ lapack_int LAPACKE_cheevd_work( int matrix_layout, char jobz, char uplo,
             goto exit_level_0;
         }
         /* Transpose input matrices */
-        LAPACKE_cge_trans( matrix_layout, n, n, a, lda, a_t, lda_t );
+        LAPACKE_che_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
         LAPACK_cheevd( &jobz, &uplo, &n, a_t, &lda_t, w, work, &lwork, rwork,
                        &lrwork, iwork, &liwork, &info );
@@ -79,7 +79,8 @@ lapack_int LAPACKE_cheevd_work( int matrix_layout, char jobz, char uplo,
             info = info - 1;
         }
         /* Transpose output matrices */
-        LAPACKE_cge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda );
+        LAPACKE_che_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
+
         /* Release memory and exit */
         LAPACKE_free( a_t );
 exit_level_0:
diff --git a/lapack-netlib/LAPACKE/src/lapacke_cheevr.c b/lapack-netlib/LAPACKE/src/lapacke_cheevr.c
index 6fe261624..f277e7f70 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_cheevr.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_cheevr.c
@@ -83,7 +83,7 @@ lapack_int LAPACKE_cheevr( int matrix_layout, char jobz, char range, char uplo,
     if( info != 0 ) {
         goto exit_level_0;
     }
-    liwork = (lapack_int)iwork_query;
+    liwork = iwork_query;
     lrwork = (lapack_int)rwork_query;
     lwork = LAPACK_C2INT( work_query );
     /* Allocate memory for work arrays */
diff --git a/lapack-netlib/LAPACKE/src/lapacke_cheevr_2stage.c b/lapack-netlib/LAPACKE/src/lapacke_cheevr_2stage.c
index 5b3f5c77a..a09eac1bd 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_cheevr_2stage.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_cheevr_2stage.c
@@ -83,7 +83,7 @@ lapack_int LAPACKE_cheevr_2stage( int matrix_layout, char jobz, char range, char
     if( info != 0 ) {
         goto exit_level_0;
     }
-    liwork = (lapack_int)iwork_query;
+    liwork = iwork_query;
     lrwork = (lapack_int)rwork_query;
     lwork = LAPACK_C2INT( work_query );
     /* Allocate memory for work arrays */
diff --git a/lapack-netlib/LAPACKE/src/lapacke_chegst.c b/lapack-netlib/LAPACKE/src/lapacke_chegst.c
index c628017c2..ff7dd3532 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_chegst.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_chegst.c
@@ -35,7 +35,7 @@
 
 lapack_int LAPACKE_chegst( int matrix_layout, lapack_int itype, char uplo,
                            lapack_int n, lapack_complex_float* a,
-                           lapack_int lda, const lapack_complex_float* b,
+                           lapack_int lda, lapack_complex_float* b,
                            lapack_int ldb )
 {
     if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) {
diff --git a/lapack-netlib/LAPACKE/src/lapacke_chegst_work.c b/lapack-netlib/LAPACKE/src/lapacke_chegst_work.c
index 001863819..a29e01961 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_chegst_work.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_chegst_work.c
@@ -35,7 +35,7 @@
 
 lapack_int LAPACKE_chegst_work( int matrix_layout, lapack_int itype, char uplo,
                                 lapack_int n, lapack_complex_float* a,
-                                lapack_int lda, const lapack_complex_float* b,
+                                lapack_int lda, lapack_complex_float* b,
                                 lapack_int ldb )
 {
     lapack_int info = 0;
diff --git a/lapack-netlib/LAPACKE/src/lapacke_chegvd.c b/lapack-netlib/LAPACKE/src/lapacke_chegvd.c
index 2959cb0dc..98c901982 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_chegvd.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_chegvd.c
@@ -70,7 +70,7 @@ lapack_int LAPACKE_chegvd( int matrix_layout, lapack_int itype, char jobz,
     if( info != 0 ) {
         goto exit_level_0;
     }
-    liwork = (lapack_int)iwork_query;
+    liwork = iwork_query;
     lrwork = (lapack_int)rwork_query;
     lwork = LAPACK_C2INT( work_query );
     /* Allocate memory for work arrays */
diff --git a/lapack-netlib/LAPACKE/src/lapacke_chpevd.c b/lapack-netlib/LAPACKE/src/lapacke_chpevd.c
index 47c7bbe23..fbdb73802 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_chpevd.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_chpevd.c
@@ -66,7 +66,7 @@ lapack_int LAPACKE_chpevd( int matrix_layout, char jobz, char uplo, lapack_int n
     if( info != 0 ) {
         goto exit_level_0;
     }
-    liwork = (lapack_int)iwork_query;
+    liwork = iwork_query;
     lrwork = (lapack_int)rwork_query;
     lwork = LAPACK_C2INT( work_query );
     /* Allocate memory for work arrays */
diff --git a/lapack-netlib/LAPACKE/src/lapacke_chpgvd.c b/lapack-netlib/LAPACKE/src/lapacke_chpgvd.c
index 568882ec9..587d1509a 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_chpgvd.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_chpgvd.c
@@ -70,7 +70,7 @@ lapack_int LAPACKE_chpgvd( int matrix_layout, lapack_int itype, char jobz,
     if( info != 0 ) {
         goto exit_level_0;
     }
-    liwork = (lapack_int)iwork_query;
+    liwork = iwork_query;
     lrwork = (lapack_int)rwork_query;
     lwork = LAPACK_C2INT( work_query );
     /* Allocate memory for work arrays */
diff --git a/lapack-netlib/LAPACKE/src/lapacke_clantr_work.c b/lapack-netlib/LAPACKE/src/lapacke_clantr_work.c
index 7f74a9789..8c4c21935 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_clantr_work.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_clantr_work.c
@@ -43,12 +43,10 @@ float LAPACKE_clantr_work( int matrix_layout, char norm, char uplo,
     if( matrix_layout == LAPACK_COL_MAJOR ) {
         /* Call LAPACK function and adjust info */
         res = LAPACK_clantr( &norm, &uplo, &diag, &m, &n, a, &lda, work );
-        if( info < 0 ) {
-            info = info - 1;
-        }
     } else if( matrix_layout == LAPACK_ROW_MAJOR ) {
         lapack_int lda_t = MAX(1,m);
         lapack_complex_float* a_t = NULL;
+        float* work_lapack = NULL;
         /* Check leading dimension(s) */
         if( lda < n ) {
             info = -8;
@@ -62,12 +60,23 @@ float LAPACKE_clantr_work( int matrix_layout, char norm, char uplo,
             info = LAPACK_TRANSPOSE_MEMORY_ERROR;
             goto exit_level_0;
         }
+        /* Allocate memory for work array(s) */
+        if( LAPACKE_lsame( norm, 'i' ) ) {
+            work_lapack = (float*)LAPACKE_malloc( sizeof(float) * MAX(1,m) );
+            if( work_lapack == NULL ) {
+                info = LAPACK_WORK_MEMORY_ERROR;
+                goto exit_level_1;
+            }
+        }
         /* Transpose input matrices */
         LAPACKE_ctr_trans( matrix_layout, uplo, diag, MAX(m,n), a, lda, a_t, lda_t );
         /* Call LAPACK function and adjust info */
-        res = LAPACK_clantr( &norm, &uplo, &diag, &m, &n, a_t, &lda_t, work );
-        info = 0;  /* LAPACK call is ok! */
+        res = LAPACK_clantr( &norm, &uplo, &diag, &m, &n, a_t, &lda_t, work_lapack );
         /* Release memory and exit */
+        if( work_lapack ) {
+            LAPACKE_free( work_lapack );
+        }
+exit_level_1:
         LAPACKE_free( a_t );
 exit_level_0:
         if( info == LAPACK_TRANSPOSE_MEMORY_ERROR ) {
diff --git a/lapack-netlib/LAPACKE/src/lapacke_cstedc.c b/lapack-netlib/LAPACKE/src/lapacke_cstedc.c
index 5be3cec70..3c0be27d5 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_cstedc.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_cstedc.c
@@ -73,7 +73,7 @@ lapack_int LAPACKE_cstedc( int matrix_layout, char compz, lapack_int n, float* d
     if( info != 0 ) {
         goto exit_level_0;
     }
-    liwork = (lapack_int)iwork_query;
+    liwork = iwork_query;
     lrwork = (lapack_int)rwork_query;
     lwork = LAPACK_C2INT( work_query );
     /* Allocate memory for work arrays */
diff --git a/lapack-netlib/LAPACKE/src/lapacke_cstegr.c b/lapack-netlib/LAPACKE/src/lapacke_cstegr.c
index 986702e62..86a0cd72d 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_cstegr.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_cstegr.c
@@ -81,7 +81,7 @@ lapack_int LAPACKE_cstegr( int matrix_layout, char jobz, char range,
     if( info != 0 ) {
         goto exit_level_0;
     }
-    liwork = (lapack_int)iwork_query;
+    liwork = iwork_query;
     lwork = (lapack_int)work_query;
     /* Allocate memory for work arrays */
     iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
diff --git a/lapack-netlib/LAPACKE/src/lapacke_cstemr.c b/lapack-netlib/LAPACKE/src/lapacke_cstemr.c
index 9b9b84e49..51e63c675 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_cstemr.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_cstemr.c
@@ -75,7 +75,7 @@ lapack_int LAPACKE_cstemr( int matrix_layout, char jobz, char range,
     if( info != 0 ) {
         goto exit_level_0;
     }
-    liwork = (lapack_int)iwork_query;
+    liwork = iwork_query;
     lwork = (lapack_int)work_query;
     /* Allocate memory for work arrays */
     iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );
diff --git a/lapack-netlib/LAPACKE/src/lapacke_csytrs2.c b/lapack-netlib/LAPACKE/src/lapacke_csytrs2.c
index f4a0a4334..44405c993 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_csytrs2.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_csytrs2.c
@@ -34,7 +34,7 @@
 #include "lapacke_utils.h"
 
 lapack_int LAPACKE_csytrs2( int matrix_layout, char uplo, lapack_int n,
-                            lapack_int nrhs, const lapack_complex_float* a,
+                            lapack_int nrhs, lapack_complex_float* a,
                             lapack_int lda, const lapack_int* ipiv,
                             lapack_complex_float* b, lapack_int ldb )
 {
diff --git a/lapack-netlib/LAPACKE/src/lapacke_csytrs2_work.c b/lapack-netlib/LAPACKE/src/lapacke_csytrs2_work.c
index d914c1d69..8567a07d5 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_csytrs2_work.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_csytrs2_work.c
@@ -34,7 +34,7 @@
 #include "lapacke_utils.h"
 
 lapack_int LAPACKE_csytrs2_work( int matrix_layout, char uplo, lapack_int n,
-                                 lapack_int nrhs, const lapack_complex_float* a,
+                                 lapack_int nrhs, lapack_complex_float* a,
                                  lapack_int lda, const lapack_int* ipiv,
                                  lapack_complex_float* b, lapack_int ldb,
                                  lapack_complex_float* work )
diff --git a/lapack-netlib/LAPACKE/src/lapacke_ctgsen.c b/lapack-netlib/LAPACKE/src/lapacke_ctgsen.c
index e2f38c87b..6bfcdc996 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_ctgsen.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_ctgsen.c
@@ -84,7 +84,7 @@ lapack_int LAPACKE_ctgsen( int matrix_layout, lapack_int ijob,
     if( info != 0 ) {
         goto exit_level_0;
     }
-    liwork = (lapack_int)iwork_query;
+    liwork = iwork_query;
     lwork = LAPACK_C2INT( work_query );
     /* Allocate memory for work arrays */
     if( ijob != 0 ) {
diff --git a/lapack-netlib/LAPACKE/src/lapacke_ctprfb.c b/lapack-netlib/LAPACKE/src/lapacke_ctprfb.c
index 9d2684e4c..fd49d6a7f 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_ctprfb.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_ctprfb.c
@@ -41,7 +41,7 @@ lapack_int LAPACKE_ctprfb( int matrix_layout, char side, char trans, char direct
                            lapack_complex_float* a, lapack_int lda,
                            lapack_complex_float* b, lapack_int ldb )
 {
-    lapack_int ncols_v, nrows_v;
+    lapack_int ncols_v, nrows_v, ncols_a, nrows_a;
     lapack_int info = 0;
     lapack_int ldwork;
     lapack_int work_size;
@@ -52,20 +52,33 @@ lapack_int LAPACKE_ctprfb( int matrix_layout, char side, char trans, char direct
     }
 #ifndef LAPACK_DISABLE_NAN_CHECK
     if( LAPACKE_get_nancheck() ) {
-        /* Optionally check input matrices for NaNs */
+        /* Optionally check input matrices for NaNs
+         * V is m-by-k (left,  columnwise)
+         *   or n-by-k (right, columnwise)
+         *   or k-by-m (left,  rowwise)
+         *   or k-by-n (right, rowwise)
+         * T is k-by-k
+         * A is k-by-n (left)
+         *   or m-by-k (right)
+         * B is m-by-n
+         */
         if( LAPACKE_lsame( storev, 'C' ) ) {
             ncols_v = k;
             nrows_v = LAPACKE_lsame( side, 'L' ) ? m :
-                                 ( LAPACKE_lsame( side, 'R' ) ? n : 0 );
+                      LAPACKE_lsame( side, 'R' ) ? n : 0;
         } else if( LAPACKE_lsame( storev, 'R' ) ) {
             ncols_v = LAPACKE_lsame( side, 'L' ) ? m :
-                                 ( LAPACKE_lsame( side, 'R' ) ? n : 0 );
+                      LAPACKE_lsame( side, 'R' ) ? n : 0;
             nrows_v = k;
         } else {
             ncols_v = 0;
             nrows_v = 0;
         }
-        if( LAPACKE_cge_nancheck( matrix_layout, k, m, a, lda ) ) {
+        nrows_a = LAPACKE_lsame( side, 'L' ) ? k :
+                  LAPACKE_lsame( side, 'R' ) ? m : 0;
+        ncols_a = LAPACKE_lsame( side, 'L' ) ? n :
+                  LAPACKE_lsame( side, 'R' ) ? k : 0;
+        if( LAPACKE_cge_nancheck( matrix_layout, ncols_a, nrows_a, a, lda ) ) {
             return -14;
         }
         if( LAPACKE_cge_nancheck( matrix_layout, m, n, b, ldb ) ) {
@@ -80,13 +93,13 @@ lapack_int LAPACKE_ctprfb( int matrix_layout, char side, char trans, char direct
     }
 #endif
     if (side=='l' ||  side=='L') {
-       ldwork = k;
-       work_size = MAX(1,ldwork) * MAX(1,n);
-       }
+        ldwork = k;
+        work_size = MAX(1,ldwork) * MAX(1,n);
+    }
     else {
-       ldwork = m;
-       work_size = MAX(1,ldwork) * MAX(1,k);
-       }
+        ldwork = m;
+        work_size = MAX(1,ldwork) * MAX(1,k);
+    }
     /* Allocate memory for working array(s) */
     work = (lapack_complex_float*)
         LAPACKE_malloc( sizeof(lapack_complex_float) * work_size );
diff --git a/lapack-netlib/LAPACKE/src/lapacke_cunmhr.c b/lapack-netlib/LAPACKE/src/lapacke_cunmhr.c
index 592c6de45..127dd8c57 100644
--- a/lapack-netlib/LAPACKE/src/lapacke_cunmhr.c
+++ b/lapack-netlib/LAPACKE/src/lapacke_cunmhr.c
@@ -58,7 +58,7 @@ lapack_int LAPACKE_cunmhr( int matrix_layout, char side, char trans,
         if( LAPACKE_cge_nancheck( matrix_layout, m, n, c, ldc ) ) {
             return -11;
         }
-        if( LAPACKE_c_nancheck( m-1, tau, 1 ) ) {
+        if( LAPACKE_c_nancheck( r-1, tau, 1 ) ) {
             return -10;
         }
     }